diff --git a/DEPS b/DEPS index 7246adf..6895f698 100644 --- a/DEPS +++ b/DEPS
@@ -175,11 +175,11 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling Skia # and whatever else without interference from each other. - 'skia_revision': 'dafbf121a8b185b9a68f363badd21e44e52275ef', + 'skia_revision': '7bb74c4299b8a85de1e5718fc45da569d6dab3fc', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling V8 # and whatever else without interference from each other. - 'v8_revision': '866726ef76c0d7d7ee239bfc7be732da0a7f6a59', + 'v8_revision': 'c1fd0b363c112c57e189e7f9b23f63cf5c2f2af3', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling swarming_client # and whatever else without interference from each other. @@ -187,7 +187,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': '90a8af383cf9173b36ed17ca5a2ec6df9fd0dbc7', + 'angle_revision': '84780f7dc5e191f50a5070a8ef6dc1108ee51c36', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling SwiftShader # and whatever else without interference from each other. @@ -195,7 +195,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': 'dbb6fcdf4353e6f186ee60b377d594c813f8fa63', + 'pdfium_revision': '83d503bc728e8a42d500727f3982de21c02f406b', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling BoringSSL # and whatever else without interference from each other. @@ -246,7 +246,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': '21996bda4c5234860015cf22fa6a49567b6394bb', + 'devtools_frontend_revision': 'ee9e28d54f35fc28e832af445e1aa9911b22660b', # 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. @@ -899,7 +899,7 @@ }, 'src/third_party/depot_tools': - Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '4c7c4b4bc6e8f294d611679364a821508e21b6bd', + Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '1ee78cdaac80d5dde7f630e6497b7b0829e38114', 'src/third_party/devtools-frontend/src': Var('chromium_git') + '/devtools/devtools-frontend' + '@' + Var('devtools_frontend_revision'), @@ -1233,7 +1233,7 @@ Var('chromium_git') + '/external/github.com/cisco/openh264' + '@' + '6f26bce0b1c4e8ce0e13332f7c0083788def5fdf', 'src/third_party/openscreen/src': - Var('chromium_git') + '/openscreen' + '@' + '84bd9713ed32230a226cb400c486564db69eadd5', + Var('chromium_git') + '/openscreen' + '@' + '1480c41c16eeba9a6c0a254ef5e9cd2f0ad4cc62', 'src/third_party/openxr/src': { 'url': Var('chromium_git') + '/external/github.com/KhronosGroup/OpenXR-SDK' + '@' + '9e97b73e7dd2bfc07745489d728f6a36665c648f', @@ -1250,7 +1250,7 @@ }, 'src/third_party/perfetto': - Var('android_git') + '/platform/external/perfetto.git' + '@' + 'de29e8343a24507ae8012895a4ff9d44bf57e10d', + Var('android_git') + '/platform/external/perfetto.git' + '@' + 'a31b0a0fbc1c6fac5701ec1154d311a9fb600c96', 'src/third_party/perl': { 'url': Var('chromium_git') + '/chromium/deps/perl.git' + '@' + '6f3e5028eb65d0b4c5fdd792106ac4c84eee1eb3', @@ -1454,7 +1454,7 @@ Var('chromium_git') + '/external/github.com/gpuweb/cts.git' + '@' + '84ee597cdeae08bb26e578fc66a35bcf35f633f4', 'src/third_party/webrtc': - Var('webrtc_git') + '/src.git' + '@' + 'd8d15937da6d6bc76c5b8411e08cb2b18ca0b07b', + Var('webrtc_git') + '/src.git' + '@' + '484bb8a03b97d71ca675a1b4800ab477f514f036', 'src/third_party/libgifcodec': Var('skia_git') + '/libgifcodec' + '@'+ Var('libgifcodec_revision'), @@ -1529,7 +1529,7 @@ Var('chromium_git') + '/v8/v8.git' + '@' + Var('v8_revision'), 'src-internal': { - 'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@06c36b3c16208d873528ba6ac0f3b8a999427096', + 'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@905a6de3705f05e6cd1d5c058801805f36efe024', 'condition': 'checkout_src_internal', },
diff --git a/android_webview/nonembedded/java/res_devui/layout/crashes_list_item_body.xml b/android_webview/nonembedded/java/res_devui/layout/crashes_list_item_body.xml index 3e86ef47..6c4d941d 100644 --- a/android_webview/nonembedded/java/res_devui/layout/crashes_list_item_body.xml +++ b/android_webview/nonembedded/java/res_devui/layout/crashes_list_item_body.xml
@@ -20,9 +20,6 @@ android:orientation="vertical"> <include layout="@layout/two_line_sublist_item" - android:id="@+id/variations"/> - - <include layout="@layout/two_line_sublist_item" android:id="@+id/upload_status"/> <!--suppress HardcodedText -->
diff --git a/android_webview/nonembedded/java/src/org/chromium/android_webview/devui/CrashesListActivity.java b/android_webview/nonembedded/java/src/org/chromium/android_webview/devui/CrashesListActivity.java index cd808d7..621cb3ca 100644 --- a/android_webview/nonembedded/java/src/org/chromium/android_webview/devui/CrashesListActivity.java +++ b/android_webview/nonembedded/java/src/org/chromium/android_webview/devui/CrashesListActivity.java
@@ -215,7 +215,6 @@ } // Child View where more info about the crash is shown: - // - Variation keys for the crash. // - Crash report upload status. @Override public View getChildView(int groupPosition, final int childPosition, boolean isLastChild, @@ -227,25 +226,6 @@ } CrashInfo crashInfo = (CrashInfo) getChild(groupPosition, childPosition); - // Variations keys - View variationsView = view.findViewById(R.id.variations); - setTwoLineListItemText(variationsView, "Variations", - crashInfo.variations == null ? "Not available" - : crashInfo.variations.toString()); - variationsView.setOnLongClickListener(v -> { - if (crashInfo.variations != null) { - ClipboardManager clipboard = - (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE); - ClipData clip = - ClipData.newPlainText("variations", crashInfo.variations.toString()); - clipboard.setPrimaryClip(clip); - // Show a toast that the text has been copied. - Toast.makeText(CrashesListActivity.this, "Copied variations keys", - Toast.LENGTH_SHORT) - .show(); - } - return true; - }); // Upload info String uploadState = uploadStateString(crashInfo.uploadState);
diff --git a/ash/multi_device_setup/multi_device_notification_presenter_unittest.cc b/ash/multi_device_setup/multi_device_notification_presenter_unittest.cc index 132251c..791d36d 100644 --- a/ash/multi_device_setup/multi_device_notification_presenter_unittest.cc +++ b/ash/multi_device_setup/multi_device_notification_presenter_unittest.cc
@@ -97,19 +97,19 @@ MultiDeviceNotificationPresenterTest() = default; void SetUp() override { - NoSessionAshTestBase::SetUp(); + fake_multidevice_setup_ = + std::make_unique<chromeos::multidevice_setup::FakeMultiDeviceSetup>(); + auto delegate = std::make_unique<TestShellDelegate>(); + delegate->SetMultiDeviceSetupBinder(base::BindRepeating( + &chromeos::multidevice_setup::MultiDeviceSetupBase::BindReceiver, + base::Unretained(fake_multidevice_setup_.get()))); + NoSessionAshTestBase::SetUp(std::move(delegate)); test_system_tray_client_ = GetSystemTrayClient(); - fake_multidevice_setup_ = - std::make_unique<chromeos::multidevice_setup::FakeMultiDeviceSetup>(); notification_presenter_ = std::make_unique<MultiDeviceNotificationPresenter>( &test_message_center_); - ash_test_helper()->test_shell_delegate()->SetMultiDeviceSetupBinder( - base::BindRepeating( - &chromeos::multidevice_setup::MultiDeviceSetupBase::BindReceiver, - base::Unretained(fake_multidevice_setup_.get()))); } void TearDown() override {
diff --git a/ash/public/cpp/shelf_config.h b/ash/public/cpp/shelf_config.h index 83737d5f..22f1926 100644 --- a/ash/public/cpp/shelf_config.h +++ b/ash/public/cpp/shelf_config.h
@@ -224,6 +224,9 @@ // Updates shelf config - called when the accessibility state changes. void UpdateConfigForAccessibilityState(); + // Whether shelf config was calculated for tablet mode. + bool in_tablet_mode_; + // Whether shelf is currently standard or dense. bool is_dense_;
diff --git a/ash/public/cpp/system_tray_client.h b/ash/public/cpp/system_tray_client.h index 81692e1..05598b2 100644 --- a/ash/public/cpp/system_tray_client.h +++ b/ash/public/cpp/system_tray_client.h
@@ -67,6 +67,9 @@ // Shows the settings related to accessibility. virtual void ShowAccessibilitySettings() = 0; + // Shows gesture education help. + virtual void ShowGestureEducationHelp() = 0; + // Shows the help center article for the stylus tool palette. virtual void ShowPaletteHelp() = 0;
diff --git a/ash/public/cpp/test/test_system_tray_client.cc b/ash/public/cpp/test/test_system_tray_client.cc index e6d941d..f96abd1 100644 --- a/ash/public/cpp/test/test_system_tray_client.cc +++ b/ash/public/cpp/test/test_system_tray_client.cc
@@ -46,6 +46,8 @@ void TestSystemTrayClient::ShowAccessibilitySettings() {} +void TestSystemTrayClient::ShowGestureEducationHelp() {} + void TestSystemTrayClient::ShowPaletteHelp() {} void TestSystemTrayClient::ShowPaletteSettings() {}
diff --git a/ash/public/cpp/test/test_system_tray_client.h b/ash/public/cpp/test/test_system_tray_client.h index 6c1b9e2..2d710cd 100644 --- a/ash/public/cpp/test/test_system_tray_client.h +++ b/ash/public/cpp/test/test_system_tray_client.h
@@ -35,6 +35,7 @@ void ShowHelp() override; void ShowAccessibilityHelp() override; void ShowAccessibilitySettings() override; + void ShowGestureEducationHelp() override; void ShowPaletteHelp() override; void ShowPaletteSettings() override; void ShowPublicAccountInfo() override;
diff --git a/ash/shelf/shelf_config.cc b/ash/shelf/shelf_config.cc index aed8eea..3c6fdb4 100644 --- a/ash/shelf/shelf_config.cc +++ b/ash/shelf/shelf_config.cc
@@ -14,6 +14,7 @@ #include "ash/system/model/system_tray_model.h" #include "ash/wallpaper/wallpaper_controller_impl.h" #include "ash/wm/tablet_mode/tablet_mode_controller.h" +#include "base/metrics/histogram_functions.h" #include "base/scoped_observer.h" #include "chromeos/constants/chromeos_switches.h" #include "ui/gfx/color_analysis.h" @@ -24,6 +25,15 @@ namespace { +// Used in as a value in histogram to record the reason shelf navigation buttons +// are shown in tablet mode. +// The values assigned to enum items should not be changed/reassigned. +constexpr int kControlButtonsShownForShelfNavigationButtonsSetting = 1; +constexpr int kControlButtonsShownForSpokenFeedback = 1 << 1; +constexpr int kControlButtonsShownForSwitchAccess = 1 << 2; +constexpr int kControlButtonsShownForAutoclick = 1 << 3; +constexpr int kControlButtonsShownReasonCount = 1 << 4; + // When any edge of the primary display is less than or equal to this threshold, // dense shelf will be active. const int kDenseShelfScreenSizeThreshold = 600; @@ -40,6 +50,33 @@ ->tablet_mode_shelf_navigation_buttons_enabled(); } +// Records the histogram value tracking the reason shelf control buttons are +// shown in tablet mode. +void RecordReasonForShowingShelfControls() { + AccessibilityControllerImpl* accessibility_controller = + Shell::Get()->accessibility_controller(); + int buttons_shown_reason_mask = 0; + + if (accessibility_controller + ->tablet_mode_shelf_navigation_buttons_enabled()) { + buttons_shown_reason_mask |= + kControlButtonsShownForShelfNavigationButtonsSetting; + } + + if (accessibility_controller->spoken_feedback_enabled()) + buttons_shown_reason_mask |= kControlButtonsShownForSpokenFeedback; + + if (accessibility_controller->switch_access_enabled()) + buttons_shown_reason_mask |= kControlButtonsShownForSwitchAccess; + + if (accessibility_controller->autoclick_enabled()) + buttons_shown_reason_mask |= kControlButtonsShownForAutoclick; + + base::UmaHistogramExactLinear( + "Ash.Shelf.NavigationButtonsInTabletMode.ReasonShown", + buttons_shown_reason_mask, kControlButtonsShownReasonCount); +} + } // namespace class ShelfConfig::ShelfAccessibilityObserver : public AccessibilityObserver { @@ -71,7 +108,8 @@ }; ShelfConfig::ShelfConfig() - : is_dense_(false), + : in_tablet_mode_(false), + is_dense_(false), shelf_controls_shown_(true), is_virtual_keyboard_shown_(false), is_app_list_visible_(false), @@ -273,11 +311,16 @@ (screen_size.width() <= kDenseShelfScreenSizeThreshold || screen_size.height() <= kDenseShelfScreenSizeThreshold)); - // TODO(http::crbug.com/1008956): Add a user preference that would allow the - // user or a policy to override this behavior. + const bool can_hide_shelf_controls = + in_tablet_mode && features::IsHideShelfControlsInTabletModeEnabled(); const bool new_shelf_controls_shown = - !(in_tablet_mode && features::IsHideShelfControlsInTabletModeEnabled()) || - ShelfControlsForcedShownForAccessibility(); + !can_hide_shelf_controls || ShelfControlsForcedShownForAccessibility(); + // Record reason to show shelf control buttons only if tablet mode changes, or + // if the buttons visibility state changes + if (can_hide_shelf_controls && new_shelf_controls_shown && + (!in_tablet_mode_ || !shelf_controls_shown_)) { + RecordReasonForShowingShelfControls(); + } // TODO(https://crbug.com/1058205): Test this behavior. // If the virtual keyboard is shown, the back button and in-app shelf should @@ -288,6 +331,8 @@ ? Shell::Get()->system_tray_model()->virtual_keyboard()->visible() : false; + in_tablet_mode_ = in_tablet_mode; + if (new_is_dense == is_dense_ && shelf_controls_shown_ == new_shelf_controls_shown && is_virtual_keyboard_shown_ == virtual_keyboard_shown &&
diff --git a/ash/shelf/shelf_view_unittest.cc b/ash/shelf/shelf_view_unittest.cc index f7c7e65..9bd0c6d3 100644 --- a/ash/shelf/shelf_view_unittest.cc +++ b/ash/shelf/shelf_view_unittest.cc
@@ -45,7 +45,6 @@ #include "ash/test/ash_test_helper.h" #include "ash/test/ui_controls_factory_ash.h" #include "ash/test_screenshot_delegate.h" -#include "ash/test_shell_delegate.h" #include "ash/wallpaper/wallpaper_controller_impl.h" #include "ash/wallpaper/wallpaper_controller_test_api.h" #include "ash/wm/tablet_mode/tablet_mode_controller.h" @@ -1942,11 +1941,6 @@ ShelfViewInkDropTest() = default; ~ShelfViewInkDropTest() override = default; - void SetUp() override { - ash_test_helper()->set_test_shell_delegate(new TestShellDelegate()); - ShelfViewTest::SetUp(); - } - protected: void InitHomeButtonInkDrop() { home_button_ = GetPrimaryShelf()->navigation_widget()->GetHomeButton();
diff --git a/ash/shell/content/client/shell_browser_main_parts.cc b/ash/shell/content/client/shell_browser_main_parts.cc index f0b86a6..ce6b8749 100644 --- a/ash/shell/content/client/shell_browser_main_parts.cc +++ b/ash/shell/content/client/shell_browser_main_parts.cc
@@ -8,7 +8,6 @@ #include <utility> #include "ash/display/privacy_screen_controller.h" -#include "ash/keyboard/test_keyboard_ui.h" #include "ash/login_status.h" #include "ash/public/cpp/event_rewriter_controller.h" #include "ash/session/test_pref_service_provider.h" @@ -21,7 +20,6 @@ #include "ash/shell/shell_views_delegate.h" #include "ash/shell/window_type_launcher.h" #include "ash/shell/window_watcher.h" -#include "ash/shell_init_params.h" #include "ash/sticky_keys/sticky_keys_controller.h" #include "ash/test/ash_test_helper.h" #include "base/bind.h" @@ -85,9 +83,9 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() { browser_context_.reset(new content::ShellBrowserContext(false)); - ash_test_helper_ = std::make_unique<AshTestHelper>(); - AshTestHelper::InitParams init_params; + init_params.delegate = std::make_unique<ShellDelegateImpl>(); + init_params.context_factory = content::GetContextFactory(); // TODO(oshima): Separate the class for ash_shell to reduce the test binary // size. if (parameters_.ui_task) { @@ -96,14 +94,8 @@ new_window_delegate_ = std::make_unique<ShellNewWindowDelegate>(); init_params.config_type = AshTestHelper::kShell; } - - ShellInitParams shell_init_params; - shell_init_params.delegate = std::make_unique<ShellDelegateImpl>(); - shell_init_params.context_factory = content::GetContextFactory(); - shell_init_params.keyboard_ui_factory = - std::make_unique<TestKeyboardUIFactory>(); - - ash_test_helper_->SetUp(init_params, std::move(shell_init_params)); + ash_test_helper_ = std::make_unique<AshTestHelper>(); + ash_test_helper_->SetUp(std::move(init_params)); window_watcher_ = std::make_unique<WindowWatcher>();
diff --git a/ash/system/gesture_education/gesture_education_notification_controller.cc b/ash/system/gesture_education/gesture_education_notification_controller.cc index 6aaead9..8b50874 100644 --- a/ash/system/gesture_education/gesture_education_notification_controller.cc +++ b/ash/system/gesture_education/gesture_education_notification_controller.cc
@@ -81,7 +81,7 @@ } void GestureEducationNotificationController::HandleNotificationClick() { - Shell::Get()->system_tray_model()->client()->ShowHelp(); + Shell::Get()->system_tray_model()->client()->ShowGestureEducationHelp(); } base::string16 GestureEducationNotificationController::GetNotificationMessage()
diff --git a/ash/test/ash_test_base.cc b/ash/test/ash_test_base.cc index 1527293..62e7475 100644 --- a/ash/test/ash_test_base.cc +++ b/ash/test/ash_test_base.cc
@@ -126,6 +126,10 @@ } void AshTestBase::SetUp() { + SetUp(nullptr); +} + +void AshTestBase::SetUp(std::unique_ptr<TestShellDelegate> delegate) { // At this point, the task APIs should already be provided either by // |task_environment_| or by the subclass in the // SubclassManagesTaskEnvironment mode. @@ -140,13 +144,13 @@ AshTestHelper::InitParams params; params.start_session = start_session_; + params.delegate = std::move(delegate); if (register_local_state_) { DCHECK(local_state_.get()); RegisterLocalStatePrefs(local_state_->registry(), true); } params.local_state = local_state_.get(); - params.config_type = AshTestHelper::kUnitTest; - ash_test_helper_.SetUp(params); + ash_test_helper_.SetUp(std::move(params)); Shell::GetPrimaryRootWindow()->Show(); Shell::GetPrimaryRootWindow()->GetHost()->Show();
diff --git a/ash/test/ash_test_base.h b/ash/test/ash_test_base.h index 39b07b2..5038681 100644 --- a/ash/test/ash_test_base.h +++ b/ash/test/ash_test_base.h
@@ -70,6 +70,7 @@ class AppListTestHelper; class Shelf; class TestScreenshotDelegate; +class TestShellDelegate; class TestSystemTrayClient; class UnifiedSystemTray; class WorkAreaInsets; @@ -95,6 +96,7 @@ // testing::Test: void SetUp() override; + void SetUp(std::unique_ptr<TestShellDelegate> delegate); void TearDown() override; // Returns the Shelf for the primary display.
diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc index e0a1738..39713e0 100644 --- a/ash/test/ash_test_helper.cc +++ b/ash/test/ash_test_helper.cc
@@ -24,6 +24,7 @@ #include "ash/session/test_pref_service_provider.h" #include "ash/session/test_session_controller_client.h" #include "ash/shell.h" +#include "ash/shell_init_params.h" #include "ash/system/message_center/test_notifier_settings_controller.h" #include "ash/system/model/system_tray_model.h" #include "ash/system/screen_layout_observer.h" @@ -65,6 +66,10 @@ namespace ash { +AshTestHelper::InitParams::InitParams() = default; +AshTestHelper::InitParams::InitParams(InitParams&&) = default; +AshTestHelper::InitParams::~InitParams() = default; + AshTestHelper::AshTestHelper() : command_line_(std::make_unique<base::test::ScopedCommandLine>()) {} @@ -74,8 +79,7 @@ ScreenAsh::DeleteScreenForShutdown(); } -void AshTestHelper::SetUp(const InitParams& init_params, - base::Optional<ShellInitParams> shell_init_params) { +void AshTestHelper::SetUp(InitParams init_params) { // TODO(jamescook): Can we do this without changing command line? // Use the origin (1,1) so that it doesn't over // lap with the native mouse cursor. @@ -116,10 +120,6 @@ if (!views::ViewsDelegate::GetInstance()) test_views_delegate_ = std::make_unique<AshTestViewsDelegate>(); - // Creates Shell and hook with Desktop. - if (!test_shell_delegate_) - test_shell_delegate_ = new TestShellDelegate; - if (!bluez::BluezDBusManager::IsInitialized()) { bluez::BluezDBusManager::InitializeFake(); bluez_dbus_manager_initialized_ = true; @@ -143,7 +143,19 @@ // last cursor visibility state, etc. ::wm::CursorManager::ResetCursorVisibilityStateForTest(); - CreateShell(std::move(shell_init_params), init_params.local_state); + ShellInitParams shell_init_params; + shell_init_params.delegate = std::move(init_params.delegate); + if (!shell_init_params.delegate) + shell_init_params.delegate = std::make_unique<TestShellDelegate>(); + shell_init_params.context_factory = init_params.context_factory; + if (!shell_init_params.context_factory) { + context_factories_ = std::make_unique<ui::TestContextFactories>(false); + shell_init_params.context_factory = context_factories_->GetContextFactory(); + } + shell_init_params.local_state = init_params.local_state; + shell_init_params.keyboard_ui_factory = + std::make_unique<TestKeyboardUIFactory>(); + Shell::CreateInstance(std::move(shell_init_params)); // Reset aura::Env to eliminate test dependency (https://crbug.com/586514). aura::test::EnvTestHelper env_helper(aura::Env::GetInstance()); @@ -295,21 +307,4 @@ .GetSecondaryDisplay(); } -void AshTestHelper::CreateShell(base::Optional<ShellInitParams> init_params, - PrefService* local_state) { - if (init_params == base::nullopt) { - context_factories_ = std::make_unique<ui::TestContextFactories>( - /*enable_pixel_output=*/false); - init_params.emplace(ShellInitParams()); - init_params->delegate.reset(test_shell_delegate_); - init_params->context_factory = context_factories_->GetContextFactory(); - init_params->keyboard_ui_factory = - std::make_unique<TestKeyboardUIFactory>(); - } - if (local_state) - init_params->local_state = local_state; - - Shell::CreateInstance(std::move(*init_params)); -} - } // namespace ash
diff --git a/ash/test/ash_test_helper.h b/ash/test/ash_test_helper.h index 3cb5128..6f92c2c1 100644 --- a/ash/test/ash_test_helper.h +++ b/ash/test/ash_test_helper.h
@@ -12,7 +12,7 @@ #include "ash/assistant/test/test_assistant_service.h" #include "ash/session/test_session_controller_client.h" -#include "ash/shell_init_params.h" +#include "ash/shell_delegate.h" #include "base/macros.h" #include "base/optional.h" #include "base/test/scoped_command_line.h" @@ -34,6 +34,7 @@ } namespace ui { +class ContextFactory; class ScopedAnimationDurationScaleMode; class TestContextFactories; } @@ -50,7 +51,6 @@ class TestNewWindowDelegate; class TestNotifierSettingsController; class TestPrefServiceProvider; -class TestShellDelegate; class TestSystemTrayClient; class TestPhotoController; @@ -75,18 +75,23 @@ }; struct InitParams { + InitParams(); + InitParams(InitParams&&); + InitParams& operator=(InitParams&&) = default; + ~InitParams(); + // True if the user should log in. - InitParams() {} // Work around https://bugs.llvm.org/show_bug.cgi?id=15886. bool start_session = true; + // If this is not set, a TestShellDelegate will be used automatically. + std::unique_ptr<ShellDelegate> delegate; + ui::ContextFactory* context_factory = nullptr; PrefService* local_state = nullptr; ConfigType config_type = kUnitTest; }; // Creates the ash::Shell and performs associated initialization according - // to |init_params|. |shell_init_params| is used to initialize ash::Shell, - // or it uses test settings if omitted. - void SetUp(const InitParams& init_params = InitParams(), - base::Optional<ShellInitParams> shell_init_params = base::nullopt); + // to |init_params|. + void SetUp(InitParams init_params = InitParams()); // Destroys the ash::Shell and performs associated cleanup. void TearDown(); @@ -98,10 +103,6 @@ PrefService* GetLocalStatePrefService(); - TestShellDelegate* test_shell_delegate() { return test_shell_delegate_; } - void set_test_shell_delegate(TestShellDelegate* test_shell_delegate) { - test_shell_delegate_ = test_shell_delegate; - } AshTestViewsDelegate* test_views_delegate() { return test_views_delegate_.get(); } @@ -138,14 +139,9 @@ void reset_commandline() { command_line_.reset(); } private: - // Called when running in ash to create Shell. - void CreateShell(base::Optional<ShellInitParams> init_params, - PrefService* local_state); - std::unique_ptr<chromeos::system::ScopedFakeStatisticsProvider> statistics_provider_; - TestShellDelegate* test_shell_delegate_ = nullptr; // Owned by ash::Shell. std::unique_ptr<ui::ScopedAnimationDurationScaleMode> zero_duration_mode_; std::unique_ptr<::wm::WMState> wm_state_;
diff --git a/ash/test/ash_test_helper_unittest.cc b/ash/test/ash_test_helper_unittest.cc index 4b4d6d4..105ef75a 100644 --- a/ash/test/ash_test_helper_unittest.cc +++ b/ash/test/ash_test_helper_unittest.cc
@@ -4,6 +4,7 @@ #include "ash/test/ash_test_helper.h" +#include "ash/shell.h" #include "base/test/task_environment.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/aura/window_event_dispatcher.h" @@ -43,7 +44,8 @@ // Ensure that we have initialized enough of Ash to create and show a window. TEST_F(AshTestHelperTest, AshTestHelper) { // Check initial state. - EXPECT_TRUE(ash_test_helper()->test_shell_delegate()); + ASSERT_TRUE(Shell::HasInstance()); + EXPECT_TRUE(Shell::Get()->shell_delegate()); EXPECT_TRUE(ash_test_helper()->GetContext()); // Enough state is initialized to create a window.
diff --git a/ash/wm/gestures/back_gesture/back_gesture_contextual_nudge_controller_impl_unittest.cc b/ash/wm/gestures/back_gesture/back_gesture_contextual_nudge_controller_impl_unittest.cc index fb6cd017..818c3cf1 100644 --- a/ash/wm/gestures/back_gesture/back_gesture_contextual_nudge_controller_impl_unittest.cc +++ b/ash/wm/gestures/back_gesture/back_gesture_contextual_nudge_controller_impl_unittest.cc
@@ -28,17 +28,19 @@ class BackGestureContextualNudgeControllerTest : public NoSessionAshTestBase { public: - BackGestureContextualNudgeControllerTest() = default; - BackGestureContextualNudgeControllerTest( - const BackGestureContextualNudgeControllerTest&) = delete; - BackGestureContextualNudgeControllerTest& operator=( - const BackGestureContextualNudgeControllerTest&) = delete; - + explicit BackGestureContextualNudgeControllerTest(bool can_go_back = true) + : can_go_back_(can_go_back) {} ~BackGestureContextualNudgeControllerTest() override = default; // NoSessionAshTestBase: void SetUp() override { - NoSessionAshTestBase::SetUp(); + std::unique_ptr<TestShellDelegate> delegate; + if (!can_go_back_) { + delegate = std::make_unique<TestShellDelegate>(); + delegate->SetCanGoBack(false); + } + NoSessionAshTestBase::SetUp(std::move(delegate)); + scoped_feature_list_.InitAndEnableFeature(features::kContextualNudges); nudge_controller_ = std::make_unique<BackGestureContextualNudgeControllerImpl>(); @@ -87,11 +89,19 @@ BackGestureContextualNudge* nudge() { return nudge_controller()->nudge(); } private: + bool can_go_back_; base::test::ScopedFeatureList scoped_feature_list_; std::unique_ptr<BackGestureContextualNudgeControllerImpl> nudge_controller_; }; +class BackGestureContextualNudgeControllerTestCantGoBack + : public BackGestureContextualNudgeControllerTest { + public: + BackGestureContextualNudgeControllerTestCantGoBack() + : BackGestureContextualNudgeControllerTest(false) {} +}; + // Tests the timing when BackGestureContextualNudgeControllerImpl should monitor // window activation changes. TEST_F(BackGestureContextualNudgeControllerTest, MonitorWindowsTest) { @@ -167,9 +177,7 @@ } // Do not show nudge ui on window that can't perform "go back" operation. -TEST_F(BackGestureContextualNudgeControllerTest, CanNotGoBackWindowTest) { - ash_test_helper()->test_shell_delegate()->SetCanGoBack(false); - +TEST_F(BackGestureContextualNudgeControllerTestCantGoBack, WindowTest) { EXPECT_FALSE(nudge()); EXPECT_TRUE(contextual_tooltip::ShouldShowNudge( user1_perf_service(), contextual_tooltip::TooltipType::kBackGesture));
diff --git a/ash/wm/gestures/back_gesture/back_gesture_event_handler_unittest.cc b/ash/wm/gestures/back_gesture/back_gesture_event_handler_unittest.cc index 2f06a24..9f4a783 100644 --- a/ash/wm/gestures/back_gesture/back_gesture_event_handler_unittest.cc +++ b/ash/wm/gestures/back_gesture/back_gesture_event_handler_unittest.cc
@@ -43,14 +43,20 @@ // activated state. static constexpr int kSwipingDistanceForGoingBack = 80; - BackGestureEventHandlerTest() = default; + explicit BackGestureEventHandlerTest(bool can_go_back = true) + : can_go_back_(can_go_back) {} BackGestureEventHandlerTest(const BackGestureEventHandlerTest&) = delete; BackGestureEventHandlerTest& operator=(const BackGestureEventHandlerTest&) = delete; ~BackGestureEventHandlerTest() override = default; void SetUp() override { - AshTestBase::SetUp(); + std::unique_ptr<TestShellDelegate> delegate; + if (!can_go_back_) { + delegate = std::make_unique<TestShellDelegate>(); + delegate->SetCanGoBack(false); + } + AshTestBase::SetUp(std::move(delegate)); feature_list_.InitAndEnableFeature(features::kSwipingFromLeftEdgeToGoBack); RecreateTopWindow(AppType::BROWSER); @@ -104,10 +110,18 @@ aura::Window* top_window() { return top_window_.get(); } private: + bool can_go_back_; base::test::ScopedFeatureList feature_list_; std::unique_ptr<aura::Window> top_window_; }; +class BackGestureEventHandlerTestCantGoBack + : public BackGestureEventHandlerTest { + public: + BackGestureEventHandlerTestCantGoBack() + : BackGestureEventHandlerTest(false) {} +}; + TEST_F(BackGestureEventHandlerTest, SwipingFromLeftEdgeToGoBack) { ui::TestAcceleratorTarget target_back_press, target_back_release; RegisterBackPressAndRelease(&target_back_press, &target_back_release); @@ -170,11 +184,10 @@ EXPECT_EQ(2, target_back_release.accelerator_count()); } -TEST_F(BackGestureEventHandlerTest, GoBackInOverviewMode) { +TEST_F(BackGestureEventHandlerTestCantGoBack, GoBackInOverviewMode) { ui::TestAcceleratorTarget target_back_press, target_back_release; RegisterBackPressAndRelease(&target_back_press, &target_back_release); - ash_test_helper()->test_shell_delegate()->SetCanGoBack(false); ASSERT_FALSE(WindowState::Get(top_window())->IsMinimized()); ASSERT_TRUE(TabletModeWindowManager::ShouldMinimizeTopWindowOnBack()); GenerateBackSequence();
diff --git a/build/fuchsia/linux.sdk.sha1 b/build/fuchsia/linux.sdk.sha1 index 85fd1bc..d4c19908 100644 --- a/build/fuchsia/linux.sdk.sha1 +++ b/build/fuchsia/linux.sdk.sha1
@@ -1 +1 @@ -0.20200311.2.1 \ No newline at end of file +0.20200311.3.1 \ No newline at end of file
diff --git a/build/fuchsia/mac.sdk.sha1 b/build/fuchsia/mac.sdk.sha1 index 85fd1bc..d4c19908 100644 --- a/build/fuchsia/mac.sdk.sha1 +++ b/build/fuchsia/mac.sdk.sha1
@@ -1 +1 @@ -0.20200311.2.1 \ No newline at end of file +0.20200311.3.1 \ No newline at end of file
diff --git a/cc/input/input_handler.h b/cc/input/input_handler.h index 40fc85d3..fd0bbc7 100644 --- a/cc/input/input_handler.h +++ b/cc/input/input_handler.h
@@ -217,6 +217,11 @@ const gfx::PointF& mouse_position) = 0; virtual void MouseLeave() = 0; + // Returns frame_element_id from the layer hit by the given point. + // If the hit test failed, an invalid element ID is returned. + virtual ElementId FindFrameElementIdAtPoint( + const gfx::PointF& mouse_position) = 0; + // Requests a callback to UpdateRootLayerStateForSynchronousInputHandler() // giving the current root scroll and page scale information. virtual void RequestUpdateForSynchronousInputHandler() = 0;
diff --git a/cc/layers/layer.cc b/cc/layers/layer.cc index bbbbc42..f30c585 100644 --- a/cc/layers/layer.cc +++ b/cc/layers/layer.cc
@@ -52,6 +52,7 @@ Region non_fast_scrollable_region; TouchActionRegion touch_action_region; ElementId element_id; + ElementId frame_element_id; } inputs; void* layer_tree_inputs; int int_fields[6]; @@ -1369,6 +1370,7 @@ layer->UnionUpdateRect(inputs_.update_rect); layer->SetHasWillChangeTransformHint(has_will_change_transform_hint()); + layer->SetFrameElementId(inputs_.frame_element_id); layer->SetNeedsPushProperties(); // debug_info_->invalidations, if exist, will be cleared in the function. @@ -1478,6 +1480,13 @@ SetNeedsCommit(); } +void Layer::SetFrameElementId(ElementId frame_element_id) { + if (inputs_.frame_element_id == frame_element_id) + return; + inputs_.frame_element_id = frame_element_id; + SetNeedsCommit(); +} + void Layer::SetTrilinearFiltering(bool trilinear_filtering) { auto& inputs = EnsureLayerTreeInputs(); if (inputs.trilinear_filtering == trilinear_filtering)
diff --git a/cc/layers/layer.h b/cc/layers/layer.h index 0fac27b..b0027ed 100644 --- a/cc/layers/layer.h +++ b/cc/layers/layer.h
@@ -570,6 +570,9 @@ return inputs_.has_will_change_transform_hint; } + void SetFrameElementId(ElementId frame_element_id); + ElementId frame_element_id() const { return inputs_.frame_element_id; } + // For layer tree mode only. // Sets or gets if trilinear filtering should be used to scaling the contents // of this layer and its subtree. When set the layer and its subtree will be @@ -870,6 +873,8 @@ TouchActionRegion touch_action_region; ElementId element_id; + // ElementId of the document that this layer was created by. + ElementId frame_element_id; }; // These inputs are used in layer tree mode (ui compositor) only. Most of them
diff --git a/cc/layers/layer_impl.cc b/cc/layers/layer_impl.cc index 8205138..8426e02c 100644 --- a/cc/layers/layer_impl.cc +++ b/cc/layers/layer_impl.cc
@@ -365,6 +365,7 @@ // depend on it. Referencing element id on a layer is // deprecated. http://crbug.com/709137 layer->SetElementId(element_id_); + layer->SetFrameElementId(frame_element_id_); layer->has_transform_node_ = has_transform_node_; layer->offset_to_transform_parent_ = offset_to_transform_parent_;
diff --git a/cc/layers/layer_impl.h b/cc/layers/layer_impl.h index c6ce557..06c3df31 100644 --- a/cc/layers/layer_impl.h +++ b/cc/layers/layer_impl.h
@@ -175,6 +175,11 @@ void SetElementId(ElementId element_id); ElementId element_id() const { return element_id_; } + void SetFrameElementId(ElementId frame_element_id) { + frame_element_id_ = frame_element_id; + } + ElementId frame_element_id() const { return frame_element_id_; } + bool IsAffectedByPageScale() const; bool Is3dSorted() const { return GetSortingContextId() != 0; } @@ -518,6 +523,8 @@ TransformTree& GetTransformTree() const; ElementId element_id_; + // Element ID of the document containing this layer. + ElementId frame_element_id_; // Rect indicating what was repainted/updated during update. // Note that plugin layers bypass this and leave it empty. // This is in the layer's space.
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc index 3ce66da..579023e3 100644 --- a/cc/trees/layer_tree_host_impl.cc +++ b/cc/trees/layer_tree_host_impl.cc
@@ -5102,6 +5102,13 @@ scroll_element_id_mouse_currently_over_ = ElementId(); } +ElementId LayerTreeHostImpl::FindFrameElementIdAtPoint( + const gfx::PointF& viewport_point) { + gfx::PointF device_viewport_point = gfx::ScalePoint( + gfx::PointF(viewport_point), active_tree_->device_scale_factor()); + return active_tree_->FindFrameElementIdAtPoint(device_viewport_point); +} + void LayerTreeHostImpl::PinchGestureBegin() { pinch_gesture_active_ = true; client_->RenewTreePriority();
diff --git a/cc/trees/layer_tree_host_impl.h b/cc/trees/layer_tree_host_impl.h index eaeeec4e..3c141a9 100644 --- a/cc/trees/layer_tree_host_impl.h +++ b/cc/trees/layer_tree_host_impl.h
@@ -283,6 +283,11 @@ const gfx::Point& viewport_point) override; void MouseLeave() override; + // Returns frame_element_id from the layer hit by the given point. + // If the hit test failed, an invalid element ID is returned. + ElementId FindFrameElementIdAtPoint( + const gfx::PointF& viewport_point) override; + void PinchGestureBegin() override; void PinchGestureUpdate(float magnify_delta, const gfx::Point& anchor) override;
diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc index 446179f..9cd1c83 100644 --- a/cc/trees/layer_tree_impl.cc +++ b/cc/trees/layer_tree_impl.cc
@@ -2247,6 +2247,37 @@ return layers; } +struct HitTestFramedVisibleScrollableOrTouchableFunctor { + bool operator()(LayerImpl* layer) const { + return layer->HitTestable() && layer->frame_element_id(); + } +}; + +ElementId LayerTreeImpl::FindFrameElementIdAtPoint( + const gfx::PointF& screen_space_point) { + if (layer_list_.empty()) + return {}; + if (!UpdateDrawProperties()) + return {}; + FindClosestMatchingLayerState state; + FindClosestMatchingLayer(screen_space_point, layer_list_[0].get(), + HitTestFramedVisibleScrollableOrTouchableFunctor(), + &state); + + if (auto* layer = state.closest_match) { + // TODO(https://crbug.com/1058870): Permit hit testing only if the framed + // element hit has a simple mask/clip. We don't have enough information + // about complex masks/clips on the impl-side to do accurate hit testing. + bool layer_hit_test_region_is_masked = + property_trees()->effect_tree.HitTestMayBeAffectedByMask( + layer->effect_tree_index()); + + if (!layer_hit_test_region_is_masked) + return layer->frame_element_id(); + } + return {}; +} + void LayerTreeImpl::RegisterSelection(const LayerSelection& selection) { if (selection_ == selection) return;
diff --git a/cc/trees/layer_tree_impl.h b/cc/trees/layer_tree_impl.h index 40cd78c..61f70b71 100644 --- a/cc/trees/layer_tree_impl.h +++ b/cc/trees/layer_tree_impl.h
@@ -590,6 +590,12 @@ std::vector<const LayerImpl*> FindLayersHitByPointInNonFastScrollableRegion( const gfx::PointF& screen_space_point); + // Returns the ElementId representing a frame's document at the given point. + // In cases where cc doesn't have enough information to perform accurate + // attribution (e.g. in the presence of a complex clip), kInvalidElementId is + // returned. + ElementId FindFrameElementIdAtPoint(const gfx::PointF& screen_space_point); + void RegisterSelection(const LayerSelection& selection); bool HandleVisibilityChanged() const { return handle_visibility_changed_; }
diff --git a/cc/trees/layer_tree_impl_unittest.cc b/cc/trees/layer_tree_impl_unittest.cc index e319e5801..883f356 100644 --- a/cc/trees/layer_tree_impl_unittest.cc +++ b/cc/trees/layer_tree_impl_unittest.cc
@@ -2549,6 +2549,91 @@ EXPECT_EQ(filter_map.size(), 1u); } +TEST_F(LayerTreeImplTest, FrameElementIdHitTestSimple) { + LayerImpl* frame_layer = AddLayer<LayerImpl>(); + frame_layer->SetBounds(gfx::Size(50, 50)); + frame_layer->SetDrawsContent(true); + frame_layer->SetHitTestable(true); + frame_layer->SetFrameElementId(ElementId(0x10)); + CopyProperties(root_layer(), frame_layer); + + UpdateDrawProperties(host_impl().active_tree()); + + EXPECT_EQ(host_impl().FindFrameElementIdAtPoint(gfx::PointF(10, 10)), + ElementId(0x10)); +} + +TEST_F(LayerTreeImplTest, FrameElementIdHitTestOverlap) { + LayerImpl* frame_layer = AddLayer<LayerImpl>(); + frame_layer->SetBounds(gfx::Size(50, 50)); + frame_layer->SetHitTestable(true); + frame_layer->SetFrameElementId(ElementId(0x10)); + CopyProperties(root_layer(), frame_layer); + + LayerImpl* occluding_frame_layer = AddLayer<LayerImpl>(); + occluding_frame_layer->SetBounds(gfx::Size(50, 50)); + occluding_frame_layer->SetHitTestable(true); + occluding_frame_layer->SetFrameElementId(ElementId(0x20)); + CopyProperties(root_layer(), occluding_frame_layer); + occluding_frame_layer->SetOffsetToTransformParent(gfx::Vector2dF(25, 25)); + + UpdateDrawProperties(host_impl().active_tree()); + + EXPECT_EQ(host_impl().FindFrameElementIdAtPoint(gfx::PointF(30, 30)), + ElementId(0x20)); +} + +TEST_F(LayerTreeImplTest, FrameElementIdHitTestOverlapSimpleClip) { + LayerImpl* frame_layer = AddLayer<LayerImpl>(); + frame_layer->SetBounds(gfx::Size(50, 50)); + frame_layer->SetHitTestable(true); + frame_layer->SetFrameElementId(ElementId(0x10)); + CopyProperties(root_layer(), frame_layer); + + LayerImpl* clipped_frame_layer = AddLayer<LayerImpl>(); + clipped_frame_layer->SetBounds(gfx::Size(50, 50)); + clipped_frame_layer->SetHitTestable(true); + clipped_frame_layer->SetFrameElementId(ElementId(0x20)); + CopyProperties(root_layer(), clipped_frame_layer); + clipped_frame_layer->SetOffsetToTransformParent(gfx::Vector2dF(25, 25)); + + // Create a clip excluding the overlapped region. + auto& clip_node = CreateClipNode(clipped_frame_layer); + clip_node.clip = gfx::RectF(40, 40, 10, 10); + + UpdateDrawProperties(host_impl().active_tree()); + + // Ensure that the overlapping (clipped) layer isn't targeted. + EXPECT_EQ(host_impl().FindFrameElementIdAtPoint(gfx::PointF(30, 30)), + ElementId(0x10)); +} + +TEST_F(LayerTreeImplTest, FrameElementIdHitTestOverlapRoundedCorners) { + LayerImpl* frame_layer = AddLayer<LayerImpl>(); + frame_layer->SetBounds(gfx::Size(50, 50)); + frame_layer->SetHitTestable(true); + frame_layer->SetFrameElementId(ElementId(0x10)); + CopyProperties(root_layer(), frame_layer); + + LayerImpl* rounded_frame_layer = AddLayer<LayerImpl>(); + rounded_frame_layer->SetBounds(gfx::Size(50, 50)); + rounded_frame_layer->SetHitTestable(true); + rounded_frame_layer->SetFrameElementId(ElementId(0x20)); + CopyProperties(root_layer(), rounded_frame_layer); + rounded_frame_layer->SetOffsetToTransformParent(gfx::Vector2dF(25, 25)); + + // Add rounded corners to the layer, which are unable to be hit tested by the + // simple quad-based logic. + CreateEffectNode(rounded_frame_layer).rounded_corner_bounds = + gfx::RRectF(25, 25, 50, 50, 5); + + UpdateDrawProperties(host_impl().active_tree()); + + // The lookup should bail out in the presence of a complex clip/mask on the + // target chain. + EXPECT_FALSE(host_impl().FindFrameElementIdAtPoint(gfx::PointF(30, 30))); +} + class LayerTreeImplOcclusionSettings : public LayerListSettings { public: explicit LayerTreeImplOcclusionSettings(bool enabled) {
diff --git a/chrome/VERSION b/chrome/VERSION index fb8403d..c21f6d3 100644 --- a/chrome/VERSION +++ b/chrome/VERSION
@@ -1,4 +1,4 @@ MAJOR=82 MINOR=0 -BUILD=4084 +BUILD=4085 PATCH=0
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn index d12cfb40..3d45dd6 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn
@@ -253,6 +253,7 @@ "//chrome/android/webapk/libs/common:common_java", "//chrome/android/webapk/libs/common:splash_java", "//chrome/android/webapk/libs/runtime_library:webapk_service_aidl_java", + "//chrome/browser/android/lifecycle:java", "//chrome/browser/android/thin_webview:factory_java", "//chrome/browser/android/thin_webview:java", "//chrome/browser/download/android:java", @@ -274,9 +275,9 @@ "//chrome/browser/ui/android/appmenu:java", "//chrome/browser/ui/android/native_page:java", "//chrome/browser/ui/messages/android:java", + "//chrome/browser/upboarding:java", "//chrome/browser/util:java", "//chrome/browser/xsurface:java", - "//chrome/lib/lifecycle/public/android:java", "//components/autofill/android:autofill_java", "//components/autofill_assistant/browser:proto_java", "//components/background_task_scheduler:background_task_scheduler_java", @@ -794,6 +795,7 @@ "//chrome/android/third_party/compositor_animator:compositor_animator_java", "//chrome/android/webapk/libs/client:client_java", "//chrome/android/webapk/libs/common:common_java", + "//chrome/browser/android/lifecycle:java", "//chrome/browser/android/metrics:ukm_java_test_support", "//chrome/browser/android/metrics:ukm_javatests", "//chrome/browser/download/android:java", @@ -806,8 +808,8 @@ "//chrome/browser/ui/android/appmenu:java", "//chrome/browser/ui/android/appmenu:test_support_java", "//chrome/browser/ui/messages/android:java", + "//chrome/browser/upboarding/query_tiles:query_tiles_javatests", "//chrome/browser/util:java", - "//chrome/lib/lifecycle/public/android:java", "//chrome/test/android:chrome_java_test_support", "//chrome/test/android/test_trusted_web_activity:test_trusted_web_activity_java", "//components/autofill/android:autofill_java", @@ -2807,6 +2809,7 @@ "java/src/org/chromium/chrome/browser/privacy/settings/PrivacyPreferencesManager.java", "java/src/org/chromium/chrome/browser/provider/ChromeBrowserProvider.java", "java/src/org/chromium/chrome/browser/push_messaging/PushMessagingServiceObserver.java", + "java/src/org/chromium/chrome/browser/query_tiles/TileProviderFactory.java", "java/src/org/chromium/chrome/browser/rappor/RapporServiceBridge.java", "java/src/org/chromium/chrome/browser/resources/ResourceMapper.java", "java/src/org/chromium/chrome/browser/rlz/RevenueStats.java",
diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni index d14a008..cd8a450 100644 --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni
@@ -1354,6 +1354,8 @@ "java/src/org/chromium/chrome/browser/provider/ChromeBrowserProviderSuggestionsCursor.java", "java/src/org/chromium/chrome/browser/provider/SearchColumns.java", "java/src/org/chromium/chrome/browser/push_messaging/PushMessagingServiceObserver.java", + "java/src/org/chromium/chrome/browser/query_tiles/QueryTileSection.java", + "java/src/org/chromium/chrome/browser/query_tiles/TileProviderFactory.java", "java/src/org/chromium/chrome/browser/rappor/RapporServiceBridge.java", "java/src/org/chromium/chrome/browser/resources/ResourceMapper.java", "java/src/org/chromium/chrome/browser/rlz/RevenueStats.java",
diff --git a/chrome/android/features/autofill_assistant/javatests/DEPS b/chrome/android/features/autofill_assistant/javatests/DEPS index 652f717..b7155a83 100644 --- a/chrome/android/features/autofill_assistant/javatests/DEPS +++ b/chrome/android/features/autofill_assistant/javatests/DEPS
@@ -1,5 +1,4 @@ include_rules = [ - "+chrome/lib/image_fetcher", "+components/browser_ui/widget/android", "+content/public/android/java/src/org/chromium/content_public/browser", ]
diff --git a/chrome/android/features/cablev2_authenticator/internal/java/src/org/chromium/chrome/browser/webauth/authenticator/BLEHandler.java b/chrome/android/features/cablev2_authenticator/internal/java/src/org/chromium/chrome/browser/webauth/authenticator/BLEHandler.java index 25a0488..219af5a 100644 --- a/chrome/android/features/cablev2_authenticator/internal/java/src/org/chromium/chrome/browser/webauth/authenticator/BLEHandler.java +++ b/chrome/android/features/cablev2_authenticator/internal/java/src/org/chromium/chrome/browser/webauth/authenticator/BLEHandler.java
@@ -19,7 +19,9 @@ import android.bluetooth.le.AdvertiseSettings; import android.bluetooth.le.BluetoothLeAdvertiser; import android.content.Context; +import android.content.SharedPreferences; import android.os.ParcelUuid; +import android.util.Base64; import org.chromium.base.ContextUtils; import org.chromium.base.Log; @@ -64,6 +66,11 @@ // need to dump debugging information from this code. private static final char[] HEX_CHARS = "0123456789ABCDEF".toCharArray(); + // The filename and key name of the SharedPreferences value that contains + // the base64-encoded state from the native code. + private static final String STATE_FILE_NAME = "cablev2_authenticator"; + private static final String STATE_VALUE_NAME = "keys"; + /** * The pending fragments to send to each client. If present, the value is * never an empty array. @@ -95,6 +102,19 @@ * @return true if successful and false on error. */ public boolean start() { + Context context = ContextUtils.getApplicationContext(); + SharedPreferences prefs = + context.getSharedPreferences(STATE_FILE_NAME, Context.MODE_PRIVATE); + byte[] stateBytes = null; + try { + stateBytes = Base64.decode(prefs.getString(STATE_VALUE_NAME, ""), Base64.DEFAULT); + if (stateBytes.length == 0) { + stateBytes = null; + } + } catch (IllegalArgumentException e) { + Log.w(TAG, "Ignoring corrupt state"); + } + BluetoothGattService cableService = new BluetoothGattService( UUID.fromString(CABLE_UUID), BluetoothGattService.SERVICE_TYPE_PRIMARY); cableService.addCharacteristic(new BluetoothGattCharacteristic( @@ -119,7 +139,6 @@ BluetoothGattCharacteristic.PERMISSION_READ | BluetoothGattCharacteristic.PERMISSION_WRITE)); - Context context = ContextUtils.getApplicationContext(); BluetoothManager manager = (BluetoothManager) context.getSystemService(Context.BLUETOOTH_SERVICE); mServer = manager.openGattServer(context, this); @@ -136,8 +155,12 @@ // worrying about JNIEnv objects and references being incorrectly used // across threads. assert mTaskRunner == null; + // TODO: in practice, this sadly appears to return the UI thread, + // despite requesting |BEST_EFFORT|. mTaskRunner = PostTask.createSingleThreadTaskRunner(TaskTraits.BEST_EFFORT); - mTaskRunner.postTask(() -> BLEHandlerJni.get().start(this)); + // Local variables passed into a lambda must be final. + final byte[] state = stateBytes; + mTaskRunner.postTask(() -> BLEHandlerJni.get().start(this, state)); return true; } @@ -275,6 +298,10 @@ } private static String hex(byte[] bytes) { + if (bytes == null) { + return "(null)"; + } + char[] ret = new char[bytes.length * 2]; for (int j = 0; j < bytes.length; j++) { int v = bytes[j] & 0xFF; @@ -370,6 +397,7 @@ */ @CalledByNative public void sendBLEAdvert(byte[] dataUuidBytes) { + assert mTaskRunner.belongsToCurrentThread(); Log.i(TAG, "sendBLEAdvert " + dataUuidBytes.length); maybeStopAdvertising(); @@ -411,13 +439,30 @@ advertiser.startAdvertising(settings, data, mCallback); } + /** + * Called by native code to store a new state blob. + */ + @CalledByNative + public void setState(byte[] newState) { + assert mTaskRunner.belongsToCurrentThread(); + + Context context = ContextUtils.getApplicationContext(); + SharedPreferences prefs = + context.getSharedPreferences(STATE_FILE_NAME, Context.MODE_PRIVATE); + Log.i(TAG, "Writing updated state"); + prefs.edit() + .putString(STATE_VALUE_NAME, + Base64.encodeToString(newState, Base64.NO_WRAP | Base64.NO_PADDING)) + .apply(); + } + @NativeMethods interface Natives { /** * Called to alert the C++ code to a new instance. The C++ code calls back into this object * to send data. */ - void start(BLEHandler bleHandler); + void start(BLEHandler bleHandler, byte[] stateBytes); void stop(); /** * Called when a QR code has been scanned.
diff --git a/chrome/android/features/cablev2_authenticator/internal/native/cablev2_authenticator_android.cc b/chrome/android/features/cablev2_authenticator/internal/native/cablev2_authenticator_android.cc index 12d5a8f..52a6624 100644 --- a/chrome/android/features/cablev2_authenticator/internal/native/cablev2_authenticator_android.cc +++ b/chrome/android/features/cablev2_authenticator/internal/native/cablev2_authenticator_android.cc
@@ -9,6 +9,7 @@ #include "base/strings/string_number_conversions.h" #include "base/task/post_task.h" #include "components/cbor/reader.h" +#include "components/cbor/writer.h" #include "components/device_event_log/device_event_log.h" #include "crypto/aead.h" #include "device/fido/authenticator_get_info_response.h" @@ -16,6 +17,7 @@ #include "device/fido/cable/cable_discovery_data.h" #include "device/fido/cable/v2_handshake.h" #include "device/fido/fido_constants.h" +#include "device/fido/fido_parsing_utils.h" #include "third_party/boringssl/src/include/openssl/aes.h" #include "third_party/boringssl/src/include/openssl/bytestring.h" #include "third_party/boringssl/src/include/openssl/digest.h" @@ -30,6 +32,8 @@ // only be included once across Chromium. #include "chrome/android/features/cablev2_authenticator/internal/jni_headers/BLEHandler_jni.h" +using device::fido_parsing_utils::CopyCBORBytestring; + namespace { // Defragmenter accepts CTAP2 message fragments and reassembles them. @@ -119,9 +123,12 @@ // AuthenticatorState contains the keys for a caBLE v2 authenticator. struct AuthenticatorState { - // TODO: authenticator-global state isn't yet implemented. - base::Optional<std::pair<std::array<uint8_t, device::kCableNonceSize>, - std::array<uint8_t, device::kCableEphemeralIdSize>>> + device::CableEidGeneratorKey eid_gen_key; + device::CablePskGeneratorKey psk_gen_key; + bssl::UniquePtr<EC_KEY> identity_key; + + std::pair<std::array<uint8_t, device::kCableNonceSize>, + std::array<uint8_t, device::kCableEphemeralIdSize>> pairing_nonce_and_eid; base::Optional<std::pair<std::array<uint8_t, device::kCableNonceSize>, std::array<uint8_t, device::kCableEphemeralIdSize>>> @@ -343,9 +350,14 @@ } void Start(JNIEnv* env, - const base::android::JavaParamRef<jobject>& ble_handler) { + const base::android::JavaParamRef<jobject>& ble_handler, + const base::android::JavaParamRef<jbyteArray>& state_bytes) { ble_handler_.Reset(ble_handler); env_ = env; + + if (!ParseState(state_bytes)) { + GenerateFreshStateAndStore(); + } } void Stop() { @@ -353,7 +365,6 @@ clients_.clear(); known_mtus_.clear(); auth_state_.qr_nonce_and_eid.reset(); - auth_state_.pairing_nonce_and_eid.reset(); auth_state_.qr_discovery_data.reset(); env_ = nullptr; } @@ -460,6 +471,63 @@ friend struct base::DefaultSingletonTraits<CableInterface>; CableInterface() = default; + bssl::UniquePtr<EC_KEY> P256KeyFromSeed(base::span<const uint8_t, 32> seed) { + bssl::UniquePtr<EC_GROUP> p256( + EC_GROUP_new_by_curve_name(NID_X9_62_prime256v1)); + return bssl::UniquePtr<EC_KEY>( + EC_KEY_derive_from_secret(p256.get(), seed.data(), seed.size())); + } + + bool ParseState(const base::android::JavaParamRef<jbyteArray>& state_bytes) { + if (!state_bytes) { + return false; + } + + base::span<const uint8_t> state_bytes_span( + reinterpret_cast<uint8_t*>( + env_->GetByteArrayElements(state_bytes, nullptr)), + env_->GetArrayLength(state_bytes)); + base::Optional<cbor::Value> state = cbor::Reader::Read(state_bytes_span); + if (!state || !state->is_map()) { + return false; + } + + const cbor::Value::MapValue& state_map(state->GetMap()); + std::array<uint8_t, 32> identity_key_seed; + if (!CopyCBORBytestring(&auth_state_.eid_gen_key, state_map, 1) || + !CopyCBORBytestring(&auth_state_.psk_gen_key, state_map, 2) || + !CopyCBORBytestring(&identity_key_seed, state_map, 3)) { + return false; + } + + auth_state_.identity_key = P256KeyFromSeed(identity_key_seed); + return true; + } + + void GenerateFreshStateAndStore() { + RAND_bytes(auth_state_.eid_gen_key.data(), auth_state_.eid_gen_key.size()); + RAND_bytes(auth_state_.psk_gen_key.data(), auth_state_.psk_gen_key.size()); + + std::array<uint8_t, 32> identity_key_seed; + RAND_bytes(identity_key_seed.data(), identity_key_seed.size()); + auth_state_.identity_key = P256KeyFromSeed(identity_key_seed); + + cbor::Value::MapValue map; + map.emplace(1, cbor::Value(auth_state_.eid_gen_key)); + map.emplace(2, cbor::Value(auth_state_.psk_gen_key)); + map.emplace(3, cbor::Value(identity_key_seed)); + + base::Optional<std::vector<uint8_t>> bytes = + cbor::Writer::Write(cbor::Value(std::move(map))); + CHECK(bytes.has_value()); + + base::android::ScopedJavaLocalRef<jbyteArray> jbytes( + env_, env_->NewByteArray(bytes->size())); + env_->SetByteArrayRegion(jbytes.obj(), 0, bytes->size(), + (jbyte*)bytes->data()); + Java_BLEHandler_setState(env_, ble_handler_, jbytes); + } + JNIEnv* env_ = nullptr; base::android::ScopedJavaGlobalRef<jobject> ble_handler_; AuthenticatorState auth_state_; @@ -473,8 +541,9 @@ static void JNI_BLEHandler_Start( JNIEnv* env, - const base::android::JavaParamRef<jobject>& ble_handler) { - CableInterface::GetInstance()->Start(env, ble_handler); + const base::android::JavaParamRef<jobject>& ble_handler, + const base::android::JavaParamRef<jbyteArray>& state_bytes) { + CableInterface::GetInstance()->Start(env, ble_handler, state_bytes); } static void JNI_BLEHandler_Stop(JNIEnv* env) {
diff --git a/chrome/android/features/tab_ui/BUILD.gn b/chrome/android/features/tab_ui/BUILD.gn index 0987740..ec9600bd 100644 --- a/chrome/android/features/tab_ui/BUILD.gn +++ b/chrome/android/features/tab_ui/BUILD.gn
@@ -125,11 +125,11 @@ "//chrome/android/features/start_surface/internal:java", "//chrome/android/public/profiles:java", "//chrome/app:java_strings_grd", + "//chrome/browser/android/lifecycle:java", "//chrome/browser/flags:java", "//chrome/browser/ui/android/strings:ui_strings_grd", "//chrome/browser/ui/messages/android:java", "//chrome/browser/util:java", - "//chrome/lib/lifecycle/public/android:java", "//components/browser_ui/styles/android:java", "//components/browser_ui/widget/android:java", "//components/embedder_support/android:util_java",
diff --git a/chrome/android/features/tab_ui/java/DEPS b/chrome/android/features/tab_ui/java/DEPS index 14ea45f..1f4ffc0c 100644 --- a/chrome/android/features/tab_ui/java/DEPS +++ b/chrome/android/features/tab_ui/java/DEPS
@@ -1,5 +1,5 @@ include_rules = [ - "+chrome/lib/lifecycle/public/android/java/src/org/chromium/chrome/browser/lifecycle", + "+chrome/browser/android/lifecycle", "+chrome/browser/ui/messages/android/java", "+chrome/browser/util", "+components/browser_ui/styles/android",
diff --git a/chrome/android/features/tab_ui/junit/DEPS b/chrome/android/features/tab_ui/junit/DEPS index 1c62038..ee28923 100644 --- a/chrome/android/features/tab_ui/junit/DEPS +++ b/chrome/android/features/tab_ui/junit/DEPS
@@ -1,7 +1,7 @@ include_rules = [ + "+chrome/browser/android/lifecycle", "+chrome/browser/util", "+content/public/android/java/src/org/chromium/content_public/browser", "+components/feature_engagement/public/android/java/src/org/chromium/components/feature_engagement", "+components/search_engines/android/java/src/org/chromium/components/search_engines", - "+chrome/lib/lifecycle/public/android/java/src/org/chromium/chrome/browser/lifecycle" ]
diff --git a/chrome/android/feed/DEPS b/chrome/android/feed/DEPS index ce99f7f..f541e4b 100644 --- a/chrome/android/feed/DEPS +++ b/chrome/android/feed/DEPS
@@ -1,6 +1,6 @@ include_rules = [ + "+chrome/browser/android/lifecycle", "+chrome/browser/ui/messages/android/java", - "+chrome/lib/lifecycle/public", "+components/background_task_scheduler", "+components/feature_engagement", "+components/feed",
diff --git a/chrome/android/feed/dummy/DEPS b/chrome/android/feed/dummy/DEPS index 09da6d1..ffd92b3 100644 --- a/chrome/android/feed/dummy/DEPS +++ b/chrome/android/feed/dummy/DEPS
@@ -1,5 +1,5 @@ include_rules = [ "-components/feed", - "+chrome/lib/lifecycle/public", + "+chrome/browser/android/lifecycle", "+components/background_task_scheduler" ]
diff --git a/chrome/android/java/DEPS b/chrome/android/java/DEPS index 984e44d..6c8f275 100644 --- a/chrome/android/java/DEPS +++ b/chrome/android/java/DEPS
@@ -1,6 +1,7 @@ include_rules = [ "-chrome/android/features/keyboard_accessory/internal", + "+chrome/browser/android/lifecycle", "+chrome/browser/android/thin_webview/java", "+chrome/browser/flags/android", "+chrome/browser/share/android", @@ -15,8 +16,8 @@ "+chrome/browser/performance_hints/android/java", "+chrome/browser/preferences/android/java", "+chrome/browser/settings/android/java", + "+chrome/browser/upboarding/query_tiles/android/java", "+chrome/browser/util/android/java", - "+chrome/lib/lifecycle/public", "+components/autofill/android/java/src/org/chromium/components/autofill", "+components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler", "+components/bookmarks/common/android/java/src/org/chromium/components/bookmarks",
diff --git a/chrome/android/java/res/layout/new_tab_page_layout.xml b/chrome/android/java/res/layout/new_tab_page_layout.xml index 522b6b1..23c44d1 100644 --- a/chrome/android/java/res/layout/new_tab_page_layout.xml +++ b/chrome/android/java/res/layout/new_tab_page_layout.xml
@@ -28,6 +28,14 @@ <!-- Search box --> <include layout="@layout/fake_search_box_layout"/> + <!-- Query tiles --> + <FrameLayout + android:id="@+id/query_tiles" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:visibility="gone"/> + <!-- Explore offline card --> <ViewStub android:id="@+id/explore_offline_card_stub"
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/background_task_scheduler/ProxyNativeTask.java b/chrome/android/java/src/org/chromium/chrome/browser/background_task_scheduler/ProxyNativeTask.java index 3430387..4f448af6 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/background_task_scheduler/ProxyNativeTask.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/background_task_scheduler/ProxyNativeTask.java
@@ -47,7 +47,8 @@ ProxyNativeTask.this, Profile.getLastUsedRegularProfile()); } else { ProxyNativeTaskJni.get().startBackgroundTaskInReducedMode(mNativeProxyNativeTask, - ProxyNativeTask.this, ProfileKey.getLastUsedProfileKey().getOriginalKey()); + ProxyNativeTask.this, + ProfileKey.getLastUsedRegularProfileKey()); BrowserStartupController.getInstance().addStartupCompletedObserver( new BrowserStartupController.StartupCallback() { @Override
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java index 768816a9..56bfcf0 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java
@@ -384,18 +384,6 @@ } /** - * @return All the permanent nodes. - */ - public List<BookmarkId> getPermanentNodeIDs() { - ThreadUtils.assertOnUiThread(); - assert mIsNativeBookmarkModelLoaded; - List<BookmarkId> result = new ArrayList<BookmarkId>(); - BookmarkBridgeJni.get().getPermanentNodeIDs( - mNativeBookmarkBridge, BookmarkBridge.this, result); - return result; - } - - /** * @return The top level folder's parents. */ public List<BookmarkId> getTopLevelFolderParentIDs() { @@ -1006,8 +994,6 @@ long getBookmarkIdForWebContents(WebContents webContents, boolean onlyEditable); BookmarkItem getBookmarkByID( long nativeBookmarkBridge, BookmarkBridge caller, long id, int type); - void getPermanentNodeIDs( - long nativeBookmarkBridge, BookmarkBridge caller, List<BookmarkId> bookmarksList); void getTopLevelFolderParentIDs( long nativeBookmarkBridge, BookmarkBridge caller, List<BookmarkId> bookmarksList); void getTopLevelFolderIDs(long nativeBookmarkBridge, BookmarkBridge caller,
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/service/DownloadBackgroundTask.java b/chrome/android/java/src/org/chromium/chrome/browser/download/service/DownloadBackgroundTask.java index 23b7373..530db7b 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/download/service/DownloadBackgroundTask.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/download/service/DownloadBackgroundTask.java
@@ -62,7 +62,7 @@ assert BrowserStartupController.getInstance().isFullBrowserStarted() || mStartsServiceManagerOnly; - ProfileKey key = ProfileKey.getLastUsedProfileKey().getOriginalKey(); + ProfileKey key = ProfileKey.getLastUsedRegularProfileKey(); DownloadBackgroundTaskJni.get().startBackgroundTask(DownloadBackgroundTask.this, key, mCurrentTaskType, needsReschedule -> callback.taskFinished(needsReschedule)); } @@ -81,7 +81,7 @@ protected boolean onStopTaskWithNative(Context context, TaskParameters taskParameters) { @DownloadTaskType int taskType = taskParameters.getExtras().getInt(DownloadTaskScheduler.EXTRA_TASK_TYPE); - ProfileKey key = ProfileKey.getLastUsedProfileKey().getOriginalKey(); + ProfileKey key = ProfileKey.getLastUsedRegularProfileKey(); return DownloadBackgroundTaskJni.get().stopBackgroundTask( DownloadBackgroundTask.this, key, taskType); }
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegate.java index 758f529..a598491 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegate.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegate.java
@@ -13,6 +13,7 @@ import org.chromium.chrome.browser.externalnav.ExternalNavigationHandler.OverrideUrlLoadingResult; import org.chromium.components.external_intents.ExternalNavigationParams; +import java.util.ArrayList; import java.util.List; /** @@ -45,6 +46,11 @@ int countSpecializedHandlers(List<ResolveInfo> infos); /** + * Returns the subset of {@params infos} that are specialized intent handlers. + */ + ArrayList<String> getSpecializedHandlers(List<ResolveInfo> infos); + + /** * Start an activity for the intent. Used for intents that must be handled externally. * @param intent The intent we want to send. * @param proxy Whether we need to proxy the intent through AuthenticatedProxyActivity (this is
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImpl.java index 3f577a7..e4cf3c4 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImpl.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImpl.java
@@ -247,6 +247,11 @@ return getSpecializedHandlersWithFilter(infos, null).size(); } + @Override + public ArrayList<String> getSpecializedHandlers(List<ResolveInfo> infos) { + return getSpecializedHandlersWithFilter(infos, null); + } + @VisibleForTesting public static ArrayList<String> getSpecializedHandlersWithFilter( List<ResolveInfo> infos, String filterPackageName) {
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java index bd2bd0e..c0f7b81b 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java
@@ -1066,9 +1066,7 @@ */ private boolean launchWebApkIfSoleIntentHandler( List<ResolveInfo> resolvingInfos, Intent targetIntent) { - ArrayList<String> packages = - ExternalNavigationDelegateImpl.getSpecializedHandlersWithFilter( - resolvingInfos, null); + ArrayList<String> packages = mDelegate.getSpecializedHandlers(resolvingInfos); if (packages.size() != 1 || !mDelegate.isValidWebApk(packages.get(0))) return false; Intent webApkIntent = new Intent(targetIntent); webApkIntent.setPackage(packages.get(0));
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/DEPS b/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/DEPS deleted file mode 100644 index 1bc3de68..0000000 --- a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/DEPS +++ /dev/null
@@ -1,3 +0,0 @@ -include_rules = { - "+chrome/lib/lifecycle/public/android/java/src/org/chromium/chrome/browser/lifecycle", -}
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java index 77e782f..5bdd94fa 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java
@@ -52,6 +52,7 @@ import org.chromium.chrome.browser.omnibox.SearchEngineLogoUtils; import org.chromium.chrome.browser.omnibox.voice.AssistantVoiceSearchService; import org.chromium.chrome.browser.profiles.Profile; +import org.chromium.chrome.browser.query_tiles.QueryTileSection; import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory; import org.chromium.chrome.browser.suggestions.SuggestionsConfig; import org.chromium.chrome.browser.suggestions.SuggestionsDependencyFactory; @@ -89,6 +90,7 @@ private ImageView mVoiceSearchButton; private View mTileGridPlaceholder; private View mNoSearchLogoSpacer; + private QueryTileSection mQueryTileSection; @Nullable private View mExploreSectionView; // View is null if explore flag is disabled. @@ -245,6 +247,8 @@ mSiteSectionViewHolder = SiteSection.createViewHolder(getSiteSectionView(), mUiConfig); mSiteSectionViewHolder.bindDataSource(mTileGroup, tileRenderer); + mQueryTileSection = new QueryTileSection(findViewById(R.id.query_tiles), profile); + int variation = ExploreSitesBridge.getVariation(); if (ExploreSitesBridge.isExperimental(variation)) { mExploreSection = new ExperimentalExploreSitesSection(
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/handler/PaymentHandlerMediator.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/handler/PaymentHandlerMediator.java index f426cf1..c25e15d 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/payments/handler/PaymentHandlerMediator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/handler/PaymentHandlerMediator.java
@@ -29,6 +29,7 @@ implements BottomSheetObserver, PaymentHandlerToolbarObserver, View.OnLayoutChangeListener { // The value is picked in order to allow users to see the tab behind this UI. /* package */ static final float FULL_HEIGHT_RATIO = 0.9f; + /* package */ static final float HALF_HEIGHT_RATIO = 0.5f; private final PropertyModel mModel; // Whenever invoked, invoked outside of the WebContentsObserver callbacks.
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/handler/PaymentHandlerView.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/handler/PaymentHandlerView.java index 034359a..9d27a210 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/payments/handler/PaymentHandlerView.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/handler/PaymentHandlerView.java
@@ -84,6 +84,11 @@ } @Override + public float getHalfHeightRatio() { + return PaymentHandlerMediator.HALF_HEIGHT_RATIO; + } + + @Override public boolean hasCustomScrimLifecycle() { return true; }
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/query_tiles/QueryTileSection.java b/chrome/android/java/src/org/chromium/chrome/browser/query_tiles/QueryTileSection.java new file mode 100644 index 0000000..b06a64c --- /dev/null +++ b/chrome/android/java/src/org/chromium/chrome/browser/query_tiles/QueryTileSection.java
@@ -0,0 +1,40 @@ +// Copyright 2020 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package org.chromium.chrome.browser.query_tiles; + +import android.view.View; +import android.view.ViewGroup; +import android.view.ViewGroup.LayoutParams; + +import org.chromium.chrome.browser.flags.ChromeFeatureList; +import org.chromium.chrome.browser.profiles.Profile; +import org.chromium.chrome.browser.query_tiles.list.QueryTileCoordinator; + +/** + * Represents the query tiles section on the new tab page. Abstracts away the general tasks related + * to initializing and fetching data for the UI and making decisions whether to show or hide this + * section. + */ +public class QueryTileSection { + private final ViewGroup mQueryTileSectionView; + private TileProvider mTileProvider; + private QueryTileCoordinator mQueryTileCoordinator; + + /** Constructor. */ + public QueryTileSection(ViewGroup queryTileSectionView, Profile profile) { + mQueryTileSectionView = queryTileSectionView; + if (!ChromeFeatureList.isEnabled(ChromeFeatureList.QUERY_TILES)) return; + + mTileProvider = TileProviderFactory.getForProfile(profile); + mQueryTileCoordinator = new QueryTileCoordinator( + mQueryTileSectionView.getContext(), mTileProvider, this::onQueryTilesChanged); + mQueryTileSectionView.addView(mQueryTileCoordinator.getView(), + new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)); + } + + private void onQueryTilesChanged(boolean hasTiles) { + mQueryTileSectionView.setVisibility(hasTiles ? View.VISIBLE : View.GONE); + } +}
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/query_tiles/TileProviderFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/query_tiles/TileProviderFactory.java new file mode 100644 index 0000000..eea4416 --- /dev/null +++ b/chrome/android/java/src/org/chromium/chrome/browser/query_tiles/TileProviderFactory.java
@@ -0,0 +1,38 @@ +// Copyright 2020 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package org.chromium.chrome.browser.query_tiles; + +import org.chromium.base.annotations.NativeMethods; +import org.chromium.chrome.browser.profiles.Profile; + +/** + * Basic factory that creates and returns an {@link TileProvider} that is attached + * natively to the given {@link Profile}. + */ +public class TileProviderFactory { + private static TileProvider sTileProvider; + + /** + * Used to get access to the tile provider backend. + * @return An {@link TileProvider} instance. + */ + public static TileProvider getForProfile(Profile profile) { + if (sTileProvider == null) { + sTileProvider = TileProviderFactoryJni.get().getForProfile(profile); + } + + return sTileProvider; + } + + /** For testing only. */ + public static void setTileProviderForTesting(TileProvider provider) { + sTileProvider = provider; + } + + @NativeMethods + interface Natives { + TileProvider getForProfile(Profile profile); + } +}
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/DEPS b/chrome/android/java/src/org/chromium/chrome/browser/tab/DEPS index d3f4836..c20b8b94 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/DEPS +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/DEPS
@@ -12,9 +12,9 @@ "+chrome/android/java/src/org/chromium/chrome/browser/ui/TabObscuringHandler.java", "+chrome/android/java/src/org/chromium/chrome/browser/webapps/WebDisplayMode.java", "+chrome/browser/flags", + "+chrome/browser/android/lifecycle", "+chrome/browser/preferences", "+chrome/browser/ui/android/native_page", - "+chrome/lib/lifecycle/public/android", "+components/browser_ui/styles/android", "+components/browser_ui/widget/android", "+content/public/android/java/src/org/chromium/content_public",
diff --git a/chrome/android/javatests/DEPS b/chrome/android/javatests/DEPS index 7a170d4a..6d7182f 100644 --- a/chrome/android/javatests/DEPS +++ b/chrome/android/javatests/DEPS
@@ -1,12 +1,12 @@ include_rules = [ "+chrome/app", + "+chrome/browser/android/lifecycle", "+chrome/browser/preferences/android/java", "+chrome/browser/thumbnail/generator/android/java", "+chrome/browser/ui/android/appmenu", "-chrome/browser/ui/android/appmenu/internal", "+chrome/browser/ui/messages/android/java", "+chrome/browser/util/android", - "+chrome/lib/lifecycle/public", "+components/autofill/android/java/src/org/chromium/components/autofill", "+components/background_task_scheduler/android/java", "+components/bookmarks/common/android/java/src/org/chromium/components/bookmarks",
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/download/DownloadManagerServiceTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/download/DownloadManagerServiceTest.java index d89db8a2..43fa937 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/download/DownloadManagerServiceTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/download/DownloadManagerServiceTest.java
@@ -18,6 +18,7 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; +import org.junit.rules.TestRule; import org.junit.runner.RunWith; import org.chromium.base.metrics.RecordHistogram; @@ -27,9 +28,9 @@ import org.chromium.base.test.util.RetryOnFailure; import org.chromium.base.test.util.UrlUtils; import org.chromium.chrome.browser.download.DownloadManagerServiceTest.MockDownloadNotifier.MethodID; -import org.chromium.chrome.browser.flags.CachedFeatureFlags; import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.chrome.test.ChromeBrowserTestRule; +import org.chromium.chrome.test.util.browser.Features; import org.chromium.components.offline_items_collection.ContentId; import org.chromium.components.offline_items_collection.OfflineItem.Progress; import org.chromium.components.offline_items_collection.OfflineItemProgressUnit; @@ -54,7 +55,8 @@ public class DownloadManagerServiceTest { @Rule public final ChromeBrowserTestRule mBrowserTestRule = new ChromeBrowserTestRule(); - + @Rule + public TestRule mProcessor = new Features.InstrumentationProcessor(); private static final int UPDATE_DELAY_FOR_TEST = 1; private static final int DELAY_BETWEEN_CALLS = 10; private static final int LONG_UPDATE_DELAY_FOR_TEST = 500; @@ -438,9 +440,8 @@ @MediumTest @Feature({"Download"}) @RetryOnFailure + @Features.DisableFeatures({ChromeFeatureList.DOWNLOADS_AUTO_RESUMPTION_NATIVE}) public void testInterruptedDownloadAreAutoResumed() throws InterruptedException { - CachedFeatureFlags.setForTesting(ChromeFeatureList.DOWNLOADS_AUTO_RESUMPTION_NATIVE, false); - MockDownloadNotifier notifier = new MockDownloadNotifier(); createDownloadManagerService(notifier, UPDATE_DELAY_FOR_TEST); DownloadManagerService.disableNetworkListenerForTest();
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandlerTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandlerTest.java index d20063e5..114acdbd 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandlerTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandlerTest.java
@@ -1778,14 +1778,20 @@ @Override public int countSpecializedHandlers(List<ResolveInfo> infos) { - int count = 0; + return getSpecializedHandlers(infos).size(); + } + + @Override + public ArrayList<String> getSpecializedHandlers(List<ResolveInfo> infos) { + ArrayList<String> result = new ArrayList<>(); List<IntentActivity> matchingIntentActivities = findMatchingIntentActivities(infos); for (IntentActivity intentActivity : matchingIntentActivities) { if (intentActivity.isSpecialized()) { - ++count; + result.add(intentActivity.packageName()); } } - return count; + + return result; } private ArrayList<IntentActivity> findMatchingIntentActivities(List<ResolveInfo> infos) {
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/homepage/HomepagePolicyIntegrationTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/homepage/HomepagePolicyIntegrationTest.java index 1b11d98..9cfa8f0 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/homepage/HomepagePolicyIntegrationTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/homepage/HomepagePolicyIntegrationTest.java
@@ -24,7 +24,6 @@ import org.chromium.base.test.util.CommandLineFlags; import org.chromium.base.test.util.Feature; import org.chromium.chrome.browser.ChromeTabbedActivity; -import org.chromium.chrome.browser.flags.CachedFeatureFlags; import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.chrome.browser.flags.ChromeSwitches; import org.chromium.chrome.browser.partnercustomizations.HomepageManager; @@ -82,8 +81,6 @@ @Before public void setUp() { - // Disable Histogram for tests. - CachedFeatureFlags.setForTesting(ChromeFeatureList.HOMEPAGE_LOCATION_POLICY, true); // Give some user pref setting, simulate user that have their customized preference. // Use shared preference manager, not to change the order object created in tests. @@ -98,7 +95,6 @@ @After public void tearDown() { mTestServer.stopAndDestroyServer(); - CachedFeatureFlags.setForTesting(ChromeFeatureList.HOMEPAGE_LOCATION_POLICY, null); } @Test
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/share/ShareButtonControllerTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/share/ShareButtonControllerTest.java index 3ba47cec..2cdf175 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/share/ShareButtonControllerTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/share/ShareButtonControllerTest.java
@@ -22,7 +22,6 @@ import org.chromium.base.test.util.Restriction; import org.chromium.chrome.R; import org.chromium.chrome.browser.compositor.layouts.OverviewModeState; -import org.chromium.chrome.browser.flags.CachedFeatureFlags; import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.chrome.browser.flags.ChromeSwitches; import org.chromium.chrome.test.ChromeJUnit4ClassRunner; @@ -36,7 +35,8 @@ /** Tests {@link ShareButtonController}. */ @RunWith(ChromeJUnit4ClassRunner.class) -@EnableFeatures({ChromeFeatureList.SHARE_BUTTON_IN_TOP_TOOLBAR}) +@EnableFeatures( + {ChromeFeatureList.SHARE_BUTTON_IN_TOP_TOOLBAR, ChromeFeatureList.START_SURFACE_ANDROID}) @CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE, "enable-features=" + ChromeFeatureList.START_SURFACE_ANDROID + "<Study", "force-fieldtrials=Study/Group"}) @@ -46,8 +46,6 @@ @Before public void setUp() { - CachedFeatureFlags.setForTesting(ChromeFeatureList.START_SURFACE_ANDROID, true); - CachedFeatureFlags.setForTesting(ChromeFeatureList.SHARE_BUTTON_IN_TOP_TOOLBAR, true); SigninTestUtil.setUpAuthForTest(); mActivityTestRule.startMainActivityOnBlankPage(); }
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarTest.java index 48836d3b..7300a2f 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarTest.java
@@ -17,9 +17,7 @@ import android.view.View; import android.view.ViewGroup; -import org.junit.After; import org.junit.Assert; -import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; @@ -27,13 +25,13 @@ import org.chromium.base.test.util.CommandLineFlags; import org.chromium.base.test.util.Restriction; import org.chromium.chrome.browser.ChromeActivity; -import org.chromium.chrome.browser.flags.CachedFeatureFlags; import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.chrome.browser.flags.ChromeSwitches; import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarVariationManager.Variations; import org.chromium.chrome.test.ChromeActivityTestRule; import org.chromium.chrome.test.ChromeJUnit4ClassRunner; import org.chromium.chrome.test.util.OverviewModeBehaviorWatcher; +import org.chromium.chrome.test.util.browser.Features; import org.chromium.content_public.browser.test.util.TestThreadUtils; import org.chromium.ui.test.util.UiRestriction; @@ -43,22 +41,16 @@ * Integration tests for the bottom toolbar. */ @RunWith(ChromeJUnit4ClassRunner.class) +// clang-format off @CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE}) @Restriction(UiRestriction.RESTRICTION_TYPE_PHONE) +@Features.EnableFeatures({ChromeFeatureList.CHROME_DUET}) public class BottomToolbarTest { + //clang-format on @Rule public ChromeActivityTestRule<ChromeActivity> mActivityTestRule = new ChromeActivityTestRule<>(ChromeActivity.class); - @Before - public void setUp() throws InterruptedException { - CachedFeatureFlags.setForTesting(ChromeFeatureList.CHROME_DUET, true); - } - - @After - public void tearDown() { - CachedFeatureFlags.setForTesting(ChromeFeatureList.CHROME_DUET, null); - } @Test @MediumTest
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarWithStartSurfaceTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarWithStartSurfaceTest.java index 917d86f9..3274578 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarWithStartSurfaceTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarWithStartSurfaceTest.java
@@ -9,7 +9,6 @@ import android.support.test.filters.MediumTest; -import org.junit.After; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -18,12 +17,12 @@ import org.chromium.base.test.util.CommandLineFlags; import org.chromium.base.test.util.Restriction; import org.chromium.chrome.browser.compositor.layouts.OverviewModeState; -import org.chromium.chrome.browser.flags.CachedFeatureFlags; import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.chrome.browser.flags.ChromeSwitches; import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarVariationManager.Variations; import org.chromium.chrome.test.ChromeJUnit4ClassRunner; import org.chromium.chrome.test.ChromeTabbedActivityTestRule; +import org.chromium.chrome.test.util.browser.Features; import org.chromium.chrome.test.util.browser.FieldTrials; import org.chromium.content_public.browser.test.util.TestThreadUtils; import org.chromium.ui.test.util.UiRestriction; @@ -32,12 +31,15 @@ * Test bottom toolbar when start surface is enabled. */ @RunWith(ChromeJUnit4ClassRunner.class) +// clang-format off @Restriction(UiRestriction.RESTRICTION_TYPE_PHONE) @CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE, "enable-features=" + ChromeFeatureList.START_SURFACE_ANDROID + "<Study", "force-fieldtrials=Study/Group", "force-fieldtrial-params=Study.Group:start_surface_variation/single"}) +@Features.EnableFeatures({ChromeFeatureList.CHROME_DUET, ChromeFeatureList.START_SURFACE_ANDROID}) public class BottomToolbarWithStartSurfaceTest { + //clang-format on @Rule public ChromeTabbedActivityTestRule mActivityTestRule = new ChromeTabbedActivityTestRule(); @@ -45,15 +47,6 @@ public void setUp() { // TODO(https://crbug.com/1060622): Removes this. FieldTrials.getInstance().reset(); - - CachedFeatureFlags.setForTesting(ChromeFeatureList.CHROME_DUET, true); - CachedFeatureFlags.setForTesting(ChromeFeatureList.START_SURFACE_ANDROID, true); - } - - @After - public void tearDown() { - CachedFeatureFlags.setForTesting(ChromeFeatureList.CHROME_DUET, null); - CachedFeatureFlags.setForTesting(ChromeFeatureList.START_SURFACE_ANDROID, null); } private void launchActivity(@Variations String variation) {
diff --git a/chrome/android/junit/DEPS b/chrome/android/junit/DEPS index 2b48467..9ec15a5 100644 --- a/chrome/android/junit/DEPS +++ b/chrome/android/junit/DEPS
@@ -1,6 +1,6 @@ include_rules = [ "!clank/java/src/org/chromium/chrome/browser/AppHooksImpl.java", - "+chrome/lib/lifecycle/public", + "+chrome/browser/android/lifecycle", "+chrome/browser/flags/android", "+chrome/browser/image_fetcher", "+chrome/browser/preferences/android/java",
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/download/DownloadResumptionSchedulerTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/download/DownloadResumptionSchedulerTest.java index 36fddd73..9e845e38 100644 --- a/chrome/android/junit/src/org/chromium/chrome/browser/download/DownloadResumptionSchedulerTest.java +++ b/chrome/android/junit/src/org/chromium/chrome/browser/download/DownloadResumptionSchedulerTest.java
@@ -19,6 +19,7 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; +import org.junit.rules.TestRule; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; @@ -29,8 +30,8 @@ import org.chromium.base.test.BaseRobolectricTestRunner; import org.chromium.base.test.util.Feature; import org.chromium.chrome.browser.background_task_scheduler.ChromeBackgroundTaskFactory; -import org.chromium.chrome.browser.flags.CachedFeatureFlags; import org.chromium.chrome.browser.flags.ChromeFeatureList; +import org.chromium.chrome.test.util.browser.Features; import org.chromium.components.background_task_scheduler.BackgroundTaskScheduler; import org.chromium.components.background_task_scheduler.BackgroundTaskSchedulerFactory; import org.chromium.components.background_task_scheduler.TaskIds; @@ -48,6 +49,7 @@ */ @RunWith(BaseRobolectricTestRunner.class) @Config(manifest = Config.NONE) +@Features.DisableFeatures({ChromeFeatureList.DOWNLOADS_AUTO_RESUMPTION_NATIVE}) public class DownloadResumptionSchedulerTest { @Mock private BackgroundTaskScheduler mScheduler; @@ -55,9 +57,11 @@ @Rule public MockitoRule mockitoRule = MockitoJUnit.rule(); + @Rule + public TestRule mProcessor = new Features.InstrumentationProcessor(); + @Before public void setUp() { - CachedFeatureFlags.setForTesting(ChromeFeatureList.DOWNLOADS_AUTO_RESUMPTION_NATIVE, false); BackgroundTaskSchedulerFactory.setSchedulerForTesting(mScheduler); ChromeBackgroundTaskFactory.setAsDefault(); }
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/homepage/HomepagePolicyManagerTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/homepage/HomepagePolicyManagerTest.java index 9cd5f4b..c5c1104 100644 --- a/chrome/android/junit/src/org/chromium/chrome/browser/homepage/HomepagePolicyManagerTest.java +++ b/chrome/android/junit/src/org/chromium/chrome/browser/homepage/HomepagePolicyManagerTest.java
@@ -9,7 +9,6 @@ import androidx.annotation.Nullable; -import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Rule; @@ -22,7 +21,6 @@ import org.robolectric.annotation.Config; import org.chromium.base.test.BaseRobolectricTestRunner; -import org.chromium.chrome.browser.flags.CachedFeatureFlags; import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.chrome.browser.homepage.HomepagePolicyManager.HomepagePolicyStateListener; import org.chromium.chrome.browser.init.ChromeBrowserInitializer; @@ -73,8 +71,6 @@ ChromeBrowserInitializer.setForTesting(mChromeBrowserInitializer); - CachedFeatureFlags.setForTesting(ChromeFeatureList.HOMEPAGE_LOCATION_POLICY, true); - // Disable the policy during setup PrefServiceBridge.setInstanceForTesting(mMockServiceBridge); setupNewHomepagePolicyManagerForTests(false, "", null); @@ -84,12 +80,6 @@ mHomepagePolicyManager.isHomepageLocationPolicyEnabled()); } - @After - public void tearDown() { - // Empty cache inside the {@link CachedFeatureFlags}. - CachedFeatureFlags.setForTesting(ChromeFeatureList.HOMEPAGE_LOCATION_POLICY, null); - } - /** * Set up the homepage location for Mock PrefServiceBridge, and create HomepagePolicyManager * instance. @@ -272,7 +262,6 @@ public void testFeatureFlagDisabled() { Mockito.reset(mMockRegistrar); Mockito.reset(mMockServiceBridge); - CachedFeatureFlags.setForTesting(ChromeFeatureList.HOMEPAGE_LOCATION_POLICY, false); // 1. Test initialization early finishing setupNewHomepagePolicyManagerForTests(true, TEST_URL, null); @@ -299,7 +288,6 @@ @SmallTest @DisableFeatures(ChromeFeatureList.HOMEPAGE_LOCATION_POLICY) public void testIllegal_Refresh() { - CachedFeatureFlags.setForTesting(ChromeFeatureList.HOMEPAGE_LOCATION_POLICY, false); TestThreadUtils.runOnUiThreadBlocking( () -> { mHomepagePolicyManager.onPreferenceChange(); }); }
diff --git a/chrome/android/profiles/newest.txt b/chrome/android/profiles/newest.txt index 8402da7c..0ebd3c1 100644 --- a/chrome/android/profiles/newest.txt +++ b/chrome/android/profiles/newest.txt
@@ -1 +1 @@ -chromeos-chrome-amd64-82.0.4081.0_rc-r1-merged.afdo.bz2 \ No newline at end of file +chromeos-chrome-amd64-82.0.4082.0_rc-r1-merged.afdo.bz2 \ No newline at end of file
diff --git a/chrome/app/chromeos_strings.grdp b/chrome/app/chromeos_strings.grdp index 7eecfe6..a719ac6 100644 --- a/chrome/app/chromeos_strings.grdp +++ b/chrome/app/chromeos_strings.grdp
@@ -4081,13 +4081,13 @@ Restart Linux? </message> <message name="IDS_CROSTINI_RECOVERY_MESSAGE" desc="Message displayed in the dialog when a Linux will be restarted after a Chrome crash."> - Your device didn't shut down properly. To use Linux (Beta) it must be restarted. + Your device didn't shut down properly. Restart Linux to use Linux apps. </message> <message name="IDS_CROSTINI_RECOVERY_TERMINAL_BUTTON" desc="Label for the dialog button when Linux will not be restarted after a Chrome crash, and instead a Terminal will be shown."> - Open Recovery Terminal + Open recovery terminal </message> <message name="IDS_CROSTINI_RECOVERY_RESTART_BUTTON" desc="Label for the dialog button when Linux will be restarted after a Chrome crash."> - Restart + Restart Linux </message> <!-- Time limit notification --> <message name="IDS_SCREEN_TIME_NOTIFICATION_TITLE" desc="The title of the notification when screen usage limit reaches before locking the device.">
diff --git a/chrome/app/os_settings_strings.grdp b/chrome/app/os_settings_strings.grdp index 2afd7ce..010b1a3 100644 --- a/chrome/app/os_settings_strings.grdp +++ b/chrome/app/os_settings_strings.grdp
@@ -374,7 +374,7 @@ <message name="IDS_SETTINGS_A11Y_TABLET_MODE_SHELF_BUTTONS_DESCRIPTION" desc="The description for the setting within accessibility settings that controls whether Chrome OS system shelf navigation buttons should be shown when the device is in tablet mode. The buttons whose visibility the setting controls are the button to go home (to launcher), the button to go back, and the button to go to overview."> Show Launcher, Back, Overview buttons in Shelf in tablet mode. Turned on when ChromeVox (spoken feedback) or Switch Access is enabled. </message> - + <!-- A11y (OS Settings) --> <message name="IDS_SETTINGS_OPTIONS_IN_MENU_LABEL" desc="Label for checkbox which enables showing accessibility options in the system menu."> Always show accessibility options in the system menu @@ -697,7 +697,10 @@ <!-- Account Manager (OS settings) --> <message name="IDS_SETTINGS_ACCOUNT_MANAGER_DESCRIPTION" desc="Description of the Account Manager Settings page. Shown just below the title of the page."> - Manage your signed-in accounts. Websites, apps, and extensions in Chrome and Google Play may use these accounts to customize your experience, depending on permissions. <a>Learn more</a> + Manage your signed-in accounts. Websites, apps, and extensions in Chrome and Google Play may use these accounts to customize your experience, depending on permissions. <ph name="LINK_BEGIN"><a></ph>Learn more<ph name="LINK_END"></a></ph> + </message> + <message name="IDS_SETTINGS_ACCOUNT_MANAGER_CHILD_DESCRIPTION" desc="Description of the Account Manager Settings page for child users. Shown just below the title of the page."> + Add a school account or manage child accounts here. <ph name="LINK_BEGIN"><a></ph>Learn more<ph name="LINK_END"></a></ph> </message> <message name="IDS_SETTINGS_ACCOUNT_MANAGER_LIST_HEADER" desc="List header for Account List in Account Manager Settings page."> Accounts @@ -945,8 +948,8 @@ </message> <message name="IDS_SETTINGS_CROSTINI_MIC_TITLE" desc="Title for sharing mic with Crostini."> Give access to microphone - </message> - + </message> + <!-- Android apps page (OS settings) --> <message name="IDS_SETTINGS_ANDROID_APPS_LABEL" desc="The text associated with the primary section setting."> Google Play Store @@ -969,7 +972,7 @@ <message name="IDS_SETTINGS_ANDROID_APPS_MANAGE_APP_LINKS" desc="Label for accessing app preferrences on ARC side."> Manage Play app links </message> - + <!-- Device Stylus (OS settings) --> <message name="IDS_SETTINGS_STYLUS_TITLE" desc="Title of the stylus settings page."> Stylus @@ -1004,7 +1007,7 @@ <message name="IDS_SETTINGS_STYLUS_NOTE_TAKING_APP_WAITING_FOR_ANDROID" desc="Secondary label used when the list of note-taking apps is not yet available, because the internal android container has not yet finished starting."> Loading apps... </message> - + <!-- Bluetooth page (OS settings) --> <message name="IDS_SETTINGS_BLUETOOTH_CONNECTED" desc="In Bluetooth device list, this label is shown below a device which is already connected."> Connected @@ -1696,7 +1699,7 @@ <message name="IDS_SETTINGS_USER_EXISTS_ERROR" desc="Error message for attempting to add a user that already exists"> This user already exists </message> - + <!-- Multidevice Page (OS settings) --> <message name="IDS_SETTINGS_MULTIDEVICE" desc="Title of a section of settings. This section describes settings for devices that are connected to the Chromebook, like phones."> Connected devices @@ -2225,7 +2228,7 @@ <message name="IDS_SETTINGS_DISPLAY_TOUCH_CALIBRATION_TEXT" desc="In Device Settings > Displays, the sublabel for initiating touch calibration."> Set up and adjust the accuracy of your touchscreen </message> - + <!-- Smart Lock Page (OS settings) --> <message name="IDS_SETTINGS_EASY_UNLOCK_SECTION_TITLE" desc="The title of the Easy Unlock section on the settings page."> Smart Lock @@ -2236,7 +2239,7 @@ <message name="IDS_SETTINGS_EASY_UNLOCK_UNLOCK_DEVICE_AND_ALLOW_SIGNIN" desc="This option lets the user unlock their Chromebook from their phone as well as log into their Chromebook without a password if their phone is nearby and unlocked."> Unlock device and sign in to Google Account </message> - + <!-- Fingerprint Page (OS settings) --> <message name="IDS_SETTINGS_PEOPLE_LOCK_SCREEN_ADD_FINGERPRINT_BUTTON" desc="Button that is used to add a new fingerprint."> Add Fingerprint @@ -2322,7 +2325,7 @@ <message name="IDS_SETTINGS_SET_DATE_TIME" desc="Label for the button that shows the dialog for setting the system date and time."> Set date and time </message> - + <!-- Device Keyboard page (OS settings) --> <message name="IDS_SETTINGS_KEYBOARD_TITLE" desc="In Device Settings, the title of the keyboard settings subpage."> Keyboard @@ -2405,7 +2408,7 @@ <message name="IDS_SETTINGS_KEYBOARD_SEND_FUNCTION_KEYS_DESCRIPTION" desc="In Device Settings, the label describing how to use the top-row keys' original actions when they are set to behave like function keys."> Hold the Search key to switch the behavior of the top-row keys </message> - + <!-- Apps Section Page --> <message name="IDS_SETTINGS_APPS_TITLE" desc="The title of Apps section."> Apps
diff --git a/chrome/app/os_settings_strings_grdp/IDS_SETTINGS_ACCOUNT_MANAGER_CHILD_DESCRIPTION.png.sha1 b/chrome/app/os_settings_strings_grdp/IDS_SETTINGS_ACCOUNT_MANAGER_CHILD_DESCRIPTION.png.sha1 new file mode 100644 index 0000000..11a84efd --- /dev/null +++ b/chrome/app/os_settings_strings_grdp/IDS_SETTINGS_ACCOUNT_MANAGER_CHILD_DESCRIPTION.png.sha1
@@ -0,0 +1 @@ +05ce55b3b1f72551dc7524643577ce67be247b25 \ No newline at end of file
diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp index 73246953..7a8f13a 100644 --- a/chrome/app/settings_strings.grdp +++ b/chrome/app/settings_strings.grdp
@@ -2038,9 +2038,6 @@ <message name="IDS_SETTINGS_COOKIES_PAGE" desc="Title of the cookies settings page"> Cookies </message> - <message name="IDS_SETTINGS_COOKIES_PAGE_DESCRIPTION" desc="Description of the settings page which controls cookie settings"> - Allows websites to remember your visit and track you across the web - </message> <message name="IDS_SETTINGS_COOKIES_CONTROLS" desc="Title of the general cookies control section."> General Settings </message> @@ -2307,6 +2304,24 @@ <message name="IDS_SETTINGS_SITE_SETTINGS_SHOW_ALL_RECOMMENDED" desc="Label for the global 'Show all' toggle (category default) in site settings -- a recommended setting for some categories, such as when sites want to show images."> Show all (recommended) </message> + <message name="IDS_SETTINGS_SITE_SETTINGS_COOKIES_ALLOW" desc="The sub-label for links to manage cookies when the current cookie setting is allow."> + {COUNT, plural, + =0 {Cookies are allowed} + =1 {Cookies are allowed, 1 exception} + other {Cookies are allowed, # exceptions}} + </message> + <message name="IDS_SETTINGS_SITE_SETTINGS_COOKIES_BLOCK" desc="The sub-label for links to manage cookies when the current cookie setting is allow."> + {COUNT, plural, + =0 {Cookies are blocked.} + =1 {Cookies are blocked, 1 exception} + other {Cookies are blocked, # exceptions}} + </message> + <message name="IDS_SETTINGS_SITE_SETTINGS_COOKIES_BLOCK_THIRD_PARTY" desc="The sub-label for links to manage cookies when the current cookie setting is to block third party cookies."> + Third-party cookies are blocked + </message> + <message name="IDS_SETTINGS_SITE_SETTINGS_COOKIES_BLOCK_THIRD_PARTY_INCOGNITO" desc="The sub-label for links to manage cookies when the current cookie setting is to block third party cookies in incognito."> + Third-party cookies are blocked in Incognito mode + </message> <message name="IDS_SETTINGS_SITE_SETTINGS_COOKIES_ALLOW_SITES" desc="The 'allow cookies' label in site settings."> Allow sites to save and read cookie data </message> @@ -3040,18 +3055,9 @@ <message name="IDS_SETTINGS_HUGE_FONT_SIZE" desc="The large end of the minimum font size slider in settings."> Huge </message> - <message name="IDS_SETTINGS_ADVANCED_FONT_SETTINGS" desc="Label for advanced font settings."> - Advanced font settings - </message> - <message name="IDS_SETTINGS_OPEN_ADVANCED_FONT_SETTINGS" desc="Sub-label for opening advanced font extension options."> - Open extension options - </message> <message name="IDS_SETTINGS_QUICK_BROWN_FOX" desc="Example text to see a font style and size sample. The quick brown fox sentence is a playful way to show all 26 English letters. Any example text will do. There is no need to translate this exactly."> The quick brown fox jumps over the lazy dog </message> - <message name="IDS_SETTINGS_REQUIRES_WEB_STORE_EXTENSION" desc="Sub-label for advanced font settings explaining that an extension from the Web Store is required."> - Requires extension from the Chrome Web Store - </message> <!-- System Page --> <if expr="not chromeos">
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn index e0ecc7d..021b133 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn
@@ -2005,6 +2005,7 @@ "//chrome/browser/touch_to_fill", "//chrome/browser/ui", "//chrome/browser/ui/webui/bluetooth_internals", + "//chrome/browser/upboarding", "//chrome/browser/updates/announcement_notification", "//chrome/common:channel_info", "//chrome/common/net", @@ -2960,6 +2961,7 @@ "touch_to_fill/touch_to_fill_controller.h", "translate/android/translate_bridge.cc", "translate/android/translate_bridge.h", + "upboarding/query_tiles/android/tile_provider_factory.cc", "updates/update_notification_client.cc", "updates/update_notification_client.h", "updates/update_notification_service_bridge_android.cc", @@ -5371,6 +5373,8 @@ "supervised_user/mature_extension_checker.h", "supervised_user/supervised_user_extensions_metrics_recorder.cc", "supervised_user/supervised_user_extensions_metrics_recorder.h", + "supervised_user/supervised_user_service_management_api_delegate.cc", + "supervised_user/supervised_user_service_management_api_delegate.h", ] } @@ -5601,10 +5605,7 @@ if (is_android) { deps += [ "//chrome/browser/ui/webui/explore_sites_internals:mojo_bindings_js" ] - } else { - deps += [ "//chrome/browser/ui/webui/app_management:mojo_bindings_js" ] } - if (is_chromeos) { deps += [ "//chrome/browser/resources/chromeos/crostini_installer:polymer3_elements", @@ -5614,6 +5615,7 @@ "//chrome/browser/resources/chromeos/set_time_dialog:polymer3_elements", "//chrome/browser/resources/chromeos/smb_shares:polymer3_elements", "//chrome/browser/supervised_user:supervised_user_unscaled_resources", + "//chrome/browser/ui/webui/app_management:mojo_bindings_js", "//chrome/browser/ui/webui/chromeos/add_supervision:mojo_bindings_js", "//chrome/browser/ui/webui/chromeos/crostini_installer:mojo_bindings_js", "//chrome/browser/ui/webui/chromeos/crostini_upgrader:mojo_bindings_js",
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index 9b5c6f9..ae0e89b3 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc
@@ -2451,6 +2451,9 @@ flag_descriptions::kOnTheFlyMhtmlHashComputationName, flag_descriptions::kOnTheFlyMhtmlHashComputationDescription, kOsAndroid, FEATURE_VALUE_TYPE(offline_pages::kOnTheFlyMhtmlHashComputationFeature)}, + {"query-tiles", flag_descriptions::kQueryTilesName, + flag_descriptions::kQueryTilesDescription, kOsAndroid, + FEATURE_VALUE_TYPE(chrome::android::kQueryTiles)}, {"android-picture-in-picture-api", flag_descriptions::kAndroidPictureInPictureAPIName, flag_descriptions::kAndroidPictureInPictureAPIDescription, kOsAndroid,
diff --git a/chrome/browser/accessibility/caption_bubble.cc b/chrome/browser/accessibility/caption_bubble.cc index 7ffa201..93ccf43 100644 --- a/chrome/browser/accessibility/caption_bubble.cc +++ b/chrome/browser/accessibility/caption_bubble.cc
@@ -42,6 +42,7 @@ label_ = new views::Label(); label_->SetMultiLine(true); label_->SetMaxLines(2); + label_->SetElideBehavior(gfx::TRUNCATE_HEAD); int max_width = GetAnchorView()->width() * 0.8; label_->SetMaximumWidth(max_width); label_->SetEnabledColor(SK_ColorWHITE);
diff --git a/chrome/browser/android/DEPS b/chrome/browser/android/DEPS index 460fc54..5f18710c 100644 --- a/chrome/browser/android/DEPS +++ b/chrome/browser/android/DEPS
@@ -2,7 +2,6 @@ "-components/devtools_bridge", "+cc/layers/layer.h", "+chrome/android/test_support_jni_headers", - "+chrome/lib/image_fetcher/public/android/jni_headers", "+chrome_jni_registration/chrome_jni_registration.h", "+device/vr/buildflags/buildflags.h", "+media/gpu",
diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browser/android/bookmarks/bookmark_bridge.cc index bd32c8d..787c2166 100644 --- a/chrome/browser/android/bookmarks/bookmark_bridge.cc +++ b/chrome/browser/android/bookmarks/bookmark_bridge.cc
@@ -7,14 +7,17 @@ #include <stddef.h> #include <stdint.h> -#include <memory> +#include <algorithm> +#include <queue> +#include <string> +#include <utility> +#include <vector> #include "base/android/jni_array.h" #include "base/android/jni_string.h" #include "base/bind.h" #include "base/containers/adapters.h" #include "base/containers/stack.h" -#include "base/containers/stack_container.h" #include "base/guid.h" #include "base/i18n/string_compare.h" #include "base/strings/string16.h" @@ -242,36 +245,6 @@ return bookmark_model_->IsDoingExtensiveChanges(); } -void BookmarkBridge::GetPermanentNodeIDs( - JNIEnv* env, - const JavaParamRef<jobject>& obj, - const JavaParamRef<jobject>& j_result_obj) { - // TODO(kkimlabs): Remove this function. - DCHECK_CURRENTLY_ON(BrowserThread::UI); - DCHECK(IsLoaded()); - - base::StackVector<const BookmarkNode*, 8> permanent_nodes; - - // Save all the permanent nodes. - const BookmarkNode* root_node = bookmark_model_->root_node(); - permanent_nodes->push_back(root_node); - for (const auto& child : root_node->children()) - permanent_nodes->push_back(child.get()); - permanent_nodes->push_back( - partner_bookmarks_shim_->GetPartnerBookmarksRoot()); - - // Write the permanent nodes to |j_result_obj|. - for (base::StackVector<const BookmarkNode*, 8>::ContainerType::const_iterator - it = permanent_nodes->begin(); - it != permanent_nodes->end(); - ++it) { - if (*it != NULL) { - Java_BookmarkBridge_addToBookmarkIdList( - env, j_result_obj, (*it)->id(), GetBookmarkType(*it)); - } - } -} - void BookmarkBridge::GetTopLevelFolderParentIDs( JNIEnv* env, const JavaParamRef<jobject>& obj,
diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.h b/chrome/browser/android/bookmarks/bookmark_bridge.h index 1045f69..9ae9073 100644 --- a/chrome/browser/android/bookmarks/bookmark_bridge.h +++ b/chrome/browser/android/bookmarks/bookmark_bridge.h
@@ -5,6 +5,9 @@ #ifndef CHROME_BROWSER_ANDROID_BOOKMARKS_BOOKMARK_BRIDGE_H_ #define CHROME_BROWSER_ANDROID_BOOKMARKS_BOOKMARK_BRIDGE_H_ +#include <memory> +#include <set> + #include "base/android/jni_android.h" #include "base/android/jni_weak_ref.h" #include "base/compiler_specific.h" @@ -57,11 +60,6 @@ jlong id, jint type); - void GetPermanentNodeIDs( - JNIEnv* env, - const base::android::JavaParamRef<jobject>& obj, - const base::android::JavaParamRef<jobject>& j_result_obj); - void GetTopLevelFolderParentIDs( JNIEnv* env, const base::android::JavaParamRef<jobject>& obj,
diff --git a/chrome/lib/lifecycle/public/android/BUILD.gn b/chrome/browser/android/lifecycle/BUILD.gn similarity index 100% rename from chrome/lib/lifecycle/public/android/BUILD.gn rename to chrome/browser/android/lifecycle/BUILD.gn
diff --git a/chrome/browser/android/lifecycle/DEPS b/chrome/browser/android/lifecycle/DEPS new file mode 100644 index 0000000..7cf2601 --- /dev/null +++ b/chrome/browser/android/lifecycle/DEPS
@@ -0,0 +1,11 @@ +noparent = True + +include_rules = [ + "+base/android", + + "-content/public/android", + "+content/public/android/java/src/org/chromium/content_public", + + # Leaf node, not dependent on other chrome/browser/ code. + "-chrome/browser", +]
diff --git a/chrome/browser/android/lifecycle/OWNERS b/chrome/browser/android/lifecycle/OWNERS new file mode 100644 index 0000000..ec11b3c --- /dev/null +++ b/chrome/browser/android/lifecycle/OWNERS
@@ -0,0 +1,5 @@ +twellington@chromium.org +dtrainor@chromium.org + +# COMPONENT: UI>Browser>Mobile +# OS: Android
diff --git a/chrome/lib/lifecycle/public/android/java/src/org/chromium/chrome/browser/lifecycle/ActivityLifecycleDispatcher.java b/chrome/browser/android/lifecycle/java/src/org/chromium/chrome/browser/lifecycle/ActivityLifecycleDispatcher.java similarity index 100% rename from chrome/lib/lifecycle/public/android/java/src/org/chromium/chrome/browser/lifecycle/ActivityLifecycleDispatcher.java rename to chrome/browser/android/lifecycle/java/src/org/chromium/chrome/browser/lifecycle/ActivityLifecycleDispatcher.java
diff --git a/chrome/lib/lifecycle/public/android/java/src/org/chromium/chrome/browser/lifecycle/ActivityResultWithNativeObserver.java b/chrome/browser/android/lifecycle/java/src/org/chromium/chrome/browser/lifecycle/ActivityResultWithNativeObserver.java similarity index 100% rename from chrome/lib/lifecycle/public/android/java/src/org/chromium/chrome/browser/lifecycle/ActivityResultWithNativeObserver.java rename to chrome/browser/android/lifecycle/java/src/org/chromium/chrome/browser/lifecycle/ActivityResultWithNativeObserver.java
diff --git a/chrome/lib/lifecycle/public/android/java/src/org/chromium/chrome/browser/lifecycle/ConfigurationChangedObserver.java b/chrome/browser/android/lifecycle/java/src/org/chromium/chrome/browser/lifecycle/ConfigurationChangedObserver.java similarity index 100% rename from chrome/lib/lifecycle/public/android/java/src/org/chromium/chrome/browser/lifecycle/ConfigurationChangedObserver.java rename to chrome/browser/android/lifecycle/java/src/org/chromium/chrome/browser/lifecycle/ConfigurationChangedObserver.java
diff --git a/chrome/lib/lifecycle/public/android/java/src/org/chromium/chrome/browser/lifecycle/Destroyable.java b/chrome/browser/android/lifecycle/java/src/org/chromium/chrome/browser/lifecycle/Destroyable.java similarity index 100% rename from chrome/lib/lifecycle/public/android/java/src/org/chromium/chrome/browser/lifecycle/Destroyable.java rename to chrome/browser/android/lifecycle/java/src/org/chromium/chrome/browser/lifecycle/Destroyable.java
diff --git a/chrome/lib/lifecycle/public/android/java/src/org/chromium/chrome/browser/lifecycle/InflationObserver.java b/chrome/browser/android/lifecycle/java/src/org/chromium/chrome/browser/lifecycle/InflationObserver.java similarity index 100% rename from chrome/lib/lifecycle/public/android/java/src/org/chromium/chrome/browser/lifecycle/InflationObserver.java rename to chrome/browser/android/lifecycle/java/src/org/chromium/chrome/browser/lifecycle/InflationObserver.java
diff --git a/chrome/lib/lifecycle/public/android/java/src/org/chromium/chrome/browser/lifecycle/LifecycleObserver.java b/chrome/browser/android/lifecycle/java/src/org/chromium/chrome/browser/lifecycle/LifecycleObserver.java similarity index 100% rename from chrome/lib/lifecycle/public/android/java/src/org/chromium/chrome/browser/lifecycle/LifecycleObserver.java rename to chrome/browser/android/lifecycle/java/src/org/chromium/chrome/browser/lifecycle/LifecycleObserver.java
diff --git a/chrome/lib/lifecycle/public/android/java/src/org/chromium/chrome/browser/lifecycle/NativeInitObserver.java b/chrome/browser/android/lifecycle/java/src/org/chromium/chrome/browser/lifecycle/NativeInitObserver.java similarity index 100% rename from chrome/lib/lifecycle/public/android/java/src/org/chromium/chrome/browser/lifecycle/NativeInitObserver.java rename to chrome/browser/android/lifecycle/java/src/org/chromium/chrome/browser/lifecycle/NativeInitObserver.java
diff --git a/chrome/lib/lifecycle/public/android/java/src/org/chromium/chrome/browser/lifecycle/PauseResumeWithNativeObserver.java b/chrome/browser/android/lifecycle/java/src/org/chromium/chrome/browser/lifecycle/PauseResumeWithNativeObserver.java similarity index 100% rename from chrome/lib/lifecycle/public/android/java/src/org/chromium/chrome/browser/lifecycle/PauseResumeWithNativeObserver.java rename to chrome/browser/android/lifecycle/java/src/org/chromium/chrome/browser/lifecycle/PauseResumeWithNativeObserver.java
diff --git a/chrome/lib/lifecycle/public/android/java/src/org/chromium/chrome/browser/lifecycle/SaveInstanceStateObserver.java b/chrome/browser/android/lifecycle/java/src/org/chromium/chrome/browser/lifecycle/SaveInstanceStateObserver.java similarity index 100% rename from chrome/lib/lifecycle/public/android/java/src/org/chromium/chrome/browser/lifecycle/SaveInstanceStateObserver.java rename to chrome/browser/android/lifecycle/java/src/org/chromium/chrome/browser/lifecycle/SaveInstanceStateObserver.java
diff --git a/chrome/lib/lifecycle/public/android/java/src/org/chromium/chrome/browser/lifecycle/StartStopWithNativeObserver.java b/chrome/browser/android/lifecycle/java/src/org/chromium/chrome/browser/lifecycle/StartStopWithNativeObserver.java similarity index 100% rename from chrome/lib/lifecycle/public/android/java/src/org/chromium/chrome/browser/lifecycle/StartStopWithNativeObserver.java rename to chrome/browser/android/lifecycle/java/src/org/chromium/chrome/browser/lifecycle/StartStopWithNativeObserver.java
diff --git a/chrome/lib/lifecycle/public/android/java/src/org/chromium/chrome/browser/lifecycle/WindowFocusChangedObserver.java b/chrome/browser/android/lifecycle/java/src/org/chromium/chrome/browser/lifecycle/WindowFocusChangedObserver.java similarity index 100% rename from chrome/lib/lifecycle/public/android/java/src/org/chromium/chrome/browser/lifecycle/WindowFocusChangedObserver.java rename to chrome/browser/android/lifecycle/java/src/org/chromium/chrome/browser/lifecycle/WindowFocusChangedObserver.java
diff --git a/chrome/browser/apps/app_service/app_service_proxy.cc b/chrome/browser/apps/app_service/app_service_proxy.cc index 5b1ad89..e80a0a8f 100644 --- a/chrome/browser/apps/app_service/app_service_proxy.cc +++ b/chrome/browser/apps/app_service/app_service_proxy.cc
@@ -272,8 +272,11 @@ continue; } - constexpr bool kPaused = true; - UpdatePausedStatus(app_type, data.first, kPaused); + cache_.ForOneApp(data.first, [this](const apps::AppUpdate& update) { + if (update.Paused() != apps::mojom::OptionalBool::kTrue) { + pending_pause_requests_.MaybeAddApp(update.AppId()); + } + }); // The app pause dialog can't be loaded for unit tests. if (!data.second.should_show_pause_dialog || is_using_testing_profile_) { @@ -302,9 +305,6 @@ continue; } - constexpr bool kPaused = false; - UpdatePausedStatus(app_type, app_id, kPaused); - app_service_->UnpauseApps(app_type, app_id); } } @@ -536,7 +536,8 @@ // Return true, and load the icon for the app pause dialog when the app // is paused. - if (update.Paused() == apps::mojom::OptionalBool::kTrue) { + if (update.Paused() == apps::mojom::OptionalBool::kTrue || + pending_pause_requests_.IsPaused(update.AppId())) { chromeos::app_time::AppTimeLimitInterface* app_limit = chromeos::app_time::AppTimeLimitInterface::Get(profile_); DCHECK(app_limit); @@ -626,19 +627,6 @@ } } -void AppServiceProxy::UpdatePausedStatus(apps::mojom::AppType app_type, - const std::string& app_id, - bool paused) { - std::vector<apps::mojom::AppPtr> apps; - apps::mojom::AppPtr app = apps::mojom::App::New(); - app->app_type = app_type; - app->app_id = app_id; - app->paused = (paused) ? apps::mojom::OptionalBool::kTrue - : apps::mojom::OptionalBool::kFalse; - apps.push_back(std::move(app)); - cache_.OnApps(std::move(apps)); -} - void AppServiceProxy::OnPauseDialogClosed(apps::mojom::AppType app_type, const std::string& app_id) { app_service_->PauseApp(app_type, app_id); @@ -646,6 +634,15 @@ #endif // OS_CHROMEOS void AppServiceProxy::OnAppUpdate(const apps::AppUpdate& update) { +#if defined(OS_CHROMEOS) + if ((update.PausedChanged() && + update.Paused() == apps::mojom::OptionalBool::kTrue) || + (update.ReadinessChanged() && + update.Readiness() == apps::mojom::Readiness::kUninstalledByUser)) { + pending_pause_requests_.MaybeRemoveApp(update.AppId()); + } +#endif // OS_CHROMEOS + if (!update.ReadinessChanged() || update.Readiness() != apps::mojom::Readiness::kUninstalledByUser) { return;
diff --git a/chrome/browser/apps/app_service/app_service_proxy.h b/chrome/browser/apps/app_service/app_service_proxy.h index 625938f..4ec3fd1 100644 --- a/chrome/browser/apps/app_service/app_service_proxy.h +++ b/chrome/browser/apps/app_service/app_service_proxy.h
@@ -306,10 +306,6 @@ const PauseData& pause_data, apps::mojom::IconValuePtr icon_value); - void UpdatePausedStatus(apps::mojom::AppType app_type, - const std::string& app_id, - bool paused); - // Invoked when the user clicks the 'OK' button of the pause app dialog. // AppService stops the running app and applies the paused app icon effect. void OnPauseDialogClosed(apps::mojom::AppType app_type, @@ -356,6 +352,13 @@ bool arc_is_registered_ = false; apps::InstanceRegistry instance_registry_; + + // When PauseApps is called, the app is added to |pending_pause_requests|. + // When the user clicks the OK from the pause app dialog, the pause status is + // updated in AppRegistryCache by the publisher, then the app is removed from + // |pending_pause_requests|. If the app status is paused in AppRegistryCache + // or pending_pause_requests, the app can't be launched. + PausedApps pending_pause_requests_; #endif // OS_CHROMEOS Profile* profile_;
diff --git a/chrome/browser/apps/app_service/arc_apps.cc b/chrome/browser/apps/app_service/arc_apps.cc index 93ea0b2..b7a57f8f 100644 --- a/chrome/browser/apps/app_service/arc_apps.cc +++ b/chrome/browser/apps/app_service/arc_apps.cc
@@ -587,19 +587,20 @@ } void ArcApps::PauseApp(const std::string& app_id) { - if (!paused_apps_.MaybeAddApp(app_id)) { - return; - } + paused_apps_.MaybeAddApp(app_id); + constexpr bool kPaused = true; + Publish(paused_apps_.GetAppWithPauseStatus(apps::mojom::AppType::kArc, app_id, + kPaused)); SetIconEffect(app_id); CloseTasks(app_id); } void ArcApps::UnpauseApps(const std::string& app_id) { - if (!paused_apps_.MaybeRemoveApp(app_id)) { - return; - } - + paused_apps_.MaybeRemoveApp(app_id); + constexpr bool kPaused = false; + Publish(paused_apps_.GetAppWithPauseStatus(apps::mojom::AppType::kArc, app_id, + kPaused)); SetIconEffect(app_id); }
diff --git a/chrome/browser/apps/app_service/extension_apps.cc b/chrome/browser/apps/app_service/extension_apps.cc index a31183d..9eb3bd16 100644 --- a/chrome/browser/apps/app_service/extension_apps.cc +++ b/chrome/browser/apps/app_service/extension_apps.cc
@@ -605,9 +605,9 @@ } void ExtensionApps::PauseApp(const std::string& app_id) { - if (!paused_apps_.MaybeAddApp(app_id)) { - return; - } + paused_apps_.MaybeAddApp(app_id); + constexpr bool kPaused = true; + Publish(paused_apps_.GetAppWithPauseStatus(app_type_, app_id, kPaused)); SetIconEffect(app_id); @@ -642,9 +642,9 @@ } void ExtensionApps::UnpauseApps(const std::string& app_id) { - if (!paused_apps_.MaybeRemoveApp(app_id)) { - return; - } + paused_apps_.MaybeRemoveApp(app_id); + constexpr bool kPaused = false; + Publish(paused_apps_.GetAppWithPauseStatus(app_type_, app_id, kPaused)); SetIconEffect(app_id);
diff --git a/chrome/browser/apps/app_service/paused_apps.cc b/chrome/browser/apps/app_service/paused_apps.cc index 563a542..e1130cc2 100644 --- a/chrome/browser/apps/app_service/paused_apps.cc +++ b/chrome/browser/apps/app_service/paused_apps.cc
@@ -12,6 +12,19 @@ PausedApps::~PausedApps() = default; +// static +apps::mojom::AppPtr PausedApps::GetAppWithPauseStatus( + apps::mojom::AppType app_type, + const std::string& app_id, + bool paused) { + apps::mojom::AppPtr app = apps::mojom::App::New(); + app->app_type = app_type; + app->app_id = app_id; + app->paused = (paused) ? apps::mojom::OptionalBool::kTrue + : apps::mojom::OptionalBool::kFalse; + return app; +} + bool PausedApps::MaybeAddApp(const std::string& app_id) { auto ret = paused_apps_.insert(app_id); return ret.second;
diff --git a/chrome/browser/apps/app_service/paused_apps.h b/chrome/browser/apps/app_service/paused_apps.h index 01efbac0..08fbed3 100644 --- a/chrome/browser/apps/app_service/paused_apps.h +++ b/chrome/browser/apps/app_service/paused_apps.h
@@ -8,6 +8,8 @@ #include <set> #include <string> +#include "chrome/services/app_service/public/mojom/types.mojom.h" + namespace apps { // PausedApps saves apps which have been paused for a specific publisher. The @@ -20,6 +22,11 @@ PausedApps(const PausedApps&) = delete; PausedApps& operator=(const PausedApps&) = delete; + static apps::mojom::AppPtr GetAppWithPauseStatus( + apps::mojom::AppType app_type, + const std::string& app_id, + bool paused); + // Returns true if the app was added to the paused set, and false if it was // already there. bool MaybeAddApp(const std::string& app_id);
diff --git a/chrome/browser/apps/app_service/web_apps.cc b/chrome/browser/apps/app_service/web_apps.cc index 8dbdf6e..afd6c0bf 100644 --- a/chrome/browser/apps/app_service/web_apps.cc +++ b/chrome/browser/apps/app_service/web_apps.cc
@@ -336,12 +336,12 @@ } void WebApps::PauseApp(const std::string& app_id) { - if (!paused_apps_.MaybeAddApp(app_id)) { - return; - } + paused_apps_.MaybeAddApp(app_id); + constexpr bool kPaused = true; + Publish(paused_apps_.GetAppWithPauseStatus(apps::mojom::AppType::kWeb, app_id, + kPaused)); SetIconEffect(app_id); - for (auto* browser : *BrowserList::GetInstance()) { if (!browser->is_type_app()) { continue; @@ -353,9 +353,10 @@ } void WebApps::UnpauseApps(const std::string& app_id) { - if (!paused_apps_.MaybeRemoveApp(app_id)) { - return; - } + paused_apps_.MaybeRemoveApp(app_id); + constexpr bool kPaused = false; + Publish(paused_apps_.GetAppWithPauseStatus(apps::mojom::AppType::kWeb, app_id, + kPaused)); SetIconEffect(app_id); } @@ -521,6 +522,8 @@ void WebApps::SetShowInFields(apps::mojom::AppPtr& app, const web_app::WebApp* web_app) { + // TODO(crbug.com/1054195): Make web_apps read this from + // system_web_app_manager. auto show = apps::mojom::OptionalBool::kTrue; app->show_in_launcher = show; app->show_in_search = show;
diff --git a/chrome/browser/chromeos/crostini/crostini_terminal.cc b/chrome/browser/chromeos/crostini/crostini_terminal.cc index 1b72852..e2505828 100644 --- a/chrome/browser/chromeos/crostini/crostini_terminal.cc +++ b/chrome/browser/chromeos/crostini/crostini_terminal.cc
@@ -136,6 +136,10 @@ params->disposition = WindowOpenDisposition::NEW_POPUP; // If |terminal| is not set, we open the settings window with the // default bounds and then resize it later. + if (!terminal) { + terminal = web_app::FindSystemWebAppBrowser( + profile, web_app::SystemAppType::TERMINAL); + } if (terminal) { const gfx::Rect& bounds = terminal->window()->GetBounds(); params->override_bounds.set_origin(
diff --git a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc index f3727ded..e2b8fd2 100644 --- a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc +++ b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
@@ -723,8 +723,6 @@ ::testing::Values( TestCase("tabindexSearchBoxFocus").FilesNg(), TestCase("tabindexSearchBoxFocus").DisableFilesNg(), - TestCase("tabindexFocusBody").DisableFilesNg(), - TestCase("tabindexFocusBody").FilesNg(), TestCase("tabindexFocus").DisableFilesNg(), TestCase("tabindexFocusDownloads").FilesNg(), TestCase("tabindexFocusDownloads").DisableFilesNg(), @@ -958,7 +956,7 @@ FilesAppBrowserTest, ::testing::Values(TestCase("breadcrumbsNavigate").DisableFilesNg(), TestCase("breadcrumbsLeafNoFocus").DisableFilesNg(), - TestCase("breadcrumbsTooltip"), + TestCase("breadcrumbsTooltip").DisableFilesNg(), TestCase("breadcrumbsDownloadsTranslation"))); WRAPPED_INSTANTIATE_TEST_SUITE_P(
diff --git a/chrome/browser/chromeos/web_applications/media_app_integration_browsertest.cc b/chrome/browser/chromeos/web_applications/media_app_integration_browsertest.cc index 909553f..400ae434 100644 --- a/chrome/browser/chromeos/web_applications/media_app_integration_browsertest.cc +++ b/chrome/browser/chromeos/web_applications/media_app_integration_browsertest.cc
@@ -26,6 +26,7 @@ #include "extensions/browser/entry_info.h" #include "extensions/browser/extension_system.h" #include "testing/gtest/include/gtest/gtest.h" +#include "third_party/blink/public/common/features.h" using platform_util::OpenOperationResult; using web_app::SystemAppType; @@ -51,7 +52,10 @@ class MediaAppIntegrationTest : public SystemWebAppIntegrationTest { public: MediaAppIntegrationTest() { - scoped_feature_list_.InitWithFeatures({chromeos::features::kMediaApp}, {}); + scoped_feature_list_.InitWithFeatures( + {chromeos::features::kMediaApp, blink::features::kNativeFileSystemAPI, + blink::features::kFileHandlingAPI}, + {}); } private: @@ -63,8 +67,8 @@ file_manager::test::AddDefaultComponentExtensionsOnMainThread(profile()); // Add the Files App, but remove the Gallery app, since its own file // handling may interfere. Long term, the Galley app will be removed. - // TODO(crbug/1030935): Rely on flags alone to remove the Gallery App (i.e. - // migrate this step to release code). + // TODO(crbug.com/1030935): Rely on flags alone to remove the Gallery App + // (i.e. migrate this step to release code). extensions::ExtensionService* service = extensions::ExtensionSystem::Get(profile())->extension_service(); service->component_loader()->Remove(file_manager::kGalleryAppId); @@ -206,6 +210,14 @@ } } +IN_PROC_BROWSER_TEST_P(MediaAppIntegrationTest, HiddenInLauncher) { + WaitForTestSystemAppInstall(); + + // Check system_web_app_manager has the correct attributes for Media App. + EXPECT_FALSE( + GetManager().ShouldShowInLauncher(web_app::SystemAppType::MEDIA)); +} + // End-to-end test to ensure that the MediaApp successfully registers as a file // handler with the ChromeOS file manager on startup and acts as the default // handler for a given file. @@ -263,7 +275,7 @@ EXPECT_EQ("640x480", WaitForOpenedImage(web_ui)); // Clear the <img> src attribute to ensure we can detect changes reliably. - // TODO(crbug/893226): Use the alt-text to find the image instead. + // TODO(crbug.com/893226): Use the alt-text to find the image instead. ClearOpenedImage(web_ui); // Navigate to the next file in the directory.
diff --git a/chrome/browser/client_hints/client_hints_browsertest.cc b/chrome/browser/client_hints/client_hints_browsertest.cc index 39b49a4..0ea9bdf 100644 --- a/chrome/browser/client_hints/client_hints_browsertest.cc +++ b/chrome/browser/client_hints/client_hints_browsertest.cc
@@ -48,6 +48,8 @@ namespace { +const unsigned expected_client_hints_number = 11u; + // An interceptor that records count of fetches and client hint headers for // requests to https://foo.com/non-existing-image.jpg. class ThirdPartyURLLoaderInterceptor { @@ -439,6 +441,10 @@ return main_frame_ua_observed_; } + const std::string& main_frame_ua_full_version_observed() const { + return main_frame_ua_full_version_observed_; + } + base::test::ScopedFeatureList scoped_feature_list_; std::string intercept_iframe_resource_; @@ -522,6 +528,13 @@ if (request.headers.find("sec-ch-ua") != request.headers.end()) main_frame_ua_observed_ = request.headers.find("sec-ch-ua")->second; + if (request.headers.find("sec-ch-ua-full-version") != + request.headers.end()) + main_frame_ua_full_version_observed_ = + request.headers.find("sec-ch-ua-full-version")->second; + else + main_frame_ua_full_version_observed_.clear(); + VerifyClientHintsReceived(expect_client_hints_on_main_frame_, request); if (expect_client_hints_on_main_frame_) { double value = 0.0; @@ -722,6 +735,7 @@ GURL redirect_url_; std::string main_frame_ua_observed_; + std::string main_frame_ua_full_version_observed_; double main_frame_dpr_observed_ = -1; double main_frame_viewport_width_observed_ = -1; @@ -800,8 +814,9 @@ content::FetchHistogramsFromChildProcesses(); SubprocessMetricsProvider::MergeHistogramDeltasForTesting(); - // client_hints_url() sets twelve client hints. - histogram_tester.ExpectUniqueSample("ClientHints.UpdateSize", 12, 1); + // client_hints_url() sets the expected number of client hints. + histogram_tester.ExpectUniqueSample("ClientHints.UpdateSize", + expected_client_hints_number, 1); // accept_ch_with_lifetime_url() sets client hints persist duration to 3600 // seconds. histogram_tester.ExpectUniqueSample("ClientHints.PersistDuration", @@ -858,9 +873,10 @@ EXPECT_EQ(3u, count_user_agent_hint_headers_seen()); EXPECT_EQ(3u, count_ua_mobile_client_hints_headers_seen()); - // Ten other client hints are attached to the image request, and ten to the - // main frame request. - EXPECT_EQ(20u, count_client_hints_headers_seen()); + // Expected number of hints attached to the image request, and the same number + // to the main frame request. + EXPECT_EQ(expected_client_hints_number * 2, + count_client_hints_headers_seen()); // Navigating to without_accept_ch_without_lifetime_img_foo_com() should not // attach client hints to the image subresouce contained in that page since @@ -873,9 +889,10 @@ // The device-memory and dprheader is attached to the main frame request. #if defined(OS_ANDROID) - EXPECT_EQ(10u, count_client_hints_headers_seen()); + EXPECT_EQ(expected_client_hints_number, count_client_hints_headers_seen()); #else - EXPECT_EQ(30u, count_client_hints_headers_seen()); + EXPECT_EQ(expected_client_hints_number * 3, + count_client_hints_headers_seen()); #endif // Requests to third party servers should have only one client hint attached @@ -910,9 +927,10 @@ EXPECT_EQ(3u, count_user_agent_hint_headers_seen()); EXPECT_EQ(3u, count_ua_mobile_client_hints_headers_seen()); - // Ten other client hints are attached to the image request, and ten to the - // main frame request. - EXPECT_EQ(20u, count_client_hints_headers_seen()); + // Expected number of hints attached to the image request, and the same number + // to the main frame request. + EXPECT_EQ(expected_client_hints_number * 2, + count_client_hints_headers_seen()); // OTR profile should get neither. Browser* otr_browser = CreateIncognitoBrowser(browser()->profile()); @@ -923,7 +941,7 @@ } // Verify that we send only major version information in the `Sec-CH-UA` header -// by default, and full version information after an opt-in. +// by default, regardless of opt-in. IN_PROC_BROWSER_TEST_P(ClientHintsBrowserTest, UserAgentVersion) { const GURL gurl = GetParam() ? http_equiv_accept_ch_with_lifetime() : accept_ch_with_lifetime_url(); @@ -934,20 +952,18 @@ // the major version, and not contain the full version. SetClientHintExpectationsOnMainFrame(false); ui_test_utils::NavigateToURL(browser(), gurl); - std::string version = ua.major_version; - version.append(1, '"'); - EXPECT_TRUE(base::EndsWith(main_frame_ua_observed(), version, - base::CompareCase::SENSITIVE)); - EXPECT_EQ(std::string::npos, main_frame_ua_observed().find(ua.full_version)); + std::string expected_ua = + "\"" + ua.brand + "\"; v=\"" + ua.major_version + "\""; + EXPECT_EQ(main_frame_ua_observed(), expected_ua); + EXPECT_TRUE(main_frame_ua_full_version_observed().empty()); - // Navigate again, after the opt-in: the value should end with the full + // Navigate again, after the opt-in: the value should stay the major // version. SetClientHintExpectationsOnMainFrame(true); ui_test_utils::NavigateToURL(browser(), gurl); - version = ua.full_version; - version.append(1, '"'); - EXPECT_TRUE(base::EndsWith(main_frame_ua_observed(), version, - base::CompareCase::SENSITIVE)); + std::string expected_full_version = "\"" + ua.full_version + "\""; + EXPECT_EQ(main_frame_ua_observed(), expected_ua); + EXPECT_EQ(main_frame_ua_full_version_observed(), expected_full_version); } void ClientHintsBrowserTest::TestProfilesIndependent(Browser* browser_a, @@ -961,23 +977,24 @@ // end with the major version, and not contain the full version. SetClientHintExpectationsOnMainFrame(false); ui_test_utils::NavigateToURL(browser_a, gurl); - EXPECT_TRUE(base::EndsWith(main_frame_ua_observed(), ua.major_version + "\"", - base::CompareCase::SENSITIVE)); - EXPECT_EQ(std::string::npos, main_frame_ua_observed().find(ua.full_version)); + std::string expected_ua = + "\"" + ua.brand + "\"; v=\"" + ua.major_version + "\""; + EXPECT_EQ(main_frame_ua_observed(), expected_ua); + EXPECT_TRUE(main_frame_ua_full_version_observed().empty()); // Try again on |browser_a|, the header should have an effect there. SetClientHintExpectationsOnMainFrame(true); ui_test_utils::NavigateToURL(browser_a, gurl); - EXPECT_TRUE(base::EndsWith(main_frame_ua_observed(), ua.full_version + "\"", - base::CompareCase::SENSITIVE)); + std::string expected_full_version = "\"" + ua.full_version + "\""; + EXPECT_EQ(main_frame_ua_observed(), expected_ua); + EXPECT_EQ(main_frame_ua_full_version_observed(), expected_full_version); // Navigate on |browser_b|. That should still only have the major // version. SetClientHintExpectationsOnMainFrame(false); ui_test_utils::NavigateToURL(browser_b, gurl); - EXPECT_TRUE(base::EndsWith(main_frame_ua_observed(), ua.major_version + "\"", - base::CompareCase::SENSITIVE)); - EXPECT_EQ(std::string::npos, main_frame_ua_observed().find(ua.full_version)); + EXPECT_EQ(main_frame_ua_observed(), expected_ua); + EXPECT_TRUE(main_frame_ua_full_version_observed().empty()); } // Check that client hints attached to navigation inside OTR profiles @@ -1011,7 +1028,7 @@ ui_test_utils::NavigateToURL(browser(), gurl); histogram_tester.ExpectTotalCount("ClientHints.UpdateEventCount", 0); - EXPECT_EQ(10u, count_client_hints_headers_seen()); + EXPECT_EQ(expected_client_hints_number, count_client_hints_headers_seen()); // Requests to third party servers should not have client hints attached. EXPECT_EQ(1u, third_party_request_count_seen()); @@ -1040,7 +1057,7 @@ EXPECT_EQ(2u, count_user_agent_hint_headers_seen()); EXPECT_EQ(2u, count_ua_mobile_client_hints_headers_seen()); - EXPECT_EQ(10u, count_client_hints_headers_seen()); + EXPECT_EQ(expected_client_hints_number, count_client_hints_headers_seen()); // Requests to third party servers should not have client hints attached. EXPECT_EQ(1u, third_party_request_count_seen()); @@ -1210,7 +1227,8 @@ content::FetchHistogramsFromChildProcesses(); SubprocessMetricsProvider::MergeHistogramDeltasForTesting(); - histogram_tester.ExpectUniqueSample("ClientHints.UpdateSize", 12u, 1); + histogram_tester.ExpectUniqueSample("ClientHints.UpdateSize", + expected_client_hints_number, 1); // |gurl| sets client hints persist duration to 3600 seconds. histogram_tester.ExpectUniqueSample("ClientHints.PersistDuration", 3600 * 1000, 1); @@ -1232,9 +1250,10 @@ EXPECT_EQ(3u, count_user_agent_hint_headers_seen()); EXPECT_EQ(3u, count_ua_mobile_client_hints_headers_seen()); - // Ten other client hints are attached to the image request, and ten to the - // main frame request. - EXPECT_EQ(20u, count_client_hints_headers_seen()); + // Expected number of hints attached to the image request, and the same number + // to the main frame request. + EXPECT_EQ(expected_client_hints_number * 2, + count_client_hints_headers_seen()); } // Loads a webpage that does not request persisting of client hints. @@ -1274,7 +1293,8 @@ content::FetchHistogramsFromChildProcesses(); SubprocessMetricsProvider::MergeHistogramDeltasForTesting(); - histogram_tester.ExpectUniqueSample("ClientHints.UpdateSize", 12u, 1); + histogram_tester.ExpectUniqueSample("ClientHints.UpdateSize", + expected_client_hints_number, 1); // accept_ch_with_lifetime_url() sets client hints persist duration to 3600 // seconds. histogram_tester.ExpectUniqueSample("ClientHints.PersistDuration", @@ -1296,9 +1316,10 @@ EXPECT_EQ(3u, count_user_agent_hint_headers_seen()); EXPECT_EQ(3u, count_ua_mobile_client_hints_headers_seen()); - // Ten other client hints are attached to the image request, and ten to the - // main frame request. - EXPECT_EQ(20u, count_client_hints_headers_seen()); + // Expected number of hints attached to the image request, and the same number + // to the main frame request. + EXPECT_EQ(expected_client_hints_number * 2, + count_client_hints_headers_seen()); } // Verify that expired persistent client hint preferences are not used. @@ -1325,7 +1346,8 @@ content::FetchHistogramsFromChildProcesses(); SubprocessMetricsProvider::MergeHistogramDeltasForTesting(); - histogram_tester.ExpectUniqueSample("ClientHints.UpdateSize", 12u, 1); + histogram_tester.ExpectUniqueSample("ClientHints.UpdateSize", + expected_client_hints_number, 1); // |gurl| sets client hints persist duration to 1 second. histogram_tester.ExpectUniqueSample("ClientHints.PersistDuration", 1 * 1000, 1); @@ -1382,7 +1404,8 @@ content::FetchHistogramsFromChildProcesses(); SubprocessMetricsProvider::MergeHistogramDeltasForTesting(); - histogram_tester.ExpectUniqueSample("ClientHints.UpdateSize", 12u, 1); + histogram_tester.ExpectUniqueSample("ClientHints.UpdateSize", + expected_client_hints_number, 1); // accept_ch_with_lifetime_url() sets client hints persist duration to 3600 // seconds. histogram_tester.ExpectUniqueSample("ClientHints.PersistDuration", @@ -1403,9 +1426,10 @@ EXPECT_EQ(3u, count_user_agent_hint_headers_seen()); EXPECT_EQ(3u, count_ua_mobile_client_hints_headers_seen()); - // Ten other client hints are attached to the image request, and ten to the - // main frame request. - EXPECT_EQ(20u, count_client_hints_headers_seen()); + // Expected number of hints attached to the image request, and the same number + // to the main frame request. + EXPECT_EQ(expected_client_hints_number * 2, + count_client_hints_headers_seen()); } // Ensure that even when cookies are blocked, client hint preferences are @@ -1457,7 +1481,8 @@ content::FetchHistogramsFromChildProcesses(); SubprocessMetricsProvider::MergeHistogramDeltasForTesting(); - histogram_tester.ExpectUniqueSample("ClientHints.UpdateSize", 12u, 1); + histogram_tester.ExpectUniqueSample("ClientHints.UpdateSize", + expected_client_hints_number, 1); // |gurl_with| tries to set client hints persist duration to 3600 seconds. histogram_tester.ExpectUniqueSample("ClientHints.PersistDuration", 3600 * 1000, 1); @@ -1484,9 +1509,10 @@ EXPECT_EQ(3u, count_user_agent_hint_headers_seen()); EXPECT_EQ(3u, count_ua_mobile_client_hints_headers_seen()); - // Ten other client hints are attached to the image request, and ten to the - // main frame request. - EXPECT_EQ(20u, count_client_hints_headers_seen()); + // Expected number of hints attached to the image request, and the same number + // to the main frame request. + EXPECT_EQ(expected_client_hints_number * 2, + count_client_hints_headers_seen()); // Clear settings. HostContentSettingsMapFactory::GetForProfile(browser()->profile()) @@ -1560,7 +1586,8 @@ EXPECT_EQ(1u, count_user_agent_hint_headers_seen()); EXPECT_EQ(1u, count_ua_mobile_client_hints_headers_seen()); - histogram_tester.ExpectUniqueSample("ClientHints.UpdateSize", 12u, 1); + histogram_tester.ExpectUniqueSample("ClientHints.UpdateSize", + expected_client_hints_number, 1); // accept_ch_with_lifetime_url() tries to set client hints persist duration to // 3600 seconds. histogram_tester.ExpectUniqueSample("ClientHints.PersistDuration", @@ -1615,9 +1642,10 @@ EXPECT_EQ(3u, count_user_agent_hint_headers_seen()); EXPECT_EQ(3u, count_ua_mobile_client_hints_headers_seen()); - // Ten other client hints are attached to the image request, and ten to the - // main frame request. - EXPECT_EQ(20u, count_client_hints_headers_seen()); + // Expected number of hints attached to the image request, and the same number + // to the main frame request. + EXPECT_EQ(expected_client_hints_number * 2, + count_client_hints_headers_seen()); // Clear settings. HostContentSettingsMapFactory::GetForProfile(browser()->profile()) @@ -1701,7 +1729,7 @@ EXPECT_EQ(2u, count_user_agent_hint_headers_seen()); EXPECT_EQ(2u, count_ua_mobile_client_hints_headers_seen()); - EXPECT_EQ(10u, count_client_hints_headers_seen()); + EXPECT_EQ(expected_client_hints_number, count_client_hints_headers_seen()); EXPECT_EQ(2u, third_party_request_count_seen()); EXPECT_EQ(2u, third_party_client_hints_count_seen()); VerifyContentSettingsNotNotified(); @@ -1721,7 +1749,7 @@ accept_ch_without_lifetime_img_localhost()); EXPECT_EQ(2u, count_user_agent_hint_headers_seen()); EXPECT_EQ(2u, count_ua_mobile_client_hints_headers_seen()); - EXPECT_EQ(10u, count_client_hints_headers_seen()); + EXPECT_EQ(expected_client_hints_number, count_client_hints_headers_seen()); EXPECT_EQ(3u, third_party_request_count_seen()); EXPECT_EQ(2u, third_party_client_hints_count_seen()); @@ -1759,7 +1787,7 @@ ui_test_utils::NavigateToURL(browser(), gurl); EXPECT_EQ(2u, count_user_agent_hint_headers_seen()); EXPECT_EQ(2u, count_ua_mobile_client_hints_headers_seen()); - EXPECT_EQ(10u, count_client_hints_headers_seen()); + EXPECT_EQ(expected_client_hints_number, count_client_hints_headers_seen()); EXPECT_EQ(1u, third_party_request_count_seen()); EXPECT_EQ(2u, third_party_client_hints_count_seen()); @@ -1792,7 +1820,8 @@ content::FetchHistogramsFromChildProcesses(); SubprocessMetricsProvider::MergeHistogramDeltasForTesting(); - histogram_tester.ExpectUniqueSample("ClientHints.UpdateSize", 12u, 1); + histogram_tester.ExpectUniqueSample("ClientHints.UpdateSize", + expected_client_hints_number, 1); // accept_ch_with_lifetime_url() sets client hints persist duration to 3600 // seconds. histogram_tester.ExpectUniqueSample("ClientHints.PersistDuration", @@ -1814,9 +1843,10 @@ EXPECT_EQ(3u, count_user_agent_hint_headers_seen()); EXPECT_EQ(3u, count_ua_mobile_client_hints_headers_seen()); - // Ten other client hints are attached to the image request, and ten to the - // main frame request. - EXPECT_EQ(20u, count_client_hints_headers_seen()); + // Expected number of hints attached to the image request, and the same number + // to the main frame request. + EXPECT_EQ(expected_client_hints_number * 2, + count_client_hints_headers_seen()); // Navigate using regular profile. Client hints should not be send. SetClientHintExpectationsOnMainFrame(false); @@ -1829,7 +1859,8 @@ EXPECT_EQ(5u, count_ua_mobile_client_hints_headers_seen()); // No additional hints are sent. - EXPECT_EQ(20u, count_client_hints_headers_seen()); + EXPECT_EQ(expected_client_hints_number * 2, + count_client_hints_headers_seen()); } class ClientHintsWebHoldbackBrowserTest : public ClientHintsBrowserTest { @@ -1902,7 +1933,8 @@ EXPECT_EQ(3u, count_user_agent_hint_headers_seen()); EXPECT_EQ(3u, count_ua_mobile_client_hints_headers_seen()); - EXPECT_EQ(20u, count_client_hints_headers_seen()); + EXPECT_EQ(expected_client_hints_number * 2, + count_client_hints_headers_seen()); EXPECT_EQ(0u, third_party_request_count_seen()); EXPECT_EQ(0u, third_party_client_hints_count_seen()); }
diff --git a/chrome/browser/extensions/api/chrome_extensions_api_client.cc b/chrome/browser/extensions/api/chrome_extensions_api_client.cc index 62e66ea..0e8e137 100644 --- a/chrome/browser/extensions/api/chrome_extensions_api_client.cc +++ b/chrome/browser/extensions/api/chrome_extensions_api_client.cc
@@ -43,6 +43,7 @@ #include "chrome/browser/search/instant_service_factory.h" #include "chrome/browser/ui/pdf/chrome_pdf_web_contents_helper_client.h" #include "chrome/browser/ui/webui/devtools_ui.h" +#include "chrome/common/buildflags.h" #include "chrome/common/url_constants.h" #include "chrome/common/webui_url_constants.h" #include "components/pdf/browser/pdf_web_contents_helper.h" @@ -54,6 +55,7 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_frame_host.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/api/management/supervised_user_service_delegate.h" #include "extensions/browser/api/system_display/display_info_provider.h" #include "extensions/browser/api/virtual_keyboard_private/virtual_keyboard_delegate.h" #include "extensions/browser/api/web_request/web_request_info.h" @@ -76,9 +78,15 @@ #include "chrome/browser/printing/printing_init.h" #endif +#if BUILDFLAG(ENABLE_SUPERVISED_USERS) +// TODO(https://crbug.com/1060801): Here and elsewhere, possibly switch build +// flag to #if defined(OS_CHROMEOS) +#include "chrome/browser/supervised_user/supervised_user_service_management_api_delegate.h" +#endif + namespace extensions { -ChromeExtensionsAPIClient::ChromeExtensionsAPIClient() {} +ChromeExtensionsAPIClient::ChromeExtensionsAPIClient() = default; ChromeExtensionsAPIClient::~ChromeExtensionsAPIClient() {} @@ -335,6 +343,15 @@ return new ChromeManagementAPIDelegate; } +std::unique_ptr<SupervisedUserServiceDelegate> +ChromeExtensionsAPIClient::CreateSupervisedUserServiceDelegate() const { +#if BUILDFLAG(ENABLE_SUPERVISED_USERS) + return std::make_unique<SupervisedUserServiceManagementAPIDelegate>(); +#else + return nullptr; +#endif +} + std::unique_ptr<DisplayInfoProvider> ChromeExtensionsAPIClient::CreateDisplayInfoProvider() const { return CreateChromeDisplayInfoProvider();
diff --git a/chrome/browser/extensions/api/chrome_extensions_api_client.h b/chrome/browser/extensions/api/chrome_extensions_api_client.h index f5ff000..a9498af 100644 --- a/chrome/browser/extensions/api/chrome_extensions_api_client.h +++ b/chrome/browser/extensions/api/chrome_extensions_api_client.h
@@ -67,6 +67,9 @@ std::unique_ptr<VirtualKeyboardDelegate> CreateVirtualKeyboardDelegate( content::BrowserContext* browser_context) const override; ManagementAPIDelegate* CreateManagementAPIDelegate() const override; + std::unique_ptr<SupervisedUserServiceDelegate> + CreateSupervisedUserServiceDelegate() const override; + std::unique_ptr<DisplayInfoProvider> CreateDisplayInfoProvider() const override; MetricsPrivateDelegate* GetMetricsPrivateDelegate() override;
diff --git a/chrome/browser/extensions/api/declarative_net_request/rule_indexing_unittest.cc b/chrome/browser/extensions/api/declarative_net_request/rule_indexing_unittest.cc index c56e4be1b..f8a4f33 100644 --- a/chrome/browser/extensions/api/declarative_net_request/rule_indexing_unittest.cc +++ b/chrome/browser/extensions/api/declarative_net_request/rule_indexing_unittest.cc
@@ -55,12 +55,11 @@ manifest_keys::kDeclarativeRuleResourcesKey); } -// Fixure testing that declarative rules corresponding to the Declarative Net -// Request API are correctly indexed, for both packed and unpacked -// extensions. +// Fixture testing that declarative rules corresponding to the Declarative Net +// Request API are correctly indexed, for both packed and unpacked extensions. class RuleIndexingTest : public DNRTestBase { public: - RuleIndexingTest() {} + RuleIndexingTest() = default; // DNRTestBase override. void SetUp() override {
diff --git a/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc b/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc index 6de9df3..0e380a2 100644 --- a/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc +++ b/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc
@@ -64,6 +64,13 @@ #include "components/arc/session/arc_bridge_service.h" #endif // OS_CHROMEOS +#if BUILDFLAG(ENABLE_SUPERVISED_USERS) +// TODO(https://crbug.com/1060801): Here and elsewhere, possibly switch build +// flag to #if defined(OS_CHROMEOS) +#include "chrome/browser/supervised_user/supervised_user_service.h" +#include "chrome/browser/supervised_user/supervised_user_service_factory.h" +#endif + namespace { #if defined(OS_CHROMEOS) @@ -524,6 +531,16 @@ const extensions::Extension* extension = extensions::ExtensionRegistry::Get(context)->GetExtensionById( extension_id, extensions::ExtensionRegistry::EVERYTHING); + +#if BUILDFLAG(ENABLE_SUPERVISED_USERS) + // We add approval for the extension here under the assumption that prior + // to this point, the supervised child user has already been prompted + // for, and received parent permission to install the extension. + SupervisedUserService* supervised_user_service = + SupervisedUserServiceFactory::GetForBrowserContext(context); + supervised_user_service->AddExtensionApproval(*extension); +#endif + // If the extension was disabled for a permissions increase, the Management // API will have displayed a re-enable prompt to the user, so we know it's // safe to grant permissions here.
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json index 05c7abb..b37f7cfc 100644 --- a/chrome/browser/flag-metadata.json +++ b/chrome/browser/flag-metadata.json
@@ -3312,6 +3312,11 @@ "expiry_milestone": 83 }, { + "name": "query-tiles", + "owners": [ "shaktisahu", "qinmin"], + "expiry_milestone": 86 + }, + { "name": "quiet-notification-prompts", "owners": [ "engedy", "mkwst", "andypaicu", "hkamila" ], "expiry_milestone": 83
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc index 28cd544..4fa278a 100644 --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc
@@ -2508,6 +2508,9 @@ "separated like strict site isolation, but process selection puts multiple " "site instances in a single process."; +const char kQueryTilesName[] = "Show query tiles"; +const char kQueryTilesDescription[] = "Shows query tiles in Chrome"; + const char kReaderModeHeuristicsName[] = "Reader Mode triggering"; const char kReaderModeHeuristicsDescription[] = "Determines what pages the Reader Mode infobar is shown on.";
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h index 6022562..61373f5 100644 --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h
@@ -1443,6 +1443,9 @@ extern const char kProcessSharingWithStrictSiteInstancesName[]; extern const char kProcessSharingWithStrictSiteInstancesDescription[]; +extern const char kQueryTilesName[]; +extern const char kQueryTilesDescription[]; + extern const char kReaderModeHeuristicsName[]; extern const char kReaderModeHeuristicsDescription[]; extern const char kReaderModeHeuristicsMarkup[];
diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc index 4c00d02..2a71e13 100644 --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc
@@ -168,6 +168,7 @@ &kPhotoPickerVideoSupport, &kPhotoPickerZoom, &kProfileCard, + &kQueryTiles, &kReachedCodeProfiler, &kReaderModeInCCT, &kReorderBookmarks, @@ -500,6 +501,9 @@ const base::Feature kProfileCard{"ProfileCard", base::FEATURE_DISABLED_BY_DEFAULT}; +const base::Feature kQueryTiles{"QueryTiles", + base::FEATURE_DISABLED_BY_DEFAULT}; + const base::Feature kReachedCodeProfiler{"ReachedCodeProfiler", base::FEATURE_DISABLED_BY_DEFAULT};
diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h index c53269f..f2d6247 100644 --- a/chrome/browser/flags/android/chrome_feature_list.h +++ b/chrome/browser/flags/android/chrome_feature_list.h
@@ -90,6 +90,7 @@ extern const base::Feature kPhotoPickerVideoSupport; extern const base::Feature kPhotoPickerZoom; extern const base::Feature kProfileCard; +extern const base::Feature kQueryTiles; extern const base::Feature kReachedCodeProfiler; extern const base::Feature kReorderBookmarks; extern const base::Feature kReaderModeInCCT;
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 b6dcde2..6f71d19 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
@@ -368,6 +368,7 @@ "PredictivePrefetchingAllowedOnAllConnectionTypes"; public static final String PRIORITIZE_BOOTSTRAP_TASKS = "PrioritizeBootstrapTasks"; public static final String PROFILE_CARD = "ProfileCard"; + public static final String QUERY_TILES = "QueryTiles"; public static final String QUERY_IN_OMNIBOX = "QueryInOmnibox"; public static final String QUIET_NOTIFICATION_PROMPTS = "QuietNotificationPrompts"; public static final String REACHED_CODE_PROFILER = "ReachedCodeProfiler";
diff --git a/chrome/browser/lookalikes/lookalike_url_navigation_throttle.cc b/chrome/browser/lookalikes/lookalike_url_navigation_throttle.cc index 3cfbfc3..85f0d44 100644 --- a/chrome/browser/lookalikes/lookalike_url_navigation_throttle.cc +++ b/chrome/browser/lookalikes/lookalike_url_navigation_throttle.cc
@@ -34,9 +34,6 @@ namespace { -const base::FeatureParam<bool> kEnableInterstitialForTopSites{ - &features::kLookalikeUrlNavigationSuggestionsUI, "topsites", true}; - using MatchType = LookalikeUrlBlockingPage::MatchType; using UserAction = LookalikeUrlBlockingPage::UserAction; using url_formatter::TopDomainEntry; @@ -462,7 +459,6 @@ return true; } return match_type == MatchType::kTopSite && - kEnableInterstitialForTopSites.Get() && navigated_domain.idn_result.matching_top_domain.is_top_500; }
diff --git a/chrome/browser/lookalikes/lookalike_url_navigation_throttle_browsertest.cc b/chrome/browser/lookalikes/lookalike_url_navigation_throttle_browsertest.cc index 4b031e9..f8df3c0 100644 --- a/chrome/browser/lookalikes/lookalike_url_navigation_throttle_browsertest.cc +++ b/chrome/browser/lookalikes/lookalike_url_navigation_throttle_browsertest.cc
@@ -42,14 +42,11 @@ using MatchType = LookalikeUrlBlockingPage::MatchType; using UserAction = LookalikeUrlBlockingPage::UserAction; -enum class UIStatus { - // Enabled for all heuristics. +enum class FeatureStatus { + // Feature is enabled. kEnabled, - // Disabled for all heuristics. Simulates the feature being disabled. - kDisabled, - // Disabled for only top 500 domains. Still enabled for all other heuristics. - // Simulates "topsites" parameter being set to false. - kDisabledForTop500Domains + // Feature is disabled. + kDisabled }; // An engagement score above MEDIUM. @@ -174,23 +171,12 @@ class LookalikeUrlNavigationThrottleBrowserTest : public InProcessBrowserTest, - public testing::WithParamInterface<UIStatus> { + public testing::WithParamInterface<FeatureStatus> { protected: void SetUp() override { - switch (ui_status()) { - case UIStatus::kDisabled: - feature_list_.InitAndDisableFeature( - features::kLookalikeUrlNavigationSuggestionsUI); - break; - - case UIStatus::kDisabledForTop500Domains: - feature_list_.InitAndEnableFeatureWithParameters( - features::kLookalikeUrlNavigationSuggestionsUI, - {{"topsites", "false"}}); - break; - - case UIStatus::kEnabled: - break; + if (!feature_enabled()) { + feature_list_.InitAndDisableFeature( + features::kLookalikeUrlNavigationSuggestionsUI); } InProcessBrowserTest::SetUp(); } @@ -250,22 +236,6 @@ test_ukm_recorder()->GetEntriesByName(UkmEntry::kEntryName).empty()); } - // Returns true if the current test parameter should result in showing an - // interstitial for |expected_event|. - bool ShouldExpectInterstitial( - LookalikeUrlNavigationThrottle::NavigationSuggestionEvent expected_event) - const { - if (ui_status() == UIStatus::kDisabled) { - return false; - } - if (expected_event == LookalikeUrlNavigationThrottle:: - NavigationSuggestionEvent::kMatchTopSite && - ui_status() == UIStatus::kDisabledForTop500Domains) { - return false; - } - return true; - } - // Tests that the histogram event |expected_event| is recorded. If the UI is // enabled, additional events for interstitial display and link click will // also be tested. @@ -276,7 +246,7 @@ LookalikeUrlNavigationThrottle::NavigationSuggestionEvent expected_event) { base::HistogramTester histograms; - if (!ShouldExpectInterstitial(expected_event)) { + if (!feature_enabled()) { TestInterstitialNotShown(browser, navigated_url); histograms.ExpectTotalCount( LookalikeUrlNavigationThrottle::kHistogramName, 1); @@ -327,7 +297,7 @@ const GURL& navigated_url, LookalikeUrlNavigationThrottle::NavigationSuggestionEvent expected_event) { - if (ui_status() == UIStatus::kDisabled) { + if (!feature_enabled()) { TestInterstitialNotShown(browser, navigated_url); histograms->ExpectTotalCount( LookalikeUrlNavigationThrottle::kHistogramName, 1); @@ -377,7 +347,9 @@ base::SimpleTestClock* test_clock() { return &test_clock_; } - virtual UIStatus ui_status() const { return GetParam(); } + virtual bool feature_enabled() const { + return GetParam() == FeatureStatus::kEnabled; + } private: base::test::ScopedFeatureList feature_list_; @@ -385,17 +357,10 @@ base::SimpleTestClock test_clock_; }; -class LookalikeUrlBlockingPageBrowserTest - : public LookalikeUrlNavigationThrottleBrowserTest { - protected: - UIStatus ui_status() const override { return UIStatus::kEnabled; } -}; - -INSTANTIATE_TEST_SUITE_P( - All, - LookalikeUrlNavigationThrottleBrowserTest, - ::testing::Values(UIStatus::kDisabled, - UIStatus::kDisabledForTop500Domains)); +INSTANTIATE_TEST_SUITE_P(All, + LookalikeUrlNavigationThrottleBrowserTest, + ::testing::Values(FeatureStatus::kEnabled, + FeatureStatus::kDisabled)); // Navigating to a non-IDN shouldn't show an interstitial or record metrics. IN_PROC_BROWSER_TEST_P(LookalikeUrlNavigationThrottleBrowserTest, @@ -927,8 +892,11 @@ // Navigate to lookalike domains that redirect to benign domains and ensure that // we display an interstitial along the way. -IN_PROC_BROWSER_TEST_F(LookalikeUrlBlockingPageBrowserTest, +IN_PROC_BROWSER_TEST_P(LookalikeUrlNavigationThrottleBrowserTest, Interstitial_CapturesRedirects) { + if (!feature_enabled()) { + return; + } { // Verify it works when the lookalike domain is the first in the chain const GURL kNavigatedUrl = @@ -960,24 +928,13 @@ } } -// Verify that the user action in UKM is recorded properly when the interstitial -// is not shown because the feature parameter for matching against top 500 -// sites ("topsites") is false. -IN_PROC_BROWSER_TEST_P(LookalikeUrlNavigationThrottleBrowserTest, - UkmRecordedWhenNoInterstitialShown) { - // UI tests are handled explicitly below. - if (ui_status() != UIStatus::kDisabledForTop500Domains) - return; - - const GURL navigated_url = GetURL("googlé.com"); - TestInterstitialNotShown(browser(), navigated_url); - CheckUkm({navigated_url}, "UserAction", UserAction::kInterstitialNotShown); -} - // Verify that the user action in UKM is recorded even when we navigate away // from the interstitial without interacting with it. -IN_PROC_BROWSER_TEST_F(LookalikeUrlBlockingPageBrowserTest, +IN_PROC_BROWSER_TEST_P(LookalikeUrlNavigationThrottleBrowserTest, UkmRecordedAfterNavigateAway) { + if (!feature_enabled()) { + return; + } const GURL navigated_url = GetURL("googlé.com"); const GURL subsequent_url = GetURL("example.com"); @@ -988,8 +945,11 @@ // Verify that the user action in UKM is recorded properly when the user accepts // the navigation suggestion. -IN_PROC_BROWSER_TEST_F(LookalikeUrlBlockingPageBrowserTest, +IN_PROC_BROWSER_TEST_P(LookalikeUrlNavigationThrottleBrowserTest, UkmRecordedAfterSuggestionAccepted) { + if (!feature_enabled()) { + return; + } const GURL navigated_url = GetURL("googlé.com"); LoadAndCheckInterstitialAt(browser(), navigated_url); @@ -1000,8 +960,11 @@ // Verify that the user action in UKM is recorded properly when the user ignores // the navigation suggestion. -IN_PROC_BROWSER_TEST_F(LookalikeUrlBlockingPageBrowserTest, +IN_PROC_BROWSER_TEST_P(LookalikeUrlNavigationThrottleBrowserTest, UkmRecordedAfterSuggestionIgnored) { + if (!feature_enabled()) { + return; + } const GURL navigated_url = GetURL("googlé.com"); LoadAndCheckInterstitialAt(browser(), navigated_url); @@ -1011,8 +974,11 @@ } // Verify that the URL shows normally on pages after a lookalike interstitial. -IN_PROC_BROWSER_TEST_F(LookalikeUrlBlockingPageBrowserTest, +IN_PROC_BROWSER_TEST_P(LookalikeUrlNavigationThrottleBrowserTest, UrlShownAfterInterstitial) { + if (!feature_enabled()) { + return; + } LoadAndCheckInterstitialAt(browser(), GetURL("googlé.com")); // URL should be showing again when we navigate to a normal URL @@ -1021,8 +987,11 @@ } // Verify that bypassing warnings in the main profile does not affect incognito. -IN_PROC_BROWSER_TEST_F(LookalikeUrlBlockingPageBrowserTest, +IN_PROC_BROWSER_TEST_P(LookalikeUrlNavigationThrottleBrowserTest, MainProfileDoesNotAffectIncognito) { + if (!feature_enabled()) { + return; + } const GURL kNavigatedUrl = GetURL("googlé.com"); // Set low engagement scores in the main profile and in incognito. @@ -1039,8 +1008,11 @@ } // Verify that bypassing warnings in incognito does not affect the main profile. -IN_PROC_BROWSER_TEST_F(LookalikeUrlBlockingPageBrowserTest, +IN_PROC_BROWSER_TEST_P(LookalikeUrlNavigationThrottleBrowserTest, IncognitoDoesNotAffectMainProfile) { + if (!feature_enabled()) { + return; + } const GURL kNavigatedUrl = GetURL("sité1.com"); const GURL kEngagedUrl = GetURL("site1.com"); @@ -1061,8 +1033,11 @@ // Verify reloading the page does not result in dismissing an interstitial. // Regression test for crbug/941886. -IN_PROC_BROWSER_TEST_F(LookalikeUrlBlockingPageBrowserTest, +IN_PROC_BROWSER_TEST_P(LookalikeUrlNavigationThrottleBrowserTest, RefreshDoesntDismiss) { + if (!feature_enabled()) { + return; + } // Verify it works when the lookalike domain is the first in the chain. const GURL kNavigatedUrl = GetLongRedirect("googlé.com", "example.net", "example.com");
diff --git a/chrome/browser/payments/android/service_worker_payment_app_bridge.cc b/chrome/browser/payments/android/service_worker_payment_app_bridge.cc index e7b5e7b..539543f 100644 --- a/chrome/browser/payments/android/service_worker_payment_app_bridge.cc +++ b/chrome/browser/payments/android/service_worker_payment_app_bridge.cc
@@ -178,9 +178,9 @@ void OnCanMakePayment(const JavaRef<jobject>& jcallback, const JavaRef<jobject>& japp, - bool can_make_payment) { + payments::mojom::CanMakePaymentResponsePtr response) { Java_PaymentHandlerFinder_onCanMakePaymentEventResponse( - AttachCurrentThread(), jcallback, japp, can_make_payment); + AttachCurrentThread(), jcallback, japp, response->can_make_payment); } void OnPaymentAppInvoked(
diff --git a/chrome/browser/resources/BUILD.gn b/chrome/browser/resources/BUILD.gn index 0e6fba3..dfdb86a 100644 --- a/chrome/browser/resources/BUILD.gn +++ b/chrome/browser/resources/BUILD.gn
@@ -292,13 +292,14 @@ if (is_chromeos) { grit("os_settings_resources") { + deps = [ "//chrome/browser/ui/webui/app_management:mojo_bindings_js" ] if (optimize_webui) { source = "settings/os_settings_resources_vulcanized.grd" # The .grd contains references to generated files. source_is_generated = true - deps = [ "//chrome/browser/resources/settings/chromeos:build" ] + deps += [ "//chrome/browser/resources/settings/chromeos:build" ] grit_flags = [ "-E",
diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox/background/background_test.js b/chrome/browser/resources/chromeos/accessibility/chromevox/background/background_test.js index a46bdf0..def7ecf 100644 --- a/chrome/browser/resources/chromeos/accessibility/chromevox/background/background_test.js +++ b/chrome/browser/resources/chromeos/accessibility/chromevox/background/background_test.js
@@ -2483,3 +2483,20 @@ .replay(); }); }); + +TEST_F('ChromeVoxBackgroundTest', 'OutputEmptyQueueMode', function() { + const mockFeedback = this.createMockFeedback(); + this.runWithLoadedTree('<p>unused</p>', function(root) { + const output = new Output(); + Output.forceModeForNextSpeechUtterance(QueueMode.CATEGORY_FLUSH); + output.append_( + output.speechBuffer_, new Spannable(''), + {annotation: [new Output.Action()]}); + output.withString('test'); + mockFeedback.clearPendingOutput() + .call(output.go.bind(output)) + .expectSpeechWithQueueMode('', QueueMode.CATEGORY_FLUSH) + .expectSpeechWithQueueMode('test', QueueMode.CATEGORY_FLUSH) + .replay(); + }); +});
diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox/background/output.js b/chrome/browser/resources/chromeos/accessibility/chromevox/background/output.js index 6a34d20..7e3b993 100644 --- a/chrome/browser/resources/chromeos/accessibility/chromevox/background/output.js +++ b/chrome/browser/resources/chromeos/accessibility/chromevox/background/output.js
@@ -515,7 +515,13 @@ } ChromeVox.tts.speak(buff.toString(), queueMode, speechProps); - queueMode = QueueMode.QUEUE; + + // Skip resetting |queueMode| if the |text| is empty. If we don't do this, + // and the tts engine doesn't generate a callback, we might not properly + // flush. + if (text !== '') { + queueMode = QueueMode.QUEUE; + } } if (this.speechRulesStr_.str) { LogStore.getInstance().writeTextLog(
diff --git a/chrome/browser/resources/chromeos/camera/src/js/device/constraints_preferrer.js b/chrome/browser/resources/chromeos/camera/src/js/device/constraints_preferrer.js index 357402e..94bbc21 100644 --- a/chrome/browser/resources/chromeos/camera/src/js/device/constraints_preferrer.js +++ b/chrome/browser/resources/chromeos/camera/src/js/device/constraints_preferrer.js
@@ -4,8 +4,11 @@ import {browserProxy} from '../browser_proxy/browser_proxy.js'; import * as state from '../state.js'; -import {Mode, Resolution, - ResolutionList, // eslint-disable-line no-unused-vars +import { + Facing, + Mode, + Resolution, + ResolutionList, // eslint-disable-line no-unused-vars } from '../type.js'; // eslint-disable-next-line no-unused-vars import {Camera3DeviceInfo} from './camera3_device_info.js'; @@ -119,10 +122,11 @@ * settings. * @param {string} deviceId Device id of video device to be updated. * @param {!MediaStream} stream Currently active preview stream. + * @param {!Facing} facing Camera facing of video device to be updated. * @param {!Resolution} resolution Resolution to be updated to. * @abstract */ - updateValues(deviceId, stream, resolution) {} + updateValues(deviceId, stream, facing, resolution) {} /** * Gets all available candidates for capturing under this controller and its @@ -321,7 +325,7 @@ /** * @override */ - updateValues(deviceId, stream, resolution) { + updateValues(deviceId, stream, facing, resolution) { this.deviceId_ = deviceId; this.resolution_ = resolution; this.prefResolution_[deviceId] = this.resolution_; @@ -333,7 +337,11 @@ const supportedConstFpses = this.constFpsInfo_[deviceId][this.resolution_].filter( (fps) => SUPPORTED_CONSTANT_FPS.includes(fps)); - state.set(state.State.MULTI_FPS, supportedConstFpses.length > 1); + // Only enable multi fps UI on external camera. + // See https://crbug.com/1059191 for details. + state.set( + state.State.MULTI_FPS, + facing === Facing.EXTERNAL && supportedConstFpses.length > 1); } /** @@ -408,7 +416,7 @@ audio: {echoCancellation: false}, video: { deviceId: {exact: deviceId}, - frameRate: fps ? {exact: fps} : {min: 24}, + frameRate: fps ? {exact: fps} : {min: 20, ideal: 30}, width, height, }, @@ -474,7 +482,7 @@ /** * @override */ - updateValues(deviceId, stream, resolution) { + updateValues(deviceId, stream, facing, resolution) { this.deviceId_ = deviceId; this.prefResolution_[deviceId] = resolution; this.saveResolutionPreference_('devicePhotoResolution');
diff --git a/chrome/browser/resources/chromeos/camera/src/js/metrics.js b/chrome/browser/resources/chromeos/camera/src/js/metrics.js index 8ff1ca4..5aeed78 100644 --- a/chrome/browser/resources/chromeos/camera/src/js/metrics.js +++ b/chrome/browser/resources/chromeos/camera/src/js/metrics.js
@@ -156,7 +156,7 @@ // Round the duration here since GA expects that the value is an integer. // Reference: https://support.google.com/analytics/answer/1033068 .value(Math.round(duration)) - .dimen(3, `${resolution}`); + .dimen(10, `${resolution}`); } /**
diff --git a/chrome/browser/resources/chromeos/camera/src/js/views/camera.js b/chrome/browser/resources/chromeos/camera/src/js/views/camera.js index 480aeb0..5904ae13 100644 --- a/chrome/browser/resources/chromeos/camera/src/js/views/camera.js +++ b/chrome/browser/resources/chromeos/camera/src/js/views/camera.js
@@ -22,7 +22,7 @@ import * as state from '../state.js'; import * as toast from '../toast.js'; import { - Facing, // eslint-disable-line no-unused-vars + Facing, Mode, } from '../type.js'; import * as util from '../util.js';
diff --git a/chrome/browser/resources/chromeos/camera/src/js/views/camera/modes.js b/chrome/browser/resources/chromeos/camera/src/js/views/camera/modes.js index 71f7d84..4ef38bf0 100644 --- a/chrome/browser/resources/chromeos/camera/src/js/views/camera/modes.js +++ b/chrome/browser/resources/chromeos/camera/src/js/views/camera/modes.js
@@ -20,13 +20,11 @@ import * as state from '../../state.js'; import * as toast from '../../toast.js'; import { + Facing, + Mode, Resolution, ResolutionList, // eslint-disable-line no-unused-vars } from '../../type.js'; -import { - Facing, // eslint-disable-line no-unused-vars - Mode, -} from '../../type.js'; import * as util from '../../util.js'; import {RecordTime} from './recordtime.js'; @@ -213,11 +211,11 @@ { aspectRatio: {ideal: videoMode ? 1.7777777778 : 1.3333333333}, width: {min: 1280}, - frameRate: {min: 24}, + frameRate: {min: 20, ideal: 30}, }, { width: {min: 640}, - frameRate: {min: 24}, + frameRate: {min: 20, ideal: 30}, }, ].map((/** !MediaTrackConstraints */ constraint) => { if (deviceId) { @@ -459,7 +457,7 @@ this.current = this.allModes_[mode].captureFactory(); if (deviceId && this.captureResolution_) { this.allModes_[mode].constraintsPreferrer.updateValues( - deviceId, stream, this.captureResolution_); + deviceId, stream, facing, this.captureResolution_); } await this.updateSaveMetadata_(); }
diff --git a/chrome/browser/resources/settings/a11y_page/captions_subpage.js b/chrome/browser/resources/settings/a11y_page/captions_subpage.js index de7c68a3a..109c2f89 100644 --- a/chrome/browser/resources/settings/a11y_page/captions_subpage.js +++ b/chrome/browser/resources/settings/a11y_page/captions_subpage.js
@@ -187,8 +187,6 @@ /** @override */ ready() { - this.browserProxy_.observeAdvancedFontExtensionAvailable(); - this.browserProxy_.fetchFontsData().then(this.setFontsData_.bind(this)); },
diff --git a/chrome/browser/resources/settings/appearance_page/appearance_fonts_page.html b/chrome/browser/resources/settings/appearance_page/appearance_fonts_page.html index b4aabc0..f1c688c 100644 --- a/chrome/browser/resources/settings/appearance_page/appearance_fonts_page.html +++ b/chrome/browser/resources/settings/appearance_page/appearance_fonts_page.html
@@ -1,6 +1,5 @@ <link rel="import" href="chrome://resources/html/polymer.html"> -<link rel="import" href="chrome://resources/cr_elements/cr_link_row/cr_link_row.html"> <link rel="import" href="chrome://resources/cr_elements/cr_slider/cr_slider.html"> <link rel="import" href="chrome://resources/html/i18n_behavior.html"> <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> @@ -138,11 +137,6 @@ $i18n{quickBrownFox} </div> </div> - <template is="dom-if" if="[[!isGuest_]]"> - <cr-link-row id="advancedButton" class="hr" - on-click="openAdvancedExtension_" label="$i18n{advancedFontSettings}" - sub-label="[[advancedExtensionSublabel_]]" external></cr-link-row> - </template> </template> <script src="appearance_fonts_page.js"></script> </dom-module>
diff --git a/chrome/browser/resources/settings/appearance_page/appearance_fonts_page.js b/chrome/browser/resources/settings/appearance_page/appearance_fonts_page.js index f9122704..b49bfed 100644 --- a/chrome/browser/resources/settings/appearance_page/appearance_fonts_page.js +++ b/chrome/browser/resources/settings/appearance_page/appearance_fonts_page.js
@@ -32,20 +32,9 @@ behaviors: [I18nBehavior, WebUIListenerBehavior], properties: { - /** @private */ - advancedExtensionSublabel_: String, - /** @private {!DropdownMenuOptionList} */ fontOptions_: Object, - /** @private */ - isGuest_: { - type: Boolean, - value() { - return loadTimeData.getBoolean('isGuest'); - } - }, - /** * Common font sizes. * @private {!Array<!cr_slider.SliderTick>} @@ -82,12 +71,6 @@ /** @private {?settings.FontsBrowserProxy} */ browserProxy_: null, - /** @private {boolean} */ - advancedExtensionInstalled_: false, - - /** @private {?string} */ - advancedExtensionUrl_: null, - /** @override */ created() { this.browserProxy_ = settings.FontsBrowserProxyImpl.getInstance(); @@ -95,37 +78,11 @@ /** @override */ ready() { - this.addWebUIListener( - 'advanced-font-settings-installed', - this.setAdvancedExtensionInstalled_.bind(this)); - this.browserProxy_.observeAdvancedFontExtensionAvailable(); - this.browserProxy_.fetchFontsData().then(this.setFontsData_.bind(this)); }, - /** @private */ - openAdvancedExtension_() { - if (this.advancedExtensionInstalled_) { - this.browserProxy_.openAdvancedFontSettings(); - } else { - window.open(this.advancedExtensionUrl_); - } - }, - /** - * @param {boolean} isInstalled Whether the advanced font settings - * extension is installed. - * @private - */ - setAdvancedExtensionInstalled_(isInstalled) { - this.advancedExtensionInstalled_ = isInstalled; - this.advancedExtensionSublabel_ = this.i18n( - isInstalled ? 'openAdvancedFontSettings' : 'requiresWebStoreExtension'); - }, - - /** - * @param {!FontsData} response A list of fonts and the advanced - * font settings extension URL. + * @param {!FontsData} response A list of fonts. * @private */ setFontsData_(response) { @@ -134,7 +91,6 @@ fontMenuOptions.push({value: fontData[0], name: fontData[1]}); } this.fontOptions_ = fontMenuOptions; - this.advancedExtensionUrl_ = response.extensionUrl; }, /**
diff --git a/chrome/browser/resources/settings/appearance_page/fonts_browser_proxy.js b/chrome/browser/resources/settings/appearance_page/fonts_browser_proxy.js index 0bcc63a..a287b73 100644 --- a/chrome/browser/resources/settings/appearance_page/fonts_browser_proxy.js +++ b/chrome/browser/resources/settings/appearance_page/fonts_browser_proxy.js
@@ -12,7 +12,6 @@ * 0: string, * 1: (string|undefined), * 2: (string|undefined)}>, - * extensionUrl: string * }} */ /* #export */ let FontsData; @@ -21,14 +20,9 @@ /** @interface */ /* #export */ class FontsBrowserProxy { /** - * @return {!Promise<!FontsData>} Fonts and the advanced font settings - * extension URL. + * @return {!Promise<!FontsData>} Fonts */ fetchFontsData() {} - - observeAdvancedFontExtensionAvailable() {} - - openAdvancedFontSettings() {} } /** @@ -39,16 +33,6 @@ fetchFontsData() { return cr.sendWithPromise('fetchFontsData'); } - - /** @override */ - observeAdvancedFontExtensionAvailable() { - chrome.send('observeAdvancedFontExtensionAvailable'); - } - - /** @override */ - openAdvancedFontSettings() { - chrome.send('openAdvancedFontSettings'); - } } cr.addSingletonGetter(FontsBrowserProxyImpl);
diff --git a/chrome/browser/resources/settings/autofill_page/password_check.js b/chrome/browser/resources/settings/autofill_page/password_check.js index 6937b5d..01fb6dd 100644 --- a/chrome/browser/resources/settings/autofill_page/password_check.js +++ b/chrome/browser/resources/settings/autofill_page/password_check.js
@@ -85,7 +85,7 @@ const statusChangeListener = status => this.status_ = status; const setLeakedCredentialsListener = compromisedCredentials => { - this.leakedPasswords = compromisedCredentials; + this.updateList(compromisedCredentials); settings.PluralStringProxyImpl.getInstance() .getPluralString('compromisedPasswords', this.leakedPasswords.length) @@ -412,5 +412,40 @@ } throw 'Not specified whether to show passwords for state: ' + status.state; }, + + /** + * Function to update compromised credentials in a proper way. New entities + * should appear in the bottom. + * @param {!Array<!PasswordManagerProxy.CompromisedCredential>} newList + * @private + */ + updateList(newList) { + const oldList = this.leakedPasswords.slice(); + const map = new Map(); + newList.forEach(item => map.set(item.id, item)); + + const resultList = []; + + oldList.forEach((item, index) => { + // If element is present in newList + if (map.has(item.id)) { + // Replace old version with new + resultList.push(map.get(item.id)); + map.delete(item.id); + } + }); + + const addedResults = Array.from(map.values()); + addedResults.sort((lhs, rhs) => { + // Phished passwords are always shown above + if (lhs.compromiseType != rhs.compromiseType) { + return lhs.compromiseType == + chrome.passwordsPrivate.CompromiseType.PHISHED ? -1 : 1; + } + return rhs.compromiseTime - lhs.compromiseTime; + }); + this.leakedPasswords = resultList.concat(addedResults); + }, + }); })();
diff --git a/chrome/browser/resources/settings/chromeos/os_people_page/account_manager.html b/chrome/browser/resources/settings/chromeos/os_people_page/account_manager.html index afb3bc3..a0e4c79 100644 --- a/chrome/browser/resources/settings/chromeos/os_people_page/account_manager.html +++ b/chrome/browser/resources/settings/chromeos/os_people_page/account_manager.html
@@ -110,7 +110,7 @@ <div class="settings-box first"> <settings-localized-link class="account-manager-description" - localized-string="$i18n{accountManagerDescription}" + localized-string="[[getAccountManagerDescription_()]]" link-url="$i18nRaw{accountManagerLearnMoreUrl}"> </settings-localized-link> </div>
diff --git a/chrome/browser/resources/settings/chromeos/os_people_page/account_manager.js b/chrome/browser/resources/settings/chromeos/os_people_page/account_manager.js index e90d42b..68870f6 100644 --- a/chrome/browser/resources/settings/chromeos/os_people_page/account_manager.js +++ b/chrome/browser/resources/settings/chromeos/os_people_page/account_manager.js
@@ -78,12 +78,24 @@ }, /** + * @return {string} account manager description text. + * @private + */ + getAccountManagerDescription_() { + if (this.isChildUser_ && + loadTimeData.getBoolean('isEduCoexistenceEnabled')) { + return loadTimeData.getString('accountManagerChildDescription'); + } + return loadTimeData.getString('accountManagerDescription'); + }, + + /** * @return {string} 'Secondary Accounts disabled' message depending on * account type * @private */ getSecondaryAccountsDisabledUserMessage_() { - return loadTimeData.getBoolean('isChild') + return this.isChildUser_ ? this.i18n('accountManagerSecondaryAccountsDisabledChildText') : this.i18n('accountManagerSecondaryAccountsDisabledText'); },
diff --git a/chrome/browser/resources/settings/privacy_page/BUILD.gn b/chrome/browser/resources/settings/privacy_page/BUILD.gn index 99fc25f..09df24b 100644 --- a/chrome/browser/resources/settings/privacy_page/BUILD.gn +++ b/chrome/browser/resources/settings/privacy_page/BUILD.gn
@@ -91,6 +91,7 @@ "../settings_page:settings_animated_pages", "../site_settings:constants", "../site_settings:site_data_details_subpage", + "../site_settings:site_settings_prefs_browser_proxy", "//ui/webui/resources/js:assert", "//ui/webui/resources/js:i18n_behavior", "//ui/webui/resources/js:web_ui_listener_behavior",
diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html index dd2d68cd..240f2b21 100644 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
@@ -21,6 +21,7 @@ <link rel="import" href="../router.html"> <link rel="import" href="../settings_page/settings_animated_pages.html"> <link rel="import" href="../settings_page/settings_subpage.html"> +<link rel="import" href="../site_settings/site_settings_prefs_browser_proxy.html"> <link rel="import" href="../settings_shared_css.html"> <link rel="import" href="../site_settings/constants.html"> @@ -127,7 +128,7 @@ on-click="onClearBrowsingDataTap_"></cr-link-row> <cr-link-row id="cookiesLinkRow" start-icon="settings:cookie" class="hr" label="$i18n{cookiePageTitle}" - sub-label="$i18n{cookiePageDescription}" + sub-label="[[cookieSettingDescription_]]" on-click="onCookiesClick_"></cr-link-row> <cr-link-row id="securityLinkRow" start-icon="cr:security" class="hr" label="$i18n{securityPageTitle}"
diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.js b/chrome/browser/resources/settings/privacy_page/privacy_page.js index 56846484..3836619b 100644 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.js +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.js
@@ -131,6 +131,9 @@ }, /** @private */ + cookieSettingDescription_: String, + + /** @private */ enableBlockAutoplayContentSetting_: { type: Boolean, value() { @@ -290,6 +293,13 @@ this.handleSyncStatus_.bind(this)); this.addWebUIListener( 'sync-status-changed', this.handleSyncStatus_.bind(this)); + + settings.SiteSettingsPrefsBrowserProxyImpl.getInstance() + .getCookieSettingDescription() + .then(description => this.cookieSettingDescription_ = description); + this.addWebUIListener( + 'cookieSettingDescriptionChanged', + description => this.cookieSettingDescription_ = description); }, /**
diff --git a/chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.js b/chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.js index c4d128e..d4b76ba7 100644 --- a/chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.js +++ b/chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.js
@@ -170,6 +170,12 @@ getAllSites(contentTypes) {} /** + * Get the string which describes the current effective cookie setting. + * @return {!Promise<string>} + */ + getCookieSettingDescription() {} + + /** * Gets most recently changed permissions grouped by host and limited to * numSources different origin/profile (inconigto/regular) pairings. * This includes permissions adjusted by embargo, but excludes any set @@ -417,6 +423,11 @@ } /** @override */ + getCookieSettingDescription() { + return cr.sendWithPromise('getCookieSettingDescription'); + } + + /** @override */ getRecentSitePermissions(contentTypes, numSources) { return cr.sendWithPromise( 'getRecentSitePermissions', contentTypes, numSources);
diff --git a/chrome/browser/resources/settings/site_settings_page/BUILD.gn b/chrome/browser/resources/settings/site_settings_page/BUILD.gn index fdcbca8..2011bfac 100644 --- a/chrome/browser/resources/settings/site_settings_page/BUILD.gn +++ b/chrome/browser/resources/settings/site_settings_page/BUILD.gn
@@ -31,6 +31,7 @@ "..:route", "..:router", "../site_settings:constants", + "../site_settings:site_settings_prefs_browser_proxy", "//ui/webui/resources/js:assert", "//ui/webui/resources/js:cr", "//ui/webui/resources/js:load_time_data",
diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_list.js b/chrome/browser/resources/settings/site_settings_page/site_settings_list.js index 1e23ffaa..7cde002 100644 --- a/chrome/browser/resources/settings/site_settings_page/site_settings_list.js +++ b/chrome/browser/resources/settings/site_settings_page/site_settings_list.js
@@ -92,6 +92,20 @@ }); this.browserProxy_.observeProtocolHandlersEnabledState(); } + + if (loadTimeData.getBoolean('privacySettingsRedesignEnabled')) { + const hasCookies = this.categoryList.some(item => { + return item.id === settings.ContentSettingsTypes.COOKIES; + }); + if (hasCookies) { + // The cookies sub-label is provided by an update from C++. + this.browserProxy_.getCookieSettingDescription().then( + this.updateCookiesLabel_.bind(this)); + this.addWebUIListener( + 'cookieSettingDescriptionChanged', + this.updateCookiesLabel_.bind(this)); + } + } }, /** @@ -100,6 +114,12 @@ * @private */ refreshDefaultValueLabel_(category) { + if (category == settings.ContentSettingsTypes.COOKIES && + loadTimeData.getBoolean('privacySettingsRedesignEnabled')) { + // Updates to the cookies label are handled by the + // cookieSettingDescriptionChanged event listener. + return; + } this.browserProxy_.getDefaultValueForContentType(category).then( defaultValue => { this.updateDefaultValueLabel_(category, defaultValue.setting); @@ -132,6 +152,17 @@ }, /** + * Update the cookies link row label when the cookies setting description + * changes. + * @param {string} label + * @private + */ + updateCookiesLabel_(label) { + const index = this.$$('dom-repeat').indexForElement(this.$$('#cookies')); + this.set(`categoryList.${index}.subLabel`, label); + }, + + /** * @param {!Event} event * @private */
diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_page.html b/chrome/browser/resources/settings/site_settings_page/site_settings_page.html index 5e4da483..cca06fac 100644 --- a/chrome/browser/resources/settings/site_settings_page/site_settings_page.html +++ b/chrome/browser/resources/settings/site_settings_page/site_settings_page.html
@@ -8,6 +8,7 @@ <link rel="import" href="../router.html"> <link rel="import" href="../settings_shared_css.html"> <link rel="import" href="../site_settings/constants.html"> +<link rel="import" href="../site_settings/site_settings_prefs_browser_proxy.html"> <link rel="import" href="recent_site_permissions.html"> <link rel="import" href="site_settings_list.html"> @@ -40,14 +41,14 @@ </div> <template is="dom-if" if="[[!privacySettingsRedesignEnabled_]]"> - <settings-site-settings-list + <settings-site-settings-list id="allSettingsList" category-list="[[lists_.all]]" focus-config="[[focusConfig]]"> </settings-site-settings-list> </template> <template is="dom-if" if="[[privacySettingsRedesignEnabled_]]"> - <settings-site-settings-list + <settings-site-settings-list id="basicPermissionsList" category-list="[[lists_.permissionsBasic]]" focus-config="[[focusConfig]]"> </settings-site-settings-list> @@ -56,7 +57,7 @@ <div>$i18n{siteSettingsPermissionsMore}</div> </cr-expand-button> <iron-collapse opened="[[permissionsExpanded_]]"> - <settings-site-settings-list + <settings-site-settings-list id="advancedPermissionsList" category-list="[[lists_.permissionsAdvanced]]" focus-config="[[focusConfig]]"> </settings-site-settings-list> @@ -65,7 +66,7 @@ <div class="settings-box first line-only"> <h2>$i18n{siteSettingsContent}</h2> </div> - <settings-site-settings-list + <settings-site-settings-list id="basicContentList" category-list="[[lists_.contentBasic]]" focus-config="[[focusConfig]]"> </settings-site-settings-list> @@ -74,7 +75,7 @@ <div>$i18n{siteSettingsContentMore}</div> </cr-expand-button> <iron-collapse opened="[[contentExpanded_]]"> - <settings-site-settings-list + <settings-site-settings-list id="advancedContentList" category-list="[[lists_.contentAdvanced]]" focus-config="[[focusConfig]]"> </settings-site-settings-list>
diff --git a/chrome/browser/resources/tab_strip/BUILD.gn b/chrome/browser/resources/tab_strip/BUILD.gn index 5219abf..9e5fa63 100644 --- a/chrome/browser/resources/tab_strip/BUILD.gn +++ b/chrome/browser/resources/tab_strip/BUILD.gn
@@ -79,6 +79,7 @@ ":custom_element", ":tab_strip_embedder_proxy", ":tabs_api_proxy", + "//ui/webui/resources/js:load_time_data.m", ] }
diff --git a/chrome/browser/resources/tab_strip/drag_manager.js b/chrome/browser/resources/tab_strip/drag_manager.js index fafb25a..69b836b 100644 --- a/chrome/browser/resources/tab_strip/drag_manager.js +++ b/chrome/browser/resources/tab_strip/drag_manager.js
@@ -297,9 +297,28 @@ event.dataTransfer.effectAllowed = 'move'; const draggedItemRect = this.element_.getBoundingClientRect(); this.element_.setDragging(true); + + const dragImage = this.element_.getDragImage(); + const dragImageRect = dragImage.getBoundingClientRect(); + + let scaleFactor = 1; + let verticalOffset = 0; + + // <if expr="chromeos"> + // Touch on ChromeOS automatically scales drag images by 1.2 and adds a + // vertical offset of 25px. See //ash/drag_drop/drag_drop_controller.cc. + scaleFactor = 1.2; + verticalOffset = 25; + // </if> + + const xDiffFromCenter = + event.clientX - draggedItemRect.left - (draggedItemRect.width / 2); + const yDiffFromCenter = event.clientY - draggedItemRect.top - + verticalOffset - (draggedItemRect.height / 2); + event.dataTransfer.setDragImage( - this.element_.getDragImage(), event.clientX - draggedItemRect.left, - event.clientY - draggedItemRect.top); + dragImage, (dragImageRect.width / 2 + xDiffFromCenter / scaleFactor), + (dragImageRect.height / 2 + yDiffFromCenter / scaleFactor)); if (isTabElement(this.element_)) { event.dataTransfer.setData(
diff --git a/chrome/browser/resources/tab_strip/tab.html b/chrome/browser/resources/tab_strip/tab.html index b29bf10..7bb542e 100644 --- a/chrome/browser/resources/tab_strip/tab.html +++ b/chrome/browser/resources/tab_strip/tab.html
@@ -2,6 +2,7 @@ :host { --tabstrip-tab-transition-duration: 250ms; + display: block; height: var(--tabstrip-tab-height); padding-inline-end: var(--tabstrip-tab-spacing); position: relative; @@ -288,12 +289,17 @@ /* When being dragged, the contents of the drag image needs to be off-screen * with nothing else on top or below obscuring it. */ :host([dragging_]) #dragImage { + /* Enough padding to not crop the box shadow set on #tab below. */ + --drag-image-padding: 25px; align-items: center; display: flex; height: 100%; justify-content: center; - /* Enough padding to not crop the box shadow set on #tab below. */ - padding: 25px; + padding-block-end: var(--drag-image-padding); + padding-block-start: var(--drag-image-padding); + padding-inline-end: calc( + var(--tabstrip-tab-spacing) + var(--drag-image-padding)); + padding-inline-start: var(--drag-image-padding); position: absolute; top: 100vh; width: 100%; @@ -301,6 +307,7 @@ :host([dragging_]) #tab { box-shadow: var(--tabstrip-tab-dragging-shadow); + transform: scale(var(--tabstrip-tab-drag-image-scale)); } </style>
diff --git a/chrome/browser/resources/tab_strip/tab_group.html b/chrome/browser/resources/tab_strip/tab_group.html index 802d3ea..77809c82 100644 --- a/chrome/browser/resources/tab_strip/tab_group.html +++ b/chrome/browser/resources/tab_strip/tab_group.html
@@ -105,6 +105,7 @@ box-shadow: var(--tabstrip-tab-dragging-shadow); height: var(--tabstrip-tab-height); overflow: hidden; + transform: scale(var(--tabstrip-tab-drag-image-scale)); } :host([getting-drag-image_]) ::slotted(tabstrip-tab) { @@ -168,7 +169,8 @@ <div id="dragImage"> <div id="tabGroup"> <div id="chipContainer"> - <div id="chip" draggable="true" tabindex="0" role="button"> + <div id="chip" draggable="true" tabindex="0" role="button" + aria-describedby="tabs"> <div id="title"></div> </div> </div>
diff --git a/chrome/browser/resources/tab_strip/tab_group.js b/chrome/browser/resources/tab_strip/tab_group.js index 9cb5960a..e50abdb 100644 --- a/chrome/browser/resources/tab_strip/tab_group.js +++ b/chrome/browser/resources/tab_strip/tab_group.js
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js'; + import {CustomElement} from './custom_element.js'; import {TabStripEmbedderProxy} from './tab_strip_embedder_proxy.js'; import {TabGroupVisualData} from './tabs_api_proxy.js'; @@ -17,9 +19,10 @@ /** @private @const {!TabStripEmbedderProxy} */ this.embedderApi_ = TabStripEmbedderProxy.getInstance(); - const chip = this.$('#chip'); - chip.addEventListener('click', () => this.onClickChip_()); - chip.addEventListener( + /** @private @const {!HTMLElement} */ + this.chip_ = /** @type {!HTMLElement} */ (this.$('#chip')); + this.chip_.addEventListener('click', () => this.onClickChip_()); + this.chip_.addEventListener( 'keydown', e => this.onKeydownChip_(/** @type {!KeyboardEvent} */ (e))); } @@ -73,6 +76,17 @@ this.style.setProperty('--tabstrip-tab-group-color-rgb', visualData.color); this.style.setProperty( '--tabstrip-tab-group-text-color-rgb', visualData.textColor); + + // Content strings are empty for the label and are instead replaced by + // the aria-describedby attribute on the chip. + if (visualData.title) { + this.chip_.setAttribute( + 'aria-label', + loadTimeData.getStringF('namedGroupLabel', visualData.title, '')); + } else { + this.chip_.setAttribute( + 'aria-label', loadTimeData.getStringF('unnamedGroupLabel', '')); + } } }
diff --git a/chrome/browser/resources/tab_strip/tab_list.html b/chrome/browser/resources/tab_strip/tab_list.html index c405f8c..2ed8f04 100644 --- a/chrome/browser/resources/tab_strip/tab_list.html +++ b/chrome/browser/resources/tab_strip/tab_list.html
@@ -8,6 +8,15 @@ 0 4px 4px 0 rgba(var(--google-grey-800-rgb), .3), 0 8px 12px 6px rgba(var(--google-grey-800-rgb), .15); +<if expr="not chromeos"> + --tabstrip-tab-drag-image-scale: 1.1; +</if> +<if expr="chromeos"> + /* ChromeOS scales drag images by 1.2, so this variable multiplied by + * 1.2 should be around 1.1. */ + --tabstrip-tab-drag-image-scale: calc(1.1 / 1.2); +</if> + background: var(--tabstrip-background-color); box-sizing: border-box; display: flex;
diff --git a/chrome/browser/resources/tab_strip/tab_strip_resources.grd b/chrome/browser/resources/tab_strip/tab_strip_resources.grd index eecea82b1..c930fd11 100644 --- a/chrome/browser/resources/tab_strip/tab_strip_resources.grd +++ b/chrome/browser/resources/tab_strip/tab_strip_resources.grd
@@ -38,7 +38,8 @@ file="${root_gen_dir}/chrome/browser/resources/tab_strip/tab_list.js" use_base_dir="false" type="chrome_html" - compress="gzip"/> + compress="gzip" + preprocess="true"/> <structure name="IDR_TAB_STRIP_TAB_JS" file="${root_gen_dir}/chrome/browser/resources/tab_strip/tab.js" @@ -76,7 +77,8 @@ name="IDR_TAB_STRIP_DRAG_MANAGER_JS" file="drag_manager.js" type="chrome_html" - compress="gzip"/> + compress="gzip" + preprocess="true"/> </structures> <includes>
diff --git a/chrome/browser/supervised_user/supervised_user_service_management_api_delegate.cc b/chrome/browser/supervised_user/supervised_user_service_management_api_delegate.cc new file mode 100644 index 0000000..b2cb63a --- /dev/null +++ b/chrome/browser/supervised_user/supervised_user_service_management_api_delegate.cc
@@ -0,0 +1,97 @@ +// Copyright 2020 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "chrome/browser/supervised_user/supervised_user_service_management_api_delegate.h" + +#include <memory> +#include <utility> + +#include "chrome/browser/profiles/profile.h" +#include "chrome/browser/supervised_user/supervised_user_service.h" +#include "chrome/browser/supervised_user/supervised_user_service_factory.h" +#include "chrome/browser/ui/supervised_user/parent_permission_dialog.h" + +namespace { + +void OnParentPermissionDialogComplete( + std::unique_ptr<ParentPermissionDialog> dialog, + extensions::SupervisedUserServiceDelegate:: + ParentPermissionDialogDoneCallback delegate_done_callback, + ParentPermissionDialog::Result result) { + switch (result) { + case ParentPermissionDialog::Result::kParentPermissionReceived: + std::move(delegate_done_callback) + .Run(extensions::SupervisedUserServiceDelegate:: + ParentPermissionDialogResult::kParentPermissionReceived); + break; + case ParentPermissionDialog::Result::kParentPermissionCanceled: + std::move(delegate_done_callback) + .Run(extensions::SupervisedUserServiceDelegate:: + ParentPermissionDialogResult::kParentPermissionCanceled); + break; + case ParentPermissionDialog::Result::kParentPermissionFailed: + std::move(delegate_done_callback) + .Run(extensions::SupervisedUserServiceDelegate:: + ParentPermissionDialogResult::kParentPermissionFailed); + break; + } +} + +} // namespace + +namespace extensions { + +SupervisedUserServiceManagementAPIDelegate:: + SupervisedUserServiceManagementAPIDelegate() = default; + +SupervisedUserServiceManagementAPIDelegate:: + ~SupervisedUserServiceManagementAPIDelegate() = default; + +bool SupervisedUserServiceManagementAPIDelegate:: + IsSupervisedChildWhoMayInstallExtensions( + content::BrowserContext* context) const { + SupervisedUserService* supervised_user_service = + SupervisedUserServiceFactory::GetForBrowserContext(context); + + return supervised_user_service->IsChild() && + supervised_user_service->CanInstallExtensions(); +} + +bool SupervisedUserServiceManagementAPIDelegate::IsExtensionAllowedByParent( + const extensions::Extension& extension, + content::BrowserContext* context) const { + SupervisedUserService* supervised_user_service = + SupervisedUserServiceFactory::GetForBrowserContext(context); + return IsSupervisedChildWhoMayInstallExtensions(context) && + supervised_user_service->IsExtensionAllowed(extension); +} + +void SupervisedUserServiceManagementAPIDelegate:: + ShowParentPermissionDialogForExtension( + const extensions::Extension& extension, + content::BrowserContext* context, + content::WebContents* contents, + ParentPermissionDialogDoneCallback done_callback) { + std::unique_ptr<ParentPermissionDialog> dialog = + std::make_unique<ParentPermissionDialog>( + Profile::FromBrowserContext(context)); + + // Cache the pointer so we can show the dialog after we pass + // ownership to the callback. + ParentPermissionDialog* dialog_ptr = dialog.get(); + + // Ownership of the dialog passes to the callback. This allows us + // to have as many instances of the dialog as calls to the management + // API. + ParentPermissionDialog::DoneCallback inner_done_callback = + base::BindOnce(&::OnParentPermissionDialogComplete, std::move(dialog), + std::move(done_callback)); + + // This is safe because moving a unique_ptr doesn't change the underlying + // object's address. + dialog_ptr->ShowPromptForExtensionInstallation( + contents, &extension, SkBitmap(), std::move(inner_done_callback)); +} + +} // namespace extensions
diff --git a/chrome/browser/supervised_user/supervised_user_service_management_api_delegate.h b/chrome/browser/supervised_user/supervised_user_service_management_api_delegate.h new file mode 100644 index 0000000..de1e585 --- /dev/null +++ b/chrome/browser/supervised_user/supervised_user_service_management_api_delegate.h
@@ -0,0 +1,41 @@ +// Copyright 2020 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SERVICE_MANAGEMENT_API_DELEGATE_H_ +#define CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SERVICE_MANAGEMENT_API_DELEGATE_H_ + +#include "extensions/browser/api/management/supervised_user_service_delegate.h" + +namespace content { +class BrowserContext; +} + +namespace extensions { + +class SupervisedUserServiceManagementAPIDelegate + : public extensions::SupervisedUserServiceDelegate { + public: + SupervisedUserServiceManagementAPIDelegate(); + ~SupervisedUserServiceManagementAPIDelegate() override; + + // extensions::SupervisedUserServiceDelegate overrides + + bool IsSupervisedChildWhoMayInstallExtensions( + content::BrowserContext* context) const override; + + bool IsExtensionAllowedByParent( + const extensions::Extension& extension, + content::BrowserContext* context) const override; + + void ShowParentPermissionDialogForExtension( + const extensions::Extension& extension, + content::BrowserContext* context, + content::WebContents* contents, + extensions::SupervisedUserServiceDelegate:: + ParentPermissionDialogDoneCallback done_callback) override; +}; + +} // namespace extensions + +#endif // CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SERVICE_MANAGEMENT_API_DELEGATE_H_
diff --git a/chrome/browser/ui/android/appmenu/BUILD.gn b/chrome/browser/ui/android/appmenu/BUILD.gn index 1fd5134..0717d92 100644 --- a/chrome/browser/ui/android/appmenu/BUILD.gn +++ b/chrome/browser/ui/android/appmenu/BUILD.gn
@@ -16,7 +16,7 @@ "java/src/org/chromium/chrome/browser/ui/appmenu/CustomViewBinder.java", "java/src/org/chromium/chrome/browser/ui/appmenu/MenuButtonDelegate.java", ] - deps = [ "//chrome/lib/lifecycle/public/android:java" ] + deps = [ "//chrome/browser/android/lifecycle:java" ] } android_library_factory("factory_java") {
diff --git a/chrome/browser/ui/android/appmenu/DEPS b/chrome/browser/ui/android/appmenu/DEPS index 1764a7c5..dd54244 100644 --- a/chrome/browser/ui/android/appmenu/DEPS +++ b/chrome/browser/ui/android/appmenu/DEPS
@@ -2,7 +2,7 @@ include_rules = [ "+base/android", "+base/test/android", - "+chrome/lib/lifecycle/public", + "+chrome/browser/android/lifecycle", "+chrome/test/android", "+components/browser_ui/styles/android", "+components/browser_ui/widget/android",
diff --git a/chrome/browser/ui/android/appmenu/internal/BUILD.gn b/chrome/browser/ui/android/appmenu/internal/BUILD.gn index 91fb79d..e129fc2 100644 --- a/chrome/browser/ui/android/appmenu/internal/BUILD.gn +++ b/chrome/browser/ui/android/appmenu/internal/BUILD.gn
@@ -19,9 +19,9 @@ deps = [ ":java_resources", "//base:base_java", + "//chrome/browser/android/lifecycle:java", "//chrome/browser/ui/android/appmenu:java", "//chrome/browser/ui/android/appmenu:java_resources", - "//chrome/lib/lifecycle/public/android:java", "//components/browser_ui/widget/android:java", "//third_party/android_deps:android_support_v7_appcompat_java", "//third_party/android_deps:androidx_annotation_annotation_java", @@ -56,9 +56,9 @@ ":test_java_resources", "//base:base_java", "//base:base_java_test_support", + "//chrome/browser/android/lifecycle:java", "//chrome/browser/ui/android/appmenu:java", "//chrome/browser/ui/android/appmenu:test_support_java", - "//chrome/lib/lifecycle/public/android:java", "//chrome/test/android:chrome_java_test_support", "//components/browser_ui/widget/android:test_support_java", "//content/public/test/android:content_java_test_support",
diff --git a/chrome/browser/ui/ash/multi_user/multi_profile_support_unittest.cc b/chrome/browser/ui/ash/multi_user/multi_profile_support_unittest.cc index c59ca44..77dd06a 100644 --- a/chrome/browser/ui/ash/multi_user/multi_profile_support_unittest.cc +++ b/chrome/browser/ui/ash/multi_user/multi_profile_support_unittest.cc
@@ -289,8 +289,7 @@ chromeos::DeviceSettingsService::Initialize(); chromeos::CrosSettings::Initialize( TestingBrowserProcess::GetGlobal()->local_state()); - ash_test_helper()->set_test_shell_delegate(new TestShellDelegateChromeOS); - ChromeAshTestBase::SetUp(); + ChromeAshTestBase::SetUp(std::make_unique<TestShellDelegateChromeOS>()); ash_test_helper() ->test_session_controller_client() ->set_use_lower_case_user_id(false);
diff --git a/chrome/browser/ui/ash/system_tray_client.cc b/chrome/browser/ui/ash/system_tray_client.cc index 1c1513c..8aa0bf1 100644 --- a/chrome/browser/ui/ash/system_tray_client.cc +++ b/chrome/browser/ui/ash/system_tray_client.cc
@@ -274,6 +274,13 @@ ShowSettingsSubPageForActiveUser(chrome::kAccessibilitySubPage); } +void SystemTrayClient::ShowGestureEducationHelp() { + chrome::ScopedTabbedBrowserDisplayer displayer( + ProfileManager::GetActiveUserProfile()); + ShowSingletonTab(displayer.browser(), + GURL(chrome::kChromeOSGestureEducationHelpURL)); +} + void SystemTrayClient::ShowPaletteHelp() { chrome::ScopedTabbedBrowserDisplayer displayer( ProfileManager::GetActiveUserProfile());
diff --git a/chrome/browser/ui/ash/system_tray_client.h b/chrome/browser/ui/ash/system_tray_client.h index 1e9d5a2..f6f0c7e1 100644 --- a/chrome/browser/ui/ash/system_tray_client.h +++ b/chrome/browser/ui/ash/system_tray_client.h
@@ -66,6 +66,7 @@ void ShowHelp() override; void ShowAccessibilityHelp() override; void ShowAccessibilitySettings() override; + void ShowGestureEducationHelp() override; void ShowPaletteHelp() override; void ShowPaletteSettings() override; void ShowPublicAccountInfo() override;
diff --git a/chrome/browser/ui/views/apps/app_dialog_view_browsertest.cc b/chrome/browser/ui/views/apps/app_dialog_view_browsertest.cc index 6ce4c64c..c817aed 100644 --- a/chrome/browser/ui/views/apps/app_dialog_view_browsertest.cc +++ b/chrome/browser/ui/views/apps/app_dialog_view_browsertest.cc
@@ -37,14 +37,12 @@ } void SetUpOnMainThread() override { - profile_ = browser()->profile(); - - arc::SetArcPlayStoreEnabledForProfile(profile_, true); + arc::SetArcPlayStoreEnabledForProfile(browser()->profile(), true); // Validating decoded content does not fit well for unit tests. ArcAppIcon::DisableSafeDecodingForTesting(); - arc_app_list_pref_ = ArcAppListPrefs::Get(profile_); + arc_app_list_pref_ = ArcAppListPrefs::Get(browser()->profile()); DCHECK(arc_app_list_pref_); base::RunLoop run_loop; arc_app_list_pref_->SetDefaultAppsReadyCallback(run_loop.QuitClosure()); @@ -70,6 +68,10 @@ return AppPauseDialogView::GetActiveViewForTesting(); } + const std::string& app_id() const { return app_id_; } + + apps::AppServiceProxy* app_service_proxy() { return app_service_proxy_; } + void ShowUi(const std::string& name) override { arc::mojom::AppInfo app; app.name = "Fake App 0"; @@ -82,55 +84,54 @@ EXPECT_EQ(1u, arc_app_list_pref_->GetAppIds().size()); EXPECT_EQ(nullptr, ActiveView(name)); - auto* app_service_proxy = - apps::AppServiceProxyFactory::GetForProfile(profile_); - ASSERT_TRUE(app_service_proxy); + app_service_proxy_ = + apps::AppServiceProxyFactory::GetForProfile(browser()->profile()); + ASSERT_TRUE(app_service_proxy_); base::RunLoop run_loop; - std::string app_id = - arc_app_list_pref_->GetAppId(app.package_name, app.activity); + app_id_ = arc_app_list_pref_->GetAppId(app.package_name, app.activity); if (name == "block") { app.suspended = true; - app_service_proxy->SetDialogCreatedCallbackForTesting( + app_service_proxy_->SetDialogCreatedCallbackForTesting( run_loop.QuitClosure()); app_instance_->SendRefreshAppList( std::vector<arc::mojom::AppInfo>(1, app)); - app_service_proxy->FlushMojoCallsForTesting(); - app_service_proxy->Launch(app_id, ui::EventFlags::EF_NONE, - apps::mojom::LaunchSource::kFromChromeInternal, - display::kInvalidDisplayId); + app_service_proxy_->FlushMojoCallsForTesting(); + app_service_proxy_->Launch(app_id_, ui::EventFlags::EF_NONE, + apps::mojom::LaunchSource::kFromChromeInternal, + display::kInvalidDisplayId); } else { std::map<std::string, apps::PauseData> pause_data; - pause_data[app_id].hours = 3; - pause_data[app_id].minutes = 30; - pause_data[app_id].should_show_pause_dialog = true; - app_service_proxy->SetDialogCreatedCallbackForTesting( + pause_data[app_id_].hours = 3; + pause_data[app_id_].minutes = 30; + pause_data[app_id_].should_show_pause_dialog = true; + app_service_proxy_->SetDialogCreatedCallbackForTesting( run_loop.QuitClosure()); - app_service_proxy->PauseApps(pause_data); + app_service_proxy_->PauseApps(pause_data); } run_loop.Run(); ASSERT_NE(nullptr, ActiveView(name)); EXPECT_EQ(ui::DIALOG_BUTTON_OK, ActiveView(name)->GetDialogButtons()); - app_service_proxy->FlushMojoCallsForTesting(); - bool state_is_set = false; - app_service_proxy->AppRegistryCache().ForOneApp( - app_id, [&state_is_set, name](const apps::AppUpdate& update) { - if (name == "block") { + if (name == "block") { + app_service_proxy_->FlushMojoCallsForTesting(); + bool state_is_set = false; + app_service_proxy_->AppRegistryCache().ForOneApp( + app_id_, [&state_is_set](const apps::AppUpdate& update) { state_is_set = (update.Readiness() == apps::mojom::Readiness::kDisabledByPolicy); - } else { - state_is_set = - (update.Paused() == apps::mojom::OptionalBool::kTrue); - } - }); + }); - EXPECT_TRUE(state_is_set); + EXPECT_TRUE(state_is_set); + } else { + ActiveView(name)->AcceptDialog(); + } } private: - Profile* profile_ = nullptr; + std::string app_id_; + apps::AppServiceProxy* app_service_proxy_ = nullptr; ArcAppListPrefs* arc_app_list_pref_ = nullptr; std::unique_ptr<arc::FakeAppInstance> app_instance_; }; @@ -141,4 +142,14 @@ IN_PROC_BROWSER_TEST_F(AppDialogViewBrowserTest, InvokeUi_pause) { ShowAndVerifyUi(); + + app_service_proxy()->FlushMojoCallsForTesting(); + + bool state_is_set = false; + app_service_proxy()->AppRegistryCache().ForOneApp( + app_id(), [&state_is_set](const apps::AppUpdate& update) { + state_is_set = (update.Paused() == apps::mojom::OptionalBool::kTrue); + }); + + EXPECT_TRUE(state_is_set); }
diff --git a/chrome/browser/ui/views/crostini/crostini_recovery_view.cc b/chrome/browser/ui/views/crostini/crostini_recovery_view.cc index 62e605ea..be842c3 100644 --- a/chrome/browser/ui/views/crostini/crostini_recovery_view.cc +++ b/chrome/browser/ui/views/crostini/crostini_recovery_view.cc
@@ -68,6 +68,12 @@ return false; } +bool CrostiniRecoveryView::IsDialogButtonEnabled( + ui::DialogButton button) const { + // Buttons are disabled after Accept or Cancel have been clicked. + return closed_reason_ == views::Widget::ClosedReason::kUnspecified; +} + gfx::Size CrostiniRecoveryView::CalculatePreferredSize() const { const int dialog_width = ChromeLayoutProvider::Get()->GetDistanceMetric( DISTANCE_STANDALONE_BUBBLE_PREFERRED_WIDTH) - @@ -90,6 +96,7 @@ } }, weak_ptr_factory_.GetWeakPtr())); + DialogModelChanged(); return false; } @@ -116,6 +123,7 @@ } app_id_ = crostini::GetTerminalId(); ScheduleAppLaunch(); + DialogModelChanged(); return false; }
diff --git a/chrome/browser/ui/views/crostini/crostini_recovery_view.h b/chrome/browser/ui/views/crostini/crostini_recovery_view.h index 4090ba5..186e59ba 100644 --- a/chrome/browser/ui/views/crostini/crostini_recovery_view.h +++ b/chrome/browser/ui/views/crostini/crostini_recovery_view.h
@@ -29,6 +29,7 @@ gfx::Size CalculatePreferredSize() const override; bool Accept() override; bool Cancel() override; + bool IsDialogButtonEnabled(ui::DialogButton button) const override; static CrostiniRecoveryView* GetActiveViewForTesting();
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc index 93b4f87..5dd65c8 100644 --- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc +++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc
@@ -1066,10 +1066,18 @@ EXPECT_TRUE(web_app_menu_button_->HasFocus()); } +// TODO(): Flaky crash on Chrome OS debug. +#if defined(OS_CHROMEOS) && !defined(NDEBUG) +#define MAYBE_BrowserCommandFocusToolbarGeolocation \ + DISABLED_BrowserCommandFocusToolbarGeolocation +#else +#define MAYBE_BrowserCommandFocusToolbarGeolocation \ + BrowserCommandFocusToolbarGeolocation +#endif // Tests that the focus toolbar command focuses content settings icons before // the app menu button when present in web-app windows. IN_PROC_BROWSER_TEST_P(WebAppNonClientFrameViewAshTest, - BrowserCommandFocusToolbarGeolocation) { + MAYBE_BrowserCommandFocusToolbarGeolocation) { SetUpWebApp(); ContentSettingImageView* geolocation_icon = GrantGeolocationPermission();
diff --git a/chrome/browser/ui/views/page_info/safety_tip_page_info_bubble_view_browsertest.cc b/chrome/browser/ui/views/page_info/safety_tip_page_info_bubble_view_browsertest.cc index 36732c8c8..f4844a71 100644 --- a/chrome/browser/ui/views/page_info/safety_tip_page_info_bubble_view_browsertest.cc +++ b/chrome/browser/ui/views/page_info/safety_tip_page_info_bubble_view_browsertest.cc
@@ -183,9 +183,7 @@ {{security_state::features::kSafetyTipUI, {{"topsites", "false"}, {"editdistance", "false"}, - {"editdistance_siteengagement", "false"}}}, - {features::kLookalikeUrlNavigationSuggestionsUI, - {{"topsites", "true"}}}}, + {"editdistance_siteengagement", "false"}}}}, {}); break; case UIStatus::kEnabledWithAllFeatures: @@ -193,9 +191,7 @@ {{security_state::features::kSafetyTipUI, {{"topsites", "true"}, {"editdistance", "true"}, - {"editdistance_siteengagement", "true"}}}, - {features::kLookalikeUrlNavigationSuggestionsUI, - {{"topsites", "true"}}}}, + {"editdistance_siteengagement", "true"}}}}, {}); }
diff --git a/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_unittest.cc b/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_unittest.cc index 7b2d7cf7..b7b9925 100644 --- a/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_unittest.cc +++ b/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_unittest.cc
@@ -751,7 +751,7 @@ void SetUp() override { ash::AshTestHelper::InitParams init_params; init_params.start_session = false; - ash_test_helper_.SetUp(init_params); + ash_test_helper_.SetUp(std::move(init_params)); user_manager_ = new chromeos::FakeChromeUserManager(); scoped_user_manager_ = std::make_unique<user_manager::ScopedUserManager>(
diff --git a/chrome/browser/ui/web_applications/web_app_file_handling_browsertest.cc b/chrome/browser/ui/web_applications/web_app_file_handling_browsertest.cc index 65cde265..718c419 100644 --- a/chrome/browser/ui/web_applications/web_app_file_handling_browsertest.cc +++ b/chrome/browser/ui/web_applications/web_app_file_handling_browsertest.cc
@@ -379,6 +379,28 @@ EXPECT_EQ(0, file_handler_manager().TriggerFileHandlerCleanupForTesting()); } +IN_PROC_BROWSER_TEST_P(WebAppFileHandlingOriginTrialBrowserTest, + DisableForceEnabledFileHandlingOriginTrial) { + InstallFileHandlingPWA(); + SetUpInterceptorNavigateToAppAndMaybeWait(); + + ASSERT_TRUE(file_handler_manager().AreFileHandlersEnabled(app_id())); + ASSERT_TRUE(file_handler_manager().GetEnabledFileHandlers(app_id())); + + // Calling this on non-force-enabled origin trial should have no effect. + file_handler_manager().DisableForceEnabledFileHandlingOriginTrial(app_id()); + EXPECT_TRUE(file_handler_manager().AreFileHandlersEnabled(app_id())); + EXPECT_TRUE(file_handler_manager().GetEnabledFileHandlers(app_id())); + + // Force enables file handling. + file_handler_manager().ForceEnableFileHandlingOriginTrial(app_id()); + + // Calling this on force enabled origin trial should remove file handlers. + file_handler_manager().DisableForceEnabledFileHandlingOriginTrial(app_id()); + EXPECT_FALSE(file_handler_manager().AreFileHandlersEnabled(app_id())); + EXPECT_EQ(nullptr, file_handler_manager().GetEnabledFileHandlers(app_id())); +} + namespace { static constexpr char kBaseDataDir[] = "chrome/test/data/web_app_file_handling";
diff --git a/chrome/browser/ui/webui/settings/chromeos/os_settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/chromeos/os_settings_localized_strings_provider.cc index 5fd4dfbc..7e435b4 100644 --- a/chrome/browser/ui/webui/settings/chromeos/os_settings_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/settings/chromeos/os_settings_localized_strings_provider.cc
@@ -583,6 +583,8 @@ void AddAccountManagerPageStrings(content::WebUIDataSource* html_source) { static constexpr webui::LocalizedString kLocalizedStrings[] = { {"accountManagerDescription", IDS_SETTINGS_ACCOUNT_MANAGER_DESCRIPTION}, + {"accountManagerChildDescription", + IDS_SETTINGS_ACCOUNT_MANAGER_CHILD_DESCRIPTION}, {"accountListHeader", IDS_SETTINGS_ACCOUNT_MANAGER_LIST_HEADER}, {"accountManagerPrimaryAccountTooltip", IDS_SETTINGS_ACCOUNT_MANAGER_PRIMARY_ACCOUNT_TOOLTIP},
diff --git a/chrome/browser/ui/webui/settings/chromeos/os_settings_ui.cc b/chrome/browser/ui/webui/settings/chromeos/os_settings_ui.cc index bb7aadc..37574b7 100644 --- a/chrome/browser/ui/webui/settings/chromeos/os_settings_ui.cc +++ b/chrome/browser/ui/webui/settings/chromeos/os_settings_ui.cc
@@ -268,6 +268,8 @@ "secondaryGoogleAccountSigninAllowed", profile->GetPrefs()->GetBoolean( chromeos::prefs::kSecondaryGoogleAccountSigninAllowed)); + html_source->AddBoolean("isEduCoexistenceEnabled", + features::IsEduCoexistenceEnabled()); } web_ui()->AddMessageHandler(
diff --git a/chrome/browser/ui/webui/settings/font_handler.cc b/chrome/browser/ui/webui/settings/font_handler.cc index 062eb45..8fac761 100644 --- a/chrome/browser/ui/webui/settings/font_handler.cc +++ b/chrome/browser/ui/webui/settings/font_handler.cc
@@ -13,28 +13,17 @@ #include "base/bind_helpers.h" #include "base/i18n/rtl.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/common/pref_names.h" #include "components/prefs/pref_service.h" #include "content/public/browser/font_list_async.h" #include "content/public/browser/web_ui.h" -#include "extensions/browser/extension_system.h" -#include "extensions/common/extension_urls.h" #if defined(OS_MACOSX) #include "chrome/browser/ui/webui/settings_utils.h" #endif -namespace { - -const char kAdvancedFontSettingsExtensionId[] = - "caclkomlalccbpcdllchkeecicepbmbm"; - -} // namespace - namespace settings { FontHandler::FontHandler(content::WebUI* webui) @@ -51,78 +40,23 @@ web_ui()->RegisterMessageCallback( "fetchFontsData", base::BindRepeating(&FontHandler::HandleFetchFontsData, base::Unretained(this))); - web_ui()->RegisterMessageCallback( - "observeAdvancedFontExtensionAvailable", - base::BindRepeating( - &FontHandler::HandleObserveAdvancedFontExtensionAvailable, - base::Unretained(this))); - web_ui()->RegisterMessageCallback( - "openAdvancedFontSettings", - base::BindRepeating(&FontHandler::HandleOpenAdvancedFontSettings, - base::Unretained(this))); } -void FontHandler::OnJavascriptAllowed() { - extension_registry_observer_.Add( - extensions::ExtensionRegistry::Get(profile_)); -} +void FontHandler::OnJavascriptAllowed() {} -void FontHandler::OnJavascriptDisallowed() { - extension_registry_observer_.RemoveAll(); -} +void FontHandler::OnJavascriptDisallowed() {} void FontHandler::HandleFetchFontsData(const base::ListValue* args) { CHECK_EQ(1U, args->GetSize()); std::string callback_id; CHECK(args->GetString(0, &callback_id)); + AllowJavascript(); content::GetFontListAsync(base::Bind(&FontHandler::FontListHasLoaded, weak_ptr_factory_.GetWeakPtr(), callback_id)); } -void FontHandler::HandleObserveAdvancedFontExtensionAvailable( - const base::ListValue* /*args*/) { - AllowJavascript(); - NotifyAdvancedFontSettingsAvailability(); -} - -void FontHandler::HandleOpenAdvancedFontSettings( - const base::ListValue* /*args*/) { - const extensions::Extension* extension = GetAdvancedFontSettingsExtension(); - if (!extension) - return; - extensions::ExtensionTabUtil::OpenOptionsPage( - extension, - chrome::FindBrowserWithWebContents(web_ui()->GetWebContents())); -} - -const extensions::Extension* FontHandler::GetAdvancedFontSettingsExtension() { - extensions::ExtensionService* service = - extensions::ExtensionSystem::Get(profile_)->extension_service(); - if (!service->IsExtensionEnabled(kAdvancedFontSettingsExtensionId)) - return nullptr; - extensions::ExtensionRegistry* registry = - extensions::ExtensionRegistry::Get(profile_); - return registry->GetInstalledExtension(kAdvancedFontSettingsExtensionId); -} - -void FontHandler::NotifyAdvancedFontSettingsAvailability() { - FireWebUIListener("advanced-font-settings-installed", - base::Value(GetAdvancedFontSettingsExtension() != nullptr)); -} - -void FontHandler::OnExtensionLoaded(content::BrowserContext*, - const extensions::Extension*) { - NotifyAdvancedFontSettingsAvailability(); -} - -void FontHandler::OnExtensionUnloaded(content::BrowserContext*, - const extensions::Extension*, - extensions::UnloadedExtensionReason) { - NotifyAdvancedFontSettingsAvailability(); -} - void FontHandler::FontListHasLoaded(std::string callback_id, std::unique_ptr<base::ListValue> list) { // Font list. Selects the directionality for the fonts in the given list. @@ -142,11 +76,6 @@ base::DictionaryValue response; response.Set("fontList", std::move(list)); - GURL extension_url(extension_urls::GetWebstoreItemDetailURLPrefix()); - response.SetString( - "extensionUrl", - extension_url.Resolve(kAdvancedFontSettingsExtensionId).spec()); - ResolveJavascriptCallback(base::Value(callback_id), response); }
diff --git a/chrome/browser/ui/webui/settings/font_handler.h b/chrome/browser/ui/webui/settings/font_handler.h index 3c0a284c..6864cb5 100644 --- a/chrome/browser/ui/webui/settings/font_handler.h +++ b/chrome/browser/ui/webui/settings/font_handler.h
@@ -12,8 +12,6 @@ #include "base/memory/weak_ptr.h" #include "base/scoped_observer.h" #include "chrome/browser/ui/webui/settings/settings_page_ui_handler.h" -#include "extensions/browser/extension_registry.h" -#include "extensions/browser/extension_registry_observer.h" namespace base { class ListValue; @@ -23,17 +21,12 @@ class WebUI; } -namespace extensions { -class Extension; -} - class Profile; namespace settings { // Handle OS font list and font preference settings. -class FontHandler : public SettingsPageUIHandler, - public extensions::ExtensionRegistryObserver { +class FontHandler : public SettingsPageUIHandler { public: explicit FontHandler(content::WebUI* webui); ~FontHandler() override; @@ -43,36 +36,14 @@ void OnJavascriptAllowed() override; void OnJavascriptDisallowed() override; - // ExtensionRegistryObserver implementation. - void OnExtensionLoaded(content::BrowserContext* browser_context, - const extensions::Extension* extension) override; - void OnExtensionUnloaded(content::BrowserContext* browser_context, - const extensions::Extension* extension, - extensions::UnloadedExtensionReason reason) override; - private: // Handler for script asking for font information. void HandleFetchFontsData(const base::ListValue* args); - // Listen for changes to whether the advanced font extension is available. - // An initial update will be sent when observation begins. - void HandleObserveAdvancedFontExtensionAvailable(const base::ListValue* args); - - // Open the advanced font settings page. - void HandleOpenAdvancedFontSettings(const base::ListValue* args); - // Callback to handle fonts loading. void FontListHasLoaded(std::string callback_id, std::unique_ptr<base::ListValue> list); - const extensions::Extension* GetAdvancedFontSettingsExtension(); - - void NotifyAdvancedFontSettingsAvailability(); - - ScopedObserver<extensions::ExtensionRegistry, - extensions::ExtensionRegistryObserver> - extension_registry_observer_{this}; - Profile* profile_; // Weak pointer. base::WeakPtrFactory<FontHandler> weak_ptr_factory_{this};
diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc index 597d960..55299097 100644 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
@@ -283,9 +283,6 @@ {"minimumFont", IDS_SETTINGS_MINIMUM_FONT_SIZE_LABEL}, {"tiny", IDS_SETTINGS_TINY_FONT_SIZE}, {"huge", IDS_SETTINGS_HUGE_FONT_SIZE}, - {"advancedFontSettings", IDS_SETTINGS_ADVANCED_FONT_SETTINGS}, - {"openAdvancedFontSettings", IDS_SETTINGS_OPEN_ADVANCED_FONT_SETTINGS}, - {"requiresWebStoreExtension", IDS_SETTINGS_REQUIRES_WEB_STORE_EXTENSION}, #if defined(OS_LINUX) && !defined(OS_CHROMEOS) {"systemTheme", IDS_SETTINGS_SYSTEM_THEME}, {"useSystemTheme", IDS_SETTINGS_USE_SYSTEM_THEME}, @@ -1370,7 +1367,6 @@ {"siteSettingsCategoryCamera", IDS_SETTINGS_SITE_SETTINGS_CAMERA}, {"siteSettingsCameraLabel", IDS_SETTINGS_SITE_SETTINGS_CAMERA_LABEL}, {"cookiePageTitle", IDS_SETTINGS_COOKIES_PAGE}, - {"cookiePageDescription", IDS_SETTINGS_COOKIES_PAGE_DESCRIPTION}, {"cookiePageGeneralControls", IDS_SETTINGS_COOKIES_CONTROLS}, {"cookiePageAllowAll", IDS_SETTINGS_COOKIES_ALLOW_ALL}, {"cookiePageAllowAllBulOne", IDS_SETTINGS_COOKIES_ALLOW_ALL_BULLET_ONE},
diff --git a/chrome/browser/ui/webui/settings/site_settings_handler.cc b/chrome/browser/ui/webui/settings/site_settings_handler.cc index 191af52..b7f16b7 100644 --- a/chrome/browser/ui/webui/settings/site_settings_handler.cc +++ b/chrome/browser/ui/webui/settings/site_settings_handler.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/ui/webui/settings/site_settings_handler.h" #include <algorithm> +#include <set> #include <utility> #include <vector> @@ -43,9 +44,12 @@ #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" #include "chrome/common/pref_names.h" #include "chrome/grit/generated_resources.h" +#include "components/content_settings/core/browser/cookie_settings.h" #include "components/content_settings/core/browser/website_settings_registry.h" #include "components/content_settings/core/common/content_settings_types.h" #include "components/content_settings/core/common/content_settings_utils.h" +#include "components/content_settings/core/common/features.h" +#include "components/content_settings/core/common/pref_names.h" #include "components/crx_file/id_util.h" #include "components/permissions/chooser_context_base.h" #include "components/permissions/permission_decision_auto_blocker.h" @@ -330,6 +334,56 @@ UMA_HISTOGRAM_ENUMERATION("WebsiteSettings.AllSitesAction2", action); } +int GetNumCookieExceptionsOfTypes(HostContentSettingsMap* map, + const std::set<ContentSetting> types) { + ContentSettingsForOneType output; + map->GetSettingsForOneType(ContentSettingsType::COOKIES, std::string(), + &output); + return std::count_if( + output.begin(), output.end(), + [types](const ContentSettingPatternSource setting) { + return types.count( + content_settings::ValueToContentSetting(&setting.setting_value)); + }); +} + +std::string GetCookieSettingDescription(Profile* profile) { + HostContentSettingsMap* map = + HostContentSettingsMapFactory::GetForProfile(profile); + auto content_setting = + map->GetDefaultContentSetting(ContentSettingsType::COOKIES, nullptr); + + bool block_third_party = + profile->GetPrefs()->GetBoolean(prefs::kBlockThirdPartyCookies); + auto control_mode = static_cast<content_settings::CookieControlsMode>( + profile->GetPrefs()->GetInteger(prefs::kCookieControlsMode)); + + // Determine what the effective cookie setting is. These conditions are not + // mutually exclusive and rely on ordering. + if (content_setting == ContentSetting::CONTENT_SETTING_BLOCK) { + return l10n_util::GetPluralStringFUTF8( + IDS_SETTINGS_SITE_SETTINGS_COOKIES_BLOCK, + GetNumCookieExceptionsOfTypes( + map, {ContentSetting::CONTENT_SETTING_ALLOW, + ContentSetting::CONTENT_SETTING_SESSION_ONLY})); + } else if (block_third_party) { + return l10n_util::GetStringUTF8( + IDS_SETTINGS_SITE_SETTINGS_COOKIES_BLOCK_THIRD_PARTY); + } else if (base::FeatureList::IsEnabled( + content_settings::kImprovedCookieControls) && + control_mode == + content_settings::CookieControlsMode::kIncognitoOnly) { + return l10n_util::GetStringUTF8( + IDS_SETTINGS_SITE_SETTINGS_COOKIES_BLOCK_THIRD_PARTY_INCOGNITO); + } else { + // We do not make a distinction between allow and clear on exit. + return l10n_util::GetPluralStringFUTF8( + IDS_SETTINGS_SITE_SETTINGS_COOKIES_ALLOW, + GetNumCookieExceptionsOfTypes(map, + {ContentSetting::CONTENT_SETTING_BLOCK})); + } +} + } // namespace SiteSettingsHandler::SiteSettingsHandler(Profile* profile, @@ -364,6 +418,11 @@ base::BindRepeating(&SiteSettingsHandler::HandleGetAllSites, base::Unretained(this))); web_ui()->RegisterMessageCallback( + "getCookieSettingDescription", + base::BindRepeating( + &SiteSettingsHandler::HandleGetCookieSettingDescription, + base::Unretained(this))); + web_ui()->RegisterMessageCallback( "getRecentSitePermissions", base::BindRepeating(&SiteSettingsHandler::HandleGetRecentSitePermissions, base::Unretained(this))); @@ -469,6 +528,16 @@ base::Bind(&SiteSettingsHandler::SendBlockAutoplayStatus, base::Unretained(this))); + // Listen for prefs that impact the effective cookie setting + pref_change_registrar_->Add( + prefs::kBlockThirdPartyCookies, + base::Bind(&SiteSettingsHandler::SendCookieSettingDescription, + base::Unretained(this))); + pref_change_registrar_->Add( + prefs::kCookieControlsMode, + base::Bind(&SiteSettingsHandler::SendCookieSettingDescription, + base::Unretained(this))); + #if defined(OS_CHROMEOS) pref_change_registrar_->Add( prefs::kEnableDRM, @@ -482,6 +551,8 @@ chooser_observer_.RemoveAll(); host_zoom_map_subscription_.reset(); pref_change_registrar_->Remove(prefs::kBlockAutoplayEnabled); + pref_change_registrar_->Remove(prefs::kBlockThirdPartyCookies); + pref_change_registrar_->Remove(prefs::kCookieControlsMode); #if defined(OS_CHROMEOS) pref_change_registrar_->Remove(prefs::kEnableDRM); #endif @@ -549,6 +620,12 @@ content_type == ContentSettingsType::SOUND) { SendBlockAutoplayStatus(); } + + // If the default cookie setting changed we should update the effective + // setting description. + if (content_type == ContentSettingsType::COOKIES) { + SendCookieSettingDescription(); + } } void SiteSettingsHandler::OnOffTheRecordProfileCreated( @@ -736,6 +813,15 @@ ResolveJavascriptCallback(base::Value(callback_id), result); } +void SiteSettingsHandler::HandleGetCookieSettingDescription( + const base::ListValue* args) { + AllowJavascript(); + CHECK_EQ(1U, args->GetList().size()); + std::string callback_id = args->GetList()[0].GetString(); + ResolveJavascriptCallback(base::Value(callback_id), + base::Value(GetCookieSettingDescription(profile_))); +} + void SiteSettingsHandler::HandleGetRecentSitePermissions( const base::ListValue* args) { AllowJavascript(); @@ -1520,4 +1606,10 @@ void SiteSettingsHandler::ClearAllSitesMapForTesting() { all_sites_map_.clear(); } + +void SiteSettingsHandler::SendCookieSettingDescription() { + FireWebUIListener("cookieSettingDescriptionChanged", + base::Value(GetCookieSettingDescription(profile_))); +} + } // namespace settings
diff --git a/chrome/browser/ui/webui/settings/site_settings_handler.h b/chrome/browser/ui/webui/settings/site_settings_handler.h index b52c80c..e0d2da953 100644 --- a/chrome/browser/ui/webui/settings/site_settings_handler.h +++ b/chrome/browser/ui/webui/settings/site_settings_handler.h
@@ -21,6 +21,7 @@ #include "components/content_settings/core/browser/content_settings_observer.h" #include "components/content_settings/core/browser/host_content_settings_map.h" #include "components/permissions/chooser_context_base.h" +#include "components/prefs/pref_store.h" #include "content/public/browser/host_zoom_map.h" #include "ppapi/buildflags/buildflags.h" @@ -124,6 +125,7 @@ FRIEND_TEST_ALL_PREFIXES(SiteSettingsHandlerTest, ZoomLevels); FRIEND_TEST_ALL_PREFIXES(SiteSettingsHandlerTest, HandleClearEtldPlus1DataAndCookies); + FRIEND_TEST_ALL_PREFIXES(SiteSettingsHandlerTest, CookieSettingDescription); FRIEND_TEST_ALL_PREFIXES(SiteSettingsHandlerTest, HandleGetFormattedBytes); FRIEND_TEST_ALL_PREFIXES(SiteSettingsHandlerTest, NotificationPermissionRevokeUkm); @@ -165,6 +167,9 @@ // the front end when fetching finished. void HandleGetAllSites(const base::ListValue* args); + // Returns a string for display describing the current cookie settings. + void HandleGetCookieSettingDescription(const base::ListValue* args); + // Returns a list containing the most recent permission changes for the // provided content types grouped by origin/profile (incognito, regular) // combinations, limited to N origin/profile pairings. This includes @@ -249,6 +254,10 @@ void ClearAllSitesMapForTesting(); + // Notifies the JS side the effective cookies setting has changed and + // provides the updated description label for display. + void SendCookieSettingDescription(); + Profile* profile_; web_app::AppRegistrar& app_registrar_;
diff --git a/chrome/browser/ui/webui/settings/site_settings_handler_unittest.cc b/chrome/browser/ui/webui/settings/site_settings_handler_unittest.cc index bbc5a12..5b77ab9 100644 --- a/chrome/browser/ui/webui/settings/site_settings_handler_unittest.cc +++ b/chrome/browser/ui/webui/settings/site_settings_handler_unittest.cc
@@ -15,6 +15,7 @@ #include "base/logging.h" #include "base/strings/utf_string_conversions.h" #include "base/test/metrics/histogram_tester.h" +#include "base/test/scoped_feature_list.h" #include "base/test/simple_test_clock.h" #include "base/values.h" #include "build/build_config.h" @@ -35,11 +36,14 @@ #include "chrome/browser/web_applications/components/web_app_helpers.h" #include "chrome/browser/web_applications/test/test_app_registrar.h" #include "chrome/common/pref_names.h" +#include "chrome/grit/generated_resources.h" #include "chrome/test/base/browser_with_test_window_test.h" #include "chrome/test/base/testing_profile.h" +#include "components/content_settings/core/browser/cookie_settings.h" #include "components/content_settings/core/browser/host_content_settings_map.h" #include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_types.h" +#include "components/content_settings/core/common/features.h" #include "components/content_settings/core/common/pref_names.h" #include "components/history/core/browser/history_service.h" #include "components/infobars/core/infobar.h" @@ -59,6 +63,7 @@ #include "ppapi/buildflags/buildflags.h" #include "services/device/public/cpp/test/fake_usb_device_manager.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/text/bytes_formatting.h" #if defined(OS_CHROMEOS) @@ -191,6 +196,8 @@ TestingProfile::Builder profile_builder; profile_builder.SetPath(profile_dir_.GetPath()); profile_ = profile_builder.Build(); + feature_list_.InitAndEnableFeature( + content_settings::kImprovedCookieControls); } void SetUp() override { @@ -400,6 +407,16 @@ } } + void ValidateCookieSettingUpdate(const std::string expected_string, + const int expected_call_index) { + const content::TestWebUI::CallData& data = + *web_ui()->call_data()[expected_call_index]; + + ASSERT_EQ("cr.webUIListenerCallback", data.function_name()); + ASSERT_EQ("cookieSettingDescriptionChanged", data.arg1()->GetString()); + ASSERT_EQ(expected_string, data.arg2()->GetString()); + } + void CreateIncognitoProfile() { incognito_profile_ = TestingProfile::Builder().BuildIncognito(profile()); } @@ -480,6 +497,10 @@ const std::string kCookies; const std::string kFlash; + // The number of listeners that are expected to fire when any content setting + // is changed. + const size_t kNumberContentSettingListeners = 2; + private: // A profile directory that outlives |task_environment_| is needed because // TestingProfile::CreateHistoryService uses the directory to host a @@ -491,6 +512,7 @@ web_app::TestAppRegistrar app_registrar_; content::TestWebUI web_ui_; std::unique_ptr<SiteSettingsHandler> handler_; + base::test::ScopedFeatureList feature_list_; #if defined(OS_CHROMEOS) std::unique_ptr<user_manager::ScopedUserManager> user_manager_enabler_; #endif @@ -1640,7 +1662,8 @@ set_args.AppendBoolean(false); // Incognito. base::HistogramTester histograms; handler()->HandleSetCategoryPermissionForPattern(&set_args); - EXPECT_EQ(1U, web_ui()->call_data().size()); + + EXPECT_EQ(kNumberContentSettingListeners, web_ui()->call_data().size()); histograms.ExpectTotalCount(uma_base, 1); histograms.ExpectTotalCount(uma_base + ".SessionOnly", 1); } @@ -2152,6 +2175,103 @@ EXPECT_EQ(0U, storage_and_cookie_list->GetSize()); } +TEST_F(SiteSettingsHandlerTest, CookieSettingDescription) { + const auto kBlocked = [](int num) { + return l10n_util::GetPluralStringFUTF8( + IDS_SETTINGS_SITE_SETTINGS_COOKIES_BLOCK, num); + }; + const auto kAllowed = [](int num) { + return l10n_util::GetPluralStringFUTF8( + IDS_SETTINGS_SITE_SETTINGS_COOKIES_ALLOW, num); + }; + const std::string kBlockThirdParty = l10n_util::GetStringUTF8( + IDS_SETTINGS_SITE_SETTINGS_COOKIES_BLOCK_THIRD_PARTY); + const std::string kBlockThirdPartyIncognito = l10n_util::GetStringUTF8( + IDS_SETTINGS_SITE_SETTINGS_COOKIES_BLOCK_THIRD_PARTY_INCOGNITO); + + // Enforce expected default profile setting. + profile()->GetPrefs()->SetBoolean(prefs::kBlockThirdPartyCookies, false); + profile()->GetPrefs()->SetInteger( + prefs::kCookieControlsMode, + static_cast<int>(content_settings::CookieControlsMode::kIncognitoOnly)); + auto* content_settings = + HostContentSettingsMapFactory::GetForProfile(profile()); + content_settings->SetDefaultContentSetting( + ContentSettingsType::COOKIES, ContentSetting::CONTENT_SETTING_ALLOW); + web_ui()->ClearTrackedCalls(); + + // Validate get method works. + base::ListValue get_args; + get_args.AppendString(kCallbackId); + handler()->HandleGetCookieSettingDescription(&get_args); + const content::TestWebUI::CallData& data = *web_ui()->call_data().back(); + + EXPECT_EQ("cr.webUIResponse", data.function_name()); + EXPECT_EQ(kCallbackId, data.arg1()->GetString()); + ASSERT_TRUE(data.arg2()->GetBool()); + EXPECT_EQ(kBlockThirdPartyIncognito, data.arg3()->GetString()); + + // Multiple listeners will be called when prefs and content settings are + // changed in this test. Increment our expected call_data index accordingly. + int expected_call_index = 0; + const int kPrefListenerIndex = 1; + const int kContentSettingListenerIndex = 2; + + // Check updates are working, + profile()->GetPrefs()->SetBoolean(prefs::kBlockThirdPartyCookies, true); + expected_call_index += kPrefListenerIndex; + ValidateCookieSettingUpdate(kBlockThirdParty, expected_call_index); + + content_settings->SetDefaultContentSetting( + ContentSettingsType::COOKIES, ContentSetting::CONTENT_SETTING_BLOCK); + expected_call_index += kContentSettingListenerIndex; + ValidateCookieSettingUpdate(kBlocked(0), expected_call_index); + + // Check changes which do not affect the effective cookie setting. + profile()->GetPrefs()->SetBoolean(prefs::kBlockThirdPartyCookies, false); + expected_call_index += kPrefListenerIndex; + ValidateCookieSettingUpdate(kBlocked(0), expected_call_index); + + profile()->GetPrefs()->SetInteger( + prefs::kCookieControlsMode, + static_cast<int>(content_settings::CookieControlsMode::kOff)); + expected_call_index += kPrefListenerIndex; + ValidateCookieSettingUpdate(kBlocked(0), expected_call_index); + + // Set to allow and check previous changes are respected. + content_settings->SetDefaultContentSetting( + ContentSettingsType::COOKIES, ContentSetting::CONTENT_SETTING_ALLOW); + expected_call_index += kContentSettingListenerIndex; + ValidateCookieSettingUpdate(kAllowed(0), expected_call_index); + + // Confirm exceptions are counted correctly. + GURL url1("https://example.com"); + GURL url2("http://example.com"); + GURL url3("http://another.example.com"); + content_settings->SetContentSettingDefaultScope( + url1, url1, ContentSettingsType::COOKIES, std::string(), + ContentSetting::CONTENT_SETTING_BLOCK); + expected_call_index += kContentSettingListenerIndex; + ValidateCookieSettingUpdate(kAllowed(1), expected_call_index); + + content_settings->SetContentSettingDefaultScope( + url2, url2, ContentSettingsType::COOKIES, std::string(), + ContentSetting::CONTENT_SETTING_ALLOW); + expected_call_index += kContentSettingListenerIndex; + ValidateCookieSettingUpdate(kAllowed(1), expected_call_index); + + content_settings->SetContentSettingDefaultScope( + url3, url3, ContentSettingsType::COOKIES, std::string(), + ContentSetting::CONTENT_SETTING_SESSION_ONLY); + expected_call_index += kContentSettingListenerIndex; + ValidateCookieSettingUpdate(kAllowed(1), expected_call_index); + + content_settings->SetDefaultContentSetting( + ContentSettingsType::COOKIES, ContentSetting::CONTENT_SETTING_BLOCK); + expected_call_index += kContentSettingListenerIndex; + ValidateCookieSettingUpdate(kBlocked(2), expected_call_index); +} + TEST_F(SiteSettingsHandlerTest, HandleGetFormattedBytes) { const double size = 120000000000; base::ListValue get_args;
diff --git a/chrome/browser/ui/webui/tab_strip/tab_strip_ui.cc b/chrome/browser/ui/webui/tab_strip/tab_strip_ui.cc index 6ed84d6..6fbcac6 100644 --- a/chrome/browser/ui/webui/tab_strip/tab_strip_ui.cc +++ b/chrome/browser/ui/webui/tab_strip/tab_strip_ui.cc
@@ -87,6 +87,8 @@ {"pipPlaying", IDS_TAB_AX_LABEL_PIP_PLAYING_FORMAT}, {"desktopCapturing", IDS_TAB_AX_LABEL_DESKTOP_CAPTURING_FORMAT}, {"vrPresenting", IDS_TAB_AX_LABEL_VR_PRESENTING}, + {"unnamedGroupLabel", IDS_GROUP_AX_LABEL_UNNAMED_GROUP_FORMAT}, + {"namedGroupLabel", IDS_GROUP_AX_LABEL_NAMED_GROUP_FORMAT}, }; AddLocalizedStringsBulk(html_source, kStrings); content::WebUIDataSource::Add(profile, html_source);
diff --git a/chrome/browser/upboarding/BUILD.gn b/chrome/browser/upboarding/BUILD.gn index 655ef82..b99fd14 100644 --- a/chrome/browser/upboarding/BUILD.gn +++ b/chrome/browser/upboarding/BUILD.gn
@@ -2,6 +2,17 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +if (is_android) { + import("//build/config/android/config.gni") + import("//build/config/android/rules.gni") +} + group("upboarding") { deps = [ "//chrome/browser/upboarding/query_tiles" ] } + +if (is_android) { + java_group("java") { + deps = [ "query_tiles:query_tiles_java" ] + } +}
diff --git a/chrome/browser/upboarding/query_tiles/BUILD.gn b/chrome/browser/upboarding/query_tiles/BUILD.gn index 02a22913..b41288c 100644 --- a/chrome/browser/upboarding/query_tiles/BUILD.gn +++ b/chrome/browser/upboarding/query_tiles/BUILD.gn
@@ -2,9 +2,89 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//build/config/android/config.gni") -import("//build/config/android/rules.gni") +if (is_android) { + import("//build/config/android/config.gni") + import("//build/config/android/rules.gni") +} -source_set("query_tiles") { - deps = [ "//chrome/browser/upboarding/query_tiles/internal" ] +if (is_android) { + java_group("query_tiles_java") { + deps = [ ":public_java" ] + } +} + +group("query_tiles") { + public_deps = [ ":public" ] + + deps = [ "internal" ] +} + +source_set("public") { + sources = [] + deps = [] + + if (is_android) { + sources += [ + "android/tile_provider_bridge.cc", + "android/tile_provider_bridge.h", + ] + + deps += [ ":jni_headers" ] + } +} + +if (is_android) { + android_library("public_java") { + sources = [ + "android/java/src/org/chromium/chrome/browser/query_tiles/Tile.java", + "android/java/src/org/chromium/chrome/browser/query_tiles/TileProvider.java", + "android/java/src/org/chromium/chrome/browser/query_tiles/bridges/TileProviderBridge.java", + "android/java/src/org/chromium/chrome/browser/query_tiles/list/QueryTileCoordinator.java", + "android/java/src/org/chromium/chrome/browser/query_tiles/list/TileListModel.java", + "android/java/src/org/chromium/chrome/browser/query_tiles/list/TileListProperties.java", + "android/java/src/org/chromium/chrome/browser/query_tiles/list/TileListPropertyViewBinder.java", + "android/java/src/org/chromium/chrome/browser/query_tiles/list/TileListView.java", + "android/java/src/org/chromium/chrome/browser/query_tiles/list/TileViewHolder.java", + ] + + deps = [ + ":chrome_upboarding_query_tiles_java_resources", + "//base:base_java", + "//base:jni_java", + "//third_party/android_deps:androidx_recyclerview_recyclerview_java", + "//ui/android:ui_java", + ] + + annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ] + } + + generate_jni("jni_headers") { + visibility = [ ":*" ] + + sources = [ "android/java/src/org/chromium/chrome/browser/query_tiles/bridges/TileProviderBridge.java" ] + } + + android_resources("chrome_upboarding_query_tiles_java_resources") { + resource_dirs = [ "android/java/res" ] + custom_package = "org.chromium.chrome.query_tiles" + } + + android_library("query_tiles_javatests") { + testonly = true + + sources = [ "android/javatests/src/org/chromium/chrome/browser/query_tiles/QueryTileSectionTest.java" ] + + deps = [ + ":public_java", + "//base:base_java", + "//base:base_java_test_support", + "//chrome/android:chrome_java", + "//chrome/android:chrome_test_util_java", + "//chrome/test/android:chrome_java_test_support", + "//third_party/espresso:espresso_all_java", + "//third_party/hamcrest:hamcrest_java", + "//third_party/junit", + "//third_party/mockito:mockito_java", + ] + } }
diff --git a/chrome/browser/upboarding/query_tiles/android/java/res/layout/query_tile_view.xml b/chrome/browser/upboarding/query_tiles/android/java/res/layout/query_tile_view.xml new file mode 100644 index 0000000..a0dcc21f --- /dev/null +++ b/chrome/browser/upboarding/query_tiles/android/java/res/layout/query_tile_view.xml
@@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright 2020 The Chromium Authors. All rights reserved. + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. --> +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="86dp" + android:layout_height="86dp" + android:orientation="vertical"> + <org.chromium.ui.widget.ChromeImageView + android:id="@+id/thumbnail" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_gravity="center_horizontal" + android:scaleType="centerCrop" + android:importantForAccessibility="no"/> + + <TextView + android:id="@+id/title" + android:layout_width="match_parent" + android:layout_height="wrap_content"/> +</LinearLayout>
diff --git a/chrome/browser/upboarding/query_tiles/android/java/src/org/chromium/chrome/browser/query_tiles/Tile.java b/chrome/browser/upboarding/query_tiles/android/java/src/org/chromium/chrome/browser/query_tiles/Tile.java new file mode 100644 index 0000000..dbdfa7c --- /dev/null +++ b/chrome/browser/upboarding/query_tiles/android/java/src/org/chromium/chrome/browser/query_tiles/Tile.java
@@ -0,0 +1,43 @@ +// Copyright 2020 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package org.chromium.chrome.browser.query_tiles; + +import androidx.annotation.VisibleForTesting; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +/** + * Class encapsulating data needed to render a query tile for the query sites section on the NTP. + */ +public class Tile { + /** The ID representing this tile. */ + public final String id; + + /** The text to be shown on this tile. */ + public final String displayTitle; + + /** The text to be shown in accessibility mode. */ + public final String accessibilityText; + + /** The string to be used for building a query when this tile is clicked. */ + public final String queryText; + + /** The next level tiles to be shown when this tile is clicked. */ + public final List<Tile> children; + + /** Constructor. */ + @VisibleForTesting + Tile(String id, String displayTitle, String accessibilityText, String queryText, + List<Tile> children) { + this.id = id; + this.displayTitle = displayTitle; + this.accessibilityText = accessibilityText; + this.queryText = queryText; + this.children = + Collections.unmodifiableList(children == null ? new ArrayList<>() : children); + } +}
diff --git a/chrome/browser/upboarding/query_tiles/android/java/src/org/chromium/chrome/browser/query_tiles/TileProvider.java b/chrome/browser/upboarding/query_tiles/android/java/src/org/chromium/chrome/browser/query_tiles/TileProvider.java new file mode 100644 index 0000000..8ca0b79 --- /dev/null +++ b/chrome/browser/upboarding/query_tiles/android/java/src/org/chromium/chrome/browser/query_tiles/TileProvider.java
@@ -0,0 +1,32 @@ +// Copyright 2020 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package org.chromium.chrome.browser.query_tiles; + +import android.graphics.Bitmap; + +import org.chromium.base.Callback; + +import java.util.List; + +/** + * Java interface for interacting with the native query tile service. Responsible for initializing + * and fetching data fo be shown on the UI. + */ +public interface TileProvider { + /** + * Called to retrieve all the tiles. + * @param callback The {@link Callback} to be notified on completion. Returns an empty list if + * no tiles are found. + */ + void getQueryTiles(Callback<List<Tile>> callback); + + /** + * Called to retrieve thumbnail for the given tile id. + * @param id The ID for a given tile. + * @param callback The {@link Callback} to be run after fetching the thumbnail. Returns null if + * no thumbnail was found. + */ + void getThumbnail(String id, Callback<Bitmap> callback); +} \ No newline at end of file
diff --git a/chrome/browser/upboarding/query_tiles/android/java/src/org/chromium/chrome/browser/query_tiles/bridges/TileProviderBridge.java b/chrome/browser/upboarding/query_tiles/android/java/src/org/chromium/chrome/browser/query_tiles/bridges/TileProviderBridge.java new file mode 100644 index 0000000..9fec4f1 --- /dev/null +++ b/chrome/browser/upboarding/query_tiles/android/java/src/org/chromium/chrome/browser/query_tiles/bridges/TileProviderBridge.java
@@ -0,0 +1,58 @@ +// Copyright 2020 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package org.chromium.chrome.browser.query_tiles.bridges; + +import android.graphics.Bitmap; + +import org.chromium.base.Callback; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; +import org.chromium.base.annotations.NativeMethods; +import org.chromium.chrome.browser.query_tiles.Tile; +import org.chromium.chrome.browser.query_tiles.TileProvider; + +import java.util.List; + +/** + * Bridge to the native query tile service for the given {@link Profile}. + */ +@JNINamespace("upboarding") +public class TileProviderBridge implements TileProvider { + private long mNativeTileProviderBridge; + + @CalledByNative + private static TileProviderBridge create(long nativePtr) { + return new TileProviderBridge(nativePtr); + } + + private TileProviderBridge(long nativePtr) { + mNativeTileProviderBridge = nativePtr; + } + + @CalledByNative + private void clearNativePtr() { + mNativeTileProviderBridge = 0; + } + + @Override + public void getQueryTiles(Callback<List<Tile>> callback) { + if (mNativeTileProviderBridge == 0) return; + TileProviderBridgeJni.get().getQueryTiles(mNativeTileProviderBridge, this, callback); + } + + @Override + public void getThumbnail(String id, Callback<Bitmap> callback) { + if (mNativeTileProviderBridge == 0) return; + TileProviderBridgeJni.get().getThumbnail(mNativeTileProviderBridge, this, id, callback); + } + + @NativeMethods + interface Natives { + void getQueryTiles(long nativeTileProviderBridge, TileProviderBridge caller, + Callback<List<Tile>> callback); + void getThumbnail(long nativeTileProviderBridge, TileProviderBridge caller, String id, + Callback<Bitmap> callback); + } +}
diff --git a/chrome/browser/upboarding/query_tiles/android/java/src/org/chromium/chrome/browser/query_tiles/list/QueryTileCoordinator.java b/chrome/browser/upboarding/query_tiles/android/java/src/org/chromium/chrome/browser/query_tiles/list/QueryTileCoordinator.java new file mode 100644 index 0000000..1c6553ea --- /dev/null +++ b/chrome/browser/upboarding/query_tiles/android/java/src/org/chromium/chrome/browser/query_tiles/list/QueryTileCoordinator.java
@@ -0,0 +1,55 @@ +// Copyright 2020 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package org.chromium.chrome.browser.query_tiles.list; + +import android.content.Context; +import android.graphics.Bitmap; +import android.view.View; + +import org.chromium.base.Callback; +import org.chromium.chrome.browser.query_tiles.Tile; +import org.chromium.chrome.browser.query_tiles.TileProvider; + +/** + * The top level coordinator for the query tiles UI. + */ +public class QueryTileCoordinator { + private final TileListModel mModel; + private final TileListView mView; + private final TileProvider mTileProvider; + private final Callback<Boolean> mVisibilityCallback; + + public QueryTileCoordinator( + Context context, TileProvider tileProvider, Callback<Boolean> visibilityCallback) { + mTileProvider = tileProvider; + mVisibilityCallback = visibilityCallback; + mModel = new TileListModel(); + mView = new TileListView(context, mModel); + + mModel.getProperties().set(TileListProperties.CLICK_CALLBACK, this::onQueryTileClicked); + mModel.getProperties().set(TileListProperties.VISUALS_CALLBACK, this::getVisuals); + onQueryTileClicked(null); + } + + /** @return The {@link View} that represents this coordinator. */ + public View getView() { + return mView.getView(); + } + + private void onQueryTileClicked(Tile tile) { + if (tile != null) { + mModel.set(tile.children); + } else { + mTileProvider.getQueryTiles(tiles -> { + mModel.set(tiles); + mVisibilityCallback.onResult(!tiles.isEmpty()); + }); + } + } + + private void getVisuals(Tile tile, Callback<Bitmap> callback) { + mTileProvider.getThumbnail(tile.id, callback); + } +}
diff --git a/chrome/browser/upboarding/query_tiles/android/java/src/org/chromium/chrome/browser/query_tiles/list/TileListModel.java b/chrome/browser/upboarding/query_tiles/android/java/src/org/chromium/chrome/browser/query_tiles/list/TileListModel.java new file mode 100644 index 0000000..78eded6 --- /dev/null +++ b/chrome/browser/upboarding/query_tiles/android/java/src/org/chromium/chrome/browser/query_tiles/list/TileListModel.java
@@ -0,0 +1,26 @@ +// Copyright 2020 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package org.chromium.chrome.browser.query_tiles.list; + +import org.chromium.chrome.browser.query_tiles.Tile; +import org.chromium.ui.modelutil.ListModel; +import org.chromium.ui.modelutil.PropertyModel; + +/** + * This model represents the data required to build a list UI around a set of {@link Tile}s. + * This includes (1) a {@link ListModel} implementation and (2) exposing a + * {@link PropertyModel} for shared item properties and general list information. + */ +class TileListModel extends ListModel<Tile> { + private final PropertyModel mListProperties = new PropertyModel(TileListProperties.ALL_KEYS); + + /** + * @return A {@link PropertyModel} instance, which is a set of shared properties for the + * list. + */ + public PropertyModel getProperties() { + return mListProperties; + } +}
diff --git a/chrome/browser/upboarding/query_tiles/android/java/src/org/chromium/chrome/browser/query_tiles/list/TileListProperties.java b/chrome/browser/upboarding/query_tiles/android/java/src/org/chromium/chrome/browser/query_tiles/list/TileListProperties.java new file mode 100644 index 0000000..02acd12 --- /dev/null +++ b/chrome/browser/upboarding/query_tiles/android/java/src/org/chromium/chrome/browser/query_tiles/list/TileListProperties.java
@@ -0,0 +1,37 @@ +// Copyright 2020 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package org.chromium.chrome.browser.query_tiles.list; + +import android.graphics.Bitmap; + +import org.chromium.base.Callback; +import org.chromium.chrome.browser.query_tiles.Tile; +import org.chromium.ui.modelutil.PropertyKey; +import org.chromium.ui.modelutil.PropertyModel.WritableObjectPropertyKey; + +/** + * The properties required to build a {@link Tile} which contain two types of properties: + * (1) A set of properties that act directly on the list view itself. (2) A set of + * properties that are effectively shared across all list items like callbacks. + */ +interface TileListProperties { + /** A helper interface to support retrieving {@link Bitmap} asynchronously. */ + @FunctionalInterface + interface VisualsProvider { + /** + * @param tile The {@link Tile} to get the {@link Bitmap} for. + * @param callback A {@link Callback} that will be notified on completion. + */ + void getVisuals(Tile tile, Callback<Bitmap> callback); + } + + /** The callback to run when a {@link Tile} is clicked on the UI. */ + WritableObjectPropertyKey<Callback<Tile>> CLICK_CALLBACK = new WritableObjectPropertyKey<>(); + + /** The provider to retrieve expensive visuals for a {@link Tile}. */ + WritableObjectPropertyKey<VisualsProvider> VISUALS_CALLBACK = new WritableObjectPropertyKey<>(); + + PropertyKey[] ALL_KEYS = new PropertyKey[] {CLICK_CALLBACK, VISUALS_CALLBACK}; +}
diff --git a/chrome/browser/upboarding/query_tiles/android/java/src/org/chromium/chrome/browser/query_tiles/list/TileListPropertyViewBinder.java b/chrome/browser/upboarding/query_tiles/android/java/src/org/chromium/chrome/browser/query_tiles/list/TileListPropertyViewBinder.java new file mode 100644 index 0000000..8a95e41 --- /dev/null +++ b/chrome/browser/upboarding/query_tiles/android/java/src/org/chromium/chrome/browser/query_tiles/list/TileListPropertyViewBinder.java
@@ -0,0 +1,19 @@ +// Copyright 2020 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package org.chromium.chrome.browser.query_tiles.list; + +import androidx.recyclerview.widget.RecyclerView; + +import org.chromium.ui.modelutil.PropertyKey; +import org.chromium.ui.modelutil.PropertyModel; +import org.chromium.ui.modelutil.PropertyModelChangeProcessor.ViewBinder; + +/** + * Binds the {@link TileListModel} with the {@link TileListView}. + */ +class TileListPropertyViewBinder implements ViewBinder<PropertyModel, RecyclerView, PropertyKey> { + @Override + public void bind(PropertyModel model, RecyclerView view, PropertyKey propertyKey) {} +} \ No newline at end of file
diff --git a/chrome/browser/upboarding/query_tiles/android/java/src/org/chromium/chrome/browser/query_tiles/list/TileListView.java b/chrome/browser/upboarding/query_tiles/android/java/src/org/chromium/chrome/browser/query_tiles/list/TileListView.java new file mode 100644 index 0000000..1be04cb --- /dev/null +++ b/chrome/browser/upboarding/query_tiles/android/java/src/org/chromium/chrome/browser/query_tiles/list/TileListView.java
@@ -0,0 +1,81 @@ +// Copyright 2020 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package org.chromium.chrome.browser.query_tiles.list; + +import android.content.Context; +import android.view.View; + +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import org.chromium.ui.modelutil.ForwardingListObservable; +import org.chromium.ui.modelutil.PropertyModelChangeProcessor; +import org.chromium.ui.modelutil.RecyclerViewAdapter; + +/** + * The View component of a query tiles. This takes the {@link TileListModel} and creates the + * glue to display it on the screen. + */ +class TileListView { + private final TileListModel mModel; + private final RecyclerView mView; + private final LinearLayoutManager mLayoutManager; + + /** Constructor. */ + public TileListView(Context context, TileListModel model) { + mModel = model; + mView = new RecyclerView(context); + mView.setHasFixedSize(true); + + mLayoutManager = new LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false); + mView.setLayoutManager(mLayoutManager); + + PropertyModelChangeProcessor.create( + mModel.getProperties(), mView, new TileListPropertyViewBinder()); + + RecyclerViewAdapter<TileViewHolder, Void> adapter = + new RecyclerViewAdapter<TileViewHolder, Void>( + new ModelChangeProcessor(mModel), TileViewHolder::create); + mView.setAdapter(adapter); + mView.post(adapter::notifyDataSetChanged); + } + + /** @return The Android {@link View} representing this widget. */ + public View getView() { + return mView; + } + + private static class ModelChangeProcessor extends ForwardingListObservable<Void> + implements RecyclerViewAdapter.Delegate<TileViewHolder, Void> { + private final TileListModel mModel; + + public ModelChangeProcessor(TileListModel model) { + mModel = model; + model.addObserver(this); + } + + @Override + public int getItemCount() { + return mModel.size(); + } + + @Override + public int getItemViewType(int position) { + return 0; + } + + @Override + public void onBindViewHolder( + TileViewHolder viewHolder, int position, @Nullable Void payload) { + viewHolder.bind(mModel.getProperties(), mModel.get(position)); + } + + @Override + public void onViewRecycled(TileViewHolder viewHolder) { + viewHolder.recycle(); + } + } +}
diff --git a/chrome/browser/upboarding/query_tiles/android/java/src/org/chromium/chrome/browser/query_tiles/list/TileViewHolder.java b/chrome/browser/upboarding/query_tiles/android/java/src/org/chromium/chrome/browser/query_tiles/list/TileViewHolder.java new file mode 100644 index 0000000..4a38387 --- /dev/null +++ b/chrome/browser/upboarding/query_tiles/android/java/src/org/chromium/chrome/browser/query_tiles/list/TileViewHolder.java
@@ -0,0 +1,59 @@ +// Copyright 2020 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package org.chromium.chrome.browser.query_tiles.list; + +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.recyclerview.widget.RecyclerView.ViewHolder; + +import org.chromium.chrome.browser.query_tiles.Tile; +import org.chromium.chrome.query_tiles.R; +import org.chromium.ui.modelutil.PropertyModel; + +/** + * A {@link ViewHolder} responsible for building and setting properties on the query tile views. + */ +class TileViewHolder extends ViewHolder { + /** Creates an instance of a {@link TileViewHolder}. */ + protected TileViewHolder(View itemView) { + super(itemView); + } + + /** + * Used as a method reference for ViewHolderFactory. + * @see RecyclerViewAdapter.ViewHolderFactory#createViewHolder + */ + public static TileViewHolder create(ViewGroup parent, int viewType) { + View view = LayoutInflater.from(parent.getContext()) + .inflate(R.layout.query_tile_view, parent, false); + return new TileViewHolder(view); + } + + /** + * Binds the currently held {@link View} to {@code item}. + * @param properties The shared {@link PropertyModel} all items can access. + * @param tile The {@link ListItem} to visually represent in this {@link ViewHolder}. + */ + public void bind(PropertyModel properties, Tile tile) { + TextView title = itemView.findViewById(R.id.title); + title.setText(tile.displayTitle); + itemView.setOnClickListener( + v -> { properties.get(TileListProperties.CLICK_CALLBACK).onResult(tile); }); + + final ImageView thumbnail = itemView.findViewById(R.id.thumbnail); + properties.get(TileListProperties.VISUALS_CALLBACK) + .getVisuals(tile, thumbnail::setImageBitmap); + } + + /** + * Gives subclasses a chance to free up expensive resources when this {@link ViewHolder} is no + * longer attached to the parent {@link RecyclerView}. + */ + public void recycle() {} +}
diff --git a/chrome/browser/upboarding/query_tiles/android/javatests/DEPS b/chrome/browser/upboarding/query_tiles/android/javatests/DEPS new file mode 100644 index 0000000..84ea19e --- /dev/null +++ b/chrome/browser/upboarding/query_tiles/android/javatests/DEPS
@@ -0,0 +1,5 @@ +specific_include_rules = { + 'QueryTileSectionTest\.java': [ + "+chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java", + ], +}
diff --git a/chrome/browser/upboarding/query_tiles/android/javatests/src/org/chromium/chrome/browser/query_tiles/QueryTileSectionTest.java b/chrome/browser/upboarding/query_tiles/android/javatests/src/org/chromium/chrome/browser/query_tiles/QueryTileSectionTest.java new file mode 100644 index 0000000..0c4c009 --- /dev/null +++ b/chrome/browser/upboarding/query_tiles/android/javatests/src/org/chromium/chrome/browser/query_tiles/QueryTileSectionTest.java
@@ -0,0 +1,81 @@ +// Copyright 2020 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package org.chromium.chrome.browser.query_tiles; + +import static android.support.test.espresso.Espresso.onView; +import static android.support.test.espresso.assertion.ViewAssertions.matches; +import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed; +import static android.support.test.espresso.matcher.ViewMatchers.withId; + +import android.graphics.Bitmap; +import android.support.test.filters.SmallTest; + +import org.junit.After; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; + +import org.chromium.base.Callback; +import org.chromium.base.test.util.CommandLineFlags; +import org.chromium.chrome.R; +import org.chromium.chrome.browser.flags.ChromeFeatureList; +import org.chromium.chrome.browser.flags.ChromeSwitches; +import org.chromium.chrome.browser.tab.Tab; +import org.chromium.chrome.test.ChromeJUnit4ClassRunner; +import org.chromium.chrome.test.ChromeTabbedActivityTestRule; +import org.chromium.chrome.test.util.NewTabPageTestUtils; +import org.chromium.chrome.test.util.browser.Features; + +import java.util.ArrayList; +import java.util.List; + +/** + * Tests for the query tiles section on new tab page. + */ +@RunWith(ChromeJUnit4ClassRunner.class) +@CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE}) +public class QueryTileSectionTest { + @Rule + public ChromeTabbedActivityTestRule mActivityTestRule = new ChromeTabbedActivityTestRule(); + + @Before + public void setUp() { + TileProviderFactory.setTileProviderForTesting(new TestTileProvider()); + mActivityTestRule.startMainActivityOnBlankPage(); + mActivityTestRule.loadUrl("chrome-native://newtab/"); + Tab tab = mActivityTestRule.getActivity().getActivityTab(); + NewTabPageTestUtils.waitForNtpLoaded(tab); + } + + @After + public void tearDown() {} + + @Test + @SmallTest + @Features.EnableFeatures(ChromeFeatureList.QUERY_TILES) + public void testSimpleTest() throws Exception { + onView(withId(R.id.query_tiles)).check(matches(isDisplayed())); + } + + private static class TestTileProvider implements TileProvider { + private List<Tile> mTiles = new ArrayList<>(); + + private TestTileProvider() { + Tile tile = new Tile("1", "Tile 1", "Tile 1", "Tile 1", null); + mTiles.add(tile); + } + + @Override + public void getQueryTiles(Callback<List<Tile>> callback) { + callback.onResult(mTiles); + } + + @Override + public void getThumbnail(String id, Callback<Bitmap> callback) { + callback.onResult(null); + } + } +}
diff --git a/chrome/browser/upboarding/query_tiles/android/tile_provider_bridge.cc b/chrome/browser/upboarding/query_tiles/android/tile_provider_bridge.cc new file mode 100644 index 0000000..b019a0ec --- /dev/null +++ b/chrome/browser/upboarding/query_tiles/android/tile_provider_bridge.cc
@@ -0,0 +1,33 @@ +// Copyright 2020 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "chrome/browser/upboarding/query_tiles/android/tile_provider_bridge.h" + +#include "chrome/browser/upboarding/query_tiles/jni_headers/TileProviderBridge_jni.h" + +namespace upboarding { + +TileProviderBridge::TileProviderBridge() { + JNIEnv* env = base::android::AttachCurrentThread(); + java_obj_.Reset( + env, Java_TileProviderBridge_create(env, reinterpret_cast<int64_t>(this)) + .obj()); +} + +TileProviderBridge::~TileProviderBridge() { + JNIEnv* env = base::android::AttachCurrentThread(); + Java_TileProviderBridge_clearNativePtr(env, java_obj_); +} + +void TileProviderBridge::GetQueryTiles(JNIEnv* env, + const JavaParamRef<jobject>& jcaller, + const JavaParamRef<jobject>& jcallback) { +} + +void TileProviderBridge::GetThumbnail(JNIEnv* env, + const JavaParamRef<jobject>& jcaller, + const JavaParamRef<jstring>& jid, + const JavaParamRef<jobject>& jcallback) {} + +} // namespace upboarding
diff --git a/chrome/browser/upboarding/query_tiles/android/tile_provider_bridge.h b/chrome/browser/upboarding/query_tiles/android/tile_provider_bridge.h new file mode 100644 index 0000000..aa7fbef5 --- /dev/null +++ b/chrome/browser/upboarding/query_tiles/android/tile_provider_bridge.h
@@ -0,0 +1,43 @@ +// Copyright 2020 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef CHROME_BROWSER_UPBOARDING_QUERY_TILES_ANDROID_TILE_PROVIDER_BRIDGE_H_ +#define CHROME_BROWSER_UPBOARDING_QUERY_TILES_ANDROID_TILE_PROVIDER_BRIDGE_H_ + +#include "base/android/jni_android.h" + +using base::android::JavaParamRef; +using base::android::JavaRef; +using base::android::ScopedJavaGlobalRef; +using base::android::ScopedJavaLocalRef; + +namespace upboarding { + +// Helper class responsible for bridging the TileProvider between C++ and Java. +class TileProviderBridge { + public: + TileProviderBridge(); + ~TileProviderBridge(); + + // Methods called from Java via JNI. + void GetQueryTiles(JNIEnv* env, + const JavaParamRef<jobject>& jcaller, + const JavaParamRef<jobject>& jcallback); + + void GetThumbnail(JNIEnv* env, + const JavaParamRef<jobject>& jcaller, + const JavaParamRef<jstring>& jid, + const JavaParamRef<jobject>& jcallback); + + private: + // A reference to the Java counterpart of this class. See + // TileProviderBridge.java. + ScopedJavaGlobalRef<jobject> java_obj_; + + DISALLOW_COPY_AND_ASSIGN(TileProviderBridge); +}; + +} // namespace upboarding + +#endif // CHROME_BROWSER_UPBOARDING_QUERY_TILES_ANDROID_TILE_PROVIDER_BRIDGE_H_
diff --git a/chrome/browser/upboarding/query_tiles/android/tile_provider_factory.cc b/chrome/browser/upboarding/query_tiles/android/tile_provider_factory.cc new file mode 100644 index 0000000..954fc97 --- /dev/null +++ b/chrome/browser/upboarding/query_tiles/android/tile_provider_factory.cc
@@ -0,0 +1,27 @@ +// Copyright 2020 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "base/android/jni_android.h" +#include "chrome/android/chrome_jni_headers/TileProviderFactory_jni.h" +#include "chrome/browser/profiles/profile.h" +#include "chrome/browser/profiles/profile_android.h" +#include "chrome/browser/profiles/profile_key.h" + +// Takes a Java Profile and returns a Java TileProvider. +static base::android::ScopedJavaLocalRef<jobject> +JNI_TileProviderFactory_GetForProfile( + JNIEnv* env, + const base::android::JavaParamRef<jobject>& j_profile) { + Profile* profile = ProfileAndroid::FromProfileAndroid(j_profile); + ProfileKey* profile_key = profile->GetProfileKey(); + + // Return null if there is no reasonable context for the provided Java + // profile. + if (profile_key == nullptr) + return base::android::ScopedJavaLocalRef<jobject>(); + + // TODO(shaktisahu): Get TileProviderBridge. + + return base::android::ScopedJavaLocalRef<jobject>(); +}
diff --git a/chrome/browser/upboarding/query_tiles/internal/BUILD.gn b/chrome/browser/upboarding/query_tiles/internal/BUILD.gn index 0cb9a0b..d03cd4a 100644 --- a/chrome/browser/upboarding/query_tiles/internal/BUILD.gn +++ b/chrome/browser/upboarding/query_tiles/internal/BUILD.gn
@@ -2,11 +2,12 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +if (is_android) { + import("//build/config/android/config.gni") + import("//build/config/android/rules.gni") +} + source_set("internal") { - visibility = [ - ":*", - "//chrome/browser/upboarding/query_tiles:*", - ] sources = [ "image_loader.cc", "image_loader.h", @@ -14,6 +15,7 @@ deps = [ "//base", + "//chrome/browser/upboarding/query_tiles:public", "//skia", "//url", ]
diff --git a/chrome/browser/web_applications/BUILD.gn b/chrome/browser/web_applications/BUILD.gn index bc74ef1..34d1f7e 100644 --- a/chrome/browser/web_applications/BUILD.gn +++ b/chrome/browser/web_applications/BUILD.gn
@@ -242,6 +242,10 @@ "//chrome/test:test_support_ui", "//components/permissions:permissions", ] + + if (is_chromeos) { + deps += [ "//chrome/browser/ui" ] + } } # TODO(crbug.com/877898): Erase this and move WebAppProvider into
diff --git a/chrome/browser/web_applications/components/file_handler_manager.cc b/chrome/browser/web_applications/components/file_handler_manager.cc index 3ec833b..b39dd2f 100644 --- a/chrome/browser/web_applications/components/file_handler_manager.cc +++ b/chrome/browser/web_applications/components/file_handler_manager.cc
@@ -20,6 +20,21 @@ namespace web_app { +namespace { +// Use a large double that can be safely saved in prefs, and be safely +// represented in JS timestamp (milliseconds from epoch). base::Time::Max() does +// not work here, it returns +Infinity (which is invalid and can not be +// represented in JSON). +// +// This value is `floor((2^53 - 1) / 1000)` because base::Time::FromDoubleT() +// accepts time offset in seconds. In reality, it means 287396-10-12 08:58:59 +// UTC, which is a long distant future (long after File Handling goes out of +// origin trial or be deprecated). +// +// Do not change this value, because it is persisted to disk. +const double kMaxOriginTrialExpiryTime = 9007199254740; +} // namespace + bool FileHandlerManager::disable_automatic_file_handler_cleanup_for_testing_ = false; @@ -109,11 +124,29 @@ DCHECK(expiry_service); auto* raw = expiry_service.get(); + + // Here we need to pass the |expiry_service| Mojom remote interface, so it is + // not destroyed before we get a reply. raw->RequestOriginTrialExpiryTime(base::BindOnce( &FileHandlerManager::OnOriginTrialExpiryTimeReceived, weak_ptr_factory_.GetWeakPtr(), std::move(expiry_service), app_id)); } +void FileHandlerManager::ForceEnableFileHandlingOriginTrial( + const AppId& app_id) { + UpdateFileHandlersForOriginTrialExpiryTime( + app_id, base::Time::FromDoubleT(kMaxOriginTrialExpiryTime)); +} + +void FileHandlerManager::DisableForceEnabledFileHandlingOriginTrial( + const AppId& app_id) { + double pref_expiry_time = GetDoubleWebAppPref( + profile()->GetPrefs(), app_id, kFileHandlingOriginTrialExpiryTime); + if (pref_expiry_time == kMaxOriginTrialExpiryTime) { + UpdateFileHandlersForOriginTrialExpiryTime(app_id, base::Time()); + } +} + const std::vector<apps::FileHandlerInfo>* FileHandlerManager::GetEnabledFileHandlers(const AppId& app_id) { if (AreFileHandlersEnabled(app_id) && IsFileHandlingAPIAvailable(app_id)) @@ -137,6 +170,12 @@ mojo::AssociatedRemote<blink::mojom::FileHandlingExpiry> /*interface*/, const AppId& app_id, base::Time expiry_time) { + UpdateFileHandlersForOriginTrialExpiryTime(app_id, expiry_time); +} + +void FileHandlerManager::UpdateFileHandlersForOriginTrialExpiryTime( + const AppId& app_id, + const base::Time& expiry_time) { web_app::UpdateDoubleWebAppPref(profile_->GetPrefs(), app_id, kFileHandlingOriginTrialExpiryTime, expiry_time.ToDoubleT());
diff --git a/chrome/browser/web_applications/components/file_handler_manager.h b/chrome/browser/web_applications/components/file_handler_manager.h index 6f24b66..6e6a859 100644 --- a/chrome/browser/web_applications/components/file_handler_manager.h +++ b/chrome/browser/web_applications/components/file_handler_manager.h
@@ -78,6 +78,14 @@ void UpdateFileHandlingOriginTrialExpiry(content::WebContents* web_contents, const AppId& app_id); + // Force enables File Handling origin trial. This will register the App's file + // handlers even if the App does not have a valid origin trial token. + void ForceEnableFileHandlingOriginTrial(const AppId& app_id); + + // Disable a force enabled File Handling origin trial. This will unregister + // App's file handlers. + void DisableForceEnabledFileHandlingOriginTrial(const AppId& app_id); + // Gets all enabled file handlers for |app_id|. |nullptr| if the app has no // enabled file handlers. Note: The lifetime of the file handlers are tied to // the app they belong to. @@ -115,6 +123,10 @@ const AppId& app_id, base::Time expiry_time); + void UpdateFileHandlersForOriginTrialExpiryTime( + const AppId& app_id, + const base::Time& expiry_time); + // Removes file handlers whose origin trials have expired (assuming // kFileHandlingAPI isn't enabled). Returns the number of apps that had file // handlers unregistered, for use in tests.
diff --git a/chrome/browser/web_applications/extensions/system_web_app_manager_unittest.cc b/chrome/browser/web_applications/extensions/system_web_app_manager_unittest.cc index 826947c..e80838b 100644 --- a/chrome/browser/web_applications/extensions/system_web_app_manager_unittest.cc +++ b/chrome/browser/web_applications/extensions/system_web_app_manager_unittest.cc
@@ -17,6 +17,7 @@ #include "chrome/browser/web_applications/components/pending_app_manager.h" #include "chrome/browser/web_applications/components/web_app_constants.h" #include "chrome/browser/web_applications/test/test_app_registrar.h" +#include "chrome/browser/web_applications/test/test_file_handler_manager.h" #include "chrome/browser/web_applications/test/test_pending_app_manager.h" #include "chrome/browser/web_applications/test/test_system_web_app_manager.h" #include "chrome/browser/web_applications/test/test_web_app_provider.h" @@ -88,6 +89,11 @@ test_pending_app_manager_ = test_pending_app_manager.get(); provider->SetPendingAppManager(std::move(test_pending_app_manager)); + auto test_file_handler_manager = + std::make_unique<TestFileHandlerManager>(profile()); + test_file_handler_manager_ = test_file_handler_manager.get(); + provider->SetFileHandlerManager(std::move(test_file_handler_manager)); + auto system_web_app_manager = std::make_unique<TestSystemWebAppManager>(profile()); system_web_app_manager_ = system_web_app_manager.get(); @@ -124,6 +130,7 @@ base::test::ScopedFeatureList scoped_feature_list_; TestAppRegistrar* test_app_registrar_ = nullptr; TestPendingAppManager* test_pending_app_manager_ = nullptr; + TestFileHandlerManager* test_file_handler_manager_ = nullptr; TestSystemWebAppManager* system_web_app_manager_ = nullptr; TestWebAppUiManager* ui_manager_ = nullptr;
diff --git a/chrome/browser/web_applications/system_web_app_manager.cc b/chrome/browser/web_applications/system_web_app_manager.cc index 9635be78..3bab8730 100644 --- a/chrome/browser/web_applications/system_web_app_manager.cc +++ b/chrome/browser/web_applications/system_web_app_manager.cc
@@ -19,6 +19,7 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/web_applications/components/app_registrar.h" +#include "chrome/browser/web_applications/components/file_handler_manager.h" #include "chrome/browser/web_applications/components/web_app_constants.h" #include "chrome/browser/web_applications/components/web_app_install_utils.h" #include "chrome/browser/web_applications/components/web_app_ui_manager.h" @@ -51,6 +52,10 @@ namespace { +// Copy the origin trial name from runtime_enabled_features.json5, to avoid +// complex dependencies. +const char kFileHandlingOriginTrial[] = "FileHandling"; + // Use #if defined to avoid compiler error on unused function. #if defined(OS_CHROMEOS) && !defined(OFFICIAL_BUILD) @@ -117,6 +122,7 @@ infos.emplace(SystemAppType::MEDIA, SystemAppInfo("Media", GURL("chrome://media-app/pwa.html"))); infos.at(SystemAppType::MEDIA).include_launch_directory = true; + infos.at(SystemAppType::MEDIA).show_in_launcher = false; } if (SystemWebAppManager::IsAppEnabled(SystemAppType::PRINT_MANAGEMENT)) { @@ -238,12 +244,15 @@ shutting_down_ = true; } -void SystemWebAppManager::SetSubsystems(PendingAppManager* pending_app_manager, - AppRegistrar* registrar, - WebAppUiManager* ui_manager) { +void SystemWebAppManager::SetSubsystems( + PendingAppManager* pending_app_manager, + AppRegistrar* registrar, + WebAppUiManager* ui_manager, + FileHandlerManager* file_handler_manager) { pending_app_manager_ = pending_app_manager; registrar_ = registrar; ui_manager_ = ui_manager; + file_handler_manager_ = file_handler_manager; } void SystemWebAppManager::Start() { @@ -358,6 +367,13 @@ return &iter_trials->second; } +bool SystemWebAppManager::AppHasFileHandlingOriginTrial(SystemAppType type) { + const auto& info = system_app_infos_.at(type); + const std::vector<std::string>* trials = + GetEnabledOriginTrials(type, info.install_url); + return trials && base::Contains(*trials, kFileHandlingOriginTrial); +} + void SystemWebAppManager::OnReadyToCommitNavigation( const AppId& app_id, content::NavigationHandle* navigation_handle) { @@ -486,6 +502,23 @@ const base::TimeTicks& install_start_time, std::map<GURL, InstallResultCode> install_results, std::map<GURL, bool> uninstall_results) { + // TODO(crbug.com/1053371): Clean up File Handler install. We install SWA file + // handlers here, because the code that registers file handlers for regular + // Web Apps, does not run when for apps installed in the background. + for (const auto& it : system_app_infos_) { + const SystemAppType& type = it.first; + base::Optional<AppId> app_id = GetAppIdForSystemApp(type); + if (!app_id) + continue; + + if (AppHasFileHandlingOriginTrial(type)) { + file_handler_manager_->ForceEnableFileHandlingOriginTrial(app_id.value()); + } else { + file_handler_manager_->DisableForceEnabledFileHandlingOriginTrial( + app_id.value()); + } + } + const base::TimeDelta install_duration = install_start_time - base::TimeTicks::Now();
diff --git a/chrome/browser/web_applications/system_web_app_manager.h b/chrome/browser/web_applications/system_web_app_manager.h index d00a0337..f628fca 100644 --- a/chrome/browser/web_applications/system_web_app_manager.h +++ b/chrome/browser/web_applications/system_web_app_manager.h
@@ -38,6 +38,7 @@ namespace web_app { class WebAppUiManager; +class FileHandlerManager; // An enum that lists the different System Apps that exist. Can be used to // retrieve the App ID from the underlying Web App system. @@ -121,7 +122,8 @@ void SetSubsystems(PendingAppManager* pending_app_manager, AppRegistrar* registrar, - WebAppUiManager* ui_manager); + WebAppUiManager* ui_manager, + FileHandlerManager* file_handler_manager); void Start(); @@ -198,6 +200,8 @@ const std::vector<std::string>* GetEnabledOriginTrials(SystemAppType type, const GURL& url); + bool AppHasFileHandlingOriginTrial(SystemAppType type); + void OnAppsSynchronized(const base::TimeTicks& install_start_time, std::map<GURL, InstallResultCode> install_results, std::map<GURL, bool> uninstall_results); @@ -230,6 +234,8 @@ WebAppUiManager* ui_manager_ = nullptr; + FileHandlerManager* file_handler_manager_ = nullptr; + base::WeakPtrFactory<SystemWebAppManager> weak_ptr_factory_{this}; DISALLOW_COPY_AND_ASSIGN(SystemWebAppManager);
diff --git a/chrome/browser/web_applications/system_web_app_manager_browsertest.cc b/chrome/browser/web_applications/system_web_app_manager_browsertest.cc index 757f3db..8962418d 100644 --- a/chrome/browser/web_applications/system_web_app_manager_browsertest.cc +++ b/chrome/browser/web_applications/system_web_app_manager_browsertest.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/web_applications/system_web_app_manager_browsertest.h" #include <string> +#include <tuple> #include <utility> #include <vector> @@ -41,14 +42,18 @@ #include "third_party/blink/public/common/features.h" #include "url/gurl.h" +#if defined(OS_CHROMEOS) +#include "chrome/browser/ui/app_list/app_list_client_impl.h" +#include "chrome/browser/ui/app_list/app_list_model_updater.h" +#include "chrome/browser/ui/app_list/extension_app_item.h" +#include "chrome/browser/ui/app_list/test/chrome_app_list_test_support.h" +#endif + namespace web_app { SystemWebAppManagerBrowserTestBase::SystemWebAppManagerBrowserTestBase( bool install_mock) { - scoped_feature_list_.InitWithFeatures( - {features::kSystemWebApps, blink::features::kNativeFileSystemAPI, - blink::features::kFileHandlingAPI}, - {}); + scoped_feature_list_.InitWithFeatures({features::kSystemWebApps}, {}); if (install_mock) { maybe_installation_ = TestSystemWebAppInstallation::SetUpStandaloneSingleWindowApp(); @@ -74,6 +79,11 @@ } else { GetManager().InstallSystemAppsForTesting(); } + // Ensure apps are registered with the |AppService| and populated in + // |AppListModel|. + apps::AppServiceProxy* proxy = + apps::AppServiceProxyFactory::GetForProfile(browser()->profile()); + proxy->FlushMojoCallsForTesting(); } content::WebContents* @@ -193,10 +203,54 @@ EXPECT_TRUE(app_browser->app_controller()->ShouldShowCustomTabBar()); } +class SystemWebAppManagerFileHandlingBrowserTestBase + : public SystemWebAppManagerBrowserTestBase, + public testing::WithParamInterface<std::tuple<bool, bool>> { + public: + using IncludeLaunchDirectory = + TestSystemWebAppInstallation::IncludeLaunchDirectory; + explicit SystemWebAppManagerFileHandlingBrowserTestBase( + IncludeLaunchDirectory include_launch_directory) + : SystemWebAppManagerBrowserTestBase(/*install_mock=*/false) { + bool enable_origin_scoped_permission_context; + bool enable_desktop_pwas_without_extensions; + std::tie(enable_origin_scoped_permission_context, + enable_desktop_pwas_without_extensions) = GetParam(); + + scoped_feature_permission_context_.InitWithFeatureState( + features::kNativeFileSystemOriginScopedPermissions, + enable_origin_scoped_permission_context); + scoped_feature_web_app_provider_type_.InitWithFeatureState( + features::kDesktopPWAsWithoutExtensions, + enable_desktop_pwas_without_extensions); + scoped_feature_blink_api_.InitWithFeatures( + {blink::features::kNativeFileSystemAPI, + blink::features::kFileHandlingAPI}, + {}); + + maybe_installation_ = + TestSystemWebAppInstallation::SetUpAppThatReceivesLaunchFiles( + include_launch_directory); + } + + private: + base::test::ScopedFeatureList scoped_feature_permission_context_; + base::test::ScopedFeatureList scoped_feature_web_app_provider_type_; + base::test::ScopedFeatureList scoped_feature_blink_api_; +}; + +class SystemWebAppManagerLaunchFilesBrowserTest + : public SystemWebAppManagerFileHandlingBrowserTestBase { + public: + SystemWebAppManagerLaunchFilesBrowserTest() + : SystemWebAppManagerFileHandlingBrowserTestBase( + IncludeLaunchDirectory::kNo) {} +}; + // Check launch files are passed to application. // Note: This test uses ExecuteScriptXXX instead of ExecJs and EvalJs because of // some quirks surrounding origin trials and content security policies. -IN_PROC_BROWSER_TEST_P(SystemWebAppManagerBrowserTest, +IN_PROC_BROWSER_TEST_P(SystemWebAppManagerLaunchFilesBrowserTest, LaunchFilesForSystemWebApp) { WaitForTestSystemAppInstall(); apps::AppLaunchParams params = LaunchParamsForApp(GetMockAppType()); @@ -271,26 +325,19 @@ EXPECT_EQ(temp_file_path2.BaseName().AsUTF8Unsafe(), file_name); } -class SystemWebAppManagerLaunchFilesBrowserTest - : public SystemWebAppManagerBrowserTestBase, - public testing::WithParamInterface<std::vector<base::Feature>> { +class SystemWebAppManagerLaunchDirectoryBrowserTest + : public SystemWebAppManagerFileHandlingBrowserTestBase { public: - SystemWebAppManagerLaunchFilesBrowserTest() - : SystemWebAppManagerBrowserTestBase(/*install_mock=*/false) { - scoped_feature_list_.InitWithFeatures(GetParam(), {}); - maybe_installation_ = - TestSystemWebAppInstallation::SetUpAppThatReceivesLaunchDirectory(); - } - - private: - base::test::ScopedFeatureList scoped_feature_list_; + SystemWebAppManagerLaunchDirectoryBrowserTest() + : SystemWebAppManagerFileHandlingBrowserTestBase( + IncludeLaunchDirectory::kYes) {} }; // Launching behavior for apps that do not want to received launch directory are // tested in |SystemWebAppManagerBrowserTestBase.LaunchFilesForSystemWebApp|. // Note: This test uses ExecuteScriptXXX instead of ExecJs and EvalJs because of // some quirks surrounding origin trials and content security policies. -IN_PROC_BROWSER_TEST_P(SystemWebAppManagerLaunchFilesBrowserTest, +IN_PROC_BROWSER_TEST_P(SystemWebAppManagerLaunchDirectoryBrowserTest, LaunchDirectoryForSystemWebApp) { WaitForTestSystemAppInstall(); apps::AppLaunchParams params = LaunchParamsForApp(GetMockAppType()); @@ -456,6 +503,58 @@ EXPECT_FALSE(base::PathExists(temp_file_path2)); } +class SystemWebAppManagerFileHandlingOriginTrialsBrowserTest + : public SystemWebAppManagerBrowserTest { + public: + SystemWebAppManagerFileHandlingOriginTrialsBrowserTest() + : SystemWebAppManagerBrowserTest(/*install_mock=*/false) { + maybe_installation_ = + TestSystemWebAppInstallation::SetUpAppWithEnabledOriginTrials( + OriginTrialsMap({{GetOrigin(GURL("chrome://test-system-app/")), + {"NativeFileSystem2", "FileHandling"}}})); + } + + ~SystemWebAppManagerFileHandlingOriginTrialsBrowserTest() override = default; + + private: + url::Origin GetOrigin(const GURL& url) { return url::Origin::Create(url); } +}; + +IN_PROC_BROWSER_TEST_P(SystemWebAppManagerFileHandlingOriginTrialsBrowserTest, + FileHandlingWorks) { + WaitForTestSystemAppInstall(); + apps::AppLaunchParams params = LaunchParamsForApp(GetMockAppType()); + params.source = apps::mojom::AppLaunchSource::kSourceChromeInternal; + + base::ScopedAllowBlockingForTesting allow_blocking; + base::ScopedTempDir temp_directory; + ASSERT_TRUE(temp_directory.CreateUniqueTempDir()); + base::FilePath temp_file_path; + ASSERT_TRUE(base::CreateTemporaryFileInDir(temp_directory.GetPath(), + &temp_file_path)); + + const GURL& launch_url = WebAppProvider::Get(browser()->profile()) + ->registrar() + .GetAppLaunchURL(params.app_id); + + params.launch_files = {temp_file_path}; + content::TestNavigationObserver navigation_observer(launch_url); + navigation_observer.StartWatchingNewWebContents(); + content::WebContents* web_contents = + apps::LaunchService::Get(browser()->profile())->OpenApplication(params); + navigation_observer.Wait(); + + // Wait for the Promise to resolve. + bool promise_resolved = false; + EXPECT_TRUE(content::ExecuteScriptAndExtractBool( + web_contents, + "launchQueue.setConsumer(launchParams => {" + " domAutomationController.send(true);" + "});", + &promise_resolved)); + EXPECT_TRUE(promise_resolved); +} + class SystemWebAppManagerNotShownInLauncherTest : public SystemWebAppManagerBrowserTest { public: @@ -484,6 +583,26 @@ EXPECT_EQ(apps::mojom::OptionalBool::kFalse, update.ShowInLauncher()); } }); + // OS Integration only relevant for Chrome OS. +#if defined(OS_CHROMEOS) + // The |AppList| should have all apps visible in the launcher, apps get + // removed from the |AppList| when they are hidden. + AppListClientImpl* client = AppListClientImpl::GetInstance(); + ASSERT_TRUE(client); + AppListModelUpdater* model_updater = test::GetModelUpdater(client); + const ChromeAppListItem* mock_app = model_updater->FindItem(app_id); + // |mock_app| shouldn't be found in |AppList| because it should be hidden in + // launcher. + if (provider == ProviderType::kWebApps) { + // TODO(crbug.com/877898): |mock_app| should be hidden but web_apps.cc does + // not currently read from system_web_app_manager.cc. When + // DesktopPWAsWithoutExtensions launches this should change to + // EXPECT_FALSE(). + EXPECT_TRUE(mock_app); + } else { + EXPECT_FALSE(mock_app); + } +#endif // defined(OS_CHROMEOS) } class SystemWebAppManagerAdditionalSearchTermsTest @@ -720,19 +839,18 @@ ProviderTypeParamToString); INSTANTIATE_TEST_SUITE_P( - PermissionContext, + All, SystemWebAppManagerLaunchFilesBrowserTest, - testing::Values( - /*default_enabled_permission_context*/ std::vector<base::Feature>(), - /*origin_scoped_permission_context*/ - std::vector<base::Feature>( - {features::kNativeFileSystemOriginScopedPermissions}), - /*default_enabled_permission_context*/ - std::vector<base::Feature>({features::kDesktopPWAsWithoutExtensions}), - /*origin_scoped_permission_context*/ - std::vector<base::Feature>( - {features::kNativeFileSystemOriginScopedPermissions, - features::kDesktopPWAsWithoutExtensions}))); + testing::Combine( + /* enable_origin_scoped_permission_context */ testing::Bool(), + /* enable_pwas_without_extensions */ testing::Bool())); + +INSTANTIATE_TEST_SUITE_P( + All, + SystemWebAppManagerLaunchDirectoryBrowserTest, + testing::Combine( + /* enable_origin_scoped_permission_context */ testing::Bool(), + /* enable_desktop_pwas_without_extensions */ testing::Bool())); INSTANTIATE_TEST_SUITE_P(All, SystemWebAppManagerNotShownInLauncherTest, @@ -758,4 +876,10 @@ ProviderType::kWebApps), ProviderTypeParamToString); +INSTANTIATE_TEST_SUITE_P(All, + SystemWebAppManagerFileHandlingOriginTrialsBrowserTest, + ::testing::Values(ProviderType::kBookmarkApps, + ProviderType::kWebApps), + ProviderTypeParamToString); + } // namespace web_app
diff --git a/chrome/browser/web_applications/test/test_system_web_app_installation.cc b/chrome/browser/web_applications/test/test_system_web_app_installation.cc index 8cef8e8..4179172 100644 --- a/chrome/browser/web_applications/test/test_system_web_app_installation.cc +++ b/chrome/browser/web_applications/test/test_system_web_app_installation.cc
@@ -125,10 +125,16 @@ // static std::unique_ptr<TestSystemWebAppInstallation> -TestSystemWebAppInstallation::SetUpAppThatReceivesLaunchDirectory() { +TestSystemWebAppInstallation::SetUpAppThatReceivesLaunchFiles( + IncludeLaunchDirectory include_launch_directory) { SystemAppInfo media_system_app_info( "Media", GURL("chrome://test-system-app/pwa.html")); - media_system_app_info.include_launch_directory = true; + + if (include_launch_directory == IncludeLaunchDirectory::kYes) + media_system_app_info.include_launch_directory = true; + else + media_system_app_info.include_launch_directory = false; + return base::WrapUnique(new TestSystemWebAppInstallation( SystemAppType::MEDIA, media_system_app_info)); }
diff --git a/chrome/browser/web_applications/test/test_system_web_app_installation.h b/chrome/browser/web_applications/test/test_system_web_app_installation.h index 99a59da1..4325b99 100644 --- a/chrome/browser/web_applications/test/test_system_web_app_installation.h +++ b/chrome/browser/web_applications/test/test_system_web_app_installation.h
@@ -22,12 +22,15 @@ // WaitForAppInstall() to finish the installation. class TestSystemWebAppInstallation { public: + enum IncludeLaunchDirectory { kYes, kNo }; + static std::unique_ptr<TestSystemWebAppInstallation> SetUpTabbedMultiWindowApp(); static std::unique_ptr<TestSystemWebAppInstallation> SetUpStandaloneSingleWindowApp(); static std::unique_ptr<TestSystemWebAppInstallation> - SetUpAppThatReceivesLaunchDirectory(); + SetUpAppThatReceivesLaunchFiles( + IncludeLaunchDirectory include_launch_directory); static std::unique_ptr<TestSystemWebAppInstallation> SetUpAppWithEnabledOriginTrials(const OriginTrialsMap& origin_to_trials); static std::unique_ptr<TestSystemWebAppInstallation>
diff --git a/chrome/browser/web_applications/web_app_install_manager.cc b/chrome/browser/web_applications/web_app_install_manager.cc index 5e3dcfd5..a5e39f8 100644 --- a/chrome/browser/web_applications/web_app_install_manager.cc +++ b/chrome/browser/web_applications/web_app_install_manager.cc
@@ -8,7 +8,6 @@ #include "base/bind.h" #include "base/callback.h" -#include "base/feature_list.h" #include "base/metrics/histogram_macros.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/profiles/profile.h" @@ -19,7 +18,6 @@ #include "chrome/browser/web_applications/components/web_app_utils.h" #include "chrome/browser/web_applications/web_app.h" #include "chrome/browser/web_applications/web_app_install_task.h" -#include "chrome/common/chrome_features.h" #include "chrome/common/web_application_info.h" #include "content/public/browser/web_contents.h" @@ -120,7 +118,7 @@ const AppId& app_id, std::unique_ptr<WebApplicationInfo> web_application_info, OnceInstallCallback callback) { - if (base::FeatureList::IsEnabled(features::kDesktopPWAsWithoutExtensions)) { + if (registrar()->AsWebAppRegistrar()) { // If new Web Applications system is enabled, any legacy sync-initiated // installation requests are ignored for now. // TODO(crbug.com/1020037): If app_id is not installed, migrate bookmark app
diff --git a/chrome/browser/web_applications/web_app_install_manager_unittest.cc b/chrome/browser/web_applications/web_app_install_manager_unittest.cc index e586e90..9052eb7 100644 --- a/chrome/browser/web_applications/web_app_install_manager_unittest.cc +++ b/chrome/browser/web_applications/web_app_install_manager_unittest.cc
@@ -294,6 +294,15 @@ return result; } + int GetNumFullyInstalledApps() const { + int num_apps = 0; + for (const WebApp& app : test_registry_controller_->registrar().AllApps()) { + if (!app.is_in_sync_install()) + ++num_apps; + } + return num_apps; + } + bool UninstallExternalWebAppByUrl( const GURL& app_url, ExternalInstallSource external_install_source) { @@ -365,17 +374,28 @@ TestFileUtils* file_utils_ = nullptr; }; -// TODO(crbug.com/1020037): Move this test out into -// install_manager_bookmark_app_unittest.cc. TEST_F(WebAppInstallManagerTest, - InstallBookmarkAppFromSync_TwoConcurrentInstallsAreRunInOrder) { - InitEmptyRegistrar(); - + InstallWebAppsAfterSync_TwoConcurrentInstallsAreRunInOrder) { const GURL url1{"https://example.com/path"}; const AppId app1_id = GenerateAppIdFromURL(url1); const GURL url2{"https://example.org/path"}; const AppId app2_id = GenerateAppIdFromURL(url2); + { + std::unique_ptr<WebApp> app1 = CreateWebAppInSyncInstall( + url1, "Name1 from sync", DisplayMode::kStandalone, SK_ColorRED, + /*is_locally_installed=*/false, /*icon_infos=*/{}); + + std::unique_ptr<WebApp> app2 = CreateWebAppInSyncInstall( + url2, "Name2 from sync", DisplayMode::kBrowser, SK_ColorGREEN, + /*is_locally_installed=*/true, /*icon_infos=*/{}); + + Registry registry; + registry.emplace(app1_id, std::move(app1)); + registry.emplace(app2_id, std::move(app2)); + + InitRegistrarWithRegistry(registry); + } // 1 InstallTask == 1 DataRetriever, their lifetime matches. base::flat_set<TestDataRetriever*> task_data_retrievers; @@ -403,6 +423,10 @@ auto data_retriever = std::make_unique<TestDataRetriever>(); task_index++; + GURL launch_url = task_index == 1 ? url1 : url2; + data_retriever->BuildDefaultDataToRetrieve(launch_url, + /*scope=*/launch_url); + TestDataRetriever* data_retriever_ptr = data_retriever.get(); task_data_retrievers.insert(data_retriever_ptr); @@ -436,48 +460,56 @@ EXPECT_FALSE(install_manager().has_web_contents_for_testing()); + WebApp* web_app1 = + controller().mutable_registrar().GetAppByIdMutable(app1_id); + WebApp* web_app2 = + controller().mutable_registrar().GetAppByIdMutable(app2_id); + ASSERT_TRUE(web_app1); + ASSERT_TRUE(web_app2); + + url_loader().SetNextLoadUrlResult(url1, WebAppUrlLoader::Result::kUrlLoaded); + url_loader().SetNextLoadUrlResult(url2, WebAppUrlLoader::Result::kUrlLoaded); + // Enqueue a request to install the 1st app. - install_manager().InstallBookmarkAppFromSync( - app1_id, CreateWebAppInfo(url1), - base::BindLambdaForTesting( - [&](const AppId& installed_app_id, InstallResultCode code) { - EXPECT_EQ(InstallResultCode::kSuccessNewInstall, code); - EXPECT_EQ(app1_id, installed_app_id); - event_order.push_back(Event::App1_CallbackCalled); - app1_installed_run_loop.Quit(); - })); + install_manager().InstallWebAppsAfterSync( + {web_app1}, base::BindLambdaForTesting([&](const AppId& installed_app_id, + InstallResultCode code) { + EXPECT_EQ(InstallResultCode::kSuccessNewInstall, code); + EXPECT_EQ(app1_id, installed_app_id); + event_order.push_back(Event::App1_CallbackCalled); + app1_installed_run_loop.Quit(); + })); EXPECT_TRUE(install_manager().has_web_contents_for_testing()); - EXPECT_EQ(0u, registrar().GetAppIds().size()); + EXPECT_EQ(0, GetNumFullyInstalledApps()); EXPECT_EQ(1u, task_data_retrievers.size()); // Immediately enqueue a request to install the 2nd app, WebContents is not // ready. - install_manager().InstallBookmarkAppFromSync( - app2_id, CreateWebAppInfo(url2), - base::BindLambdaForTesting( - [&](const AppId& installed_app_id, InstallResultCode code) { - EXPECT_EQ(InstallResultCode::kSuccessNewInstall, code); - EXPECT_EQ(app2_id, installed_app_id); - event_order.push_back(Event::App2_CallbackCalled); - app2_installed_run_loop.Quit(); - })); + install_manager().InstallWebAppsAfterSync( + {web_app2}, base::BindLambdaForTesting([&](const AppId& installed_app_id, + InstallResultCode code) { + EXPECT_EQ(InstallResultCode::kSuccessNewInstall, code); + EXPECT_EQ(app2_id, installed_app_id); + event_order.push_back(Event::App2_CallbackCalled); + app2_installed_run_loop.Quit(); + })); EXPECT_TRUE(install_manager().has_web_contents_for_testing()); EXPECT_EQ(2u, task_data_retrievers.size()); - EXPECT_EQ(0u, registrar().GetAppIds().size()); + EXPECT_EQ(0, GetNumFullyInstalledApps()); // Wait for the 1st app installed. app1_installed_run_loop.Run(); EXPECT_TRUE(install_manager().has_web_contents_for_testing()); EXPECT_EQ(1u, task_data_retrievers.size()); - EXPECT_EQ(1u, registrar().GetAppIds().size()); + EXPECT_EQ(1, GetNumFullyInstalledApps()); // Wait for the 2nd app installed. app2_installed_run_loop.Run(); EXPECT_FALSE(install_manager().has_web_contents_for_testing()); EXPECT_EQ(0u, task_data_retrievers.size()); - EXPECT_EQ(2u, registrar().GetAppIds().size()); + EXPECT_EQ(2, GetNumFullyInstalledApps()); const std::vector<Event> expected_event_order{ Event::Task1_Queued, Event::Task2_Queued, Event::Task1_Started, @@ -488,21 +520,26 @@ EXPECT_EQ(expected_event_order, event_order); } -// TODO(crbug.com/1020037): Move this test out into -// install_manager_bookmark_app_unittest.cc. TEST_F(WebAppInstallManagerTest, - InstallBookmarkAppFromSync_InstallManagerDestroyed) { - InitEmptyRegistrar(); + InstallWebAppsAfterSync_InstallManagerDestroyed) { + const GURL launch_url{"https://example.com/path"}; + const AppId app_id = GenerateAppIdFromURL(launch_url); - const GURL app_url("https://example.com/path"); - const AppId app_id = GenerateAppIdFromURL(app_url); - NavigateAndCommit(app_url); + { + std::unique_ptr<WebApp> app_in_sync_install = CreateWebAppInSyncInstall( + launch_url, "Name from sync", DisplayMode::kStandalone, SK_ColorRED, + /*is_locally_installed=*/true, /*icon_infos=*/{}); + + InitRegistrarWithApp(std::move(app_in_sync_install)); + } base::RunLoop run_loop; install_manager().SetDataRetrieverFactoryForTesting( base::BindLambdaForTesting([&]() { auto data_retriever = std::make_unique<TestDataRetriever>(); + data_retriever->BuildDefaultDataToRetrieve(launch_url, + /*scope=*/launch_url); // Every InstallTask starts with WebAppDataRetriever::GetIcons step. data_retriever->SetGetIconsDelegate(base::BindLambdaForTesting( @@ -519,12 +556,16 @@ return std::unique_ptr<WebAppDataRetriever>(std::move(data_retriever)); })); - install_manager().InstallBookmarkAppFromSync( - app_id, CreateWebAppInfo(app_url), - base::BindLambdaForTesting( - [](const AppId& installed_app_id, InstallResultCode code) { - EXPECT_EQ(InstallResultCode::kWebContentsDestroyed, code); - })); + WebApp* web_app = controller().mutable_registrar().GetAppByIdMutable(app_id); + + url_loader().SetNextLoadUrlResult(launch_url, + WebAppUrlLoader::Result::kUrlLoaded); + + bool callback_called = false; + install_manager().InstallWebAppsAfterSync( + {web_app}, base::BindLambdaForTesting( + [&](const AppId& installed_app_id, + InstallResultCode code) { callback_called = true; })); EXPECT_TRUE(install_manager().has_web_contents_for_testing()); // Wait for the task to start. @@ -533,6 +574,8 @@ // Simulate Profile getting destroyed. DestroyManagers(); + + EXPECT_FALSE(callback_called); } TEST_F(WebAppInstallManagerTest, InstallWebAppsAfterSync_Success) {
diff --git a/chrome/browser/web_applications/web_app_provider.cc b/chrome/browser/web_applications/web_app_provider.cc index e264d12..aab5f815 100644 --- a/chrome/browser/web_applications/web_app_provider.cc +++ b/chrome/browser/web_applications/web_app_provider.cc
@@ -242,7 +242,8 @@ ui_manager_.get(), install_finalizer_.get()); external_web_app_manager_->SetSubsystems(pending_app_manager_.get()); system_web_app_manager_->SetSubsystems(pending_app_manager_.get(), - registrar_.get(), ui_manager_.get()); + registrar_.get(), ui_manager_.get(), + file_handler_manager_.get()); web_app_policy_manager_->SetSubsystems(pending_app_manager_.get()); file_handler_manager_->SetSubsystems(registrar_.get()); shortcut_manager_->SetSubsystems(registrar_.get());
diff --git a/chrome/browser/web_applications/web_app_tab_helper.cc b/chrome/browser/web_applications/web_app_tab_helper.cc index da17e14..d842e83 100644 --- a/chrome/browser/web_applications/web_app_tab_helper.cc +++ b/chrome/browser/web_applications/web_app_tab_helper.cc
@@ -106,7 +106,10 @@ if (app_id_.empty()) return; - // Update when the file handling origin trial expires for this app. + // Ordinary Web Apps need to hold valid origin trial tokens to continue using + // File Handling API. + if (provider_->system_web_app_manager().IsSystemWebApp(app_id_)) + return; provider_->file_handler_manager().UpdateFileHandlingOriginTrialExpiry( web_contents(), app_id_); } @@ -135,8 +138,16 @@ SetAppId(app_id); - // When the app is installed record when its File Handling origin trial - // expires, so it can be removed. + // Ordinary Web Apps need valid origin trial tokens to use File Handling API. + // When an App is installed, record its origin trial expiry time. + // + // TODO(crbug.com/1053371): Clean up where we install file handlers. + // The following check is not necessary. This tab helper is not attached to + // the WebContents we used to install the WebApp. When a System Web App is + // installed, there is no associated tab and we early return at `app_id != + // installed_app_id`. + if (provider_->system_web_app_manager().IsSystemWebApp(installed_app_id)) + return; provider_->file_handler_manager().UpdateFileHandlingOriginTrialExpiry( web_contents(), installed_app_id); }
diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc index 3ae48827..ff2d9382 100644 --- a/chrome/common/url_constants.cc +++ b/chrome/common/url_constants.cc
@@ -319,6 +319,9 @@ const char kChromeOSCreditsPath[] = "/opt/google/chrome/resources/about_os_credits.html"; +const char kChromeOSGestureEducationHelpURL[] = + "https://support.google.com/chromebook?p=tablet_mode_gestures"; + const char kChromePaletteHelpURL[] = "https://support.google.com/chromebook?p=stylus_help";
diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h index 86a6f14..a106785 100644 --- a/chrome/common/url_constants.h +++ b/chrome/common/url_constants.h
@@ -267,6 +267,9 @@ extern const char kChromeOSCreditsPath[]; +// Chrome OS tablet gestures education help link for Chrome. +extern const char kChromeOSGestureEducationHelpURL[]; + // Palette help link for Chrome. extern const char kChromePaletteHelpURL[];
diff --git a/chrome/lib/DEPS b/chrome/lib/DEPS deleted file mode 100644 index dd4dbb7d..0000000 --- a/chrome/lib/DEPS +++ /dev/null
@@ -1,16 +0,0 @@ -noparent = True - -include_rules = [ - "+base/android", - - "-content/public/android", - "+content/public/android/java/src/org/chromium/content_public", - - # Targets under chrome/lib should generally be independent from browser code. - "-chrome/android", - "-chrome/browser", - - # Each directory should only cross-depend on public dirs. - # e.g. +chrome/lib/<name>/public for each feature they depend on. - "-chrome/lib", -]
diff --git a/chrome/lib/OWNERS b/chrome/lib/OWNERS deleted file mode 100644 index 36bcba4..0000000 --- a/chrome/lib/OWNERS +++ /dev/null
@@ -1,6 +0,0 @@ -dtrainor@chromium.org -nyquist@chromium.org -tedchoc@chromium.org -tiborg@chromium.org -twellington@chromium.org -wnwen@chromium.org
diff --git a/chrome/lib/lifecycle/OWNERS b/chrome/lib/lifecycle/OWNERS deleted file mode 100644 index e30356a..0000000 --- a/chrome/lib/lifecycle/OWNERS +++ /dev/null
@@ -1,4 +0,0 @@ -pshmakov@chromium.org - -# COMPONENT: UI>Browser>Mobile -# OS: Android
diff --git a/chrome/test/data/client_hints/accept_ch_with_lifetime.html.mock-http-headers b/chrome/test/data/client_hints/accept_ch_with_lifetime.html.mock-http-headers index 07a1114..76d239e 100644 --- a/chrome/test/data/client_hints/accept_ch_with_lifetime.html.mock-http-headers +++ b/chrome/test/data/client_hints/accept_ch_with_lifetime.html.mock-http-headers
@@ -1,3 +1,3 @@ HTTP/1.1 200 OK -Accept-CH: dpr,device-memory,viewport-width,rtt,downlink,ect,lang,ua,arch,platform,model,mobile +Accept-CH: dpr,device-memory,viewport-width,rtt,downlink,ect,lang,ua-arch,ua-platform,ua-model,ua-full-version Accept-CH-Lifetime: 3600
diff --git a/chrome/test/data/client_hints/accept_ch_with_short_lifetime.html.mock-http-headers b/chrome/test/data/client_hints/accept_ch_with_short_lifetime.html.mock-http-headers index a532778..190e38b 100644 --- a/chrome/test/data/client_hints/accept_ch_with_short_lifetime.html.mock-http-headers +++ b/chrome/test/data/client_hints/accept_ch_with_short_lifetime.html.mock-http-headers
@@ -1,3 +1,3 @@ HTTP/1.1 200 OK -Accept-CH: dpr,device-memory,viewport-width,rtt,downlink,ect,lang,ua,arch,platform,model,mobile +Accept-CH: dpr,device-memory,viewport-width,rtt,downlink,ect,lang,ua-arch,ua-platform,ua-model,ua-full-version Accept-CH-Lifetime: 1
diff --git a/chrome/test/data/client_hints/accept_ch_without_lifetime.html.mock-http-headers b/chrome/test/data/client_hints/accept_ch_without_lifetime.html.mock-http-headers index 3a0c021..9371d62 100644 --- a/chrome/test/data/client_hints/accept_ch_without_lifetime.html.mock-http-headers +++ b/chrome/test/data/client_hints/accept_ch_without_lifetime.html.mock-http-headers
@@ -1,2 +1,2 @@ HTTP/1.1 200 OK -Accept-CH: dpr,device-memory,viewport-width,rtt,downlink,ect,lang,ua,arch,platform,model,mobile +Accept-CH: dpr,device-memory,viewport-width,rtt,downlink,ect,lang,ua-arch,ua-platform,ua-model,ua-full-version
diff --git a/chrome/test/data/client_hints/accept_ch_without_lifetime_img_localhost.html.mock-http-headers b/chrome/test/data/client_hints/accept_ch_without_lifetime_img_localhost.html.mock-http-headers index 3a0c021..9371d62 100644 --- a/chrome/test/data/client_hints/accept_ch_without_lifetime_img_localhost.html.mock-http-headers +++ b/chrome/test/data/client_hints/accept_ch_without_lifetime_img_localhost.html.mock-http-headers
@@ -1,2 +1,2 @@ HTTP/1.1 200 OK -Accept-CH: dpr,device-memory,viewport-width,rtt,downlink,ect,lang,ua,arch,platform,model,mobile +Accept-CH: dpr,device-memory,viewport-width,rtt,downlink,ect,lang,ua-arch,ua-platform,ua-model,ua-full-version
diff --git a/chrome/test/data/client_hints/http_equiv_accept_ch_with_lifetime.html b/chrome/test/data/client_hints/http_equiv_accept_ch_with_lifetime.html index 5612ea9..601d910 100644 --- a/chrome/test/data/client_hints/http_equiv_accept_ch_with_lifetime.html +++ b/chrome/test/data/client_hints/http_equiv_accept_ch_with_lifetime.html
@@ -1,5 +1,5 @@ <html> -<meta http-equiv="Accept-CH" content="dpr,device-memory,viewport-width,rtt,downlink,ect,lang,ua,arch,platform,model,mobile"> +<meta http-equiv="Accept-CH" content="dpr,device-memory,viewport-width,rtt,downlink,ect,lang,ua-arch,ua-platform,ua-model,ua-full-version"> <meta http-equiv="Accept-CH-Lifetime" content="3600"> <link rel="icon" href="data:;base64,="> </html>
diff --git a/chrome/test/data/client_hints/http_equiv_accept_ch_without_lifetime.html b/chrome/test/data/client_hints/http_equiv_accept_ch_without_lifetime.html index ef501c8..c2c7e72f 100644 --- a/chrome/test/data/client_hints/http_equiv_accept_ch_without_lifetime.html +++ b/chrome/test/data/client_hints/http_equiv_accept_ch_without_lifetime.html
@@ -1,5 +1,5 @@ <html> -<meta http-equiv="Accept-CH" content="dpr,device-memory,viewport-width,rtt,downlink,ect,lang,ua,arch,platform,model,mobile"> +<meta http-equiv="Accept-CH" content="dpr,device-memory,viewport-width,rtt,downlink,ect,lang,ua-arch,ua-platform,ua-model,ua-full-version"> <link rel="icon" href="data:;base64,="> <head></head> Empty file which uses link-rel to disable favicon fetches. The corresponding
diff --git a/chrome/test/data/client_hints/http_equiv_accept_ch_without_lifetime_img_localhost.html b/chrome/test/data/client_hints/http_equiv_accept_ch_without_lifetime_img_localhost.html index 81f2bf61..38208dc 100644 --- a/chrome/test/data/client_hints/http_equiv_accept_ch_without_lifetime_img_localhost.html +++ b/chrome/test/data/client_hints/http_equiv_accept_ch_without_lifetime_img_localhost.html
@@ -1,5 +1,5 @@ <html> -<meta http-equiv="Accept-CH" content="dpr,device-memory,viewport-width,rtt,downlink,ect,lang,ua,arch,platform,model,mobile"> +<meta http-equiv="Accept-CH" content="dpr,device-memory,viewport-width,rtt,downlink,ect,lang,ua-arch,ua-platform,ua-model,ua-full-version"> <link rel="icon" href="data:;base64,="> <head></head> Empty file which uses link-rel to disable favicon fetches. The corresponding
diff --git a/chrome/test/data/webui/settings/appearance_fonts_page_test.js b/chrome/test/data/webui/settings/appearance_fonts_page_test.js index f511451..7e8b849 100644 --- a/chrome/test/data/webui/settings/appearance_fonts_page_test.js +++ b/chrome/test/data/webui/settings/appearance_fonts_page_test.js
@@ -13,8 +13,6 @@ constructor() { super([ 'fetchFontsData', - 'observeAdvancedFontExtensionAvailable', - 'openAdvancedFontSettings', ]); /** @private {!FontsData} */ @@ -29,16 +27,6 @@ this.methodCalled('fetchFontsData'); return Promise.resolve(this.fontsData_); } - - /** @override */ - observeAdvancedFontExtensionAvailable() { - this.methodCalled('observeAdvancedFontExtensionAvailable'); - } - - /** @override */ - openAdvancedFontSettings() { - this.methodCalled('openAdvancedFontSettings'); - } } let fontsPage = null; @@ -65,15 +53,6 @@ return fontsBrowserProxy.whenCalled('fetchFontsData'); }); - test('openAdvancedFontSettings', function() { - cr.webUIListenerCallback('advanced-font-settings-installed', [true]); - Polymer.dom.flush(); - const button = fontsPage.$$('#advancedButton'); - assertTrue(!!button); - button.click(); - return fontsBrowserProxy.whenCalled('openAdvancedFontSettings'); - }); - test('minimum font size sample', async () => { fontsPage.prefs = {webkit: {webprefs: {minimum_font_size: {value: 0}}}}; assertTrue(fontsPage.$.minimumSizeSample.hidden);
diff --git a/chrome/test/data/webui/settings/cr_settings_browsertest.js b/chrome/test/data/webui/settings/cr_settings_browsertest.js index ba51817..c23a6e4 100644 --- a/chrome/test/data/webui/settings/cr_settings_browsertest.js +++ b/chrome/test/data/webui/settings/cr_settings_browsertest.js
@@ -960,7 +960,9 @@ '../test_browser_proxy.js', 'test_privacy_page_browser_proxy.js', 'test_metrics_browser_proxy.js', + 'test_site_settings_prefs_browser_proxy.js', 'test_sync_browser_proxy.js', + 'test_util.js', 'privacy_page_test.js', ]), }; @@ -1111,7 +1113,8 @@ '//ui/webui/resources/js/promise_resolver.js', '../test_util.js', '../test_browser_proxy.js', - 'test_metrics_browser_proxy.js', + 'test_site_settings_prefs_browser_proxy.js', + 'test_util.js', 'site_settings_page_test.js', ]) };
diff --git a/chrome/test/data/webui/settings/password_check_test.js b/chrome/test/data/webui/settings/password_check_test.js index 75b5169..5041513 100644 --- a/chrome/test/data/webui/settings/password_check_test.js +++ b/chrome/test/data/webui/settings/password_check_test.js
@@ -44,6 +44,22 @@ } /** + * Helper method used to randomize array. + * @param {!Array<!chrome.passwordsPrivate.CompromisedCredential>} array + * @return {!Array<!chrome.passwordsPrivate.CompromisedCredential>} + */ + function shuffleArray(array) { + const copy = array.slice(); + for (let i = copy.length - 1; i > 0; i--) { + const j = Math.floor(Math.random() * (i + 1)); + const temp = copy[i]; + copy[i] = copy[j]; + copy[j] = temp; + } + return copy; + } + + /** * Helper method that validates a that elements in the compromised credentials * list match the expected data. * @param {!Element} checkPasswordSection The section element that will be @@ -235,9 +251,9 @@ test('testSomeCompromisedCredentials', function() { const leakedPasswords = [ autofill_test_util.makeCompromisedCredential( - 'one.com', 'test4', 'LEAKED'), + 'one.com', 'test4', 'PHISHED', 1, 1), autofill_test_util.makeCompromisedCredential( - 'two.com', 'test3', 'PHISHED'), + 'two.com', 'test3', 'LEAKED', 2, 2), ]; passwordManager.data.leakedCredentials = leakedPasswords; const checkPasswordSection = createCheckPasswordSection(); @@ -749,6 +765,58 @@ expectFalse(isElementVisible(checkPasswordSection.$$('#bannerImage'))); }); }); + + // Test verifies that new credentials are added to the bottom + test('testAppendCompromisedCredentials', function() { + const leakedPasswords = [ + autofill_test_util.makeCompromisedCredential( + 'one.com', 'test4', 'LEAKED', 1, 0), + autofill_test_util.makeCompromisedCredential( + 'two.com', 'test3', 'LEAKED', 2, 0), + ]; + const checkPasswordSection = createCheckPasswordSection(); + checkPasswordSection.updateList(leakedPasswords); + Polymer.dom.flush(); + + validateLeakedPasswordsList(checkPasswordSection, leakedPasswords); + + leakedPasswords.push(autofill_test_util.makeCompromisedCredential( + 'three.com', 'test2', 'PHISHED', 3, 3)); + leakedPasswords.push(autofill_test_util.makeCompromisedCredential( + 'four.com', 'test1', 'LEAKED', 4, 5)); + leakedPasswords.push(autofill_test_util.makeCompromisedCredential( + 'five.com', 'test0', 'LEAKED', 5, 4)); + checkPasswordSection.updateList(shuffleArray(leakedPasswords)); + Polymer.dom.flush(); + validateLeakedPasswordsList(checkPasswordSection, leakedPasswords); + }); + + // Test verifies that deleting and adding works as it should + test('testDeleteComrpomisedCredemtials', function() { + const leakedPasswords = [ + autofill_test_util.makeCompromisedCredential( + 'one.com', 'test4', 'PHISHED', 0, 0), + autofill_test_util.makeCompromisedCredential( + 'two.com', 'test3', 'LEAKED', 1, 2), + autofill_test_util.makeCompromisedCredential( + 'three.com', 'test2', 'LEAKED', 2, 2), + autofill_test_util.makeCompromisedCredential( + 'four.com', 'test2', 'LEAKED', 3, 2), + ]; + const checkPasswordSection = createCheckPasswordSection(); + checkPasswordSection.updateList(leakedPasswords); + Polymer.dom.flush(); + validateLeakedPasswordsList(checkPasswordSection, leakedPasswords); + + // remove 2nd and 3rd elements + leakedPasswords.splice(1, 2); + leakedPasswords.push(autofill_test_util.makeCompromisedCredential( + 'five.com', 'test2', 'LEAKED', 4, 3)); + + checkPasswordSection.updateList(shuffleArray(leakedPasswords)); + Polymer.dom.flush(); + validateLeakedPasswordsList(checkPasswordSection, leakedPasswords); + }); }); // #cr_define_end });
diff --git a/chrome/test/data/webui/settings/passwords_and_autofill_fake_data.js b/chrome/test/data/webui/settings/passwords_and_autofill_fake_data.js index 29e87f3..5863dfb 100644 --- a/chrome/test/data/webui/settings/passwords_and_autofill_fake_data.js +++ b/chrome/test/data/webui/settings/passwords_and_autofill_fake_data.js
@@ -122,16 +122,21 @@ * @param {string=} url * @param {string=} username * @param {string=} type + * @param {number=} id + * @param {number=} createTime * @return {chrome.passwordsPrivate.CompromisedCredential} * @private */ - /* #export */ function makeCompromisedCredential(url, username, type) { + /* #export */ function makeCompromisedCredential( + url, username, type, id, createTime) { return { + id: id, formattedOrigin: url, changePasswordUrl: 'http://${url}/', username: username, elapsedTimeSinceCompromise: (Math.floor(Math.random() * 60)).toString() + ' min ago', + compromiseTime: createTime, compromiseType: type, }; }
diff --git a/chrome/test/data/webui/settings/privacy_page_test.js b/chrome/test/data/webui/settings/privacy_page_test.js index 5913333..aaf25dc 100644 --- a/chrome/test/data/webui/settings/privacy_page_test.js +++ b/chrome/test/data/webui/settings/privacy_page_test.js
@@ -231,6 +231,12 @@ /** @type {SettingsPrivacyPageElement} */ let page; + /** @type {TestSiteSettingsPrefsBrowserProxy}*/ + let siteSettingsBrowserProxy = null; + + /** @type {Array<string>} */ + const testLabels = ['test label 1', 'test label 2']; + suiteSetup(function() { loadTimeData.overrideValues({ privacySettingsRedesignEnabled: true, @@ -238,6 +244,11 @@ }); setup(function() { + siteSettingsBrowserProxy = new TestSiteSettingsPrefsBrowserProxy(); + settings.SiteSettingsPrefsBrowserProxyImpl.instance_ = + siteSettingsBrowserProxy; + siteSettingsBrowserProxy.setResultFor( + 'getCookieSettingDescription', Promise.resolve(testLabels[0])); PolymerTest.clearBody(); page = document.createElement('settings-privacy-page'); document.body.appendChild(page); @@ -267,6 +278,17 @@ assertFalse(test_util.isChildVisible(page, selector)); }); }); + + test('CookiesLinkRowSublabel', async function() { + await siteSettingsBrowserProxy.whenCalled( + 'getCookieSettingDescription'); + Polymer.dom.flush(); + assertEquals(page.$$('#cookiesLinkRow').subLabel, testLabels[0]); + + cr.webUIListenerCallback( + 'cookieSettingDescriptionChanged', testLabels[1]); + assertEquals(page.$$('#cookiesLinkRow').subLabel, testLabels[1]); + }); }); }
diff --git a/chrome/test/data/webui/settings/site_settings_page_test.js b/chrome/test/data/webui/settings/site_settings_page_test.js index 279ea01..aeb3384 100644 --- a/chrome/test/data/webui/settings/site_settings_page_test.js +++ b/chrome/test/data/webui/settings/site_settings_page_test.js
@@ -3,12 +3,15 @@ // found in the LICENSE file. suite('SiteSettingsPage', function() { - /** @type {settings.TestMetricsBrowserProxy} */ - let testBrowserProxy; + /** @type {TestSiteSettingsPrefsBrowserProxy} */ + let siteSettingsBrowserProxy = null; /** @type {SettingsSiteSettingsPageElement} */ let page; + /** @type {Array<string>} */ + const testLabels = ['test label 1', 'test label 2']; + suiteSetup(function() { loadTimeData.overrideValues({ privacySettingsRedesignEnabled: false, @@ -16,8 +19,11 @@ }); function setupPage() { - testBrowserProxy = new TestMetricsBrowserProxy(); - settings.MetricsBrowserProxyImpl.instance_ = testBrowserProxy; + siteSettingsBrowserProxy = new TestSiteSettingsPrefsBrowserProxy(); + settings.SiteSettingsPrefsBrowserProxyImpl.instance_ = + siteSettingsBrowserProxy; + siteSettingsBrowserProxy.setResultFor( + 'getCookieSettingDescription', Promise.resolve(testLabels[0])); PolymerTest.clearBody(); page = document.createElement('settings-site-settings-page'); document.body.appendChild(page); @@ -62,4 +68,25 @@ settings.defaultSettingLabel( settings.ContentSetting.IMPORTANT_CONTENT, 'a', 'b', 'c')); }); + + test('CookiesLinkRowSublabel', function() { + const allSettingsList = page.$$('#allSettingsList'); + assertEquals( + allSettingsList.$$('#cookies').subLabel, + allSettingsList.i18n('siteSettingsCookiesAllowed')); + }); + + test('CookiesLinkRowSublabel_Redesign', async function() { + loadTimeData.overrideValues({ + privacySettingsRedesignEnabled: true, + }); + setupPage(); + await siteSettingsBrowserProxy.whenCalled('getCookieSettingDescription'); + Polymer.dom.flush(); + const cookiesLinkRow = page.$$('#basicContentList').$$('#cookies'); + assertEquals(cookiesLinkRow.subLabel, testLabels[0]); + + cr.webUIListenerCallback('cookieSettingDescriptionChanged', testLabels[1]); + assertEquals(cookiesLinkRow.subLabel, testLabels[1]); + }); });
diff --git a/chrome/test/data/webui/settings/test_site_settings_prefs_browser_proxy.js b/chrome/test/data/webui/settings/test_site_settings_prefs_browser_proxy.js index d5890f4..73cbf29b 100644 --- a/chrome/test/data/webui/settings/test_site_settings_prefs_browser_proxy.js +++ b/chrome/test/data/webui/settings/test_site_settings_prefs_browser_proxy.js
@@ -28,6 +28,7 @@ 'fetchBlockAutoplayStatus', 'fetchZoomLevels', 'getAllSites', + 'getCookieSettingDescription', 'getRecentSitePermissions', 'getChooserExceptionList', 'getDefaultValueForContentType', @@ -238,6 +239,12 @@ } /** @override */ + getCookieSettingDescription() { + this.methodCalled('getCookieSettingDescription'); + return this.getResultFor('getCookieSettingDescription'); + } + + /** @override */ getRecentSitePermissions(contentTypes, numSources) { this.methodCalled('getRecentSitePermissions', contentTypes); return this.getResultFor('getRecentSitePermissions');
diff --git a/chrome/test/data/webui/tab_strip/drag_manager_test.js b/chrome/test/data/webui/tab_strip/drag_manager_test.js index fec5ca4a..e153f92 100644 --- a/chrome/test/data/webui/tab_strip/drag_manager_test.js +++ b/chrome/test/data/webui/tab_strip/drag_manager_test.js
@@ -1,6 +1,7 @@ // Copyright 2020 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +import {isChromeOS} from 'chrome://resources/js/cr.m.js'; import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js'; import {DragManager, PLACEHOLDER_GROUP_ID, PLACEHOLDER_TAB_ID} from 'chrome://tab-strip/drag_manager.js'; import {TabElement} from 'chrome://tab-strip/tab.js'; @@ -128,26 +129,56 @@ }); dragManager = new DragManager(delegate); dragManager.startObserving(); + + document.body.style.margin = 0; + document.body.appendChild(delegate); }); test('DragStartSetsDragImage', () => { - const draggedTab = delegate.children[0]; + const draggedElement = delegate.children[0]; + const dragImage = draggedElement.getDragImage(); + + // Mock the dimensions and position of the element and the drag image. + const draggedElementRect = {top: 20, left: 30, width: 200, height: 150}; + draggedElement.getBoundingClientRect = () => draggedElementRect; + const dragImageRect = {top: 20, left: 30, width: 200, height: 150}; + dragImage.getBoundingClientRect = () => dragImageRect; + + const eventClientX = 100; + const eventClientY = 50; const mockDataTransfer = new MockDataTransfer(); const dragStartEvent = new DragEvent('dragstart', { bubbles: true, composed: true, - clientX: 100, - clientY: 150, + clientX: eventClientX, + clientY: eventClientY, dataTransfer: mockDataTransfer, }); - draggedTab.dispatchEvent(dragStartEvent); + draggedElement.dispatchEvent(dragStartEvent); assertEquals(dragStartEvent.dataTransfer.effectAllowed, 'move'); assertEquals( - mockDataTransfer.dragImageData.image, draggedTab.getDragImage()); - assertEquals( - mockDataTransfer.dragImageData.offsetX, 100 - draggedTab.offsetLeft); - assertEquals( - mockDataTransfer.dragImageData.offsetY, 150 - draggedTab.offsetTop); + mockDataTransfer.dragImageData.image, draggedElement.getDragImage()); + + const xDiffFromCenter = + eventClientX - draggedElementRect.left - draggedElementRect.width / 2; + const yDiffFromCenter = + eventClientY - draggedElementRect.top - draggedElementRect.height / 2; + + if (isChromeOS) { + assertEquals( + dragImageRect.width / 2 + xDiffFromCenter / 1.2, + mockDataTransfer.dragImageData.offsetX); + assertEquals( + dragImageRect.height / 2 + (yDiffFromCenter - 25) / 1.2, + mockDataTransfer.dragImageData.offsetY); + } else { + assertEquals( + dragImageRect.width / 2 + xDiffFromCenter, + mockDataTransfer.dragImageData.offsetX); + assertEquals( + dragImageRect.height / 2 + yDiffFromCenter, + mockDataTransfer.dragImageData.offsetY); + } }); test('DragOverMovesTabs', async () => {
diff --git a/chrome/test/data/webui/tab_strip/tab_test.js b/chrome/test/data/webui/tab_strip/tab_test.js index 97d2f18..57cdcb6 100644 --- a/chrome/test/data/webui/tab_strip/tab_test.js +++ b/chrome/test/data/webui/tab_strip/tab_test.js
@@ -22,6 +22,7 @@ alertStates: [], id: 1001, networkState: TabNetworkState.NONE, + pinned: false, title: 'My title', }; @@ -38,6 +39,7 @@ document.body.innerHTML = ''; // Set CSS variable for animations + document.body.style.setProperty('--tabstrip-tab-height', '100px'); document.body.style.setProperty('--tabstrip-tab-width', '280px'); document.body.style.setProperty('--tabstrip-tab-spacing', '20px'); @@ -60,7 +62,7 @@ const animationPromise = tabElement.slideIn(); // Before animation completes. assertEquals('20px', tabElementStyle.paddingRight); - assertEquals('none', tabElementStyle.maxWidth); + assertEquals('280px', tabElementStyle.maxWidth); assertEquals('matrix(0, 0, 0, 0, 0, 0)', tabElementStyle.transform); await animationPromise; // After animation completes. @@ -432,4 +434,19 @@ assertEquals(await testTabsApiProxy.whenCalled('activateTab'), tab.id); testTabsApiProxy.reset(); }); + + test('DragImagePreservesAspectRatio', () => { + const originalBoundingBox = tabElement.$('#tab').getBoundingClientRect(); + const originalAspectRatio = + originalBoundingBox.width / originalBoundingBox.height; + tabElement.setDragging(true); + const dragImageBoundingBox = + tabElement.getDragImage().querySelector('#tab').getBoundingClientRect(); + const dragImageAspectRatio = + dragImageBoundingBox.width / dragImageBoundingBox.height; + // Check the Math.floor values of these values to prevent possible + // flakiness caused by comparing float values. + assertEquals( + Math.floor(originalAspectRatio), Math.floor(dragImageAspectRatio)); + }); });
diff --git a/chromeos/components/media_app_ui/resources/js/receiver.js b/chromeos/components/media_app_ui/resources/js/receiver.js index ab328fa..ed631d3 100644 --- a/chromeos/components/media_app_ui/resources/js/receiver.js +++ b/chromeos/components/media_app_ui/resources/js/receiver.js
@@ -69,13 +69,13 @@ /** * A delegate which exposes privileged WebUI functionality to the media * app. - * @implements mediaApp.ClientApiDelegate + * @type {!mediaApp.ClientApiDelegate} */ -class Delegate { +const DELEGATE = { /** @override */ async openFeedbackDialog() { - const response = await parentMessagePipe.sendMessage( - Message.OPEN_FEEDBACK_DIALOG); + const response = + await parentMessagePipe.sendMessage(Message.OPEN_FEEDBACK_DIALOG); return /** @type {?string} */ (response['errorMessage']); } }; @@ -113,7 +113,7 @@ * @param {!mediaApp.ClientApi} app */ function initializeApp(app) { - app.setDelegate(new Delegate()); + app.setDelegate(DELEGATE); } /**
diff --git a/chromeos/profiles/orderfile.newest.txt b/chromeos/profiles/orderfile.newest.txt index 4910582..e371931 100644 --- a/chromeos/profiles/orderfile.newest.txt +++ b/chromeos/profiles/orderfile.newest.txt
@@ -1 +1 @@ -chromeos-chrome-orderfile-field-82-4044.31-1583145468-benchmark-82.0.4079.0-r1.orderfile.xz \ No newline at end of file +chromeos-chrome-orderfile-field-82-4072.0-1583746630-benchmark-82.0.4079.0-r1.orderfile.xz \ No newline at end of file
diff --git a/components/arc/mojom/net.mojom b/components/arc/mojom/net.mojom index 1344d494..81791af 100644 --- a/components/arc/mojom/net.mojom +++ b/components/arc/mojom/net.mojom
@@ -192,8 +192,8 @@ // IP configuration for the network service inside ARC. array<IPConfiguration>? ip_configs; - // MAC address of the network interface inside the ARC. - string? mac_address; + // Deprecated field unused from ARC P and later. + string? deprecated_mac_address; // The type of the underlying physical network. NetworkType type; @@ -336,7 +336,7 @@ }; // Next Method ID: 14 -// ID 3 is missing as it belonged to a deprecated method. +// IDs 3 and 9 are missing as they belonged to deprecated methods. interface NetHost { // Sends a request to get enabled / disabled status of WiFi. GetWifiEnabledState@1() => (bool is_enabled); @@ -364,11 +364,6 @@ // Disconnects from network |guid|. [MinVersion=4] StartDisconnect@8(string guid) => (NetworkResult status); - // Retrieve details (IP, SSID, etc.) about the current network connection. - [MinVersion=5] GetDefaultNetwork@9() => ( - NetworkConfiguration? logical_default, - NetworkConfiguration? physical_default); - // Sends a request to get the subset of network services existing on Chrome OS // that match the kind specified with GetNetworksRequestType. This call // supports three usages: @@ -401,6 +396,7 @@ }; // Next Method ID: 8 +// ID 2 is missing as it belonged to deprecated method. interface NetInstance { // DEPRECATED: Please use Init@6 instead. InitDeprecated@0(NetHost host_ptr); @@ -411,11 +407,6 @@ // Notifies the instance of a WiFI AP scan being completed. [MinVersion=1] ScanCompleted@1(); - // Notifies the instance of a change in the host default network service. - [MinVersion=2] DefaultNetworkChanged@2( - NetworkConfiguration? logical_default, - NetworkConfiguration? physical_default); - // Notifies the instance of a change in the state of WiFi on the host. [MinVersion=3] WifiEnabledStateChanged@3(bool is_enabled);
diff --git a/components/arc/net/arc_net_host_impl.cc b/components/arc/net/arc_net_host_impl.cc index efb55dff..2a247d2 100644 --- a/components/arc/net/arc_net_host_impl.cc +++ b/components/arc/net/arc_net_host_impl.cc
@@ -355,8 +355,6 @@ mojo->guid = GetStringFromONCDictionary(dict, onc::network_config::kGUID, true /* required */); - mojo->mac_address = GetStringFromONCDictionary( - dict, onc::network_config::kMacAddress, false /* required */); TranslateONCNetworkTypeDetails(dict, mojo.get()); if (network_state) { @@ -456,36 +454,6 @@ std::move(callback).Run(arc::mojom::NetworkResult::FAILURE); } -void GetDefaultNetworkSuccessCallback( - base::OnceCallback<void(arc::mojom::NetworkConfigurationPtr, - arc::mojom::NetworkConfigurationPtr)> callback, - const std::string& service_path, - const base::DictionaryValue& dictionary) { - // TODO(cernekee): Figure out how to query Chrome for the default physical - // service if a VPN is connected, rather than just reporting the - // default logical service in both fields. - const chromeos::NetworkState* network_state = - GetStateHandler()->GetNetworkState(service_path); - std::move(callback).Run( - TranslateONCConfiguration(network_state, &dictionary), - TranslateONCConfiguration(network_state, &dictionary)); -} - -void GetDefaultNetworkFailureCallback( - base::OnceCallback<void(arc::mojom::NetworkConfigurationPtr, - arc::mojom::NetworkConfigurationPtr)> callback, - const std::string& error_name, - std::unique_ptr<base::DictionaryValue> error_data) { - LOG(ERROR) << "Failed to query default logical network: " << error_name; - std::move(callback).Run(nullptr, nullptr); -} - -void DefaultNetworkFailureCallback( - const std::string& error_name, - std::unique_ptr<base::DictionaryValue> error_data) { - LOG(ERROR) << "Failed to query default logical network: " << error_name; -} - void ArcVpnSuccessCallback() { DVLOG(1) << "ArcVpnSuccessCallback"; } @@ -799,80 +767,8 @@ net_instance->ScanCompleted(); } -const chromeos::NetworkState* ArcNetHostImpl::GetDefaultNetworkFromChrome() { - // If an Android VPN is connected, report the underlying physical - // connection only. Never tell Android about its own VPN. - // If a Chrome OS VPN is connected, report the Chrome OS VPN as the - // default connection. - if (arc_vpn_service_path_.empty()) { - return GetShillBackedNetwork(GetStateHandler()->DefaultNetwork()); - } - - return GetShillBackedNetwork(GetStateHandler()->ConnectedNetworkByType( - chromeos::NetworkTypePattern::NonVirtual())); -} - -void ArcNetHostImpl::GetDefaultNetwork(GetDefaultNetworkCallback callback) { - const chromeos::NetworkState* default_network = GetDefaultNetworkFromChrome(); - - if (!default_network) { - VLOG(1) << "GetDefaultNetwork: no default network"; - std::move(callback).Run(nullptr, nullptr); - return; - } - VLOG(1) << "GetDefaultNetwork: default network is " - << default_network->path(); - std::string user_id_hash = chromeos::LoginState::Get()->primary_user_hash(); - // TODO(crbug.com/730593): Remove AdaptCallbackForRepeating() by updating - // the callee interface. - auto repeating_callback = - base::AdaptCallbackForRepeating(std::move(callback)); - GetManagedConfigurationHandler()->GetProperties( - user_id_hash, default_network->path(), - base::Bind(&GetDefaultNetworkSuccessCallback, repeating_callback), - base::Bind(&GetDefaultNetworkFailureCallback, repeating_callback)); -} - -void ArcNetHostImpl::DefaultNetworkSuccessCallback( - const std::string& service_path, - const base::DictionaryValue& dictionary) { - auto* net_instance = ARC_GET_INSTANCE_FOR_METHOD(arc_bridge_service_->net(), - DefaultNetworkChanged); - if (!net_instance) - return; - - const chromeos::NetworkState* network_state = - GetStateHandler()->GetNetworkState(service_path); - net_instance->DefaultNetworkChanged( - TranslateONCConfiguration(network_state, &dictionary), - TranslateONCConfiguration(network_state, &dictionary)); -} - -void ArcNetHostImpl::UpdateDefaultNetwork() { - const chromeos::NetworkState* default_network = GetDefaultNetworkFromChrome(); - - if (!default_network) { - VLOG(1) << "No default network"; - auto* net_instance = ARC_GET_INSTANCE_FOR_METHOD(arc_bridge_service_->net(), - DefaultNetworkChanged); - if (net_instance) - net_instance->DefaultNetworkChanged(nullptr, nullptr); - return; - } - - VLOG(1) << "New default network: " << default_network->path() << " (" - << default_network->type() << ")"; - std::string user_id_hash = chromeos::LoginState::Get()->primary_user_hash(); - GetManagedConfigurationHandler()->GetProperties( - user_id_hash, default_network->path(), - base::Bind(&ArcNetHostImpl::DefaultNetworkSuccessCallback, - weak_factory_.GetWeakPtr()), - base::Bind(&DefaultNetworkFailureCallback)); -} - void ArcNetHostImpl::DefaultNetworkChanged( const chromeos::NetworkState* network) { - UpdateDefaultNetwork(); UpdateActiveNetworks(); } @@ -1070,12 +966,6 @@ void ArcNetHostImpl::NetworkConnectionStateChanged( const chromeos::NetworkState* network) { - // DefaultNetworkChanged() won't be invoked if an ARC VPN is the default - // network and the underlying physical connection changed, so check for - // that condition here. This is invoked any time any service state - // changes. - UpdateDefaultNetwork(); - const chromeos::NetworkState* shill_backed_network = GetShillBackedNetwork(network); if (!shill_backed_network) @@ -1144,7 +1034,6 @@ // During the transition when a new service comes online, it will // temporarily be ranked below "inferior" services. This callback // informs us that shill's ordering has been updated. - UpdateDefaultNetwork(); UpdateActiveNetworks(); }
diff --git a/components/arc/net/arc_net_host_impl.h b/components/arc/net/arc_net_host_impl.h index 63e2f63..f9cb5c8 100644 --- a/components/arc/net/arc_net_host_impl.h +++ b/components/arc/net/arc_net_host_impl.h
@@ -96,7 +96,6 @@ const std::vector<const chromeos::NetworkState*>& networks) override; void NetworkListChanged() override; void DeviceListChanged() override; - void GetDefaultNetwork(GetDefaultNetworkCallback callback) override; // Overriden from chromeos::NetworkConnectionObserver. void DisconnectRequested(const std::string& service_path) override; @@ -107,7 +106,6 @@ private: const chromeos::NetworkState* GetDefaultNetworkFromChrome(); - void UpdateDefaultNetwork(); void UpdateActiveNetworks(); void DefaultNetworkSuccessCallback(const std::string& service_path, const base::DictionaryValue& dictionary);
diff --git a/components/bookmarks/browser/bookmark_model_unittest.cc b/components/bookmarks/browser/bookmark_model_unittest.cc index a5e0d251..2fa09d6 100644 --- a/components/bookmarks/browser/bookmark_model_unittest.cc +++ b/components/bookmarks/browser/bookmark_model_unittest.cc
@@ -432,12 +432,8 @@ BookmarkPermanentNode* ReloadModelWithManagedNode() { model_->RemoveObserver(this); - auto owned_managed_node = - std::make_unique<BookmarkPermanentNode>(100, BookmarkNode::FOLDER); - BookmarkPermanentNode* managed_node = owned_managed_node.get(); - - std::unique_ptr<TestBookmarkClient> client(new TestBookmarkClient); - client->SetManagedNodeToLoad(std::move(owned_managed_node)); + auto client = std::make_unique<TestBookmarkClient>(); + BookmarkPermanentNode* managed_node = client->EnableManagedNode(); model_ = TestBookmarkClient::CreateModelWithClient(std::move(client)); model_->AddObserver(this);
diff --git a/components/bookmarks/browser/bookmark_utils_unittest.cc b/components/bookmarks/browser/bookmark_utils_unittest.cc index 394bba5f..c31ab25e 100644 --- a/components/bookmarks/browser/bookmark_utils_unittest.cc +++ b/components/bookmarks/browser/bookmark_utils_unittest.cc
@@ -426,11 +426,8 @@ TEST_F(BookmarkUtilsTest, PasteNonEditableNodes) { // Load a model with an managed node that is not editable. - std::unique_ptr<TestBookmarkClient> client(new TestBookmarkClient()); - auto owned_managed_node = - std::make_unique<BookmarkPermanentNode>(100, BookmarkNode::FOLDER); - BookmarkPermanentNode* managed_node = owned_managed_node.get(); - client->SetManagedNodeToLoad(std::move(owned_managed_node)); + auto client = std::make_unique<TestBookmarkClient>(); + BookmarkNode* managed_node = client->EnableManagedNode(); std::unique_ptr<BookmarkModel> model( TestBookmarkClient::CreateModelWithClient(std::move(client))); @@ -577,11 +574,8 @@ TEST_F(BookmarkUtilsTest, RemoveAllBookmarks) { // Load a model with an managed node that is not editable. - std::unique_ptr<TestBookmarkClient> client(new TestBookmarkClient()); - auto owned_managed_node = - std::make_unique<BookmarkPermanentNode>(100, BookmarkNode::FOLDER); - BookmarkPermanentNode* managed_node = owned_managed_node.get(); - client->SetManagedNodeToLoad(std::move(owned_managed_node)); + auto client = std::make_unique<TestBookmarkClient>(); + BookmarkNode* managed_node = client->EnableManagedNode(); std::unique_ptr<BookmarkModel> model( TestBookmarkClient::CreateModelWithClient(std::move(client)));
diff --git a/components/bookmarks/managed/managed_bookmarks_tracker_unittest.cc b/components/bookmarks/managed/managed_bookmarks_tracker_unittest.cc index d3c3c62..3376b36 100644 --- a/components/bookmarks/managed/managed_bookmarks_tracker_unittest.cc +++ b/components/bookmarks/managed/managed_bookmarks_tracker_unittest.cc
@@ -54,16 +54,13 @@ void CreateModel() { // Simulate the creation of the managed node by the BookmarkClient. - auto owned_managed_node = - std::make_unique<BookmarkPermanentNode>(100, BookmarkNode::FOLDER); - BookmarkPermanentNode* managed_node = owned_managed_node.get(); + auto client = std::make_unique<TestBookmarkClient>(); + managed_node_ = client->EnableManagedNode(); ManagedBookmarksTracker::LoadInitial( - managed_node, prefs_.GetList(prefs::kManagedBookmarks), 101); - managed_node->SetTitle(l10n_util::GetStringUTF16( + managed_node_, prefs_.GetList(prefs::kManagedBookmarks), 101); + managed_node_->SetTitle(l10n_util::GetStringUTF16( IDS_BOOKMARK_BAR_MANAGED_FOLDER_DEFAULT_NAME)); - std::unique_ptr<TestBookmarkClient> client(new TestBookmarkClient); - client->SetManagedNodeToLoad(std::move(owned_managed_node)); model_.reset(new BookmarkModel(std::move(client))); model_->AddObserver(&observer_); @@ -74,10 +71,6 @@ test::WaitForBookmarkModelToLoad(model_.get()); Mock::VerifyAndClearExpectations(&observer_); - TestBookmarkClient* client_ptr = - static_cast<TestBookmarkClient*>(model_->client()); - managed_node_ = client_ptr->managed_node(); - managed_bookmarks_tracker_ = std::make_unique<ManagedBookmarksTracker>( model_.get(), &prefs_, base::BindRepeating(&ManagedBookmarksTrackerTest::GetManagementDomain));
diff --git a/components/bookmarks/test/test_bookmark_client.cc b/components/bookmarks/test/test_bookmark_client.cc index ab3bf05..4e3b0a6 100644 --- a/components/bookmarks/test/test_bookmark_client.cc +++ b/components/bookmarks/test/test_bookmark_client.cc
@@ -42,12 +42,13 @@ return bookmark_model; } -void TestBookmarkClient::SetManagedNodeToLoad( - std::unique_ptr<BookmarkPermanentNode> managed_node) { - managed_node_ = std::move(managed_node); +BookmarkPermanentNode* TestBookmarkClient::EnableManagedNode() { + managed_node_ = std::make_unique<BookmarkPermanentNode>( + 100, BookmarkNode::FOLDER, /*visible_when_empty=*/false); // Keep a copy of the node in |unowned_managed_node_| for the accessor // functions. unowned_managed_node_ = managed_node_.get(); + return unowned_managed_node_; } bool TestBookmarkClient::IsManagedNodeRoot(const BookmarkNode* node) {
diff --git a/components/bookmarks/test/test_bookmark_client.h b/components/bookmarks/test/test_bookmark_client.h index 3e866e67..d7eea4f 100644 --- a/components/bookmarks/test/test_bookmark_client.h +++ b/components/bookmarks/test/test_bookmark_client.h
@@ -28,13 +28,10 @@ static std::unique_ptr<BookmarkModel> CreateModelWithClient( std::unique_ptr<BookmarkClient> client); - // Sets the managed node to be returned by the next call to CreateModel() or - // GetLoadManagedNodeCallback(). - void SetManagedNodeToLoad( - std::unique_ptr<BookmarkPermanentNode> managed_node); - - // Returns the current managed_node, set via SetManagedNodeToLoad(). - BookmarkPermanentNode* managed_node() { return unowned_managed_node_; } + // Causes the the next call to CreateModel() or GetLoadManagedNodeCallback() + // to return a node representing managed bookmarks. The raw pointer of this + // node is returned for convenience. + BookmarkPermanentNode* EnableManagedNode(); // Returns true if |node| is the |managed_node_|. bool IsManagedNodeRoot(const BookmarkNode* node);
diff --git a/components/google/core/common/google_tld_list.h b/components/google/core/common/google_tld_list.h index ce6277d5..c857d43 100644 --- a/components/google/core/common/google_tld_list.h +++ b/components/google/core/common/google_tld_list.h
@@ -5,8 +5,10 @@ #ifndef COMPONENTS_GOOGLE_CORE_COMMON_GOOGLE_TLD_LIST_H_ #define COMPONENTS_GOOGLE_CORE_COMMON_GOOGLE_TLD_LIST_H_ -// DO NOT EDIT. This file is generated by a script. See crbug.com/674712 -// for details. +// DO NOT EDIT. This file is generated by a script. See https://crbug.com/674712 +// and https://crbug.com/1048878 for details. + +// clang-format off #define GOOGLE_TLD_LIST \ "ac", "ad", "ae", "af", "ag", "al", "am", "as", "at", "aw", "az", "ba", \ @@ -39,4 +41,25 @@ "sn", "so", "sr", "st", "sz", "td", "tel", "tg", "tk", "tl", "tm", "tn", \ "to", "tt", "tw", "ua", "us", "uz", "vg", "vn", "vu", "ws", "yt" +#define YOUTUBE_TLD_LIST \ + "ae", "al", "am", "at", "aw", "az", "ba", "be", "bg", "bh", "bo", "by", \ + "ca", "cat", "ch", "cl", "co", "co.ae", "co.at", "co.cr", "co.hu", \ + "co.id", "co.il", "co.in", "co.jp", "co.ke", "co.kr", "co.ma", "co.ni", \ + "co.nz", "co.th", "co.tz", "co.ug", "co.uk", "co.ve", "co.za", "co.zw", \ + "com", "com.ar", "com.au", "com.az", "com.bd", "com.bh", "com.bo", \ + "com.br", "com.by", "com.co", "com.cy", "com.do", "com.ec", "com.ee", \ + "com.eg", "com.es", "com.gh", "com.gr", "com.gt", "com.hk", "com.hn", \ + "com.hr", "com.jm", "com.jo", "com.kw", "com.lb", "com.lv", "com.mk", \ + "com.mt", "com.mx", "com.my", "com.ng", "com.ni", "com.om", "com.pa", \ + "com.pe", "com.ph", "com.pk", "com.pt", "com.py", "com.qa", "com.ro", \ + "com.sa", "com.sg", "com.sv", "com.tn", "com.tr", "com.tw", "com.ua", \ + "com.uy", "com.ve", "cr", "cz", "de", "ec", "ee", "es", "fi", "fr", \ + "ge", "gr", "gt", "hk", "hn", "hr", "hu", "ie", "in", "iq", "is", "it", \ + "jo", "jp", "kr", "kz", "la", "li", "lk", "lt", "lv", "ma", "md", "me", \ + "mk", "mn", "mx", "my", "ng", "ni", "nl", "pa", "pe", "ph", "pk", "pl", \ + "pr", "pt", "qa", "ro", "rs", "ru", "sa", "se", "sg", "si", "sk", "sn", \ + "soy", "sv", "tn", "ua", "ug", "uy", "vn" + +// clang-format on + #endif // COMPONENTS_GOOGLE_CORE_COMMON_GOOGLE_TLD_LIST_H_
diff --git a/components/google/core/common/google_util.cc b/components/google/core/common/google_util.cc index ab0e61a..a8ad7f36 100644 --- a/components/google/core/common/google_util.cc +++ b/components/google/core/common/google_util.cc
@@ -58,13 +58,13 @@ } // True if the given canonical |host| is "[www.]<domain_in_lower_case>.<TLD>" -// with a valid TLD. If |subdomain_permission| is ALLOW_SUBDOMAIN, we check -// against host "*.<domain_in_lower_case>.<TLD>" instead. Will return the TLD -// string in |tld|, if specified and the |host| can be parsed. +// with a valid TLD that appears in |allowed_tlds|. If |subdomain_permission| is +// ALLOW_SUBDOMAIN, we check against host "*.<domain_in_lower_case>.<TLD>" +// instead. bool IsValidHostName(base::StringPiece host, base::StringPiece domain_in_lower_case, SubdomainPermission subdomain_permission, - base::StringPiece* tld) { + const base::flat_set<base::StringPiece>& allowed_tlds) { // Fast path to avoid searching the registry set. if (host.find(domain_in_lower_case) == base::StringPiece::npos) return false; @@ -80,8 +80,12 @@ base::StringPiece host_minus_tld = host.substr(0, host.length() - tld_length - 1); - if (tld) - *tld = host.substr(host.length() - tld_length); + base::StringPiece tld = host.substr(host.length() - tld_length); + // Remove the trailing dot from tld if present, as for Google domains it's the + // same page. + StripTrailingDot(&tld); + if (!allowed_tlds.contains(tld)) + return false; if (base::LowerCaseEqualsASCII(host_minus_tld, domain_in_lower_case)) return true; @@ -111,17 +115,19 @@ if (base_url.is_valid() && (canonical_host == base_url.host_piece())) return true; - base::StringPiece tld; - if (!IsValidHostName(canonical_host, "google", subdomain_permission, &tld)) - return false; - - // Remove the trailing dot from tld if present, as for google domain it's the - // same page. - StripTrailingDot(&tld); - static const base::NoDestructor<base::flat_set<base::StringPiece>> google_tlds(std::initializer_list<base::StringPiece>({GOOGLE_TLD_LIST})); - return google_tlds->contains(tld); + return IsValidHostName(canonical_host, "google", subdomain_permission, + *google_tlds); +} + +bool IsCanonicalHostYoutubeHostname(base::StringPiece canonical_host, + SubdomainPermission subdomain_permission) { + static const base::NoDestructor<base::flat_set<base::StringPiece>> + youtube_tlds( + std::initializer_list<base::StringPiece>({YOUTUBE_TLD_LIST})); + return IsValidHostName(canonical_host, "youtube", subdomain_permission, + *youtube_tlds); } // True if |url| is a valid URL with a host that is in the static list of @@ -286,8 +292,7 @@ SubdomainPermission subdomain_permission, PortPermission port_permission) { return IsValidURL(url, port_permission) && - IsValidHostName(url.host_piece(), "youtube", subdomain_permission, - nullptr); + IsCanonicalHostYoutubeHostname(url.host_piece(), subdomain_permission); } bool IsGoogleAssociatedDomainUrl(const GURL& url) {
diff --git a/components/google/core/common/google_util_unittest.cc b/components/google/core/common/google_util_unittest.cc index b975048..d0df418 100644 --- a/components/google/core/common/google_util_unittest.cc +++ b/components/google/core/common/google_util_unittest.cc
@@ -413,6 +413,11 @@ google_util::ALLOW_SUBDOMAIN, google_util::DISALLOW_NON_STANDARD_PORTS)); + // Non-YouTube TLD. + EXPECT_FALSE(IsYoutubeDomainUrl(GURL("http://www.youtube.biz.tj"), + google_util::ALLOW_SUBDOMAIN, + google_util::DISALLOW_NON_STANDARD_PORTS)); + // Subdomain checks. EXPECT_TRUE(IsYoutubeDomainUrl(GURL("http://images.youtube.com"), google_util::ALLOW_SUBDOMAIN,
diff --git a/components/payments/content/service_worker_payment_app.cc b/components/payments/content/service_worker_payment_app.cc index d9afb03..8d9b29a 100644 --- a/components/payments/content/service_worker_payment_app.cc +++ b/components/payments/content/service_worker_payment_app.cc
@@ -214,10 +214,10 @@ void ServiceWorkerPaymentApp::OnCanMakePaymentEventResponded( ValidateCanMakePaymentCallback callback, - bool result) { + mojom::CanMakePaymentResponsePtr response) { // |can_make_payment| is true as long as there is a matching payment handler. can_make_payment_result_ = true; - has_enrolled_instrument_result_ = result; + has_enrolled_instrument_result_ = response->can_make_payment; base::ThreadTaskRunnerHandle::Get()->PostTask( FROM_HERE, base::BindOnce(std::move(callback), this, can_make_payment_result_));
diff --git a/components/payments/content/service_worker_payment_app.h b/components/payments/content/service_worker_payment_app.h index 9dcec7a0..d58a692 100644 --- a/components/payments/content/service_worker_payment_app.h +++ b/components/payments/content/service_worker_payment_app.h
@@ -111,8 +111,9 @@ mojom::CanMakePaymentEventDataPtr CreateCanMakePaymentEventData(); void OnCanMakePaymentEventSkipped(ValidateCanMakePaymentCallback callback); - void OnCanMakePaymentEventResponded(ValidateCanMakePaymentCallback callback, - bool result); + void OnCanMakePaymentEventResponded( + ValidateCanMakePaymentCallback callback, + mojom::CanMakePaymentResponsePtr response); // Called from two places: // 1) From PaymentAppProvider after a just-in-time installable payment handler
diff --git a/components/sync_bookmarks/bookmark_model_observer_impl_unittest.cc b/components/sync_bookmarks/bookmark_model_observer_impl_unittest.cc index 93e3833..02f54ea5 100644 --- a/components/sync_bookmarks/bookmark_model_observer_impl_unittest.cc +++ b/components/sync_bookmarks/bookmark_model_observer_impl_unittest.cc
@@ -500,11 +500,8 @@ } TEST_F(BookmarkModelObserverImplTest, ShouldNotSyncUnsyncableBookmarks) { - auto owned_managed_node = std::make_unique<bookmarks::BookmarkPermanentNode>( - 100, bookmarks::BookmarkNode::FOLDER); - bookmarks::BookmarkPermanentNode* managed_node = owned_managed_node.get(); auto client = std::make_unique<bookmarks::TestBookmarkClient>(); - client->SetManagedNodeToLoad(std::move(owned_managed_node)); + bookmarks::BookmarkNode* managed_node = client->EnableManagedNode(); std::unique_ptr<bookmarks::BookmarkModel> model = bookmarks::TestBookmarkClient::CreateModelWithClient(std::move(client));
diff --git a/components/sync_bookmarks/synced_bookmark_tracker_unittest.cc b/components/sync_bookmarks/synced_bookmark_tracker_unittest.cc index d0e3a09..0d489af 100644 --- a/components/sync_bookmarks/synced_bookmark_tracker_unittest.cc +++ b/components/sync_bookmarks/synced_bookmark_tracker_unittest.cc
@@ -741,9 +741,8 @@ const int64_t kManagedNodeId = 100; auto owned_managed_node = std::make_unique<bookmarks::BookmarkPermanentNode>( kManagedNodeId, bookmarks::BookmarkNode::FOLDER); - bookmarks::BookmarkPermanentNode* managed_node = owned_managed_node.get(); auto client = std::make_unique<bookmarks::TestBookmarkClient>(); - client->SetManagedNodeToLoad(std::move(owned_managed_node)); + bookmarks::BookmarkNode* managed_node = client->EnableManagedNode(); std::unique_ptr<bookmarks::BookmarkModel> model = bookmarks::TestBookmarkClient::CreateModelWithClient(std::move(client));
diff --git a/content/browser/background_sync/background_sync_base_browsertest.cc b/content/browser/background_sync/background_sync_base_browsertest.cc index 4b8e103..ccaa88ef 100644 --- a/content/browser/background_sync/background_sync_base_browsertest.cc +++ b/content/browser/background_sync/background_sync_base_browsertest.cc
@@ -12,6 +12,7 @@ #include "base/task/post_task.h" #include "content/browser/background_sync/background_sync_manager.h" #include "content/browser/storage_partition_impl.h" +#include "content/public/browser/browser_context.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/service_worker_context.h" #include "content/public/test/background_sync_test_util.h"
diff --git a/content/browser/cache_storage/cache_storage_context_impl.cc b/content/browser/cache_storage/cache_storage_context_impl.cc index eae6bba..1093d52 100644 --- a/content/browser/cache_storage/cache_storage_context_impl.cc +++ b/content/browser/cache_storage/cache_storage_context_impl.cc
@@ -102,6 +102,8 @@ void CacheStorageContextImpl::AddReceiver( const network::CrossOriginEmbedderPolicy& cross_origin_embedder_policy, + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter> + coep_reporter, const url::Origin& origin, mojo::PendingReceiver<blink::mojom::CacheStorage> receiver) { DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -112,8 +114,8 @@ base::RetainedRef(this)); } dispatcher_host_.Post(FROM_HERE, &CacheStorageDispatcherHost::AddReceiver, - cross_origin_embedder_policy, origin, - std::move(receiver)); + cross_origin_embedder_policy, std::move(coep_reporter), + origin, std::move(receiver)); } scoped_refptr<CacheStorageManager> CacheStorageContextImpl::CacheManager() {
diff --git a/content/browser/cache_storage/cache_storage_context_impl.h b/content/browser/cache_storage/cache_storage_context_impl.h index e2b091f..463d5b1 100644 --- a/content/browser/cache_storage/cache_storage_context_impl.h +++ b/content/browser/cache_storage/cache_storage_context_impl.h
@@ -88,6 +88,8 @@ // Only callable on the UI thread. void AddReceiver( const network::CrossOriginEmbedderPolicy& cross_origin_embedder_policy, + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter> + coep_reporter_remote, const url::Origin& origin, mojo::PendingReceiver<blink::mojom::CacheStorage> receiver);
diff --git a/content/browser/cache_storage/cache_storage_dispatcher_host.cc b/content/browser/cache_storage/cache_storage_dispatcher_host.cc index bd21a41..bf36f53 100644 --- a/content/browser/cache_storage/cache_storage_dispatcher_host.cc +++ b/content/browser/cache_storage/cache_storage_dispatcher_host.cc
@@ -119,11 +119,15 @@ bool ResponseBlockedByCrossOriginResourcePolicy( const blink::mojom::FetchAPIResponse* response, const url::Origin& document_origin, - const CrossOriginEmbedderPolicy& document_coep) { + const CrossOriginEmbedderPolicy& document_coep, + const mojo::Remote<network::mojom::CrossOriginEmbedderPolicyReporter>& + coep_reporter) { // optional short-circuit to avoid parsing CORP again and again when no COEP // policy is defined. if (document_coep.value == - network::mojom::CrossOriginEmbedderPolicyValue::kNone) { + network::mojom::CrossOriginEmbedderPolicyValue::kNone && + document_coep.report_only_value == + network::mojom::CrossOriginEmbedderPolicyValue::kNone) { return false; } @@ -142,7 +146,8 @@ return CrossOriginResourcePolicy::IsBlockedByHeaderValue( response->url_list.back(), response->url_list.front(), document_origin, corp_header_value, RequestMode::kNoCors, - document_origin, document_coep) + document_origin, document_coep, + coep_reporter ? coep_reporter.get() : nullptr) .has_value(); } @@ -158,10 +163,13 @@ explicit CacheImpl( CacheStorageCacheHandle cache_handle, const url::Origin& origin, - const CrossOriginEmbedderPolicy& cross_origin_embedder_policy) + const CrossOriginEmbedderPolicy& cross_origin_embedder_policy, + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter> + coep_reporter) : cache_handle_(std::move(cache_handle)), origin_(origin), - cross_origin_embedder_policy_(cross_origin_embedder_policy) {} + cross_origin_embedder_policy_(cross_origin_embedder_policy), + coep_reporter_(std::move(coep_reporter)) {} ~CacheImpl() override { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); } @@ -186,13 +194,14 @@ : false; auto cb = base::BindOnce( - [](base::TimeTicks start_time, bool ignore_search, - bool in_related_fetch_event, bool cache_initialized, - int64_t trace_id, url::Origin origin, - const CrossOriginEmbedderPolicy& cross_origin_embedder_policy, + [](base::WeakPtr<CacheImpl> self, base::TimeTicks start_time, + bool ignore_search, bool in_related_fetch_event, + bool cache_initialized, int64_t trace_id, blink::mojom::CacheStorageCache::MatchCallback callback, blink::mojom::CacheStorageError error, blink::mojom::FetchAPIResponsePtr response) { + if (!self) + return; base::TimeDelta elapsed = base::TimeTicks::Now() - start_time; UMA_HISTOGRAM_LONG_TIMES("ServiceWorkerCache.Cache.Browser.Match", elapsed); @@ -229,7 +238,8 @@ // against the requesting document's origin and // Cross-Origin-Embedder-Policy (COEP). if (ResponseBlockedByCrossOriginResourcePolicy( - response.get(), origin, cross_origin_embedder_policy)) { + response.get(), self->origin_, + self->cross_origin_embedder_policy_, self->coep_reporter_)) { std::move(callback).Run(blink::mojom::MatchResult::NewStatus( CacheStorageError::kErrorCrossOriginResourcePolicy)); return; @@ -253,9 +263,9 @@ } std::move(callback).Run(std::move(result)); }, - base::TimeTicks::Now(), match_options->ignore_search, - in_related_fetch_event, cache_initialized, trace_id, origin_, - cross_origin_embedder_policy_, std::move(callback)); + weak_factory_.GetWeakPtr(), base::TimeTicks::Now(), + match_options->ignore_search, in_related_fetch_event, cache_initialized, + trace_id, std::move(callback)); if (!cache) { std::move(cb).Run(CacheStorageError::kErrorNotFound, nullptr); @@ -287,11 +297,13 @@ "options", CacheStorageTracedValue(match_options)); auto cb = base::BindOnce( - [](base::TimeTicks start_time, int64_t trace_id, url::Origin origin, - const CrossOriginEmbedderPolicy& cross_origin_embedder_policy, + [](base::WeakPtr<CacheImpl> self, base::TimeTicks start_time, + int64_t trace_id, blink::mojom::CacheStorageCache::MatchAllCallback callback, blink::mojom::CacheStorageError error, std::vector<blink::mojom::FetchAPIResponsePtr> responses) { + if (!self) + return; base::TimeDelta elapsed = base::TimeTicks::Now() - start_time; UMA_HISTOGRAM_LONG_TIMES("ServiceWorkerCache.Cache.Browser.MatchAll", elapsed); @@ -313,7 +325,9 @@ // Cross-Origin-Embedder-Policy (COEP). for (const auto& response : responses) { if (ResponseBlockedByCrossOriginResourcePolicy( - response.get(), origin, cross_origin_embedder_policy)) { + response.get(), self->origin_, + self->cross_origin_embedder_policy_, + self->coep_reporter_)) { std::move(callback).Run(blink::mojom::MatchAllResult::NewStatus( CacheStorageError::kErrorCrossOriginResourcePolicy)); return; @@ -329,8 +343,8 @@ std::move(callback).Run( blink::mojom::MatchAllResult::NewResponses(std::move(responses))); }, - base::TimeTicks::Now(), trace_id, origin_, - cross_origin_embedder_policy_, std::move(callback)); + weak_factory_.GetWeakPtr(), base::TimeTicks::Now(), trace_id, + std::move(callback)); content::CacheStorageCache* cache = cache_handle_.value(); if (!cache) { @@ -471,7 +485,11 @@ CacheStorageCacheHandle cache_handle_; const url::Origin origin_; const CrossOriginEmbedderPolicy cross_origin_embedder_policy_; + mojo::Remote<network::mojom::CrossOriginEmbedderPolicyReporter> + coep_reporter_; SEQUENCE_CHECKER(sequence_checker_); + + base::WeakPtrFactory<CacheImpl> weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(CacheImpl); }; @@ -485,10 +503,13 @@ CacheStorageImpl( CacheStorageDispatcherHost* owner, const url::Origin& origin, - const CrossOriginEmbedderPolicy& cross_origin_embedder_policy) + const CrossOriginEmbedderPolicy& cross_origin_embedder_policy, + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter> + coep_reporter) : owner_(owner), origin_(origin), - cross_origin_embedder_policy_(cross_origin_embedder_policy) { + cross_origin_embedder_policy_(cross_origin_embedder_policy), + coep_reporter_(std::move(coep_reporter)) { // The CacheStorageHandle is empty to start and lazy initialized on first // use via GetOrCreateCacheStorage(). In the future we could eagerly create // the backend when the mojo connection is created. @@ -628,12 +649,14 @@ "options", CacheStorageTracedValue(match_options)); auto cb = BindOnce( - [](base::TimeTicks start_time, bool match_all_caches, - bool in_related_fetch_event, int64_t trace_id, url::Origin origin, - const CrossOriginEmbedderPolicy& cross_origin_embedder_policy, + [](base::WeakPtr<CacheStorageImpl> self, base::TimeTicks start_time, + bool match_all_caches, bool in_related_fetch_event, int64_t trace_id, blink::mojom::CacheStorage::MatchCallback callback, CacheStorageError error, blink::mojom::FetchAPIResponsePtr response) { + if (!self) + return; + base::TimeDelta elapsed = base::TimeTicks::Now() - start_time; if (match_all_caches) { UMA_HISTOGRAM_LONG_TIMES( @@ -666,7 +689,8 @@ // against the requesting document's origin and // Cross-Origin-Embedder-Policy (COEP). if (ResponseBlockedByCrossOriginResourcePolicy( - response.get(), origin, cross_origin_embedder_policy)) { + response.get(), self->origin_, + self->cross_origin_embedder_policy_, self->coep_reporter_)) { std::move(callback).Run(blink::mojom::MatchResult::NewStatus( CacheStorageError::kErrorCrossOriginResourcePolicy)); return; @@ -681,9 +705,9 @@ } std::move(callback).Run(std::move(result)); }, - base::TimeTicks::Now(), !match_options->cache_name, - in_related_fetch_event, trace_id, origin_, - cross_origin_embedder_policy_, std::move(callback)); + weak_factory_.GetWeakPtr(), base::TimeTicks::Now(), + !match_options->cache_name, in_related_fetch_event, trace_id, + std::move(callback)); content::CacheStorage* cache_storage = GetOrCreateCacheStorage(); if (!cache_storage) { @@ -724,9 +748,7 @@ content::CacheStorage* cache_storage = GetOrCreateCacheStorage(); auto cb = base::BindOnce( [](base::WeakPtr<CacheStorageImpl> self, base::TimeTicks start_time, - int64_t trace_id, url::Origin origin, - const CrossOriginEmbedderPolicy& cross_origin_embedder_policy, - blink::mojom::CacheStorage::OpenCallback callback, + int64_t trace_id, blink::mojom::CacheStorage::OpenCallback callback, CacheStorageCacheHandle cache_handle, CacheStorageError error) { if (!self) return; @@ -749,8 +771,15 @@ mojo::PendingAssociatedRemote<blink::mojom::CacheStorageCache> pending_remote; + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter> + coep_reporter; + if (self->coep_reporter_) { + self->coep_reporter_->Clone( + coep_reporter.InitWithNewPipeAndPassReceiver()); + } auto cache_impl = std::make_unique<CacheImpl>( - std::move(cache_handle), origin, cross_origin_embedder_policy); + std::move(cache_handle), self->origin_, + self->cross_origin_embedder_policy_, std::move(coep_reporter)); self->owner_->AddCacheReceiver( std::move(cache_impl), pending_remote.InitWithNewEndpointAndPassReceiver()); @@ -758,8 +787,8 @@ std::move(callback).Run( blink::mojom::OpenResult::NewCache(std::move(pending_remote))); }, - weak_factory_.GetWeakPtr(), base::TimeTicks::Now(), trace_id, origin_, - cross_origin_embedder_policy_, std::move(callback)); + weak_factory_.GetWeakPtr(), base::TimeTicks::Now(), trace_id, + std::move(callback)); if (!cache_storage) { std::move(cb).Run(CacheStorageCacheHandle(), @@ -788,6 +817,8 @@ const url::Origin origin_; const CrossOriginEmbedderPolicy cross_origin_embedder_policy_; + mojo::Remote<network::mojom::CrossOriginEmbedderPolicyReporter> + coep_reporter_; CacheStorageHandle cache_storage_handle_; SEQUENCE_CHECKER(sequence_checker_); @@ -808,11 +839,13 @@ void CacheStorageDispatcherHost::AddReceiver( const CrossOriginEmbedderPolicy& cross_origin_embedder_policy, + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter> + coep_reporter, const url::Origin& origin, mojo::PendingReceiver<blink::mojom::CacheStorage> receiver) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - auto impl = std::make_unique<CacheStorageImpl>(this, origin, - cross_origin_embedder_policy); + auto impl = std::make_unique<CacheStorageImpl>( + this, origin, cross_origin_embedder_policy, std::move(coep_reporter)); receivers_.Add(std::move(impl), std::move(receiver)); }
diff --git a/content/browser/cache_storage/cache_storage_dispatcher_host.h b/content/browser/cache_storage/cache_storage_dispatcher_host.h index 386fb67..f992402 100644 --- a/content/browser/cache_storage/cache_storage_dispatcher_host.h +++ b/content/browser/cache_storage/cache_storage_dispatcher_host.h
@@ -46,6 +46,8 @@ // client to provide its origin at every method call. void AddReceiver( const network::CrossOriginEmbedderPolicy& cross_origin_embedder_policy, + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter> + coep_reporter, const url::Origin& origin, mojo::PendingReceiver<blink::mojom::CacheStorage> receiver);
diff --git a/content/browser/client_hints/client_hints.cc b/content/browser/client_hints/client_hints.cc index cd7146e..ea1203e9 100644 --- a/content/browser/client_hints/client_hints.cc +++ b/content/browser/client_hints/client_hints.cc
@@ -517,12 +517,8 @@ // // TODO(morlovich): This should probably be using ShouldAddClientHint, // to check FP? - std::string version = - web_client_hints.IsEnabled(blink::mojom::WebClientHintsType::kUA) - ? ua.full_version - : ua.major_version; AddUAHeader(headers, blink::mojom::WebClientHintsType::kUA, - AddBrandVersionQuotes(ua.brand, version)); + AddBrandVersionQuotes(ua.brand, ua.major_version)); // The `Sec-CH-UA-Mobile client hint was also deemed "low entropy" and can // safely be sent with every request. AddUAHeader(headers, blink::mojom::WebClientHintsType::kUAMobile, @@ -530,6 +526,14 @@ if (ShouldAddClientHint( web_client_hints, is_main_frame, is_1p_origin, feature_policy, + resource_origin, blink::mojom::WebClientHintsType::kUAFullVersion, + blink::mojom::FeaturePolicyFeature::kClientHintUAFullVersion)) { + AddUAHeader(headers, blink::mojom::WebClientHintsType::kUAFullVersion, + AddQuotes(ua.full_version)); + } + + if (ShouldAddClientHint( + web_client_hints, is_main_frame, is_1p_origin, feature_policy, resource_origin, blink::mojom::WebClientHintsType::kUAArch, blink::mojom::FeaturePolicyFeature::kClientHintUAArch)) { AddUAHeader(headers, blink::mojom::WebClientHintsType::kUAArch, @@ -558,7 +562,7 @@ // If possible, logic should be added above so that the request headers for // the newly added client hint can be added to the request. static_assert( - blink::mojom::WebClientHintsType::kUAMobile == + blink::mojom::WebClientHintsType::kUAFullVersion == blink::mojom::WebClientHintsType::kMaxValue, "Consider adding client hint request headers from the browser process");
diff --git a/content/browser/devtools/protocol/storage_handler.cc b/content/browser/devtools/protocol/storage_handler.cc index 7fae93ba..eabcefc 100644 --- a/content/browser/devtools/protocol/storage_handler.cc +++ b/content/browser/devtools/protocol/storage_handler.cc
@@ -18,6 +18,7 @@ #include "content/browser/devtools/protocol/network.h" #include "content/browser/devtools/protocol/network_handler.h" #include "content/browser/storage_partition_impl.h" +#include "content/public/browser/browser_context.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_process_host.h"
diff --git a/content/browser/devtools/service_worker_devtools_agent_host.cc b/content/browser/devtools/service_worker_devtools_agent_host.cc index 02c8487..bebadd2 100644 --- a/content/browser/devtools/service_worker_devtools_agent_host.cc +++ b/content/browser/devtools/service_worker_devtools_agent_host.cc
@@ -73,6 +73,8 @@ bool is_installed_version, base::Optional<network::CrossOriginEmbedderPolicy> cross_origin_embedder_policy, + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter> + coep_reporter, const base::UnguessableToken& devtools_worker_token) : DevToolsAgentHostImpl(devtools_worker_token.ToString()), state_(WORKER_NOT_READY), @@ -86,7 +88,8 @@ scope_(scope), version_installed_time_(is_installed_version ? base::Time::Now() : base::Time()), - cross_origin_embedder_policy_(std::move(cross_origin_embedder_policy)) { + cross_origin_embedder_policy_(std::move(cross_origin_embedder_policy)), + coep_reporter_(std::move(coep_reporter)) { NotifyCreated(); } @@ -177,8 +180,11 @@ } void ServiceWorkerDevToolsAgentHost::UpdateCrossOriginEmbedderPolicy( - network::CrossOriginEmbedderPolicy cross_origin_embedder_policy) { + network::CrossOriginEmbedderPolicy cross_origin_embedder_policy, + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter> + coep_reporter) { cross_origin_embedder_policy_ = std::move(cross_origin_embedder_policy); + coep_reporter_.Bind(std::move(coep_reporter)); } void ServiceWorkerDevToolsAgentHost::WorkerRestarted(int worker_process_id, @@ -215,6 +221,16 @@ } const url::Origin origin = url::Origin::Create(url_); + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter> + coep_reporter_for_script_loader; + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter> + coep_reporter_for_subresource_loader; + if (coep_reporter_) { + coep_reporter_->Clone( + coep_reporter_for_script_loader.InitWithNewPipeAndPassReceiver()); + coep_reporter_->Clone( + coep_reporter_for_subresource_loader.InitWithNewPipeAndPassReceiver()); + } // Use the default CrossOriginEmbedderPolicy if // |cross_origin_embedder_policy_| is nullopt. It's acceptable because the // factory bundles are updated with correct COEP value before any subresource @@ -223,11 +239,13 @@ rph, worker_route_id_, origin, cross_origin_embedder_policy_ ? cross_origin_embedder_policy_.value() : network::CrossOriginEmbedderPolicy(), + std::move(coep_reporter_for_script_loader), ContentBrowserClient::URLLoaderFactoryType::kServiceWorkerScript); auto subresource_bundle = EmbeddedWorkerInstance::CreateFactoryBundleOnUI( rph, worker_route_id_, origin, cross_origin_embedder_policy_ ? cross_origin_embedder_policy_.value() : network::CrossOriginEmbedderPolicy(), + std::move(coep_reporter_for_subresource_loader), ContentBrowserClient::URLLoaderFactoryType::kServiceWorkerSubResource); if (ServiceWorkerContext::IsServiceWorkerOnUIEnabled()) {
diff --git a/content/browser/devtools/service_worker_devtools_agent_host.h b/content/browser/devtools/service_worker_devtools_agent_host.h index b2bc1ce..08cb2e0 100644 --- a/content/browser/devtools/service_worker_devtools_agent_host.h +++ b/content/browser/devtools/service_worker_devtools_agent_host.h
@@ -15,6 +15,7 @@ #include "content/browser/devtools/devtools_agent_host_impl.h" #include "content/browser/devtools/service_worker_devtools_manager.h" #include "services/network/public/cpp/cross_origin_embedder_policy.h" +#include "services/network/public/mojom/cross_origin_embedder_policy.mojom.h" #include "third_party/blink/public/mojom/devtools/devtools_agent.mojom.h" namespace content { @@ -38,6 +39,8 @@ bool is_installed_version, base::Optional<network::CrossOriginEmbedderPolicy> cross_origin_embedder_policy, + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter> + coep_reporter, const base::UnguessableToken& devtools_worker_token); // DevToolsAgentHost overrides. @@ -54,7 +57,9 @@ mojo::PendingRemote<blink::mojom::DevToolsAgent> agent_remote, mojo::PendingReceiver<blink::mojom::DevToolsAgentHost> host_receiver); void UpdateCrossOriginEmbedderPolicy( - network::CrossOriginEmbedderPolicy cross_origin_embedder_policy); + network::CrossOriginEmbedderPolicy cross_origin_embedder_policy, + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter> + coep_reporter); void WorkerDestroyed(); void WorkerVersionInstalled(); void WorkerVersionDoomed(); @@ -104,6 +109,8 @@ base::Time version_doomed_time_; base::Optional<network::CrossOriginEmbedderPolicy> cross_origin_embedder_policy_; + mojo::Remote<network::mojom::CrossOriginEmbedderPolicyReporter> + coep_reporter_; DISALLOW_COPY_AND_ASSIGN(ServiceWorkerDevToolsAgentHost); };
diff --git a/content/browser/devtools/service_worker_devtools_manager.cc b/content/browser/devtools/service_worker_devtools_manager.cc index 442c93d..b487941 100644 --- a/content/browser/devtools/service_worker_devtools_manager.cc +++ b/content/browser/devtools/service_worker_devtools_manager.cc
@@ -54,6 +54,8 @@ bool is_installed_version, base::Optional<network::CrossOriginEmbedderPolicy> cross_origin_embedder_policy, + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter> + coep_reporter, base::UnguessableToken* devtools_worker_token, bool* pause_on_start) { DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -71,7 +73,8 @@ new ServiceWorkerDevToolsAgentHost( worker_process_id, worker_route_id, context, context_weak, version_id, url, scope, is_installed_version, - cross_origin_embedder_policy, *devtools_worker_token); + cross_origin_embedder_policy, std::move(coep_reporter), + *devtools_worker_token); live_hosts_[worker_id] = host; *pause_on_start = debug_service_worker_on_start_; for (auto& observer : observer_list_) { @@ -112,15 +115,17 @@ void ServiceWorkerDevToolsManager::UpdateCrossOriginEmbedderPolicy( int worker_process_id, int worker_route_id, - network::CrossOriginEmbedderPolicy cross_origin_embedder_policy) { + network::CrossOriginEmbedderPolicy cross_origin_embedder_policy, + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter> + coep_reporter) { DCHECK_CURRENTLY_ON(BrowserThread::UI); const WorkerId worker_id(worker_process_id, worker_route_id); auto it = live_hosts_.find(worker_id); if (it == live_hosts_.end()) return; scoped_refptr<ServiceWorkerDevToolsAgentHost> host = it->second; - host->UpdateCrossOriginEmbedderPolicy( - std::move(cross_origin_embedder_policy)); + host->UpdateCrossOriginEmbedderPolicy(std::move(cross_origin_embedder_policy), + std::move(coep_reporter)); } void ServiceWorkerDevToolsManager::WorkerVersionInstalled(int worker_process_id,
diff --git a/content/browser/devtools/service_worker_devtools_manager.h b/content/browser/devtools/service_worker_devtools_manager.h index aab651b..b991e1b 100644 --- a/content/browser/devtools/service_worker_devtools_manager.h +++ b/content/browser/devtools/service_worker_devtools_manager.h
@@ -17,6 +17,7 @@ #include "base/unguessable_token.h" #include "content/common/content_export.h" #include "services/network/public/cpp/cross_origin_embedder_policy.h" +#include "services/network/public/mojom/cross_origin_embedder_policy.mojom-forward.h" #include "services/network/public/mojom/url_response_head.mojom-forward.h" #include "third_party/blink/public/mojom/devtools/devtools_agent.mojom.h" #include "url/gurl.h" @@ -59,18 +60,21 @@ BrowserContext* browser_context, std::vector<scoped_refptr<ServiceWorkerDevToolsAgentHost>>* result); - void WorkerCreated(int worker_process_id, - int worker_route_id, - const ServiceWorkerContextCore* context, - base::WeakPtr<ServiceWorkerContextCore> context_weak, - int64_t version_id, - const GURL& url, - const GURL& scope, - bool is_installed_version, - base::Optional<network::CrossOriginEmbedderPolicy> - cross_origin_embedder_policy, - base::UnguessableToken* devtools_worker_token, - bool* pause_on_start); + void WorkerCreated( + int worker_process_id, + int worker_route_id, + const ServiceWorkerContextCore* context, + base::WeakPtr<ServiceWorkerContextCore> context_weak, + int64_t version_id, + const GURL& url, + const GURL& scope, + bool is_installed_version, + base::Optional<network::CrossOriginEmbedderPolicy> + cross_origin_embedder_policy, + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter> + coep_reporter, + base::UnguessableToken* devtools_worker_token, + bool* pause_on_start); void WorkerReadyForInspection( int worker_process_id, int worker_route_id, @@ -79,7 +83,9 @@ void UpdateCrossOriginEmbedderPolicy( int worker_process_id, int worker_route_id, - network::CrossOriginEmbedderPolicy cross_origin_embedder_policy); + network::CrossOriginEmbedderPolicy cross_origin_embedder_policy, + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter> + coep_reporter); void WorkerVersionInstalled(int worker_process_id, int worker_route_id); void WorkerVersionDoomed(int worker_process_id, int worker_route_id); void WorkerDestroyed(int worker_process_id, int worker_route_id);
diff --git a/content/browser/frame_host/navigation_request.cc b/content/browser/frame_host/navigation_request.cc index 9a394012..f8396058 100644 --- a/content/browser/frame_host/navigation_request.cc +++ b/content/browser/frame_host/navigation_request.cc
@@ -2671,16 +2671,22 @@ } } + CreateCoepReporter(render_frame_host_->GetProcess()->GetStoragePartition()); + blink::mojom::ServiceWorkerProviderInfoForClientPtr service_worker_provider_info; if (service_worker_handle_) { + DCHECK(coep_reporter()); + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter> + reporter_remote; + coep_reporter()->Clone(reporter_remote.InitWithNewPipeAndPassReceiver()); // Notify the service worker navigation handle that navigation commit is // about to go. service_worker_handle_->OnBeginNavigationCommit( render_frame_host_->GetProcess()->GetID(), render_frame_host_->GetRoutingID(), render_frame_host_->cross_origin_embedder_policy(), - &service_worker_provider_info); + std::move(reporter_remote), &service_worker_provider_info); } if (web_bundle_handle_ && web_bundle_handle_->navigation_info()) {
diff --git a/content/browser/frame_host/navigation_request.h b/content/browser/frame_host/navigation_request.h index eb302a5..da2c6b0 100644 --- a/content/browser/frame_host/navigation_request.h +++ b/content/browser/frame_host/navigation_request.h
@@ -554,7 +554,7 @@ CrossOriginEmbedderPolicyReporter* coep_reporter() { return coep_reporter_.get(); } - void CreateCoepReporter(StoragePartition* storage_partition); + std::unique_ptr<CrossOriginEmbedderPolicyReporter> TakeCoepReporter(); private: @@ -877,6 +877,8 @@ void ForceEnableOriginTrials(const std::vector<std::string>& trials) override; + void CreateCoepReporter(StoragePartition* storage_partition); + base::Optional<network::BlockedByResponseReason> IsBlockedByCorp(); FrameTreeNode* frame_tree_node_;
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc index 6c20849..e987c69 100644 --- a/content/browser/frame_host/render_frame_host_impl.cc +++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -1278,8 +1278,11 @@ default_factory_receiver) { mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter> coep_reporter_remote; - DCHECK(coep_reporter_); - coep_reporter_->Clone(coep_reporter_remote.InitWithNewPipeAndPassReceiver()); + if (coep_reporter_) { + coep_reporter_->Clone( + coep_reporter_remote.InitWithNewPipeAndPassReceiver()); + } + // We use the last committed Origin and ClientSecurityState. If the caller // wanted a factory associated to a navigation about to commit, the params // generated won't be correct. There is no good way of fixing this before @@ -5260,9 +5263,6 @@ blink::mojom::ServiceWorkerProviderInfoForClientPtr provider_info, const base::UnguessableToken& devtools_navigation_token, std::unique_ptr<WebBundleHandle> web_bundle_handle) { - if (navigation_request) { - navigation_request->CreateCoepReporter(GetProcess()->GetStoragePartition()); - } web_bundle_handle_ = std::move(web_bundle_handle); TRACE_EVENT2("navigation", "RenderFrameHostImpl::CommitNavigation", @@ -6838,7 +6838,14 @@ void RenderFrameHostImpl::BindCacheStorage( mojo::PendingReceiver<blink::mojom::CacheStorage> receiver) { + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter> + coep_reporter_remote; + if (coep_reporter_) { + coep_reporter_->Clone( + coep_reporter_remote.InitWithNewPipeAndPassReceiver()); + } GetProcess()->BindCacheStorage(cross_origin_embedder_policy_, + std::move(coep_reporter_remote), GetLastCommittedOrigin(), std::move(receiver)); }
diff --git a/content/browser/loader/prefetch_browsertest_base.cc b/content/browser/loader/prefetch_browsertest_base.cc index fa511496..4d2c727 100644 --- a/content/browser/loader/prefetch_browsertest_base.cc +++ b/content/browser/loader/prefetch_browsertest_base.cc
@@ -12,6 +12,7 @@ #include "content/browser/storage_partition_impl.h" #include "content/browser/web_package/signed_exchange_handler.h" #include "content/browser/web_package/signed_exchange_loader.h" +#include "content/public/browser/browser_context.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/web_contents.h"
diff --git a/content/browser/locks/lock_manager.h b/content/browser/locks/lock_manager.h index 7f5f7d0..5ef6149 100644 --- a/content/browser/locks/lock_manager.h +++ b/content/browser/locks/lock_manager.h
@@ -13,7 +13,6 @@ #include "base/callback.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h" -#include "content/public/browser/browser_context.h" #include "mojo/public/cpp/bindings/receiver_set.h" #include "third_party/blink/public/mojom/locks/lock_manager.mojom.h" #include "url/origin.h"
diff --git a/content/browser/payments/payment_app_browsertest.cc b/content/browser/payments/payment_app_browsertest.cc index b9a78a1..17af276 100644 --- a/content/browser/payments/payment_app_browsertest.cc +++ b/content/browser/payments/payment_app_browsertest.cc
@@ -25,6 +25,7 @@ using ::payments::mojom::CanMakePaymentEventData; using ::payments::mojom::CanMakePaymentEventDataPtr; +using ::payments::mojom::CanMakePaymentResponsePtr; using ::payments::mojom::PaymentCurrencyAmount; using ::payments::mojom::PaymentDetailsModifier; using ::payments::mojom::PaymentDetailsModifierPtr; @@ -43,8 +44,8 @@ void CaptureCanMakePaymentResult(base::OnceClosure done_callback, bool* out_payment_event_result, - bool payment_event_result) { - *out_payment_event_result = payment_event_result; + CanMakePaymentResponsePtr response) { + *out_payment_event_result = response->can_make_payment; std::move(done_callback).Run(); }
diff --git a/content/browser/payments/payment_app_provider_impl.cc b/content/browser/payments/payment_app_provider_impl.cc index 62ec14e..b358369 100644 --- a/content/browser/payments/payment_app_provider_impl.cc +++ b/content/browser/payments/payment_app_provider_impl.cc
@@ -25,6 +25,7 @@ #include "content/browser/service_worker/service_worker_version.h" #include "content/browser/storage_partition_impl.h" #include "content/common/service_worker/service_worker_utils.h" +#include "content/public/browser/browser_context.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/devtools_background_services_context.h" @@ -59,6 +60,13 @@ base::OnceCallback<void(scoped_refptr<ServiceWorkerVersion>, blink::ServiceWorkerStatusCode)>; +CanMakePaymentResponsePtr CreateBlankCanMakePaymentResponse( + CanMakePaymentEventResponseType response_type) { + return CanMakePaymentResponse::New(response_type, /*can_make_payment=*/false, + /*ready_for_minimal_ui=*/false, + /*account_balance=*/base::nullopt); +} + PaymentHandlerResponsePtr CreateBlankPaymentHandlerResponse( PaymentEventResponseType response_type) { return PaymentHandlerResponse::New( @@ -68,7 +76,7 @@ base::nullopt /*=shipping_option*/); } -class RespondWithCallbacks; +class InvokeRespondWithCallback; // A repository to store invoking payment app callback. It is used to abort // payment when the opened payment handler window is closed before payment @@ -88,7 +96,7 @@ InvokePaymentAppCallbackRepository& operator=( const InvokePaymentAppCallbackRepository& other) = delete; - RespondWithCallbacks* GetCallback(BrowserContext* browser_context) { + InvokeRespondWithCallback* GetCallback(BrowserContext* browser_context) { DCHECK_CURRENTLY_ON(ServiceWorkerContext::GetCoreThreadId()); auto it = invoke_callbacks_.find(browser_context); if (it != invoke_callbacks_.end()) { @@ -98,7 +106,7 @@ } void SetCallback(BrowserContext* browser_context, - RespondWithCallbacks* callback) { + InvokeRespondWithCallback* callback) { DCHECK_CURRENTLY_ON(ServiceWorkerContext::GetCoreThreadId()); invoke_callbacks_[browser_context] = callback; } @@ -115,167 +123,59 @@ friend struct base::DefaultSingletonTraits< InvokePaymentAppCallbackRepository>; - std::map<BrowserContext*, RespondWithCallbacks*> invoke_callbacks_; + std::map<BrowserContext*, InvokeRespondWithCallback*> invoke_callbacks_; }; -// Note that one and only one of the callbacks from this class must/should be -// called. -// TODO(crbug.com/1060298): Split RespondWithCallbacks into three classes with -// one callback each. -class RespondWithCallbacks : public PaymentHandlerResponseCallback { +// Abstract base class for event callbacks that are invoked when the payment +// handler resolves the promise passed in to TheEvent.respondWith() method. +class RespondWithCallback : public PaymentHandlerResponseCallback { public: - static RespondWithCallbacks* CreateForCanMakePayment( - BrowserContext* browser_context, - scoped_refptr<ServiceWorkerVersion> service_worker_version, - PaymentAppProvider::CanMakePaymentCallback callback) { - RespondWithCallbacks* callbacks = new RespondWithCallbacks( - browser_context, ServiceWorkerMetrics::EventType::CAN_MAKE_PAYMENT, - service_worker_version, - /*can_make_payment_callback=*/std::move(callback), - PaymentAppProvider::InvokePaymentAppCallback(), - PaymentAppProvider::AbortCallback()); - return callbacks; - } - - static RespondWithCallbacks* CreateForInvoke( - BrowserContext* browser_context, - scoped_refptr<ServiceWorkerVersion> service_worker_version, - PaymentAppProvider::InvokePaymentAppCallback callback) { - RespondWithCallbacks* callbacks = new RespondWithCallbacks( - browser_context, ServiceWorkerMetrics::EventType::PAYMENT_REQUEST, - service_worker_version, PaymentAppProvider::CanMakePaymentCallback(), - /*invoke_callback=*/std::move(callback), - PaymentAppProvider::AbortCallback()); - InvokePaymentAppCallbackRepository::GetInstance()->SetCallback( - browser_context, callbacks); - return callbacks; - } - - static RespondWithCallbacks* CreateForAbort( - BrowserContext* browser_context, - scoped_refptr<ServiceWorkerVersion> service_worker_version, - PaymentAppProvider::AbortCallback callback) { - RespondWithCallbacks* callbacks = new RespondWithCallbacks( - browser_context, ServiceWorkerMetrics::EventType::ABORT_PAYMENT, - service_worker_version, PaymentAppProvider::CanMakePaymentCallback(), - PaymentAppProvider::InvokePaymentAppCallback(), - /*abort_callback=*/std::move(callback)); - return callbacks; - } - // Disallow copy and assign. - RespondWithCallbacks(const RespondWithCallbacks& other) = delete; - RespondWithCallbacks& operator=(const RespondWithCallbacks& other) = delete; + RespondWithCallback(const RespondWithCallback& other) = delete; + RespondWithCallback& operator=(const RespondWithCallback& other) = delete; mojo::PendingRemote<PaymentHandlerResponseCallback> BindNewPipeAndPassRemote() { return receiver_.BindNewPipeAndPassRemote(); } - void AbortPaymentSinceOpennedWindowClosing(PaymentEventResponseType reason) { - DCHECK_CURRENTLY_ON(ServiceWorkerContext::GetCoreThreadId()); - - service_worker_version_->FinishRequest(request_id_, false); - RespondWithErrorAndDeleteSelf(reason); - } - - private: - RespondWithCallbacks( + protected: + RespondWithCallback( BrowserContext* browser_context, ServiceWorkerMetrics::EventType event_type, - scoped_refptr<ServiceWorkerVersion> service_worker_version, - PaymentAppProvider::CanMakePaymentCallback can_make_payment_callback, - PaymentAppProvider::InvokePaymentAppCallback invoke_callback, - PaymentAppProvider::AbortCallback abort_callback) + scoped_refptr<ServiceWorkerVersion> service_worker_version) : browser_context_(browser_context), - event_type_(event_type), - service_worker_version_(service_worker_version), - can_make_payment_callback_(std::move(can_make_payment_callback)), - invoke_payment_app_callback_(std::move(invoke_callback)), - abort_callback_(std::move(abort_callback)) { + service_worker_version_(service_worker_version) { request_id_ = service_worker_version->StartRequest( - event_type, base::BindOnce(&RespondWithCallbacks::OnErrorStatus, + event_type, base::BindOnce(&RespondWithCallback::OnServiceWorkerError, weak_ptr_factory_.GetWeakPtr())); } - ~RespondWithCallbacks() override = default; + ~RespondWithCallback() override = default; - void OnResponseForPaymentRequest( - PaymentHandlerResponsePtr response) override { - DCHECK_CURRENTLY_ON(ServiceWorkerContext::GetCoreThreadId()); - service_worker_version_->FinishRequest(request_id_, false); - RunOrPostTaskOnThread( - FROM_HERE, BrowserThread::UI, - base::BindOnce(std::move(invoke_payment_app_callback_), - std::move(response))); - - ClearCallbackRepositoryAndCloseWindow(); - delete this; - } - + // PaymentHandlerResponseCallback implementation. void OnResponseForCanMakePayment( - CanMakePaymentResponsePtr response) override { - DCHECK_CURRENTLY_ON(ServiceWorkerContext::GetCoreThreadId()); + CanMakePaymentResponsePtr response) override {} + + // PaymentHandlerResponseCallback implementation. + void OnResponseForPaymentRequest( + PaymentHandlerResponsePtr response) override {} + + // PaymentHandlerResponseCallback implementation. + void OnResponseForAbortPayment(bool payment_aborted) override {} + + virtual void OnServiceWorkerError( + blink::ServiceWorkerStatusCode service_worker_status) = 0; + + void FinishServiceWorkerRequest() { service_worker_version_->FinishRequest(request_id_, false); - RunOrPostTaskOnThread(FROM_HERE, BrowserThread::UI, - base::BindOnce(std::move(can_make_payment_callback_), - response->can_make_payment)); - delete this; } - void OnResponseForAbortPayment(bool payment_aborted) override { - DCHECK_CURRENTLY_ON(ServiceWorkerContext::GetCoreThreadId()); - service_worker_version_->FinishRequest(request_id_, false); - RunOrPostTaskOnThread( - FROM_HERE, BrowserThread::UI, - base::BindOnce(std::move(abort_callback_), payment_aborted)); - - ClearCallbackRepositoryAndCloseWindow(); - delete this; - } - - void RespondWithErrorAndDeleteSelf(PaymentEventResponseType response_type) { - DCHECK_CURRENTLY_ON(ServiceWorkerContext::GetCoreThreadId()); - - if (event_type_ == ServiceWorkerMetrics::EventType::CAN_MAKE_PAYMENT) { - RunOrPostTaskOnThread( - FROM_HERE, BrowserThread::UI, - base::BindOnce(std::move(can_make_payment_callback_), false)); - } else if (event_type_ == - ServiceWorkerMetrics::EventType::PAYMENT_REQUEST) { - RunOrPostTaskOnThread( - FROM_HERE, BrowserThread::UI, - base::BindOnce(std::move(invoke_payment_app_callback_), - CreateBlankPaymentHandlerResponse(response_type))); - } else if (event_type_ == ServiceWorkerMetrics::EventType::ABORT_PAYMENT) { - RunOrPostTaskOnThread(FROM_HERE, BrowserThread::UI, - base::BindOnce(std::move(abort_callback_), false)); - } - - if (event_type_ == ServiceWorkerMetrics::EventType::PAYMENT_REQUEST || - event_type_ == ServiceWorkerMetrics::EventType::ABORT_PAYMENT) { - ClearCallbackRepositoryAndCloseWindow(); - } - delete this; - } - - void OnErrorStatus(blink::ServiceWorkerStatusCode service_worker_status) { - DCHECK_CURRENTLY_ON(ServiceWorkerContext::GetCoreThreadId()); - DCHECK(service_worker_status != blink::ServiceWorkerStatusCode::kOk); - - PaymentEventResponseType response_type = - PaymentEventResponseType::PAYMENT_EVENT_BROWSER_ERROR; - if (service_worker_status == - blink::ServiceWorkerStatusCode::kErrorEventWaitUntilRejected) { - response_type = PaymentEventResponseType::PAYMENT_EVENT_REJECT; - } else if (service_worker_status == - blink::ServiceWorkerStatusCode::kErrorTimeout) { - response_type = PaymentEventResponseType::PAYMENT_EVENT_TIMEOUT; + void MaybeRecordTimeoutMetric(blink::ServiceWorkerStatusCode status) { + if (status == blink::ServiceWorkerStatusCode::kErrorTimeout) { UMA_HISTOGRAM_BOOLEAN("PaymentRequest.ServiceWorkerStatusCodeTimeout", true); } - - RespondWithErrorAndDeleteSelf(response_type); } void ClearCallbackRepositoryAndCloseWindow() { @@ -288,6 +188,7 @@ base::BindOnce(&CloseClientWindowOnUIThread, browser_context_)); } + private: static void CloseClientWindowOnUIThread(BrowserContext* browser_context) { DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -296,14 +197,205 @@ int request_id_; BrowserContext* browser_context_; - ServiceWorkerMetrics::EventType event_type_; scoped_refptr<ServiceWorkerVersion> service_worker_version_; - PaymentAppProvider::CanMakePaymentCallback can_make_payment_callback_; - PaymentAppProvider::InvokePaymentAppCallback invoke_payment_app_callback_; - PaymentAppProvider::AbortCallback abort_callback_; mojo::Receiver<PaymentHandlerResponseCallback> receiver_{this}; - base::WeakPtrFactory<RespondWithCallbacks> weak_ptr_factory_{this}; + base::WeakPtrFactory<RespondWithCallback> weak_ptr_factory_{this}; +}; + +// Self-deleting callback for "canmakepayment" event. Invoked when the payment +// handler resolves the promise passed into CanMakePaymentEvent.respondWith() +// method. +class CanMakePaymentRespondWithCallback : public RespondWithCallback { + public: + CanMakePaymentRespondWithCallback( + BrowserContext* browser_context, + scoped_refptr<ServiceWorkerVersion> service_worker_version, + PaymentAppProvider::CanMakePaymentCallback callback) + : RespondWithCallback(browser_context, + ServiceWorkerMetrics::EventType::CAN_MAKE_PAYMENT, + service_worker_version), + callback_(std::move(callback)) {} + + // Disallow copy and assign. + CanMakePaymentRespondWithCallback( + const CanMakePaymentRespondWithCallback& other) = delete; + CanMakePaymentRespondWithCallback& operator=( + const CanMakePaymentRespondWithCallback& other) = delete; + + private: + ~CanMakePaymentRespondWithCallback() override = default; + + // PaymentHandlerResponseCallback implementation. + void OnResponseForCanMakePayment( + CanMakePaymentResponsePtr response) override { + DCHECK_CURRENTLY_ON(ServiceWorkerContext::GetCoreThreadId()); + FinishServiceWorkerRequest(); + RunOrPostTaskOnThread( + FROM_HERE, BrowserThread::UI, + base::BindOnce(std::move(callback_), std::move(response))); + delete this; + } + + // RespondWithCallback implementation. + void OnServiceWorkerError( + blink::ServiceWorkerStatusCode service_worker_status) override { + DCHECK_CURRENTLY_ON(ServiceWorkerContext::GetCoreThreadId()); + DCHECK_NE(service_worker_status, blink::ServiceWorkerStatusCode::kOk); + MaybeRecordTimeoutMetric(service_worker_status); + + CanMakePaymentEventResponseType response_type = + CanMakePaymentEventResponseType::BROWSER_ERROR; + if (service_worker_status == + blink::ServiceWorkerStatusCode::kErrorEventWaitUntilRejected) { + response_type = CanMakePaymentEventResponseType::REJECT; + } else if (service_worker_status == + blink::ServiceWorkerStatusCode::kErrorTimeout) { + response_type = CanMakePaymentEventResponseType::TIMEOUT; + } + + RunOrPostTaskOnThread( + FROM_HERE, BrowserThread::UI, + base::BindOnce(std::move(callback_), + CreateBlankCanMakePaymentResponse(response_type))); + delete this; + } + + PaymentAppProvider::CanMakePaymentCallback callback_; +}; + +// Self-deleting callback for "paymentrequest" event. Invoked when the payment +// handler resolves the promise passed into PaymentRequestEvent.respondWith() +// method. +class InvokeRespondWithCallback : public RespondWithCallback { + public: + InvokeRespondWithCallback( + BrowserContext* browser_context, + scoped_refptr<ServiceWorkerVersion> service_worker_version, + PaymentAppProvider::InvokePaymentAppCallback callback) + : RespondWithCallback(browser_context, + ServiceWorkerMetrics::EventType::PAYMENT_REQUEST, + service_worker_version), + callback_(std::move(callback)) { + InvokePaymentAppCallbackRepository::GetInstance()->SetCallback( + browser_context, this); + } + + // Disallow copy and assign. + InvokeRespondWithCallback(const InvokeRespondWithCallback& other) = delete; + InvokeRespondWithCallback& operator=(const InvokeRespondWithCallback& other) = + delete; + + // Called only for "paymentrequest" event. + void AbortPaymentSinceOpennedWindowClosing(PaymentEventResponseType reason) { + DCHECK_CURRENTLY_ON(ServiceWorkerContext::GetCoreThreadId()); + + FinishServiceWorkerRequest(); + RespondToPaymentRequestWithErrorAndDeleteSelf(reason); + } + + private: + ~InvokeRespondWithCallback() override = default; + + // PaymentHandlerResponseCallback implementation. + void OnResponseForPaymentRequest( + PaymentHandlerResponsePtr response) override { + DCHECK_CURRENTLY_ON(ServiceWorkerContext::GetCoreThreadId()); + FinishServiceWorkerRequest(); + RunOrPostTaskOnThread( + FROM_HERE, BrowserThread::UI, + base::BindOnce(std::move(callback_), std::move(response))); + + ClearCallbackRepositoryAndCloseWindow(); + delete this; + } + + // RespondWithCallback implementation. + void OnServiceWorkerError( + blink::ServiceWorkerStatusCode service_worker_status) override { + DCHECK_CURRENTLY_ON(ServiceWorkerContext::GetCoreThreadId()); + DCHECK_NE(service_worker_status, blink::ServiceWorkerStatusCode::kOk); + MaybeRecordTimeoutMetric(service_worker_status); + + PaymentEventResponseType response_type = + PaymentEventResponseType::PAYMENT_EVENT_BROWSER_ERROR; + if (service_worker_status == + blink::ServiceWorkerStatusCode::kErrorEventWaitUntilRejected) { + response_type = PaymentEventResponseType::PAYMENT_EVENT_REJECT; + } else if (service_worker_status == + blink::ServiceWorkerStatusCode::kErrorTimeout) { + response_type = PaymentEventResponseType::PAYMENT_EVENT_TIMEOUT; + } + + RespondToPaymentRequestWithErrorAndDeleteSelf(response_type); + } + + void RespondToPaymentRequestWithErrorAndDeleteSelf( + PaymentEventResponseType response_type) { + DCHECK_CURRENTLY_ON(ServiceWorkerContext::GetCoreThreadId()); + RunOrPostTaskOnThread( + FROM_HERE, BrowserThread::UI, + base::BindOnce(std::move(callback_), + CreateBlankPaymentHandlerResponse(response_type))); + ClearCallbackRepositoryAndCloseWindow(); + delete this; + } + + PaymentAppProvider::InvokePaymentAppCallback callback_; +}; + +// Self-deleting callback for "abortpayment" event. Invoked when the payment +// handler resolves the promise passed into AbortPayment.respondWith() method. +class AbortRespondWithCallback : public RespondWithCallback { + public: + AbortRespondWithCallback( + BrowserContext* browser_context, + scoped_refptr<ServiceWorkerVersion> service_worker_version, + PaymentAppProvider::AbortCallback callback) + : RespondWithCallback(browser_context, + ServiceWorkerMetrics::EventType::ABORT_PAYMENT, + service_worker_version), + callback_(std::move(callback)) {} + + // Disallow copy and assign. + AbortRespondWithCallback(const AbortRespondWithCallback& other) = delete; + AbortRespondWithCallback& operator=(const AbortRespondWithCallback& other) = + delete; + + private: + ~AbortRespondWithCallback() override = default; + + // PaymentHandlerResponseCallback implementation. + void OnResponseForAbortPayment(bool payment_aborted) override { + DCHECK_CURRENTLY_ON(ServiceWorkerContext::GetCoreThreadId()); + FinishServiceWorkerRequest(); + RunOrPostTaskOnThread( + FROM_HERE, BrowserThread::UI, + base::BindOnce(std::move(callback_), payment_aborted)); + + if (payment_aborted) + ClearCallbackRepositoryAndCloseWindow(); + + delete this; + } + + // RespondWithCallback implementation. + void OnServiceWorkerError( + blink::ServiceWorkerStatusCode service_worker_status) override { + DCHECK_CURRENTLY_ON(ServiceWorkerContext::GetCoreThreadId()); + DCHECK_NE(service_worker_status, blink::ServiceWorkerStatusCode::kOk); + MaybeRecordTimeoutMetric(service_worker_status); + RunOrPostTaskOnThread( + FROM_HERE, BrowserThread::UI, + base::BindOnce(std::move(callback_), /*payment_aborted=*/false)); + // Do not call ClearCallbackRepositoryAndCloseWindow() here, because payment + // has not been aborted. The service worker either rejected, timed out, or + // threw a JavaScript exception in the "abortpayment" event, but that does + // not affect the ongoing "paymentrequest" event. + delete this; + } + + PaymentAppProvider::AbortCallback callback_; }; void DidGetAllPaymentAppsOnCoreThread( @@ -342,12 +434,11 @@ // This object self-deletes after either success or error callback is // invoked. - RespondWithCallbacks* invocation_callbacks = - RespondWithCallbacks::CreateForAbort(browser_context, active_version, - std::move(callback)); + RespondWithCallback* respond_with_callback = new AbortRespondWithCallback( + browser_context, active_version, std::move(callback)); active_version->endpoint()->DispatchAbortPaymentEvent( - invocation_callbacks->BindNewPipeAndPassRemote(), + respond_with_callback->BindNewPipeAndPassRemote(), active_version->CreateSimpleEventCallback(event_finish_id)); } @@ -360,8 +451,11 @@ DCHECK_CURRENTLY_ON(ServiceWorkerContext::GetCoreThreadId()); if (service_worker_status != blink::ServiceWorkerStatusCode::kOk) { - base::PostTask(FROM_HERE, {BrowserThread::UI}, - base::BindOnce(std::move(callback), false)); + base::PostTask( + FROM_HERE, {BrowserThread::UI}, + base::BindOnce(std::move(callback), + CreateBlankCanMakePaymentResponse( + CanMakePaymentEventResponseType::BROWSER_ERROR))); return; } @@ -372,12 +466,12 @@ // This object self-deletes after either success or error callback is // invoked. - RespondWithCallbacks* invocation_callbacks = - RespondWithCallbacks::CreateForCanMakePayment( - browser_context, active_version, std::move(callback)); + RespondWithCallback* respond_with_callback = + new CanMakePaymentRespondWithCallback(browser_context, active_version, + std::move(callback)); active_version->endpoint()->DispatchCanMakePaymentEvent( - std::move(event_data), invocation_callbacks->BindNewPipeAndPassRemote(), + std::move(event_data), respond_with_callback->BindNewPipeAndPassRemote(), active_version->CreateSimpleEventCallback(event_finish_id)); } @@ -406,12 +500,11 @@ // This object self-deletes after either success or error callback is // invoked. - RespondWithCallbacks* invocation_callbacks = - RespondWithCallbacks::CreateForInvoke(browser_context, active_version, - std::move(callback)); + RespondWithCallback* respond_with_callback = new InvokeRespondWithCallback( + browser_context, active_version, std::move(callback)); active_version->endpoint()->DispatchPaymentRequestEvent( - std::move(event_data), invocation_callbacks->BindNewPipeAndPassRemote(), + std::move(event_data), respond_with_callback->BindNewPipeAndPassRemote(), active_version->CreateSimpleEventCallback(event_finish_id)); } @@ -509,7 +602,7 @@ PaymentEventResponseType reason) { DCHECK_CURRENTLY_ON(ServiceWorkerContext::GetCoreThreadId()); - RespondWithCallbacks* callback = + InvokeRespondWithCallback* callback = InvokePaymentAppCallbackRepository::GetInstance()->GetCallback( browser_context); if (callback) @@ -574,17 +667,22 @@ const url::Origin& sw_origin, const std::string& payment_request_id, PaymentAppProvider::CanMakePaymentCallback callback, - bool can_make_payment) { + CanMakePaymentResponsePtr response) { + // TODO(rouslan): Validate, log, and forward these fields from the renderer to + // the browser. + response->ready_for_minimal_ui = false; + response->account_balance.reset(); + auto* dev_tools = GetDevToolsForInstanceGroup(instance_group, sw_origin); if (dev_tools) { dev_tools->LogBackgroundServiceEvent( registration_id, sw_origin, DevToolsBackgroundService::kPaymentHandler, "Can make payment response", /*instance_id=*/payment_request_id, - {{"Can Make Payment", can_make_payment ? "true" : "false"}}); + {{"Can Make Payment", response->can_make_payment ? "true" : "false"}}); } - std::move(callback).Run(can_make_payment); + std::move(callback).Run(std::move(response)); } void OnResponseForAbortPaymentOnUiThread(
diff --git a/content/browser/payments/payment_app_provider_impl_unittest.cc b/content/browser/payments/payment_app_provider_impl_unittest.cc index d609550..d13d0d4 100644 --- a/content/browser/payments/payment_app_provider_impl_unittest.cc +++ b/content/browser/payments/payment_app_provider_impl_unittest.cc
@@ -40,10 +40,11 @@ *out_apps = std::move(apps); } -void CaptureCanMakePaymentResult(base::OnceClosure callback, - bool* out_payment_event_result, - bool payment_event_result) { - *out_payment_event_result = payment_event_result; +void CaptureCanMakePaymentResult( + base::OnceClosure callback, + bool* out_payment_event_result, + payments::mojom::CanMakePaymentResponsePtr response) { + *out_payment_event_result = response->can_make_payment; std::move(callback).Run(); }
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc index 95c091d..85edc39 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -1936,11 +1936,14 @@ void RenderProcessHostImpl::BindCacheStorage( const network::CrossOriginEmbedderPolicy& cross_origin_embedder_policy, + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter> + coep_reporter_remote, const url::Origin& origin, mojo::PendingReceiver<blink::mojom::CacheStorage> receiver) { DCHECK_CURRENTLY_ON(BrowserThread::UI); storage_partition_impl_->GetCacheStorageContext()->AddReceiver( - cross_origin_embedder_policy, origin, std::move(receiver)); + cross_origin_embedder_policy, std::move(coep_reporter_remote), origin, + std::move(receiver)); } void RenderProcessHostImpl::BindIndexedDB(
diff --git a/content/browser/renderer_host/render_process_host_impl.h b/content/browser/renderer_host/render_process_host_impl.h index 08b7376..1f67061 100644 --- a/content/browser/renderer_host/render_process_host_impl.h +++ b/content/browser/renderer_host/render_process_host_impl.h
@@ -256,6 +256,8 @@ const GURL& lock_url) override; void BindCacheStorage( const network::CrossOriginEmbedderPolicy& cross_origin_embedder_policy, + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter> + coep_reporter, const url::Origin& origin, mojo::PendingReceiver<blink::mojom::CacheStorage> receiver) override; void BindIndexedDB(
diff --git a/content/browser/service_worker/embedded_worker_instance.cc b/content/browser/service_worker/embedded_worker_instance.cc index eee6eef6..3b5a603 100644 --- a/content/browser/service_worker/embedded_worker_instance.cc +++ b/content/browser/service_worker/embedded_worker_instance.cc
@@ -20,6 +20,7 @@ #include "content/browser/data_url_loader_factory.h" #include "content/browser/devtools/devtools_instrumentation.h" #include "content/browser/devtools/service_worker_devtools_manager.h" +#include "content/browser/net/cross_origin_embedder_policy_reporter.h" #include "content/browser/renderer_host/render_process_host_impl.h" #include "content/browser/service_worker/embedded_worker_status.h" #include "content/browser/service_worker/service_worker_consts.h" @@ -79,11 +80,13 @@ void NotifyUpdateCrossOriginEmbedderPolicyOnUI( int worker_process_id, int worker_route_id, - network::CrossOriginEmbedderPolicy cross_origin_embedder_policy) { + network::CrossOriginEmbedderPolicy cross_origin_embedder_policy, + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter> + coep_reporter) { DCHECK_CURRENTLY_ON(BrowserThread::UI); ServiceWorkerDevToolsManager::GetInstance()->UpdateCrossOriginEmbedderPolicy( worker_process_id, worker_route_id, - std::move(cross_origin_embedder_policy)); + std::move(cross_origin_embedder_policy), std::move(coep_reporter)); } void NotifyWorkerDestroyedOnUI(int worker_process_id, int worker_route_id) { @@ -105,6 +108,74 @@ worker_process_id, worker_route_id); } +using CreateFactoryBundlesOnUICallback = base::OnceCallback<void( + std::unique_ptr<blink::PendingURLLoaderFactoryBundle> script_bundle, + std::unique_ptr<blink::PendingURLLoaderFactoryBundle> subresouce_bundle, + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter> + coep_reporter)>; +void CreateFactoryBundlesOnUI(int process_id, + int routing_id, + const GURL& script_url, + base::Optional<network::CrossOriginEmbedderPolicy> + cross_origin_embedder_policy, + CreateFactoryBundlesOnUICallback callback) { + DCHECK_CURRENTLY_ON(BrowserThread::UI); + auto* rph = RenderProcessHost::FromID(process_id); + if (!rph) { + // Return nullptr because we can't create a factory bundle because of + // missing renderer. + ServiceWorkerContextWrapper::RunOrPostTaskOnCoreThread( + FROM_HERE, base::BindOnce(std::move(callback), nullptr, nullptr, + mojo::NullRemote())); + return; + } + + // Create mojo::Remote which is connected to and owns a COEP reporter. + mojo::Remote<network::mojom::CrossOriginEmbedderPolicyReporter> coep_reporter; + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter> + coep_reporter_for_devtools; + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter> + coep_reporter_for_scripts; + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter> + coep_reporter_for_subresources; + + // |cross_origin_embedder_policy| is nullopt in some unittests. + // TODO(shimazu): Set COEP in those tests. + if (cross_origin_embedder_policy) { + mojo::MakeSelfOwnedReceiver( + std::make_unique<CrossOriginEmbedderPolicyReporter>( + rph->GetStoragePartition(), script_url, + cross_origin_embedder_policy->reporting_endpoint, + cross_origin_embedder_policy->report_only_reporting_endpoint), + coep_reporter.BindNewPipeAndPassReceiver()); + coep_reporter->Clone( + coep_reporter_for_devtools.InitWithNewPipeAndPassReceiver()); + coep_reporter->Clone( + coep_reporter_for_scripts.InitWithNewPipeAndPassReceiver()); + coep_reporter->Clone( + coep_reporter_for_subresources.InitWithNewPipeAndPassReceiver()); + + NotifyUpdateCrossOriginEmbedderPolicyOnUI( + process_id, routing_id, cross_origin_embedder_policy.value(), + std::move(coep_reporter_for_devtools)); + } + + const url::Origin origin = url::Origin::Create(script_url); + auto script_bundle = EmbeddedWorkerInstance::CreateFactoryBundleOnUI( + rph, routing_id, origin, cross_origin_embedder_policy, + std::move(coep_reporter_for_scripts), + ContentBrowserClient::URLLoaderFactoryType::kServiceWorkerScript); + auto subresource_bundle = EmbeddedWorkerInstance::CreateFactoryBundleOnUI( + rph, routing_id, origin, cross_origin_embedder_policy, + std::move(coep_reporter_for_subresources), + ContentBrowserClient::URLLoaderFactoryType::kServiceWorkerSubResource); + ServiceWorkerContextWrapper::RunOrPostTaskOnCoreThread( + FROM_HERE, base::BindOnce(std::move(callback), std::move(script_bundle), + std::move(subresource_bundle), + coep_reporter ? coep_reporter.Unbind() + : mojo::NullRemote())); +} + using SetupProcessCallback = base::OnceCallback<void( blink::ServiceWorkerStatusCode, blink::mojom::EmbeddedWorkerStartParamsPtr, @@ -116,6 +187,7 @@ , std::unique_ptr< blink::PendingURLLoaderFactoryBundle> /* factory_bundle_for_renderer */, + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter>, const base::Optional<base::TimeDelta>& thread_hop_time, const base::Optional<base::Time>& ui_post_time)>; @@ -166,6 +238,7 @@ std::move(devtools_proxy), std::move(factory_bundle_for_new_scripts), std::move(factory_bundle_for_renderer), + /*coep_reporter=*/mojo::NullRemote(), thread_hop_time, ui_post_time)); return; } @@ -185,7 +258,8 @@ base::BindOnce(std::move(callback), status, std::move(params), std::move(process_info), std::move(devtools_proxy), std::move(factory_bundle_for_new_scripts), - std::move(factory_bundle_for_renderer), thread_hop_time, + std::move(factory_bundle_for_renderer), + /*coep_reporter=*/mojo::NullRemote(), thread_hop_time, ui_post_time)); return; } @@ -202,13 +276,37 @@ if (receiver.is_valid()) rph->BindReceiver(std::move(receiver)); + // Create COEP reporter if COEP value is already available (= this worker is + // not a worker which is going to be newly registered). + mojo::Remote<network::mojom::CrossOriginEmbedderPolicyReporter> coep_reporter; + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter> + coep_reporter_for_devtools; + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter> + coep_reporter_for_scripts; + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter> + coep_reporter_for_subresources; + if (cross_origin_embedder_policy) { + mojo::MakeSelfOwnedReceiver( + std::make_unique<CrossOriginEmbedderPolicyReporter>( + rph->GetStoragePartition(), params->script_url, + cross_origin_embedder_policy->reporting_endpoint, + cross_origin_embedder_policy->report_only_reporting_endpoint), + coep_reporter.BindNewPipeAndPassReceiver()); + coep_reporter->Clone( + coep_reporter_for_devtools.InitWithNewPipeAndPassReceiver()); + coep_reporter->Clone( + coep_reporter_for_scripts.InitWithNewPipeAndPassReceiver()); + coep_reporter->Clone( + coep_reporter_for_subresources.InitWithNewPipeAndPassReceiver()); + } // Register to DevTools and update params accordingly. const int routing_id = rph->GetNextRoutingID(); ServiceWorkerDevToolsManager::GetInstance()->WorkerCreated( process_id, routing_id, context, weak_context, params->service_worker_version_id, params->script_url, params->scope, params->is_installed, cross_origin_embedder_policy, - ¶ms->devtools_worker_token, ¶ms->wait_for_debugger); + std::move(coep_reporter_for_devtools), ¶ms->devtools_worker_token, + ¶ms->wait_for_debugger); params->service_worker_route_id = routing_id; // Create DevToolsProxy here to ensure that the WorkerCreated() call is // balanced by DevToolsProxy's destructor calling WorkerDestroyed(). @@ -228,6 +326,7 @@ factory_bundle_for_new_scripts = EmbeddedWorkerInstance::CreateFactoryBundleOnUI( rph, routing_id, origin, cross_origin_embedder_policy, + std::move(coep_reporter_for_scripts), ContentBrowserClient::URLLoaderFactoryType::kServiceWorkerScript); } @@ -238,6 +337,7 @@ // instance can be started. factory_bundle_for_renderer = EmbeddedWorkerInstance::CreateFactoryBundleOnUI( rph, routing_id, origin, cross_origin_embedder_policy, + std::move(coep_reporter_for_subresources), ContentBrowserClient::URLLoaderFactoryType::kServiceWorkerSubResource); // TODO(crbug.com/862854): Support changes to @@ -260,11 +360,13 @@ ui_post_time = base::Time::Now(); RunOrPostTaskOnThread( FROM_HERE, ServiceWorkerContext::GetCoreThreadId(), - base::BindOnce(std::move(callback), status, std::move(params), - std::move(process_info), std::move(devtools_proxy), - std::move(factory_bundle_for_new_scripts), - std::move(factory_bundle_for_renderer), thread_hop_time, - ui_post_time)); + base::BindOnce( + std::move(callback), status, std::move(params), + std::move(process_info), std::move(devtools_proxy), + std::move(factory_bundle_for_new_scripts), + std::move(factory_bundle_for_renderer), + coep_reporter ? coep_reporter.Unbind() : mojo::NullRemote(), + thread_hop_time, ui_post_time)); } bool HasSentStartWorker(EmbeddedWorkerInstance::StartingPhase phase) { @@ -301,14 +403,16 @@ int process_id, url::Origin origin, network::CrossOriginEmbedderPolicy cross_origin_embedder_policy, + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter> + coep_reporter, mojo::PendingReceiver<blink::mojom::CacheStorage> receiver) { DCHECK_CURRENTLY_ON(BrowserThread::UI); auto* rph = RenderProcessHost::FromID(process_id); if (!rph) return; - rph->BindCacheStorage(cross_origin_embedder_policy, origin, - std::move(receiver)); + rph->BindCacheStorage(cross_origin_embedder_policy, std::move(coep_reporter), + origin, std::move(receiver)); } } // namespace @@ -350,21 +454,6 @@ } } - void NotifyUpdateCrossOriginEmbedderPolicy( - network::CrossOriginEmbedderPolicy cross_origin_embedder_policy) { - DCHECK_CURRENTLY_ON(ServiceWorkerContext::GetCoreThreadId()); - if (ServiceWorkerContext::IsServiceWorkerOnUIEnabled()) { - NotifyUpdateCrossOriginEmbedderPolicyOnUI( - process_id_, agent_route_id_, - std::move(cross_origin_embedder_policy)); - } else { - ui_task_runner_->PostTask( - FROM_HERE, base::BindOnce(NotifyUpdateCrossOriginEmbedderPolicyOnUI, - process_id_, agent_route_id_, - std::move(cross_origin_embedder_policy))); - } - } - void NotifyWorkerVersionInstalled() { DCHECK_CURRENTLY_ON(ServiceWorkerContext::GetCoreThreadId()); if (ServiceWorkerContext::IsServiceWorkerOnUIEnabled()) { @@ -617,6 +706,8 @@ factory_bundle_for_new_scripts, std::unique_ptr<blink::PendingURLLoaderFactoryBundle> factory_bundle_for_renderer, + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter> + coep_reporter, const base::Optional<base::TimeDelta>& thread_hop_time, const base::Optional<base::Time>& ui_post_time) { DCHECK_CURRENTLY_ON(ServiceWorkerContext::GetCoreThreadId()); @@ -697,6 +788,14 @@ .InitWithNewPipeAndPassReceiver()); } + // Bind COEP reporter created on the UI thread, which has the onwership of + // the instance. The |coep_reporter| might be null when the COEP value is + // not known because the main script has not been loaded yet. In that case, + // COEP reporter will be bound after the main script is loaded. + if (coep_reporter) { + instance_->coep_reporter_.Bind(std::move(coep_reporter)); + } + instance_->SendStartWorker(std::move(params)); std::move(sent_start_callback_).Run(blink::ServiceWorkerStatusCode::kOk); @@ -931,13 +1030,6 @@ if (!inflight_start_task_) return; - // COEP could be nullopt if it's in unittests. - // TODO(shimazu): Set COEP in the failing unit tests. - if (devtools_proxy_ && owner_version_->cross_origin_embedder_policy()) { - devtools_proxy_->NotifyUpdateCrossOriginEmbedderPolicy( - owner_version_->cross_origin_embedder_policy().value()); - } - // Renderer side has started to launch the worker thread. starting_phase_ = SCRIPT_LOADED; owner_version_->OnMainScriptLoaded(); @@ -1087,6 +1179,8 @@ const url::Origin& origin, const base::Optional<network::CrossOriginEmbedderPolicy>& cross_origin_embedder_policy, + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter> + coep_reporter, ContentBrowserClient::URLLoaderFactoryType factory_type) { DCHECK_CURRENTLY_ON(BrowserThread::UI); auto factory_bundle = @@ -1096,7 +1190,8 @@ .InitWithNewPipeAndPassReceiver(); network::mojom::URLLoaderFactoryParamsPtr factory_params = URLLoaderFactoryParamsHelper::CreateForWorker( - rph, origin, net::NetworkIsolationKey(origin, origin)); + rph, origin, net::NetworkIsolationKey(origin, origin), + std::move(coep_reporter)); bool bypass_redirect_checks = false; DCHECK(factory_type == @@ -1157,6 +1252,19 @@ return factory_bundle; } +void EmbeddedWorkerInstance::CreateFactoryBundles( + CreateFactoryBundlesCallback callback) { + DCHECK_CURRENTLY_ON(ServiceWorkerContext::GetCoreThreadId()); + RunOrPostTaskOnThread( + FROM_HERE, BrowserThread::UI, + base::BindOnce( + &CreateFactoryBundlesOnUI, process_id(), + worker_devtools_agent_route_id(), owner_version_->script_url(), + owner_version_->cross_origin_embedder_policy(), + base::BindOnce(&EmbeddedWorkerInstance::OnCreatedFactoryBundles, + AsWeakPtr(), std::move(callback)))); +} + void EmbeddedWorkerInstance::OnReportException( const base::string16& error_message, int line_number, @@ -1232,6 +1340,7 @@ process_handle_.reset(); lifetime_tracker_.reset(); subresource_loader_updater_.reset(); + coep_reporter_.reset(); status_ = EmbeddedWorkerStatus::STOPPED; starting_phase_ = NOT_STARTING; thread_id_ = ServiceWorkerConsts::kInvalidEmbeddedWorkerThreadId; @@ -1350,16 +1459,36 @@ // loaded the headers and the COEP one is known. if (!owner_version_->cross_origin_embedder_policy()) return; + network::CrossOriginEmbedderPolicy coep = + owner_version_->cross_origin_embedder_policy().value(); + + // TODO(https://crbug.com/1059727) Plumb a CrossOriginEmbedderPolicyReporter + // to handle reports. + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter> + coep_reporter_remote; for (auto& receiver : pending_cache_storage_receivers_) { RunOrPostTaskOnThread( FROM_HERE, BrowserThread::UI, base::BindOnce(content::BindCacheStorageOnUIThread, process_id(), - owner_version_->script_origin(), - owner_version_->cross_origin_embedder_policy().value(), - std::move(receiver))); + owner_version_->script_origin(), coep, + std::move(coep_reporter_remote), std::move(receiver))); } pending_cache_storage_receivers_.clear(); } +void EmbeddedWorkerInstance::OnCreatedFactoryBundles( + CreateFactoryBundlesCallback callback, + std::unique_ptr<blink::PendingURLLoaderFactoryBundle> script_bundle, + std::unique_ptr<blink::PendingURLLoaderFactoryBundle> subresource_bundle, + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter> + coep_reporter) { + DCHECK_CURRENTLY_ON(ServiceWorkerContext::GetCoreThreadId()); + if (coep_reporter) { + coep_reporter_.Bind(std::move(coep_reporter)); + } + std::move(callback).Run(std::move(script_bundle), + std::move(subresource_bundle)); +} + } // namespace content
diff --git a/content/browser/service_worker/embedded_worker_instance.h b/content/browser/service_worker/embedded_worker_instance.h index 7079655c..5c4c6af 100644 --- a/content/browser/service_worker/embedded_worker_instance.h +++ b/content/browser/service_worker/embedded_worker_instance.h
@@ -41,10 +41,12 @@ namespace content { +class CrossOriginEmbedderPolicyReporter; class RenderProcessHost; class ServiceWorkerContentSettingsProxyImpl; class ServiceWorkerContextCore; class ServiceWorkerVersion; +class CrossOriginEmbedderPolicyReporter; namespace service_worker_new_script_loader_unittest { class ServiceWorkerNewScriptLoaderTest; @@ -234,8 +236,17 @@ const url::Origin& origin, const base::Optional<network::CrossOriginEmbedderPolicy>& cross_origin_embedder_policy, + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter> + coep_reporter, ContentBrowserClient::URLLoaderFactoryType factory_type); + // Creates a set of factory bundles for scripts and subresources. This must be + // called after the COEP value for the worker script is known. + using CreateFactoryBundlesCallback = base::OnceCallback<void( + std::unique_ptr<blink::PendingURLLoaderFactoryBundle> script_bundle, + std::unique_ptr<blink::PendingURLLoaderFactoryBundle> subresouce_bundle)>; + void CreateFactoryBundles(CreateFactoryBundlesCallback callback); + private: typedef base::ObserverList<Listener>::Unchecked ListenerList; class ScopedLifetimeTracker; @@ -310,6 +321,13 @@ void BindCacheStorageInternal(); + void OnCreatedFactoryBundles( + CreateFactoryBundlesCallback callback, + std::unique_ptr<blink::PendingURLLoaderFactoryBundle> script_bundle, + std::unique_ptr<blink::PendingURLLoaderFactoryBundle> subresouce_bundle, + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter> + coep_reporter); + base::WeakPtr<ServiceWorkerContextCore> context_; ServiceWorkerVersion* owner_version_; @@ -373,6 +391,12 @@ std::vector<mojo::PendingReceiver<blink::mojom::CacheStorage>> pending_cache_storage_receivers_; + // COEP Reporter connected to the URLLoaderFactories that handles subresource + // requests initiated from the service worker. The impl lives on the UI + // thread, and |coep_reporter_| has the ownership of the impl instance. + mojo::Remote<network::mojom::CrossOriginEmbedderPolicyReporter> + coep_reporter_; + base::WeakPtrFactory<EmbeddedWorkerInstance> weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(EmbeddedWorkerInstance);
diff --git a/content/browser/service_worker/service_worker_client_utils.cc b/content/browser/service_worker/service_worker_client_utils.cc index 2ec241b..04e5003 100644 --- a/content/browser/service_worker/service_worker_client_utils.cc +++ b/content/browser/service_worker/service_worker_client_utils.cc
@@ -316,7 +316,7 @@ } void AddWindowClient( - ServiceWorkerContainerHost* container_host, + const ServiceWorkerContainerHost* container_host, std::vector<std::tuple<int, int, base::TimeTicks, std::string>>* client_info) { DCHECK_CURRENTLY_ON(ServiceWorkerContext::GetCoreThreadId()); @@ -332,7 +332,7 @@ } void AddNonWindowClient( - ServiceWorkerContainerHost* container_host, + const ServiceWorkerContainerHost* container_host, blink::mojom::ServiceWorkerClientType client_type, std::vector<blink::mojom::ServiceWorkerClientInfoPtr>* out_clients) { DCHECK_CURRENTLY_ON(ServiceWorkerContext::GetCoreThreadId()); @@ -432,7 +432,7 @@ std::vector<blink::mojom::ServiceWorkerClientInfoPtr> clients) { DCHECK_CURRENTLY_ON(ServiceWorkerContext::GetCoreThreadId()); if (!options->include_uncontrolled) { - for (auto& controllee : controller->controllee_map()) + for (const auto& controllee : controller->controllee_map()) AddNonWindowClient(controllee.second, options->client_type, &clients); } else if (controller->context()) { GURL origin = controller->script_url().GetOrigin(); @@ -473,7 +473,7 @@ std::vector<std::tuple<int, int, base::TimeTicks, std::string>> clients_info; if (!options->include_uncontrolled) { - for (auto& controllee : controller->controllee_map()) + for (const auto& controllee : controller->controllee_map()) AddWindowClient(controllee.second, &clients_info); } else if (controller->context()) { GURL origin = controller->script_url().GetOrigin();
diff --git a/content/browser/service_worker/service_worker_container_host.cc b/content/browser/service_worker/service_worker_container_host.cc index bcc2528..37b2527 100644 --- a/content/browser/service_worker/service_worker_container_host.cc +++ b/content/browser/service_worker/service_worker_container_host.cc
@@ -758,7 +758,9 @@ void ServiceWorkerContainerHost::OnBeginNavigationCommit( int container_process_id, int container_frame_id, - const network::CrossOriginEmbedderPolicy& cross_origin_embedder_policy) { + const network::CrossOriginEmbedderPolicy& cross_origin_embedder_policy, + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter> + coep_reporter) { DCHECK_CURRENTLY_ON(ServiceWorkerContext::GetCoreThreadId()); DCHECK_EQ(blink::mojom::ServiceWorkerContainerType::kForWindow, type()); @@ -770,11 +772,19 @@ DCHECK(!cross_origin_embedder_policy_.has_value()); cross_origin_embedder_policy_ = cross_origin_embedder_policy; + coep_reporter_.Bind(std::move(coep_reporter)); + + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter> + coep_reporter_to_be_passed; + coep_reporter_->Clone( + coep_reporter_to_be_passed.InitWithNewPipeAndPassReceiver()); + if (controller_ && controller_->fetch_handler_existence() == ServiceWorkerVersion::FetchHandlerExistence::EXISTS) { DCHECK(pending_controller_receiver_); controller_->controller()->Clone(std::move(pending_controller_receiver_), - cross_origin_embedder_policy_.value()); + cross_origin_embedder_policy_.value(), + std::move(coep_reporter_to_be_passed)); } if (IsBackForwardCacheEnabled()) { @@ -807,8 +817,10 @@ if (controller_ && controller_->fetch_handler_existence() == ServiceWorkerVersion::FetchHandlerExistence::EXISTS) { DCHECK(pending_controller_receiver_); + // TODO(https://crbug.com/999049): Plumb the COEP reporter. controller_->controller()->Clone(std::move(pending_controller_receiver_), - cross_origin_embedder_policy_.value()); + cross_origin_embedder_policy_.value(), + mojo::NullRemote()); } TransitionToClientPhase(ClientPhase::kResponseCommitted); @@ -915,9 +927,26 @@ pending_controller_receiver_ = remote_controller.BindNewPipeAndPassReceiver(); } else { + using ServiceWorkerContainerType = blink::mojom::ServiceWorkerContainerType; + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter> + coep_reporter_to_be_passed; + if (coep_reporter_) { + DCHECK_EQ(ServiceWorkerContainerType::kForWindow, type_); + coep_reporter_->Clone( + coep_reporter_to_be_passed.InitWithNewPipeAndPassReceiver()); + } else { + // TODO(https://crbug.com/999049): Implement DedicatedWorker and + // SharedWorker cases. + DCHECK( + (base::FeatureList::IsEnabled(blink::features::kPlzDedicatedWorker) && + type_ == ServiceWorkerContainerType::kForDedicatedWorker) || + type_ == ServiceWorkerContainerType::kForSharedWorker); + } + controller_->controller()->Clone( remote_controller.BindNewPipeAndPassReceiver(), - cross_origin_embedder_policy_.value()); + cross_origin_embedder_policy_.value(), + std::move(coep_reporter_to_be_passed)); } return remote_controller; } @@ -1287,8 +1316,26 @@ DCHECK_CURRENTLY_ON(ServiceWorkerContext::GetCoreThreadId()); if (status == blink::ServiceWorkerStatusCode::kOk) { DCHECK(is_response_committed()); + + using ServiceWorkerContainerType = blink::mojom::ServiceWorkerContainerType; + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter> + coep_reporter_to_be_passed; + if (coep_reporter_) { + DCHECK_EQ(ServiceWorkerContainerType::kForWindow, type_); + coep_reporter_->Clone( + coep_reporter_to_be_passed.InitWithNewPipeAndPassReceiver()); + } else { + // TODO(https://crbug.com/999049): Implement DedicatedWorker and + // SharedWorker cases. + DCHECK( + (base::FeatureList::IsEnabled(blink::features::kPlzDedicatedWorker) && + type_ == ServiceWorkerContainerType::kForDedicatedWorker) || + type_ == ServiceWorkerContainerType::kForSharedWorker); + } + controller_->controller()->Clone(std::move(receiver), - cross_origin_embedder_policy_.value()); + cross_origin_embedder_policy_.value(), + std::move(coep_reporter_to_be_passed)); } }
diff --git a/content/browser/service_worker/service_worker_container_host.h b/content/browser/service_worker/service_worker_container_host.h index 96615f8..ff1e50e 100644 --- a/content/browser/service_worker/service_worker_container_host.h +++ b/content/browser/service_worker/service_worker_container_host.h
@@ -267,7 +267,9 @@ void OnBeginNavigationCommit( int container_process_id, int container_frame_id, - const network::CrossOriginEmbedderPolicy& cross_origin_embedder_policy); + const network::CrossOriginEmbedderPolicy& cross_origin_embedder_policy, + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter> + coep_reporter); // For service worker clients that are shared workers or dedicated workers. // Called when the web worker main script resource has finished loading. @@ -599,6 +601,10 @@ // response commit. base::Optional<network::CrossOriginEmbedderPolicy> cross_origin_embedder_policy_; + // An endpoint connected to the COEP reporter. A clone of this connection is + // passed to the service worker. + mojo::Remote<network::mojom::CrossOriginEmbedderPolicyReporter> + coep_reporter_; // TODO(yuzus): This bit will be unnecessary once ServiceWorkerContainerHost // and RenderFrameHost have the same lifetime.
diff --git a/content/browser/service_worker/service_worker_context_core.cc b/content/browser/service_worker/service_worker_context_core.cc index 5b2d4b4..8bc8d30 100644 --- a/content/browser/service_worker/service_worker_context_core.cc +++ b/content/browser/service_worker/service_worker_context_core.cc
@@ -827,9 +827,7 @@ void ServiceWorkerContextCore::OnRunningStateChanged( ServiceWorkerVersion* version) { - if (!version->context()) - return; - + DCHECK_EQ(this, version->context().get()); switch (version->running_status()) { case EmbeddedWorkerStatus::STOPPED: observer_list_->Notify(FROM_HERE, @@ -857,6 +855,7 @@ void ServiceWorkerContextCore::OnVersionStateChanged( ServiceWorkerVersion* version) { + DCHECK_EQ(this, version->context().get()); observer_list_->Notify( FROM_HERE, &ServiceWorkerContextCoreObserver::OnVersionStateChanged, version->version_id(), version->scope(), version->status()); @@ -864,6 +863,7 @@ void ServiceWorkerContextCore::OnDevToolsRoutingIdChanged( ServiceWorkerVersion* version) { + DCHECK_EQ(this, version->context().get()); if (!version->embedded_worker()) return; observer_list_->Notify( @@ -879,6 +879,7 @@ int line_number, int column_number, const GURL& source_url) { + DCHECK_EQ(this, version->context().get()); observer_list_->Notify( FROM_HERE, &ServiceWorkerContextCoreObserver::OnErrorReported, version->version_id(), @@ -894,6 +895,7 @@ int line_number, const GURL& source_url) { DCHECK_CURRENTLY_ON(ServiceWorkerContext::GetCoreThreadId()); + DCHECK_EQ(this, version->context().get()); // NOTE: This differs slightly from // RenderFrameHostImpl::DidAddMessageToConsole, which also asks the // content embedder whether to classify the message as a builtin component. @@ -915,6 +917,7 @@ ServiceWorkerVersion* version, const std::string& client_uuid, const ServiceWorkerClientInfo& client_info) { + DCHECK_EQ(this, version->context().get()); observer_list_->Notify( FROM_HERE, &ServiceWorkerContextCoreObserver::OnControlleeAdded, version->version_id(), version->scope(), client_uuid, client_info); @@ -923,12 +926,14 @@ void ServiceWorkerContextCore::OnControlleeRemoved( ServiceWorkerVersion* version, const std::string& client_uuid) { + DCHECK_EQ(this, version->context().get()); observer_list_->Notify(FROM_HERE, &ServiceWorkerContextCoreObserver::OnControlleeRemoved, version->version_id(), version->scope(), client_uuid); } void ServiceWorkerContextCore::OnNoControllees(ServiceWorkerVersion* version) { + DCHECK_EQ(this, version->context().get()); observer_list_->Notify(FROM_HERE, &ServiceWorkerContextCoreObserver::OnNoControllees, version->version_id(), version->scope());
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 27ec8dd..8983898 100644 --- a/content/browser/service_worker/service_worker_main_resource_handle.cc +++ b/content/browser/service_worker/service_worker_main_resource_handle.cc
@@ -45,6 +45,8 @@ int render_process_id, int render_frame_id, const network::CrossOriginEmbedderPolicy& cross_origin_embedder_policy, + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter> + coep_reporter, blink::mojom::ServiceWorkerProviderInfoForClientPtr* out_provider_info) { DCHECK_CURRENTLY_ON(BrowserThread::UI); // We may have failed to pre-create the provider host. @@ -55,7 +57,7 @@ base::BindOnce( &ServiceWorkerMainResourceHandleCore::OnBeginNavigationCommit, base::Unretained(core_), render_process_id, render_frame_id, - cross_origin_embedder_policy)); + cross_origin_embedder_policy, std::move(coep_reporter))); *out_provider_info = std::move(provider_info_); }
diff --git a/content/browser/service_worker/service_worker_main_resource_handle.h b/content/browser/service_worker/service_worker_main_resource_handle.h index a684cccf..0d739eb 100644 --- a/content/browser/service_worker/service_worker_main_resource_handle.h +++ b/content/browser/service_worker/service_worker_main_resource_handle.h
@@ -12,8 +12,13 @@ #include "third_party/blink/public/mojom/service_worker/service_worker_provider.mojom.h" namespace network { +namespace mojom { +class CrossOriginEmbedderPolicyReporter; +} // namespace mojom + struct CrossOriginEmbedderPolicy; -} + +} // namespace network namespace content { @@ -74,6 +79,8 @@ int render_process_id, int render_frame_id, const network::CrossOriginEmbedderPolicy& cross_origin_embedder_policy, + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter> + coep_reporter, blink::mojom::ServiceWorkerProviderInfoForClientPtr* out_provider_info); // Similar to OnBeginNavigationCommit() for shared workers (and dedicated
diff --git a/content/browser/service_worker/service_worker_main_resource_handle_core.cc b/content/browser/service_worker/service_worker_main_resource_handle_core.cc index 7f610116..9048297c3 100644 --- a/content/browser/service_worker/service_worker_main_resource_handle_core.cc +++ b/content/browser/service_worker/service_worker_main_resource_handle_core.cc
@@ -26,11 +26,14 @@ void ServiceWorkerMainResourceHandleCore::OnBeginNavigationCommit( int render_process_id, int render_frame_id, - const network::CrossOriginEmbedderPolicy& cross_origin_embedder_policy) { + const network::CrossOriginEmbedderPolicy& cross_origin_embedder_policy, + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter> + coep_reporter) { DCHECK_CURRENTLY_ON(ServiceWorkerContext::GetCoreThreadId()); if (container_host_) { container_host_->OnBeginNavigationCommit(render_process_id, render_frame_id, - cross_origin_embedder_policy); + cross_origin_embedder_policy, + std::move(coep_reporter)); } }
diff --git a/content/browser/service_worker/service_worker_main_resource_handle_core.h b/content/browser/service_worker/service_worker_main_resource_handle_core.h index 3e75fd6..43d2b517 100644 --- a/content/browser/service_worker/service_worker_main_resource_handle_core.h +++ b/content/browser/service_worker/service_worker_main_resource_handle_core.h
@@ -44,7 +44,9 @@ void OnBeginNavigationCommit( int render_process_id, int render_frame_id, - const network::CrossOriginEmbedderPolicy& cross_origin_embedder_policy); + const network::CrossOriginEmbedderPolicy& cross_origin_embedder_policy, + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter> + coep_reporter); void OnBeginWorkerCommit( const network::CrossOriginEmbedderPolicy& cross_origin_embedder_policy);
diff --git a/content/browser/service_worker/service_worker_provider_host_unittest.cc b/content/browser/service_worker/service_worker_provider_host_unittest.cc index 939bb29d..8340c47 100644 --- a/content/browser/service_worker/service_worker_provider_host_unittest.cc +++ b/content/browser/service_worker/service_worker_provider_host_unittest.cc
@@ -201,11 +201,16 @@ container_host->UpdateUrls(url, net::SiteForCookies::FromUrl(url), url::Origin::Create(url)); + // Establish a dummy connection to allow sending messages without errors. + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter> + reporter; + auto dummy = reporter.InitWithNewPipeAndPassReceiver(); + // In production code this is called from NavigationRequest in the browser // process right before navigation commit. container_host->OnBeginNavigationCommit( helper_->mock_render_process_id(), 1 /* route_id */, - network::CrossOriginEmbedderPolicy()); + network::CrossOriginEmbedderPolicy(), std::move(reporter)); } blink::mojom::ServiceWorkerErrorType Register(
diff --git a/content/browser/service_worker/service_worker_test_utils.cc b/content/browser/service_worker/service_worker_test_utils.cc index 4057e943..6874b503 100644 --- a/content/browser/service_worker/service_worker_test_utils.cc +++ b/content/browser/service_worker/service_worker_test_utils.cc
@@ -319,10 +319,16 @@ std::move(host_and_info->host); output_endpoint->BindForWindow(std::move(host_and_info->info)); + // Establish a dummy connection to allow sending messages without errors. + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter> + reporter; + auto dummy = reporter.InitWithNewPipeAndPassReceiver(); + // In production code this is called from NavigationRequest in the browser // process right before navigation commit. container_host->OnBeginNavigationCommit(process_id, 1 /* route_id */, - network::CrossOriginEmbedderPolicy()); + network::CrossOriginEmbedderPolicy(), + std::move(reporter)); return container_host; }
diff --git a/content/browser/service_worker/service_worker_version.cc b/content/browser/service_worker/service_worker_version.cc index 9f7a20d..feb94b83 100644 --- a/content/browser/service_worker/service_worker_version.cc +++ b/content/browser/service_worker/service_worker_version.cc
@@ -205,36 +205,6 @@ return base::TimeDelta::FromMilliseconds(kUpdateDelayParam.Get()); } -using CreateFactoryBundleForSubresourceOnUICallback = base::OnceCallback<void( - std::unique_ptr<blink::PendingURLLoaderFactoryBundle> script_bundle, - std::unique_ptr<blink::PendingURLLoaderFactoryBundle> subresouce_bundle)>; -void CreateFactoryBundleForSubresourceOnUI( - int process_id, - int routing_id, - const url::Origin& origin, - base::Optional<network::CrossOriginEmbedderPolicy> - cross_origin_embedder_policy, - CreateFactoryBundleForSubresourceOnUICallback callback) { - DCHECK_CURRENTLY_ON(BrowserThread::UI); - auto* rph = RenderProcessHost::FromID(process_id); - if (!rph) { - // Return nullptr because we can't create a factory bundle because of - // missing renderer. - ServiceWorkerContextWrapper::RunOrPostTaskOnCoreThread( - FROM_HERE, base::BindOnce(std::move(callback), nullptr, nullptr)); - return; - } - auto script_bundle = EmbeddedWorkerInstance::CreateFactoryBundleOnUI( - rph, routing_id, origin, cross_origin_embedder_policy, - ContentBrowserClient::URLLoaderFactoryType::kServiceWorkerScript); - auto subresource_bundle = EmbeddedWorkerInstance::CreateFactoryBundleOnUI( - rph, routing_id, origin, cross_origin_embedder_policy, - ContentBrowserClient::URLLoaderFactoryType::kServiceWorkerSubResource); - ServiceWorkerContextWrapper::RunOrPostTaskOnCoreThread( - FROM_HERE, base::BindOnce(std::move(callback), std::move(script_bundle), - std::move(subresource_bundle))); -} - } // namespace constexpr base::TimeDelta ServiceWorkerVersion::kTimeoutTimerDelay; @@ -997,15 +967,9 @@ // TODO(https://crbug.com/1039613): Update the loader factories passed to the // script loader factory too. DCHECK_EQ(NEW, status()); - RunOrPostTaskOnThread( - FROM_HERE, BrowserThread::UI, - base::BindOnce( - &CreateFactoryBundleForSubresourceOnUI, - embedded_worker()->process_id(), - embedded_worker()->worker_devtools_agent_route_id(), script_origin(), - cross_origin_embedder_policy(), - base::BindOnce(&ServiceWorkerVersion::InitializeGlobalScope, - weak_factory_.GetWeakPtr()))); + embedded_worker_->CreateFactoryBundles( + base::BindOnce(&ServiceWorkerVersion::InitializeGlobalScope, + weak_factory_.GetWeakPtr())); } void ServiceWorkerVersion::InitializeGlobalScope(
diff --git a/content/browser/service_worker/service_worker_version.h b/content/browser/service_worker/service_worker_version.h index b46ec06..95c125e 100644 --- a/content/browser/service_worker/service_worker_version.h +++ b/content/browser/service_worker/service_worker_version.h
@@ -397,7 +397,8 @@ // Note regarding BackForwardCache: // Clients in back-forward cache don't count as controllees. bool HasControllee() const { return !controllee_map_.empty(); } - std::map<std::string, ServiceWorkerContainerHost*> controllee_map() { + const std::map<std::string, ServiceWorkerContainerHost*>& controllee_map() + const { return controllee_map_; }
diff --git a/content/browser/service_worker/service_worker_version_unittest.cc b/content/browser/service_worker/service_worker_version_unittest.cc index d258179e..33113ad 100644 --- a/content/browser/service_worker/service_worker_version_unittest.cc +++ b/content/browser/service_worker/service_worker_version_unittest.cc
@@ -1214,12 +1214,18 @@ // This is necessary to make OnBeginNavigationCommit() work. auto remote_controller = container_host->GetRemoteControllerServiceWorker(); + // Establish a dummy connection to allow sending messages without errors. + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter> + reporter; + auto dummy = reporter.InitWithNewPipeAndPassReceiver(); + // Now begin the navigation commit with the same process id used by the // worker. This should cause the worker to stop being considered foreground // priority. container_host->OnBeginNavigationCommit( version_->embedded_worker()->process_id(), - /* render_frame_id = */ 1, network::CrossOriginEmbedderPolicy()); + /* render_frame_id = */ 1, network::CrossOriginEmbedderPolicy(), + std::move(reporter)); // RenderProcessHost should be notified of foreground worker. base::RunLoop().RunUntilIdle();
diff --git a/content/browser/storage_service_restart_browsertest.cc b/content/browser/storage_service_restart_browsertest.cc index a40c36a8..e3529b54 100644 --- a/content/browser/storage_service_restart_browsertest.cc +++ b/content/browser/storage_service_restart_browsertest.cc
@@ -11,6 +11,7 @@ #include "components/services/storage/public/mojom/test_api.test-mojom.h" #include "content/browser/dom_storage/dom_storage_context_wrapper.h" #include "content/browser/storage_partition_impl.h" +#include "content/public/browser/browser_context.h" #include "content/public/browser/web_contents.h" #include "content/public/common/content_features.h" #include "content/public/test/browser_test_utils.h"
diff --git a/content/browser/storage_service_sandbox_browsertest.cc b/content/browser/storage_service_sandbox_browsertest.cc index ec05955..4521992 100644 --- a/content/browser/storage_service_sandbox_browsertest.cc +++ b/content/browser/storage_service_sandbox_browsertest.cc
@@ -11,6 +11,7 @@ #include "components/services/storage/public/mojom/test_api.test-mojom.h" #include "content/browser/dom_storage/dom_storage_context_wrapper.h" #include "content/browser/storage_partition_impl.h" +#include "content/public/browser/browser_context.h" #include "content/public/browser/web_contents.h" #include "content/public/common/content_features.h" #include "content/public/test/browser_test_utils.h"
diff --git a/content/browser/url_loader_factory_params_helper.cc b/content/browser/url_loader_factory_params_helper.cc index bc8421a..9f51bf6 100644 --- a/content/browser/url_loader_factory_params_helper.cc +++ b/content/browser/url_loader_factory_params_helper.cc
@@ -169,7 +169,9 @@ URLLoaderFactoryParamsHelper::CreateForWorker( RenderProcessHost* process, const url::Origin& request_initiator, - const net::NetworkIsolationKey& network_isolation_key) { + const net::NetworkIsolationKey& network_isolation_key, + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter> + coep_reporter) { return CreateParams(process, request_initiator, // origin request_initiator, // request_initiator_site_lock @@ -177,8 +179,8 @@ false, // is_trusted base::nullopt, // top_frame_token network_isolation_key, - nullptr, // client_security_state - mojo::NullRemote(), // coep_reporter + nullptr, // client_security_state + std::move(coep_reporter), false, // allow_universal_access_from_file_urls false); // is_for_isolated_world }
diff --git a/content/browser/url_loader_factory_params_helper.h b/content/browser/url_loader_factory_params_helper.h index 88512e6..5b94c02 100644 --- a/content/browser/url_loader_factory_params_helper.h +++ b/content/browser/url_loader_factory_params_helper.h
@@ -66,7 +66,9 @@ static network::mojom::URLLoaderFactoryParamsPtr CreateForWorker( RenderProcessHost* process, const url::Origin& request_initiator, - const net::NetworkIsolationKey& network_isolation_key); + const net::NetworkIsolationKey& network_isolation_key, + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter> + coep_reporter); // TODO(kinuko, lukasza): https://crbug.com/891872: Remove, once all // URLLoaderFactories vended to a renderer process are associated with a
diff --git a/content/browser/worker_host/dedicated_worker_host.cc b/content/browser/worker_host/dedicated_worker_host.cc index 0b7b2be..1636920 100644 --- a/content/browser/worker_host/dedicated_worker_host.cc +++ b/content/browser/worker_host/dedicated_worker_host.cc
@@ -397,7 +397,16 @@ void DedicatedWorkerHost::BindCacheStorage( mojo::PendingReceiver<blink::mojom::CacheStorage> receiver) { DCHECK_CURRENTLY_ON(BrowserThread::UI); + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter> + coep_reporter_remote; + // coep_reporter is avaible only when PlzDedicatedWorker is enabled. + // TODO(arthursonzogni): Add similar support when PlzDedicatedWorker is + if (coep_reporter_) { + coep_reporter_->Clone( + coep_reporter_remote.InitWithNewPipeAndPassReceiver()); + } worker_process_host_->BindCacheStorage(cross_origin_embedder_policy_, + std::move(coep_reporter_remote), worker_origin_, std::move(receiver)); }
diff --git a/content/browser/worker_host/shared_worker_host.cc b/content/browser/worker_host/shared_worker_host.cc index c0bc9d3..c940e88 100644 --- a/content/browser/worker_host/shared_worker_host.cc +++ b/content/browser/worker_host/shared_worker_host.cc
@@ -263,10 +263,13 @@ pending_default_factory.InitWithNewPipeAndPassReceiver(); const url::Origin& origin = instance_.constructor_origin(); + // TODO(https://crbug.com/1060832): Implement COEP reporter for shared + // workers. network::mojom::URLLoaderFactoryParamsPtr factory_params = URLLoaderFactoryParamsHelper::CreateForWorker( worker_process_host_, origin, - net::NetworkIsolationKey(origin, origin)); + net::NetworkIsolationKey(origin, origin), + /*coep_reporter=*/mojo::NullRemote()); GetContentClient()->browser()->WillCreateURLLoaderFactory( worker_process_host_->GetBrowserContext(), /*frame=*/nullptr, worker_process_host_->GetID(), @@ -343,8 +346,15 @@ // TODO(https://crbug.com/1031542): Add support enforcing CORP in // cache.match() for SharedWorker by providing the correct value here. network::CrossOriginEmbedderPolicy cross_origin_embedder_policy; + + // TODO(https://crbug.com/1031542): Plumb a CrossOriginEmbedderPolicyReporter + // here to handle reports. + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter> + coep_reporter; + const url::Origin origin = url::Origin::Create(instance().url()); - worker_process_host_->BindCacheStorage(cross_origin_embedder_policy, origin, + worker_process_host_->BindCacheStorage(cross_origin_embedder_policy, + std::move(coep_reporter), origin, std::move(receiver)); }
diff --git a/content/browser/worker_host/worker_script_fetch_initiator.cc b/content/browser/worker_host/worker_script_fetch_initiator.cc index 29d4f58..6534c66 100644 --- a/content/browser/worker_host/worker_script_fetch_initiator.cc +++ b/content/browser/worker_host/worker_script_fetch_initiator.cc
@@ -320,9 +320,12 @@ DCHECK(factory_bundle_for_browser_info); const url::Origin& request_initiator = *resource_request->request_initiator; + // TODO(https://crbug.com/1060837): Pass the Mojo remote which is connected + // to the COEP reporter in DedicatedWorkerHost. network::mojom::URLLoaderFactoryParamsPtr factory_params = URLLoaderFactoryParamsHelper::CreateForWorker( - factory_process, request_initiator, trusted_network_isolation_key); + factory_process, request_initiator, trusted_network_isolation_key, + /*coep_reporter=*/mojo::NullRemote()); mojo::PendingReceiver<network::mojom::URLLoaderFactory> default_factory_receiver =
diff --git a/content/common/service_worker/service_worker_loader_helpers.cc b/content/common/service_worker/service_worker_loader_helpers.cc index 3c32df4..5360383 100644 --- a/content/common/service_worker/service_worker_loader_helpers.cc +++ b/content/common/service_worker/service_worker_loader_helpers.cc
@@ -14,8 +14,11 @@ #include "content/public/common/content_features.h" #include "mojo/public/cpp/bindings/self_owned_receiver.h" #include "net/http/http_util.h" +#include "net/http/structured_headers.h" #include "net/url_request/redirect_util.h" #include "services/network/public/cpp/content_security_policy/content_security_policy.h" +#include "services/network/public/cpp/cross_origin_embedder_policy.h" +#include "services/network/public/cpp/features.h" #include "services/network/public/cpp/resource_request.h" #include "services/network/public/cpp/resource_request_body.h" #include "services/network/public/mojom/url_response_head.mojom.h" @@ -45,6 +48,37 @@ BlobCompleteCallback callback_; }; +std::pair<network::mojom::CrossOriginEmbedderPolicyValue, + base::Optional<std::string>> +ParseCrossOriginEmbedderPolicyValueInternal( + const net::HttpResponseHeaders* headers, + base::StringPiece header_name) { + static constexpr char kRequireCorp[] = "require-corp"; + constexpr auto kNone = network::mojom::CrossOriginEmbedderPolicyValue::kNone; + using Item = net::structured_headers::Item; + std::string header_value; + if (!headers || + !headers->GetNormalizedHeader(header_name.as_string(), &header_value)) { + return std::make_pair(kNone, base::nullopt); + } + const auto item = net::structured_headers::ParseItem(header_value); + if (!item || item->item.Type() != Item::kTokenType || + item->item.GetString() != kRequireCorp) { + return std::make_pair(kNone, base::nullopt); + } + base::Optional<std::string> endpoint; + auto it = std::find_if(item->params.cbegin(), item->params.cend(), + [](const std::pair<std::string, Item>& param) { + return param.first == "report-to"; + }); + if (it != item->params.end() && it->second.Type() == Item::kStringType) { + endpoint = it->second.GetString(); + } + return std::make_pair( + network::mojom::CrossOriginEmbedderPolicyValue::kRequireCorp, + std::move(endpoint)); +} + } // namespace // static @@ -88,6 +122,27 @@ // headers. if (out_head->content_length == -1) out_head->content_length = out_head->headers->GetContentLength(); + + // TODO(yhirano): Remove the code duplication with + // //services/network/url_loader.cc. + if (base::FeatureList::IsEnabled(network::features::kCrossOriginIsolation)) { + // Parse the Cross-Origin-Embedder-Policy and + // Cross-Origin-Embedder-Policy-Report-Only headers. + + static constexpr char kCrossOriginEmbedderPolicyValueHeader[] = + "Cross-Origin-Embedder-Policy"; + static constexpr char kCrossOriginEmbedderPolicyValueReportOnlyHeader[] = + "Cross-Origin-Embedder-Policy-Report-Only"; + network::CrossOriginEmbedderPolicy coep; + std::tie(coep.value, coep.reporting_endpoint) = + ParseCrossOriginEmbedderPolicyValueInternal( + out_head->headers.get(), kCrossOriginEmbedderPolicyValueHeader); + std::tie(coep.report_only_value, coep.report_only_reporting_endpoint) = + ParseCrossOriginEmbedderPolicyValueInternal( + out_head->headers.get(), + kCrossOriginEmbedderPolicyValueReportOnlyHeader); + out_head->cross_origin_embedder_policy = coep; + } } // static
diff --git a/content/public/browser/payment_app_provider.h b/content/public/browser/payment_app_provider.h index 63306aa..140ccc5 100644 --- a/content/public/browser/payment_app_provider.h +++ b/content/public/browser/payment_app_provider.h
@@ -45,7 +45,8 @@ base::OnceCallback<void(int64_t registration_id)>; using InvokePaymentAppCallback = base::OnceCallback<void(payments::mojom::PaymentHandlerResponsePtr)>; - using CanMakePaymentCallback = base::OnceCallback<void(bool)>; + using CanMakePaymentCallback = + base::OnceCallback<void(payments::mojom::CanMakePaymentResponsePtr)>; using AbortCallback = base::OnceCallback<void(bool)>; // Should be accessed only on the UI thread.
diff --git a/content/public/browser/render_process_host.h b/content/public/browser/render_process_host.h index ff0e9cc..8a45242 100644 --- a/content/public/browser/render_process_host.h +++ b/content/public/browser/render_process_host.h
@@ -27,6 +27,7 @@ #include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/pending_remote.h" #include "net/base/network_isolation_key.h" +#include "services/network/public/mojom/cross_origin_embedder_policy.mojom-forward.h" #include "services/network/public/mojom/network_context.mojom-forward.h" #include "services/network/public/mojom/restricted_cookie_manager.mojom-forward.h" #include "services/network/public/mojom/url_loader_factory.mojom-forward.h" @@ -469,6 +470,8 @@ // exposed here to support MockRenderProcessHost usage in tests. virtual void BindCacheStorage( const network::CrossOriginEmbedderPolicy& cross_origin_embedder_policy, + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter> + coep_reporter_remote, const url::Origin& origin, mojo::PendingReceiver<blink::mojom::CacheStorage> receiver) = 0; virtual void BindFileSystemManager(
diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc index bd6b00f..a7be3cd 100644 --- a/content/public/common/content_features.cc +++ b/content/public/common/content_features.cc
@@ -208,10 +208,6 @@ const base::Feature kFontSrcLocalMatching{"FontSrcLocalMatching", base::FEATURE_ENABLED_BY_DEFAULT}; -// Enables forced colors mode for web content. -const base::Feature kForcedColors{"ForcedColors", - base::FEATURE_DISABLED_BY_DEFAULT}; - #if !defined(OS_ANDROID) // Feature controlling whether or not memory pressure signals will be forwarded // to the GPU process.
diff --git a/content/public/common/content_features.h b/content/public/common/content_features.h index 76348ab..9d3e019b 100644 --- a/content/public/common/content_features.h +++ b/content/public/common/content_features.h
@@ -55,7 +55,6 @@ CONTENT_EXPORT extern const base::Feature kFeaturePolicyForClientHints; CONTENT_EXPORT extern const base::Feature kFeaturePolicyForSandbox; CONTENT_EXPORT extern const base::Feature kFontSrcLocalMatching; -CONTENT_EXPORT extern const base::Feature kForcedColors; #if !defined(OS_ANDROID) CONTENT_EXPORT extern const base::Feature kForwardMemoryPressureEventsToGpuProcess;
diff --git a/content/public/test/mock_render_process_host.cc b/content/public/test/mock_render_process_host.cc index f3c1643..ed65b158 100644 --- a/content/public/test/mock_render_process_host.cc +++ b/content/public/test/mock_render_process_host.cc
@@ -452,6 +452,7 @@ void MockRenderProcessHost::BindCacheStorage( const network::CrossOriginEmbedderPolicy&, + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter>, const url::Origin& origin, mojo::PendingReceiver<blink::mojom::CacheStorage> receiver) { cache_storage_receiver_ = std::move(receiver);
diff --git a/content/public/test/mock_render_process_host.h b/content/public/test/mock_render_process_host.h index 44b219e..11c5a97 100644 --- a/content/public/test/mock_render_process_host.h +++ b/content/public/test/mock_render_process_host.h
@@ -166,6 +166,7 @@ const GURL& lock_url) override; void BindCacheStorage( const network::CrossOriginEmbedderPolicy&, + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter>, const url::Origin& origin, mojo::PendingReceiver<blink::mojom::CacheStorage> receiver) override; void BindFileSystemManager(
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 2eebde1..e46eacd2 100644 --- a/content/renderer/service_worker/service_worker_provider_context_unittest.cc +++ b/content/renderer/service_worker/service_worker_provider_context_unittest.cc
@@ -198,7 +198,9 @@ } void Clone( mojo::PendingReceiver<blink::mojom::ControllerServiceWorker> receiver, - const network::CrossOriginEmbedderPolicy&) override { + const network::CrossOriginEmbedderPolicy&, + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter>) + override { receivers_.Add(this, std::move(receiver)); } @@ -462,7 +464,8 @@ auto controller_info1 = blink::mojom::ControllerServiceWorkerInfo::New(); mojo::Remote<blink::mojom::ControllerServiceWorker> remote_controller1; fake_controller1.Clone(remote_controller1.BindNewPipeAndPassReceiver(), - network::CrossOriginEmbedderPolicy()); + network::CrossOriginEmbedderPolicy(), + mojo::NullRemote()); controller_info1->mode = blink::mojom::ControllerServiceWorkerMode::kControlled; controller_info1->object_info = std::move(object_info1); @@ -506,7 +509,8 @@ auto controller_info2 = blink::mojom::ControllerServiceWorkerInfo::New(); mojo::Remote<blink::mojom::ControllerServiceWorker> remote_controller2; fake_controller2.Clone(remote_controller2.BindNewPipeAndPassReceiver(), - network::CrossOriginEmbedderPolicy()); + network::CrossOriginEmbedderPolicy(), + mojo::NullRemote()); controller_info2->mode = blink::mojom::ControllerServiceWorkerMode::kControlled; controller_info2->object_info = std::move(object_info2); @@ -596,7 +600,8 @@ auto controller_info4 = blink::mojom::ControllerServiceWorkerInfo::New(); mojo::Remote<blink::mojom::ControllerServiceWorker> remote_controller4; fake_controller4.Clone(remote_controller4.BindNewPipeAndPassReceiver(), - network::CrossOriginEmbedderPolicy()); + network::CrossOriginEmbedderPolicy(), + mojo::NullRemote()); controller_info4->mode = blink::mojom::ControllerServiceWorkerMode::kControlled; controller_info4->object_info = std::move(object_info4); @@ -750,7 +755,8 @@ auto controller_info = blink::mojom::ControllerServiceWorkerInfo::New(); mojo::Remote<blink::mojom::ControllerServiceWorker> remote_controller; fake_controller.Clone(remote_controller.BindNewPipeAndPassReceiver(), - network::CrossOriginEmbedderPolicy()); + network::CrossOriginEmbedderPolicy(), + mojo::NullRemote()); controller_info->mode = blink::mojom::ControllerServiceWorkerMode::kControlled; controller_info->object_info = std::move(object_info); @@ -798,7 +804,8 @@ auto controller_info = blink::mojom::ControllerServiceWorkerInfo::New(); mojo::Remote<blink::mojom::ControllerServiceWorker> remote_controller; fake_controller.Clone(remote_controller.BindNewPipeAndPassReceiver(), - network::CrossOriginEmbedderPolicy()); + network::CrossOriginEmbedderPolicy(), + mojo::NullRemote()); controller_info->mode = blink::mojom::ControllerServiceWorkerMode::kControlled; controller_info->object_info = std::move(object_info);
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 5b782b6..5bf2b295 100644 --- a/content/renderer/service_worker/service_worker_subresource_loader_unittest.cc +++ b/content/renderer/service_worker/service_worker_subresource_loader_unittest.cc
@@ -329,7 +329,9 @@ void Clone( mojo::PendingReceiver<blink::mojom::ControllerServiceWorker> receiver, - const network::CrossOriginEmbedderPolicy&) override { + const network::CrossOriginEmbedderPolicy&, + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter>) + override { receivers_.Add(this, std::move(receiver)); } @@ -425,7 +427,8 @@ if (!fake_controller_) return; fake_controller_->Clone(std::move(receiver), - network::CrossOriginEmbedderPolicy()); + network::CrossOriginEmbedderPolicy(), + mojo::NullRemote()); } void CloneContainerHost( mojo::PendingReceiver<blink::mojom::ServiceWorkerContainerHost> receiver)
diff --git a/content/test/data/fuzzer_corpus/origin_policy_parser_data/all.txt b/content/test/data/fuzzer_corpus/origin_policy_parser_data/all.txt deleted file mode 100644 index 4c36bab..0000000 --- a/content/test/data/fuzzer_corpus/origin_policy_parser_data/all.txt +++ /dev/null
@@ -1,7 +0,0 @@ -{ - "content-security-policy": { - "policy": "does not matter", - "disposition": "enforce", - "allow-override": true, - } -}
diff --git a/content/test/data/fuzzer_corpus/origin_policy_parser_data/empty.txt b/content/test/data/fuzzer_corpus/origin_policy_parser_data/empty.txt deleted file mode 100644 index 0967ef4..0000000 --- a/content/test/data/fuzzer_corpus/origin_policy_parser_data/empty.txt +++ /dev/null
@@ -1 +0,0 @@ -{}
diff --git a/content/test/data/fuzzer_dictionaries/origin_policy_parser_fuzzer.dict b/content/test/data/fuzzer_dictionaries/origin_policy_parser_fuzzer.dict deleted file mode 100644 index f98418c9..0000000 --- a/content/test/data/fuzzer_dictionaries/origin_policy_parser_fuzzer.dict +++ /dev/null
@@ -1,12 +0,0 @@ -# Copyright 2017 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -"\"content-security-policy\"" -"\"policy\"" -"\"disposition\"" -"\"enforce\"" -"\"report-only\"" -"\"allow-override\"" -"true" -"false"
diff --git a/content/test/fuzzer/BUILD.gn b/content/test/fuzzer/BUILD.gn index 0481254..2f22106 100644 --- a/content/test/fuzzer/BUILD.gn +++ b/content/test/fuzzer/BUILD.gn
@@ -37,18 +37,6 @@ seed_corpus = "//content/test/data/fuzzer_corpus/origin_trial_token_data/" } -fuzzer_test("origin_policy_parser_fuzzer") { - sources = [ "origin_policy_parser_fuzzer.cc" ] - deps = [ - "//base", - "//base:i18n", - "//content/test:test_support", - ] - dict = - "//content/test/data/fuzzer_dictionaries/origin_policy_parser_fuzzer.dict" - seed_corpus = "//content/test/data/fuzzer_corpus/origin_policy_parser_data/" -} - fuzzer_test("renderer_fuzzer") { sources = [ "renderer_fuzzer.cc" ] deps = [ ":fuzzer_support" ]
diff --git a/content/test/fuzzer/origin_policy_parser_fuzzer.cc b/content/test/fuzzer/origin_policy_parser_fuzzer.cc deleted file mode 100644 index 875e9ae..0000000 --- a/content/test/fuzzer/origin_policy_parser_fuzzer.cc +++ /dev/null
@@ -1,30 +0,0 @@ -// Copyright 2017 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "third_party/blink/public/common/origin_policy/origin_policy.h" // nogncheck - -#include "base/at_exit.h" -#include "base/i18n/icu_util.h" -#include "base/strings/string_piece.h" - -#include <stddef.h> -#include <stdint.h> - -struct IcuEnvironment { - IcuEnvironment() { CHECK(base::i18n::InitializeICU()); } - base::AtExitManager at_exit_manager; -}; - -// Initialize ICU, which is required by the URL parser. -IcuEnvironment* env = new IcuEnvironment(); - -namespace content { - -extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { - blink::OriginPolicy::From( - base::StringPiece(reinterpret_cast<const char*>(data), size)); - return 0; -} - -} // namespace content
diff --git a/device/fido/cable/v2_handshake.cc b/device/fido/cable/v2_handshake.cc index d0a904b6..76effce 100644 --- a/device/fido/cable/v2_handshake.cc +++ b/device/fido/cable/v2_handshake.cc
@@ -21,6 +21,8 @@ #include "third_party/boringssl/src/include/openssl/obj.h" #include "third_party/boringssl/src/include/openssl/sha.h" +using device::fido_parsing_utils::CopyCBORBytestring; + namespace { // Maximum value of a sequence number. Exceeding this causes all operations to @@ -42,18 +44,6 @@ return true; } -template <size_t N> -bool CopyBytestring(std::array<uint8_t, N>* out, - const cbor::Value::MapValue& map, - int key) { - const auto it = map.find(cbor::Value(key)); - if (it == map.end() || !it->second.is_bytestring()) { - return false; - } - const std::vector<uint8_t> bytestring = it->second.GetBytestring(); - return device::fido_parsing_utils::ExtractArray(bytestring, /*pos=*/0, out); -} - CBS CBSFromSpan(base::span<const uint8_t> in) { CBS cbs; CBS_init(&cbs, in.data(), in.size()); @@ -302,10 +292,12 @@ const cbor::Value::MapValue& pairing_map(pairing->GetMap()); const auto name_it = pairing_map.find(cbor::Value(4)); - if (!CopyBytestring(&future_discovery->v2->eid_gen_key, pairing_map, 1) || - !CopyBytestring(&future_discovery->v2->psk_gen_key, pairing_map, 2) || - !CopyBytestring(&future_discovery->v2->peer_identity.value(), - pairing_map, 3) || + if (!CopyCBORBytestring(&future_discovery->v2->eid_gen_key, pairing_map, + 1) || + !CopyCBORBytestring(&future_discovery->v2->psk_gen_key, pairing_map, + 2) || + !CopyCBORBytestring(&future_discovery->v2->peer_identity.value(), + pairing_map, 3) || name_it == pairing_map.end() || !name_it->second.is_string() || !EC_POINT_oct2point(group, peer_point.get(), future_discovery->v2->peer_identity->data(),
diff --git a/device/fido/fido_parsing_utils.h b/device/fido/fido_parsing_utils.h index fa6d5d2..43136148 100644 --- a/device/fido/fido_parsing_utils.h +++ b/device/fido/fido_parsing_utils.h
@@ -18,6 +18,7 @@ #include "base/containers/span.h" #include "base/optional.h" #include "base/strings/string_piece.h" +#include "components/cbor/values.h" #include "crypto/sha2.h" namespace device { @@ -123,6 +124,21 @@ COMPONENT_EXPORT(DEVICE_FIDO) std::string ConvertBytesToUuid(base::span<const uint8_t, 16> bytes); +// Copies the contents of the bytestring, keyed by |key|, from |map| into |out|. +// Returns true on success or false if the key if not found, the value is not a +// bytestring, or the value has the wrong length. +template <size_t N> +bool CopyCBORBytestring(std::array<uint8_t, N>* out, + const cbor::Value::MapValue& map, + int key) { + const auto it = map.find(cbor::Value(key)); + if (it == map.end() || !it->second.is_bytestring()) { + return false; + } + const std::vector<uint8_t> bytestring = it->second.GetBytestring(); + return ExtractArray(bytestring, /*pos=*/0, out); +} + } // namespace fido_parsing_utils } // namespace device
diff --git a/extensions/browser/api/declarative_net_request/constants.cc b/extensions/browser/api/declarative_net_request/constants.cc index 2a8358a6..e4cd972 100644 --- a/extensions/browser/api/declarative_net_request/constants.cc +++ b/extensions/browser/api/declarative_net_request/constants.cc
@@ -63,6 +63,11 @@ const char kErrorRegexesTooLarge[] = "Rules with ids [*] specified a more complex regex than allowed as part of " "the \"*\" key."; +const char kErrorNoHeaderListsSpecified[] = + "Rule with id * does not specify a value for \"*\" or \"*\" key. At least " + "one of these keys must be specified with a non-empty list."; +const char kErrorInvalidHeaderName[] = + "Rule with id * must specify a valid header name to be modified."; const char kErrorListNotPassed[] = "Rules file must contain a list."; const char kRuleCountExceeded[] =
diff --git a/extensions/browser/api/declarative_net_request/constants.h b/extensions/browser/api/declarative_net_request/constants.h index 9adcfa1c..6d15e57 100644 --- a/extensions/browser/api/declarative_net_request/constants.h +++ b/extensions/browser/api/declarative_net_request/constants.h
@@ -53,6 +53,11 @@ ERROR_REGEX_SUBSTITUTION_WITHOUT_FILTER, ERROR_INVALID_REGEX_SUBSTITUTION, ERROR_INVALID_ALLOW_ALL_REQUESTS_RESOURCE_TYPE, + + ERROR_NO_HEADERS_SPECIFIED, + ERROR_EMPTY_REQUEST_HEADERS_LIST, + ERROR_EMPTY_RESPONSE_HEADERS_LIST, + ERROR_INVALID_HEADER_NAME }; // Describes the ways in which updating dynamic rules can fail. @@ -105,6 +110,8 @@ extern const char kErrorInvalidAllowAllRequestsResourceType[]; extern const char kErrorRegexTooLarge[]; extern const char kErrorRegexesTooLarge[]; +extern const char kErrorNoHeaderListsSpecified[]; +extern const char kErrorInvalidHeaderName[]; extern const char kErrorListNotPassed[];
diff --git a/extensions/browser/api/declarative_net_request/indexed_rule.cc b/extensions/browser/api/declarative_net_request/indexed_rule.cc index d122a8fb..5897932 100644 --- a/extensions/browser/api/declarative_net_request/indexed_rule.cc +++ b/extensions/browser/api/declarative_net_request/indexed_rule.cc
@@ -17,6 +17,7 @@ #include "extensions/browser/api/declarative_net_request/utils.h" #include "extensions/common/api/declarative_net_request.h" #include "extensions/common/api/declarative_net_request/utils.h" +#include "net/http/http_util.h" #include "third_party/re2/src/re2/re2.h" #include "url/gurl.h" #include "url/url_constants.h" @@ -388,10 +389,10 @@ case dnr_api::RULE_ACTION_TYPE_ALLOW: case dnr_api::RULE_ACTION_TYPE_UPGRADESCHEME: case dnr_api::RULE_ACTION_TYPE_ALLOWALLREQUESTS: + case dnr_api::RULE_ACTION_TYPE_MODIFYHEADERS: return true; case dnr_api::RULE_ACTION_TYPE_REMOVEHEADERS: return false; - case dnr_api::RULE_ACTION_TYPE_MODIFYHEADERS: case dnr_api::RULE_ACTION_TYPE_NONE: break; } @@ -412,8 +413,8 @@ case dnr_api::RULE_ACTION_TYPE_REDIRECT: return 1; case dnr_api::RULE_ACTION_TYPE_REMOVEHEADERS: - return 0; case dnr_api::RULE_ACTION_TYPE_MODIFYHEADERS: + return 0; case dnr_api::RULE_ACTION_TYPE_NONE: break; } @@ -425,6 +426,22 @@ UMA_HISTOGRAM_BOOLEAN(kIsLargeRegexHistogram, is_large_regex); } +ParseResult ValidateHeaders( + const std::vector<dnr_api::ModifyHeaderInfo>& headers, + bool are_request_headers) { + if (headers.empty()) { + return are_request_headers ? ParseResult::ERROR_EMPTY_REQUEST_HEADERS_LIST + : ParseResult::ERROR_EMPTY_RESPONSE_HEADERS_LIST; + } + + for (const auto& header_info : headers) { + if (!net::HttpUtil::IsValidHeaderName(header_info.header)) + return ParseResult::ERROR_INVALID_HEADER_NAME; + } + + return ParseResult::SUCCESS; +} + } // namespace IndexedRule::IndexedRule() = default; @@ -580,6 +597,32 @@ parsed_rule.action.remove_headers_list->end()); } + if (parsed_rule.action.type == dnr_api::RULE_ACTION_TYPE_MODIFYHEADERS) { + if (!parsed_rule.action.request_headers && + !parsed_rule.action.response_headers) + return ParseResult::ERROR_NO_HEADERS_SPECIFIED; + + if (parsed_rule.action.request_headers) { + indexed_rule->request_headers = + std::move(*parsed_rule.action.request_headers); + + ParseResult result = ValidateHeaders(indexed_rule->request_headers, + true /* are_request_headers */); + if (result != ParseResult::SUCCESS) + return result; + } + + if (parsed_rule.action.response_headers) { + indexed_rule->response_headers = + std::move(*parsed_rule.action.response_headers); + + ParseResult result = ValidateHeaders(indexed_rule->response_headers, + false /* are_request_headers */); + if (result != ParseResult::SUCCESS) + return result; + } + } + // Some sanity checks to ensure we return a valid IndexedRule. DCHECK_GE(indexed_rule->id, static_cast<uint32_t>(kMinValidID)); DCHECK_GE(indexed_rule->priority, static_cast<uint32_t>(kMinValidPriority));
diff --git a/extensions/browser/api/declarative_net_request/indexed_rule.h b/extensions/browser/api/declarative_net_request/indexed_rule.h index 08a6419..411f0e2 100644 --- a/extensions/browser/api/declarative_net_request/indexed_rule.h +++ b/extensions/browser/api/declarative_net_request/indexed_rule.h
@@ -68,6 +68,13 @@ // List of headers to remove, valid iff this is a remove headers rule. std::set<api::declarative_net_request::RemoveHeaderType> remove_headers_set; + // List of request headers to modify. Valid iff this is a modify headers rule. + std::vector<api::declarative_net_request::ModifyHeaderInfo> request_headers; + + // List of response headers to modify. Valid iff this is a modify headers + // rule. + std::vector<api::declarative_net_request::ModifyHeaderInfo> response_headers; + DISALLOW_COPY_AND_ASSIGN(IndexedRule); };
diff --git a/extensions/browser/api/declarative_net_request/indexed_rule_unittest.cc b/extensions/browser/api/declarative_net_request/indexed_rule_unittest.cc index 4646a9f2..ab7959e 100644 --- a/extensions/browser/api/declarative_net_request/indexed_rule_unittest.cc +++ b/extensions/browser/api/declarative_net_request/indexed_rule_unittest.cc
@@ -832,6 +832,104 @@ } } +TEST_F(IndexedRuleTest, ModifyHeadersParsing) { + struct RawHeaderInfo { + dnr_api::HeaderOperation operation; + std::string header; + }; + + using RawHeaderInfoList = std::vector<RawHeaderInfo>; + using ModifyHeaderInfoList = std::vector<dnr_api::ModifyHeaderInfo>; + + // A copy-able version of dnr_api::ModifyHeaderInfo is used for ease of + // specifying test cases because elements are copied when initializing a + // vector from an array. + struct { + base::Optional<RawHeaderInfoList> request_headers; + base::Optional<RawHeaderInfoList> response_headers; + ParseResult expected_result; + } cases[] = { + // Raise an error if no headers are specified. + {base::nullopt, base::nullopt, ParseResult::ERROR_NO_HEADERS_SPECIFIED}, + + // Raise an error if the request or response headers list is specified, + // but empty. + {RawHeaderInfoList(), + RawHeaderInfoList({{dnr_api::HEADER_OPERATION_REMOVE, "set-cookie"}}), + ParseResult::ERROR_EMPTY_REQUEST_HEADERS_LIST}, + + {base::nullopt, RawHeaderInfoList(), + ParseResult::ERROR_EMPTY_RESPONSE_HEADERS_LIST}, + + // Raise an error if a header list contains an empty or invalid header + // name. + {base::nullopt, + RawHeaderInfoList({{dnr_api::HEADER_OPERATION_REMOVE, ""}}), + ParseResult::ERROR_INVALID_HEADER_NAME}, + + {base::nullopt, + RawHeaderInfoList({{dnr_api::HEADER_OPERATION_REMOVE, "<<invalid>>"}}), + ParseResult::ERROR_INVALID_HEADER_NAME}, + + // Parsing should succeed if only one non-empty header list is specified. + {RawHeaderInfoList({{dnr_api::HEADER_OPERATION_REMOVE, "cookie"}}), + base::nullopt, ParseResult::SUCCESS}, + + // Parsing should succeed if both header lists are specified and + // non-empty. + {RawHeaderInfoList({{dnr_api::HEADER_OPERATION_REMOVE, "referer"}}), + RawHeaderInfoList({{dnr_api::HEADER_OPERATION_REMOVE, "set-cookie"}}), + ParseResult::SUCCESS}, + }; + + for (size_t i = 0; i < base::size(cases); ++i) { + SCOPED_TRACE(base::StringPrintf("Testing case[%" PRIuS "]", i)); + dnr_api::Rule rule = CreateGenericParsedRule(); + rule.action.type = dnr_api::RULE_ACTION_TYPE_MODIFYHEADERS; + + ModifyHeaderInfoList expected_request_headers; + if (cases[i].request_headers) { + rule.action.request_headers = std::make_unique<ModifyHeaderInfoList>(); + for (auto header : *cases[i].request_headers) { + rule.action.request_headers->push_back( + CreateModifyHeaderInfo(header.operation, header.header)); + + expected_request_headers.push_back( + CreateModifyHeaderInfo(header.operation, header.header)); + } + } + + ModifyHeaderInfoList expected_response_headers; + if (cases[i].response_headers) { + rule.action.response_headers = std::make_unique<ModifyHeaderInfoList>(); + for (auto header : *cases[i].response_headers) { + rule.action.response_headers->push_back( + CreateModifyHeaderInfo(header.operation, header.header)); + + expected_response_headers.push_back( + CreateModifyHeaderInfo(header.operation, header.header)); + } + } + + IndexedRule indexed_rule; + ParseResult result = IndexedRule::CreateIndexedRule( + std::move(rule), GetBaseURL(), &indexed_rule); + EXPECT_EQ(cases[i].expected_result, result); + if (result != ParseResult::SUCCESS) + continue; + + EXPECT_EQ(dnr_api::RULE_ACTION_TYPE_MODIFYHEADERS, + indexed_rule.action_type); + + EXPECT_TRUE(std::equal( + expected_request_headers.begin(), expected_request_headers.end(), + indexed_rule.request_headers.begin(), EqualsForTesting)); + EXPECT_TRUE(std::equal( + expected_response_headers.begin(), expected_response_headers.end(), + indexed_rule.response_headers.begin(), EqualsForTesting)); + } +} + } // namespace } // namespace declarative_net_request } // namespace extensions
diff --git a/extensions/browser/api/declarative_net_request/parse_info.cc b/extensions/browser/api/declarative_net_request/parse_info.cc index 9c6eec7c..fd07c17 100644 --- a/extensions/browser/api/declarative_net_request/parse_info.cc +++ b/extensions/browser/api/declarative_net_request/parse_info.cc
@@ -167,6 +167,24 @@ error_ = ErrorUtils::FormatErrorMessage( kErrorInvalidKey, base::NumberToString(*rule_id), kRegexFilterKey); break; + case ParseResult::ERROR_NO_HEADERS_SPECIFIED: + error_ = ErrorUtils::FormatErrorMessage( + kErrorNoHeaderListsSpecified, base::NumberToString(*rule_id), + kRequestHeadersPath, kResponseHeadersPath); + break; + case ParseResult::ERROR_EMPTY_REQUEST_HEADERS_LIST: + error_ = ErrorUtils::FormatErrorMessage( + kErrorEmptyList, base::NumberToString(*rule_id), kRequestHeadersPath); + break; + case ParseResult::ERROR_EMPTY_RESPONSE_HEADERS_LIST: + error_ = ErrorUtils::FormatErrorMessage(kErrorEmptyList, + base::NumberToString(*rule_id), + kResponseHeadersPath); + break; + case ParseResult::ERROR_INVALID_HEADER_NAME: + error_ = ErrorUtils::FormatErrorMessage(kErrorInvalidHeaderName, + base::NumberToString(*rule_id)); + break; case ParseResult::ERROR_REGEX_TOO_LARGE: // These rules are ignored while indexing and so SetError won't be called // for them. See AddRegexLimitExceededRule().
diff --git a/extensions/browser/api/declarative_net_request/test_utils.cc b/extensions/browser/api/declarative_net_request/test_utils.cc index 7df08892e..56b06450 100644 --- a/extensions/browser/api/declarative_net_request/test_utils.cc +++ b/extensions/browser/api/declarative_net_request/test_utils.cc
@@ -222,6 +222,18 @@ case ParseResult::ERROR_INVALID_REGEX_FILTER: output << "ERROR_INVALID_REGEX_FILTER"; break; + case ParseResult::ERROR_NO_HEADERS_SPECIFIED: + output << "ERROR_NO_HEADERS_SPECIFIED"; + break; + case ParseResult::ERROR_EMPTY_REQUEST_HEADERS_LIST: + output << "ERROR_EMPTY_REQUEST_HEADERS_LIST"; + break; + case ParseResult::ERROR_EMPTY_RESPONSE_HEADERS_LIST: + output << "ERROR_EMPTY_RESPONSE_HEADERS_LIST"; + break; + case ParseResult::ERROR_INVALID_HEADER_NAME: + output << "ERROR_INVALID_HEADER_NAME"; + break; case ParseResult::ERROR_REGEX_TOO_LARGE: output << "ERROR_REGEX_TOO_LARGE"; break; @@ -296,5 +308,21 @@ return source->Clone(); } +dnr_api::ModifyHeaderInfo CreateModifyHeaderInfo( + dnr_api::HeaderOperation operation, + std::string header) { + dnr_api::ModifyHeaderInfo header_info; + + header_info.operation = operation; + header_info.header = header; + + return header_info; +} + +bool EqualsForTesting(const dnr_api::ModifyHeaderInfo& lhs, + const dnr_api::ModifyHeaderInfo& rhs) { + return lhs.operation == rhs.operation && lhs.header == rhs.header; +} + } // namespace declarative_net_request } // namespace extensions
diff --git a/extensions/browser/api/declarative_net_request/test_utils.h b/extensions/browser/api/declarative_net_request/test_utils.h index fa3d7340..6dfa68f 100644 --- a/extensions/browser/api/declarative_net_request/test_utils.h +++ b/extensions/browser/api/declarative_net_request/test_utils.h
@@ -9,6 +9,7 @@ #include <ostream> #include <vector> +#include "base/optional.h" #include "extensions/browser/api/declarative_net_request/constants.h" #include "extensions/browser/api/declarative_net_request/request_action.h" #include "extensions/common/api/declarative_net_request.h" @@ -73,6 +74,14 @@ size_t rule_count_limit = 100, ExtensionId extension_id = "extensionid"); +api::declarative_net_request::ModifyHeaderInfo CreateModifyHeaderInfo( + api::declarative_net_request::HeaderOperation operation, + std::string header); + +bool EqualsForTesting( + const api::declarative_net_request::ModifyHeaderInfo& lhs, + const api::declarative_net_request::ModifyHeaderInfo& rhs); + } // namespace declarative_net_request } // namespace extensions
diff --git a/extensions/browser/api/extensions_api_client.cc b/extensions/browser/api/extensions_api_client.cc index 8251270..956c285 100644 --- a/extensions/browser/api/extensions_api_client.cc +++ b/extensions/browser/api/extensions_api_client.cc
@@ -6,6 +6,7 @@ #include "base/logging.h" #include "extensions/browser/api/device_permissions_prompt.h" +#include "extensions/browser/api/management/supervised_user_service_delegate.h" #include "extensions/browser/api/system_display/display_info_provider.h" #include "extensions/browser/api/virtual_keyboard_private/virtual_keyboard_delegate.h" #include "extensions/browser/guest_view/extensions_guest_view_manager_delegate.h" @@ -120,6 +121,11 @@ return nullptr; } +std::unique_ptr<SupervisedUserServiceDelegate> +ExtensionsAPIClient::CreateSupervisedUserServiceDelegate() const { + return nullptr; +} + std::unique_ptr<DisplayInfoProvider> ExtensionsAPIClient::CreateDisplayInfoProvider() const { return nullptr;
diff --git a/extensions/browser/api/extensions_api_client.h b/extensions/browser/api/extensions_api_client.h index b9b9144..81a7cad 100644 --- a/extensions/browser/api/extensions_api_client.h +++ b/extensions/browser/api/extensions_api_client.h
@@ -55,6 +55,7 @@ class NonNativeFileSystemDelegate; class RulesCacheDelegate; class SettingsObserver; +class SupervisedUserServiceDelegate; class ValueStoreCache; class ValueStoreFactory; class VirtualKeyboardDelegate; @@ -167,6 +168,11 @@ // Creates a delegate for handling the management extension api. virtual ManagementAPIDelegate* CreateManagementAPIDelegate() const; + // Creates a delegate for calling into the SupervisedUserService from the + // Management API. + virtual std::unique_ptr<SupervisedUserServiceDelegate> + CreateSupervisedUserServiceDelegate() const; + // Creates and returns the DisplayInfoProvider used by the // chrome.system.display extension API. virtual std::unique_ptr<DisplayInfoProvider> CreateDisplayInfoProvider()
diff --git a/extensions/browser/api/management/BUILD.gn b/extensions/browser/api/management/BUILD.gn index 7670df7..7692a4e1 100644 --- a/extensions/browser/api/management/BUILD.gn +++ b/extensions/browser/api/management/BUILD.gn
@@ -14,6 +14,7 @@ "management_api_constants.cc", "management_api_constants.h", "management_api_delegate.h", + "supervised_user_service_delegate.h", ] deps = [ "//extensions/common/api" ]
diff --git a/extensions/browser/api/management/management_api.cc b/extensions/browser/api/management/management_api.cc index 6721adc8..c2af513 100644 --- a/extensions/browser/api/management/management_api.cc +++ b/extensions/browser/api/management/management_api.cc
@@ -406,11 +406,9 @@ return RespondNow(NoArguments()); } -ManagementSetEnabledFunction::ManagementSetEnabledFunction() { -} +ManagementSetEnabledFunction::ManagementSetEnabledFunction() = default; -ManagementSetEnabledFunction::~ManagementSetEnabledFunction() { -} +ManagementSetEnabledFunction::~ManagementSetEnabledFunction() = default; ExtensionFunction::ResponseAction ManagementSetEnabledFunction::Run() { std::unique_ptr<management::SetEnabled::Params> params( @@ -432,12 +430,41 @@ return RespondNow(Error(keys::kNoExtensionError, extension_id_)); bool enabled = params->enabled; + + const SupervisedUserServiceDelegate* supervised_user_service_delegate = + ManagementAPI::GetFactoryInstance() + ->Get(browser_context()) + ->GetSupervisedUserServiceDelegate(); + + const bool is_supervised_child_who_may_install_extensions = + supervised_user_service_delegate + ? supervised_user_service_delegate + ->IsSupervisedChildWhoMayInstallExtensions(browser_context()) + : false; + const ManagementPolicy* policy = ExtensionSystem::Get(browser_context())->management_policy(); + if (!policy->ExtensionMayModifySettings(extension(), target_extension, - nullptr) || - (enabled && - policy->MustRemainDisabled(target_extension, nullptr, nullptr))) { + nullptr)) { + return RespondNow(Error(keys::kUserCantModifyError, extension_id_)); + } + + disable_reason::DisableReason reason; + bool disallow_enable = + enabled && policy->MustRemainDisabled(target_extension, &reason, nullptr); + + // Figure out if we should prompt for parental approval. + bool prompt_parent_for_approval = + disallow_enable && is_supervised_child_who_may_install_extensions && + reason == + disable_reason::DisableReason::DISABLE_CUSTODIAN_APPROVAL_REQUIRED; + + // If the extension can't be enabled, only continue if we plan to prompt for + // parental approval. + if (disallow_enable && !prompt_parent_for_approval) { + LOG(ERROR) << "ManagementSetEnabledFunction::Run: extension may not be " + "enabled, and we're not prompting for parent approval"; return RespondNow(Error(keys::kUserCantModifyError, extension_id_)); } @@ -467,6 +494,18 @@ this)); // This bind creates a reference. return RespondLater(); } + // Handle parental approval for child accounts that have the + // ability to install extensions. + if (prompt_parent_for_approval && + // Don't re-prompt the parent for extensions that have already been + // approved for a child. + !supervised_user_service_delegate->IsExtensionAllowedByParent( + *target_extension, browser_context())) { + LOG(ERROR) << "ManagementSetEnabledFunction::Run: prompting for parent " + "approval"; + return RequestParentPermission(target_extension); + } + delegate->EnableExtension(browser_context(), extension_id_); } else if (currently_enabled && !params->enabled) { delegate->DisableExtension( @@ -506,6 +545,54 @@ } } +ExtensionFunction::ResponseAction +ManagementSetEnabledFunction::RequestParentPermission( + const Extension* extension) { + content::WebContents* web_contents = GetSenderWebContents(); + if (!web_contents) + return RespondNow(Error(keys::kWebContentsDisappearedError)); + + // Show parental approval prompt. + auto callback = base::BindOnce( + &ManagementSetEnabledFunction::OnParentPermissionDone, this); + SupervisedUserServiceDelegate* supervised_user_service_delegate = + ManagementAPI::GetFactoryInstance() + ->Get(browser_context()) + ->GetSupervisedUserServiceDelegate(); + DCHECK(supervised_user_service_delegate); + supervised_user_service_delegate->ShowParentPermissionDialogForExtension( + *extension, browser_context(), web_contents, std::move(callback)); + return RespondLater(); +} + +void ManagementSetEnabledFunction::OnParentPermissionDone( + SupervisedUserServiceDelegate::ParentPermissionDialogResult result) { + switch (result) { + case SupervisedUserServiceDelegate::ParentPermissionDialogResult:: + kParentPermissionReceived: { + const ManagementAPIDelegate* delegate = + ManagementAPI::GetFactoryInstance() + ->Get(browser_context()) + ->GetDelegate(); + delegate->EnableExtension(browser_context(), extension_id_); + Respond(OneArgument(std::make_unique<base::Value>(true))); + break; + } + + case SupervisedUserServiceDelegate::ParentPermissionDialogResult:: + kParentPermissionCanceled: { + Respond(Error(keys::kUserDidNotReEnableError)); + break; + } + + case SupervisedUserServiceDelegate::ParentPermissionDialogResult:: + kParentPermissionFailed: { + Respond(Error(keys::kParentPermissionFailedError)); + break; + } + } +} + ManagementUninstallFunctionBase::ManagementUninstallFunctionBase() { } @@ -1043,7 +1130,9 @@ ManagementAPI::ManagementAPI(content::BrowserContext* context) : browser_context_(context), - delegate_(ExtensionsAPIClient::Get()->CreateManagementAPIDelegate()) { + delegate_(ExtensionsAPIClient::Get()->CreateManagementAPIDelegate()), + supervised_user_service_delegate_( + ExtensionsAPIClient::Get()->CreateSupervisedUserServiceDelegate()) { EventRouter* event_router = EventRouter::Get(browser_context_); event_router->RegisterObserver(this, management::OnInstalled::kEventName); event_router->RegisterObserver(this, management::OnUninstalled::kEventName);
diff --git a/extensions/browser/api/management/management_api.h b/extensions/browser/api/management/management_api.h index cd42762..271a1a8 100644 --- a/extensions/browser/api/management/management_api.h +++ b/extensions/browser/api/management/management_api.h
@@ -14,6 +14,7 @@ #include "base/strings/string16.h" #include "components/keyed_service/core/keyed_service.h" #include "extensions/browser/api/management/management_api_delegate.h" +#include "extensions/browser/api/management/supervised_user_service_delegate.h" #include "extensions/browser/browser_context_keyed_api_factory.h" #include "extensions/browser/event_router.h" #include "extensions/browser/extension_event_histogram_value.h" @@ -116,6 +117,15 @@ void OnRequirementsChecked(const PreloadCheck::Errors& errors); + ExtensionFunction::ResponseAction RequestParentPermission( + const Extension* extension); + + void OnParentPermissionDone( + SupervisedUserServiceDelegate::ParentPermissionDialogResult result); + + std::unique_ptr<SupervisedUserServiceDelegate::ParentPermissionDialogResult> + parental_permission_dialog_; + std::string extension_id_; std::unique_ptr<InstallPromptDelegate> install_prompt_; @@ -315,6 +325,12 @@ // Returns the ManagementAPI delegate. const ManagementAPIDelegate* GetDelegate() const { return delegate_.get(); } + // Returns the SupervisedUserService delegate, which might be null depending + // on the extensions embedder. + SupervisedUserServiceDelegate* GetSupervisedUserServiceDelegate() const { + return supervised_user_service_delegate_.get(); + } + private: friend class BrowserContextKeyedAPIFactory<ManagementAPI>; @@ -329,6 +345,8 @@ std::unique_ptr<ManagementEventRouter> management_event_router_; std::unique_ptr<ManagementAPIDelegate> delegate_; + std::unique_ptr<SupervisedUserServiceDelegate> + supervised_user_service_delegate_; DISALLOW_COPY_AND_ASSIGN(ManagementAPI); };
diff --git a/extensions/browser/api/management/management_api_constants.cc b/extensions/browser/api/management/management_api_constants.cc index 75901ef..5069a509 100644 --- a/extensions/browser/api/management/management_api_constants.cc +++ b/extensions/browser/api/management/management_api_constants.cc
@@ -63,5 +63,8 @@ "Only extensions from the web store can install replacement Android apps."; const char kInstallReplacementAndroidAppCannotInstallApp[] = "Could not install Android App."; +const char kWebContentsDisappearedError[] = + "Web contents disappeared while attempting to enable extension."; +const char kParentPermissionFailedError[] = "Parent Permission Request Failed."; } // namespace extension_management_api_constants
diff --git a/extensions/browser/api/management/management_api_constants.h b/extensions/browser/api/management/management_api_constants.h index a9ab618..d93cbbd 100644 --- a/extensions/browser/api/management/management_api_constants.h +++ b/extensions/browser/api/management/management_api_constants.h
@@ -44,6 +44,8 @@ extern const char kInstallReplacementAndroidAppCannotInstallApp[]; extern const char kInstallReplacementAndroidAppInvalidContextError[]; extern const char kInstallReplacementAndroidAppNotFromWebstoreError[]; +extern const char kWebContentsDisappearedError[]; +extern const char kParentPermissionFailedError[]; } // namespace extension_management_api_constants
diff --git a/extensions/browser/api/management/supervised_user_service_delegate.h b/extensions/browser/api/management/supervised_user_service_delegate.h new file mode 100644 index 0000000..d38fdc9 --- /dev/null +++ b/extensions/browser/api/management/supervised_user_service_delegate.h
@@ -0,0 +1,54 @@ +// Copyright 2020 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef EXTENSIONS_BROWSER_API_MANAGEMENT_SUPERVISED_USER_SERVICE_DELEGATE_H_ +#define EXTENSIONS_BROWSER_API_MANAGEMENT_SUPERVISED_USER_SERVICE_DELEGATE_H_ + +#include "base/callback.h" +#include "extensions/common/extension.h" + +namespace content { +class BrowserContext; +class WebContents; +} // namespace content + +namespace extensions { + +class SupervisedUserServiceDelegate { + public: + virtual ~SupervisedUserServiceDelegate() = default; + + // Returns true if |context| represents a supervised child account + // who may install extensions with parent permission. + virtual bool IsSupervisedChildWhoMayInstallExtensions( + content::BrowserContext* context) const = 0; + + // Returns true if the current child user is allowed to install the specified + // |extension|. + virtual bool IsExtensionAllowedByParent( + const extensions::Extension& extension, + content::BrowserContext* context) const = 0; + + // Result of the parent permission dialog invocation. + enum class ParentPermissionDialogResult { + kParentPermissionReceived, + kParentPermissionCanceled, + kParentPermissionFailed, + }; + + using ParentPermissionDialogDoneCallback = + base::OnceCallback<void(ParentPermissionDialogResult)>; + + // Show a parent permission dialog for |extension| and call |done_callback| + // when it completes. + virtual void ShowParentPermissionDialogForExtension( + const extensions::Extension& extension, + content::BrowserContext* context, + content::WebContents* contents, + ParentPermissionDialogDoneCallback done_callback) = 0; +}; + +} // namespace extensions + +#endif // EXTENSIONS_BROWSER_API_MANAGEMENT_SUPERVISED_USER_SERVICE_DELEGATE_H_
diff --git a/extensions/common/api/declarative_net_request/constants.cc b/extensions/common/api/declarative_net_request/constants.cc index 026d96f1..ea3c9ad 100644 --- a/extensions/common/api/declarative_net_request/constants.cc +++ b/extensions/common/api/declarative_net_request/constants.cc
@@ -52,6 +52,8 @@ const char kQueryValueKey[] = "value"; const char kRegexSubstitutionKey[] = "regexSubstitution"; const char kRegexSubstitutionPath[] = "action.redirect.regexSubstitution"; +const char kRequestHeadersPath[] = "action.requestHeaders"; +const char kResponseHeadersPath[] = "action.responseHeaders"; } // namespace declarative_net_request } // namespace extensions
diff --git a/extensions/common/api/declarative_net_request/constants.h b/extensions/common/api/declarative_net_request/constants.h index 0bbe5b5..9e9704299 100644 --- a/extensions/common/api/declarative_net_request/constants.h +++ b/extensions/common/api/declarative_net_request/constants.h
@@ -66,6 +66,8 @@ extern const char kQueryValueKey[]; extern const char kRegexSubstitutionKey[]; extern const char kRegexSubstitutionPath[]; +extern const char kRequestHeadersPath[]; +extern const char kResponseHeadersPath[]; } // namespace declarative_net_request } // namespace extensions
diff --git a/extensions/shell/test/shell_test_helper_aura.cc b/extensions/shell/test/shell_test_helper_aura.cc index 04475aa..9e9d4c4 100644 --- a/extensions/shell/test/shell_test_helper_aura.cc +++ b/extensions/shell/test/shell_test_helper_aura.cc
@@ -12,7 +12,6 @@ #include "extensions/shell/browser/shell_app_delegate.h" #include "ui/aura/test/aura_test_helper.h" #include "ui/compositor/compositor.h" -#include "ui/compositor/test/test_context_factories.h" #include "url/gurl.h" namespace extensions { @@ -22,19 +21,14 @@ ShellTestHelperAura::~ShellTestHelperAura() {} void ShellTestHelperAura::SetUp() { - // The ContextFactory must exist before any Compositors are created. - context_factories_ = - std::make_unique<ui::TestContextFactories>(/*enable_pixel_output=*/false); - // AuraTestHelper sets up the rest of the Aura initialization. helper_ = std::make_unique<aura::test::AuraTestHelper>(); - helper_->SetUp(context_factories_->GetContextFactory()); + helper_->SetUp(); } void ShellTestHelperAura::TearDown() { helper_->RunAllPendingInMessageLoop(); helper_->TearDown(); - context_factories_.reset(); } void ShellTestHelperAura::InitAppWindow(AppWindow* app_window,
diff --git a/extensions/shell/test/shell_test_helper_aura.h b/extensions/shell/test/shell_test_helper_aura.h index 6b38495..1ef311a 100644 --- a/extensions/shell/test/shell_test_helper_aura.h +++ b/extensions/shell/test/shell_test_helper_aura.h
@@ -16,10 +16,6 @@ } } // namespace aura -namespace ui { -class TestContextFactories; -} - namespace extensions { class AppWindow; @@ -40,7 +36,6 @@ void InitAppWindow(AppWindow* app_window, const gfx::Rect& bounds = {}); private: - std::unique_ptr<ui::TestContextFactories> context_factories_; std::unique_ptr<aura::test::AuraTestHelper> helper_; DISALLOW_COPY_AND_ASSIGN(ShellTestHelperAura);
diff --git a/infra/config/buckets/try.star b/infra/config/buckets/try.star index 8cb3cf7..7b74ec0f 100644 --- a/infra/config/buckets/try.star +++ b/infra/config/buckets/try.star
@@ -822,6 +822,12 @@ ) try_.chromium_mac_ios_builder( + name = 'ios-simulator-code-coverage', + executable = 'recipe:chromium_trybot', + use_clang_coverage = True, +) + +try_.chromium_mac_ios_builder( name = 'ios-simulator-cr-recipe', executable = 'recipe:chromium_trybot', properties = {
diff --git a/infra/config/consoles/tryserver.chromium.mac.star b/infra/config/consoles/tryserver.chromium.mac.star index c199b61..ffee5716 100644 --- a/infra/config/consoles/tryserver.chromium.mac.star +++ b/infra/config/consoles/tryserver.chromium.mac.star
@@ -17,6 +17,7 @@ 'try/gpu-try-mac-amd-retina-dbg', 'try/gpu-try-mac-intel-dbg', 'try/ios-device', + 'try/ios-simulator-code-coverage', 'try/ios-simulator-cr-recipe', 'try/ios-simulator-cronet', 'try/ios-simulator-full-configs',
diff --git a/infra/config/generated/commit-queue.cfg b/infra/config/generated/commit-queue.cfg index 9ad8054..4936ebf8 100644 --- a/infra/config/generated/commit-queue.cfg +++ b/infra/config/generated/commit-queue.cfg
@@ -662,6 +662,10 @@ name: "chromium/try/ios-simulator" > builders: < + name: "chromium/try/ios-simulator-code-coverage" + includable_only: true + > + builders: < name: "chromium/try/ios-simulator-cr-recipe" includable_only: true >
diff --git a/infra/config/generated/cr-buildbucket.cfg b/infra/config/generated/cr-buildbucket.cfg index cf8a30c..99b4997 100644 --- a/infra/config/generated/cr-buildbucket.cfg +++ b/infra/config/generated/cr-buildbucket.cfg
@@ -15268,6 +15268,37 @@ > > builders: < + name: "ios-simulator-code-coverage" + swarming_host: "chromium-swarm.appspot.com" + swarming_tags: "vpython:native-python-wrapper" + dimensions: "builder:ios-simulator-code-coverage" + dimensions: "cpu:x86-64" + dimensions: "os:Mac" + recipe: < + name: "chromium_trybot" + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/master" + properties_j: "$build/code_coverage:{\"use_clang_coverage\":true}" + properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}" + properties_j: "mastername:\"tryserver.chromium.mac\"" + > + execution_timeout_secs: 14400 + expiration_secs: 7200 + caches: < + name: "win_toolchain" + path: "win_toolchain" + > + caches: < + name: "xcode_ios_11c29" + path: "xcode_ios_11c29.app" + > + build_numbers: YES + service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com" + task_template_canary_percentage: < + value: 5 + > + > + builders: < name: "ios-simulator-cr-recipe" swarming_host: "chromium-swarm.appspot.com" swarming_tags: "vpython:native-python-wrapper"
diff --git a/infra/config/generated/luci-milo.cfg b/infra/config/generated/luci-milo.cfg index df74b93..8f4ab7ee 100644 --- a/infra/config/generated/luci-milo.cfg +++ b/infra/config/generated/luci-milo.cfg
@@ -12961,6 +12961,9 @@ name: "buildbucket/luci.chromium.try/ios-device" > builders: < + name: "buildbucket/luci.chromium.try/ios-simulator-code-coverage" + > + builders: < name: "buildbucket/luci.chromium.try/ios-simulator-cr-recipe" > builders: <
diff --git a/ios/chrome/browser/ui/webui/web_ui_egtest.mm b/ios/chrome/browser/ui/webui/web_ui_egtest.mm index c616b03b..1767920 100644 --- a/ios/chrome/browser/ui/webui/web_ui_egtest.mm +++ b/ios/chrome/browser/ui/webui/web_ui_egtest.mm
@@ -127,7 +127,8 @@ // Tests that back navigation functions properly after navigation via anchor // click. -- (void)testChromeURLBackNavigationFromAnchorClick { +// TODO(crbug.com/1058028): This test is flaky. +- (void)FLAKY_testChromeURLBackNavigationFromAnchorClick { [ChromeEarlGrey loadURL:GURL(kChromeUIChromeURLsURL)]; // Tap on chrome://version link on the page. @@ -218,7 +219,8 @@ } // Tests that repeated back/forward navigation from web URL is allowed. -- (void)testBackForwardFromWebURL { +// TODO(crbug.com/1058028): This test is flaky. +- (void)FLAKY_testBackForwardFromWebURL { GREYAssertTrue(self.testServer->Start(), @"Test server failed to start."); std::string chromeVersionWebText =
diff --git a/media/gpu/BUILD.gn b/media/gpu/BUILD.gn index 184f4a5b..dbbc4f6e 100644 --- a/media/gpu/BUILD.gn +++ b/media/gpu/BUILD.gn
@@ -565,6 +565,7 @@ } test("video_encode_accelerator_perf_tests") { + testonly = true sources = [ "video_encode_accelerator_perf_tests.cc" ] data = [ "//media/test/data/" ] deps = [
diff --git a/media/gpu/test/BUILD.gn b/media/gpu/test/BUILD.gn index 2ec2073..0b53449 100644 --- a/media/gpu/test/BUILD.gn +++ b/media/gpu/test/BUILD.gn
@@ -128,6 +128,7 @@ deps = [ ":frame_file_writer", ":helpers", + ":video_player", "//media/gpu", ] }
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 0119cc6..9185742 100644 --- a/media/gpu/test/video_player/test_vda_video_decoder.cc +++ b/media/gpu/test/video_player/test_vda_video_decoder.cc
@@ -21,7 +21,9 @@ #include "testing/gtest/include/gtest/gtest.h" #if BUILDFLAG(USE_CHROMEOS_MEDIA_ACCELERATION) +#include "media/gpu/chromeos/chromeos_video_decoder_factory.h" #include "media/gpu/chromeos/platform_video_frame_utils.h" +#include "media/gpu/chromeos/vd_video_decode_accelerator.h" #endif // BUILDFLAG(USE_CHROMEOS_MEDIA_ACCELERATION) namespace media { @@ -34,12 +36,14 @@ TestVDAVideoDecoder::TestVDAVideoDecoder( AllocationMode allocation_mode, + bool use_vd_vda, const gfx::ColorSpace& target_color_space, FrameRenderer* const frame_renderer, gpu::GpuMemoryBufferFactory* gpu_memory_buffer_factory) : output_mode_(allocation_mode == AllocationMode::kAllocate ? VideoDecodeAccelerator::Config::OutputMode::ALLOCATE : VideoDecodeAccelerator::Config::OutputMode::IMPORT), + use_vd_vda_(use_vd_vda), target_color_space_(target_color_space), frame_renderer_(frame_renderer), #if BUILDFLAG(USE_CHROMEOS_MEDIA_ACCELERATION) @@ -125,8 +129,19 @@ gpu::GpuDriverBugWorkarounds gpu_driver_bug_workarounds; gpu::GpuPreferences gpu_preferences; - decoder_ = decoder_factory->CreateVDA( - this, vda_config, gpu_driver_bug_workarounds, gpu_preferences); + if (use_vd_vda_) { +#if BUILDFLAG(USE_CHROMEOS_MEDIA_ACCELERATION) + DVLOGF(2) << "Use VdVideoDecodeAccelerator"; + vda_config.is_deferred_initialization_allowed = true; + decoder_ = media::VdVideoDecodeAccelerator::Create( + base::BindRepeating(&media::ChromeosVideoDecoderFactory::Create), this, + vda_config, base::SequencedTaskRunnerHandle::Get()); +#endif // BUILDFLAG(USE_CHROMEOS_MEDIA_ACCELERATION) + } else { + DVLOGF(2) << "Use original VDA"; + decoder_ = decoder_factory->CreateVDA( + this, vda_config, gpu_driver_bug_workarounds, gpu_preferences); + } if (!decoder_) { ASSERT_TRUE(decoder_) << "Failed to create VideoDecodeAccelerator factory";
diff --git a/media/gpu/test/video_player/test_vda_video_decoder.h b/media/gpu/test/video_player/test_vda_video_decoder.h index 054ae5f6..716d117 100644 --- a/media/gpu/test/video_player/test_vda_video_decoder.h +++ b/media/gpu/test/video_player/test_vda_video_decoder.h
@@ -37,6 +37,7 @@ // whether allocating video frames will be done by the TestVDAVideoDecoder, or // delegated to the underlying VDA. TestVDAVideoDecoder(AllocationMode allocation_mode, + bool use_vd_vda, const gfx::ColorSpace& target_color_space, FrameRenderer* const frame_renderer, gpu::GpuMemoryBufferFactory* gpu_memory_buffer_factory); @@ -105,6 +106,9 @@ // Video decode accelerator output mode. const VideoDecodeAccelerator::Config::OutputMode output_mode_; + // Whether VdVideoDecodeAccelerator is used. + bool use_vd_vda_; + // Output color space, used as hint to decoder to avoid conversions. const gfx::ColorSpace target_color_space_;
diff --git a/media/gpu/test/video_player/video_decoder_client.cc b/media/gpu/test/video_player/video_decoder_client.cc index 1f50dbe..7029278 100644 --- a/media/gpu/test/video_player/video_decoder_client.cc +++ b/media/gpu/test/video_player/video_decoder_client.cc
@@ -181,24 +181,32 @@ DCHECK_EQ(decoder_client_state_, VideoDecoderClientState::kUninitialized); ASSERT_TRUE(!decoder_) << "Can't create decoder: already created"; - if (decoder_client_config_.use_vd) { + switch (decoder_client_config_.implementation) { + case DecoderImplementation::kVD: #if BUILDFLAG(USE_CHROMEOS_MEDIA_ACCELERATION) - if (decoder_client_config_.allocation_mode == AllocationMode::kImport) { - decoder_ = ChromeosVideoDecoderFactory::Create( - base::ThreadTaskRunnerHandle::Get(), - std::make_unique<PlatformVideoFramePool>(gpu_memory_buffer_factory_), - std::make_unique<VideoFrameConverter>(), gpu_memory_buffer_factory_); - } else { - LOG(ERROR) << "VD-based video decoders only support import mode"; - } + if (decoder_client_config_.allocation_mode == AllocationMode::kImport) { + decoder_ = ChromeosVideoDecoderFactory::Create( + base::ThreadTaskRunnerHandle::Get(), + std::make_unique<PlatformVideoFramePool>( + gpu_memory_buffer_factory_), + std::make_unique<VideoFrameConverter>(), + gpu_memory_buffer_factory_); + } else { + LOG(ERROR) << "VD-based video decoders only support import mode"; + } #endif // BUILDFLAG(USE_CHROMEOS_MEDIA_ACCELERATION) - } else { - // The video decoder client expects decoders to use the VD interface. We - // can use the TestVDAVideoDecoder wrapper here to test VDA-based video - // decoders. - decoder_ = std::make_unique<TestVDAVideoDecoder>( - decoder_client_config_.allocation_mode, gfx::ColorSpace(), - frame_renderer_.get(), gpu_memory_buffer_factory_); + break; + case DecoderImplementation::kVDA: + case DecoderImplementation::kVDVDA: + // The video decoder client expects decoders to use the VD interface. We + // can use the TestVDAVideoDecoder wrapper here to test VDA-based video + // decoders. + decoder_ = std::make_unique<TestVDAVideoDecoder>( + decoder_client_config_.allocation_mode, + decoder_client_config_.implementation == + DecoderImplementation::kVDVDA, + gfx::ColorSpace(), frame_renderer_.get(), gpu_memory_buffer_factory_); + break; } *success = (decoder_ != nullptr);
diff --git a/media/gpu/test/video_player/video_decoder_client.h b/media/gpu/test/video_player/video_decoder_client.h index 255b7c8..b1c1423 100644 --- a/media/gpu/test/video_player/video_decoder_client.h +++ b/media/gpu/test/video_player/video_decoder_client.h
@@ -38,6 +38,13 @@ kAllocate, // Video decoder allocates video frame memory. }; +// The supported video decoding implementation. +enum class DecoderImplementation { + kVDA, // VDA-based video decoder. + kVD, // VD-based video decoder. + kVDVDA, // VD-based video decoder with VdVDA. +}; + // Video decoder client configuration. struct VideoDecoderClientConfig { // The maximum number of bitstream buffer decodes that can be requested @@ -45,8 +52,7 @@ size_t max_outstanding_decode_requests = 1; // How the pictures buffers should be allocated. AllocationMode allocation_mode = AllocationMode::kImport; - // Use VD-based video decoders instead of VDA-based video decoders. - bool use_vd = false; + DecoderImplementation implementation = DecoderImplementation::kVDA; }; // The video decoder client is responsible for the communication between the
diff --git a/media/gpu/test/video_player/video_player_test_environment.cc b/media/gpu/test/video_player/video_player_test_environment.cc index 580d5a4..388f2c6 100644 --- a/media/gpu/test/video_player/video_player_test_environment.cc +++ b/media/gpu/test/video_player/video_player_test_environment.cc
@@ -9,6 +9,7 @@ #include "base/system/sys_info.h" #include "media/base/video_types.h" #include "media/gpu/test/video.h" +#include "media/gpu/test/video_player/video_decoder_client.h" namespace media { namespace test { @@ -22,7 +23,7 @@ const base::FilePath& video_path, const base::FilePath& video_metadata_path, bool enable_validator, - bool use_vd, + const DecoderImplementation implementation, const base::FilePath& output_folder, const FrameOutputConfig& frame_output_config) { auto video = std::make_unique<media::test::Video>( @@ -34,19 +35,19 @@ } return new VideoPlayerTestEnvironment(std::move(video), enable_validator, - use_vd, output_folder, + implementation, output_folder, frame_output_config); } VideoPlayerTestEnvironment::VideoPlayerTestEnvironment( std::unique_ptr<media::test::Video> video, bool enable_validator, - bool use_vd, + const DecoderImplementation implementation, const base::FilePath& output_folder, const FrameOutputConfig& frame_output_config) : video_(std::move(video)), enable_validator_(enable_validator), - use_vd_(use_vd), + implementation_(implementation), frame_output_config_(frame_output_config), output_folder_(output_folder), gpu_memory_buffer_factory_( @@ -74,7 +75,7 @@ #endif // defined(OS_CHROMEOS) // VideoDecoders always require import mode to be supported. - DCHECK(!use_vd_ || import_supported_); + DCHECK(import_supported_ || implementation_ == DecoderImplementation::kVDA); } const media::test::Video* VideoPlayerTestEnvironment::Video() const { @@ -90,8 +91,9 @@ return enable_validator_; } -bool VideoPlayerTestEnvironment::UseVD() const { - return use_vd_; +DecoderImplementation VideoPlayerTestEnvironment::GetDecoderImplementation() + const { + return implementation_; } FrameOutputMode VideoPlayerTestEnvironment::GetFrameOutputMode() const {
diff --git a/media/gpu/test/video_player/video_player_test_environment.h b/media/gpu/test/video_player/video_player_test_environment.h index fad8045f..9c7107f 100644 --- a/media/gpu/test/video_player/video_player_test_environment.h +++ b/media/gpu/test/video_player/video_player_test_environment.h
@@ -11,6 +11,7 @@ #include "base/files/file_path.h" #include "gpu/ipc/service/gpu_memory_buffer_factory.h" #include "media/gpu/test/video_frame_file_writer.h" +#include "media/gpu/test/video_player/video_decoder_client.h" #include "media/gpu/test/video_test_environment.h" namespace media { @@ -47,7 +48,7 @@ const base::FilePath& video_path, const base::FilePath& video_metadata_path, bool enable_validator, - bool use_vd, + const DecoderImplementation implementation, const base::FilePath& output_folder = base::FilePath(), const FrameOutputConfig& frame_output_config = FrameOutputConfig()); ~VideoPlayerTestEnvironment() override; @@ -59,8 +60,8 @@ const media::test::Video* Video() const; // Check whether frame validation is enabled. bool IsValidatorEnabled() const; - // Check whether we should use VD-based video decoders instead of VDA-based. - bool UseVD() const; + // Return which implementation is used. + DecoderImplementation GetDecoderImplementation() const; // Get the frame output mode. FrameOutputMode GetFrameOutputMode() const; @@ -83,13 +84,13 @@ private: VideoPlayerTestEnvironment(std::unique_ptr<media::test::Video> video, bool enable_validator, - bool use_vd, + const DecoderImplementation implementation, const base::FilePath& output_folder, const FrameOutputConfig& frame_output_config); const std::unique_ptr<media::test::Video> video_; const bool enable_validator_; - const bool use_vd_; + const DecoderImplementation implementation_; const FrameOutputConfig frame_output_config_; const base::FilePath output_folder_;
diff --git a/media/gpu/v4l2/v4l2_image_processor_backend.cc b/media/gpu/v4l2/v4l2_image_processor_backend.cc index 6c89a9c..21b7dbe 100644 --- a/media/gpu/v4l2/v4l2_image_processor_backend.cc +++ b/media/gpu/v4l2/v4l2_image_processor_backend.cc
@@ -55,7 +55,7 @@ void FillV4L2BufferByGpuMemoryBufferHandle( const Fourcc& fourcc, - const gfx::Size& buffer_size, + const gfx::Size& coded_size, const gfx::GpuMemoryBufferHandle& gmb_handle, V4L2WritableBufferRef* buffer) { DCHECK_EQ(buffer->Memory(), V4L2_MEMORY_DMABUF); @@ -66,7 +66,7 @@ for (size_t i = 0; i < num_planes; ++i) { const int bytes_used = - VideoFrame::PlaneSize(fourcc.ToVideoPixelFormat(), i, buffer_size) + VideoFrame::PlaneSize(fourcc.ToVideoPixelFormat(), i, coded_size) .GetArea(); if (fourcc.IsMultiPlanar()) { @@ -77,7 +77,7 @@ buffer->SetPlaneDataOffset(i, planes[i].offset); // V4L2 counts data_offset as used bytes - buffer->SetPlaneSize(i, bytes_used + planes[i].offset); + buffer->SetPlaneSize(i, planes[i].size + planes[i].offset); // Workaround: filling length should not be needed. This is a bug of // videobuf2 library. buffer->SetPlaneBytesUsed(i, bytes_used + planes[i].offset); @@ -284,9 +284,10 @@ return nullptr; } - const v4l2_memory output_memory_type = output_mode == OutputMode::ALLOCATE - ? V4L2_MEMORY_MMAP - : V4L2_MEMORY_DMABUF; + const v4l2_memory output_memory_type = + output_mode == OutputMode::ALLOCATE + ? V4L2_MEMORY_MMAP + : InputStorageTypeToV4L2Memory(output_storage_type); if (!device->IsImageProcessingSupported()) { VLOGF(1) << "V4L2ImageProcessorBackend not supported in this platform";
diff --git a/media/gpu/video_decode_accelerator_perf_tests.cc b/media/gpu/video_decode_accelerator_perf_tests.cc index 19a77a53..9912778 100644 --- a/media/gpu/video_decode_accelerator_perf_tests.cc +++ b/media/gpu/video_decode_accelerator_perf_tests.cc
@@ -29,7 +29,7 @@ constexpr const char* usage_msg = "usage: video_decode_accelerator_perf_tests\n" " [-v=<level>] [--vmodule=<config>] [--output_folder]\n" - " [--use_vd] [--gtest_help] [--help]\n" + " ([--use_vd]|[--use_vd_vda]) [--gtest_help] [--help]\n" " [<video path>] [<video metadata path>]\n"; // Video decoder perf tests help message. @@ -49,6 +49,10 @@ " will be stored in the current working directory.\n" " --use_vd use the new VD-based video decoders, instead of\n" " the default VDA-based video decoders.\n" + " --use_vd_vda use the new VD-based video decoders with a wrapper" + " that translates to the VDA interface, used to test" + " interaction with older components expecting the VDA" + " interface.\n" " --gtest_help display the gtest help and exit.\n" " --help display this help and exit.\n"; @@ -316,7 +320,7 @@ // Use the new VD-based video decoders if requested. VideoDecoderClientConfig config; - config.use_vd = g_env->UseVD(); + config.implementation = g_env->GetDecoderImplementation(); // Force allocate mode if import mode is not supported. if (!g_env->ImportSupported()) @@ -399,6 +403,9 @@ // Parse command line arguments. base::FilePath::StringType output_folder = media::test::kDefaultOutputFolder; bool use_vd = false; + bool use_vd_vda = false; + media::test::DecoderImplementation implementation = + media::test::DecoderImplementation::kVDA; base::CommandLine::SwitchMap switches = cmd_line->GetSwitches(); for (base::CommandLine::SwitchMap::const_iterator it = switches.begin(); it != switches.end(); ++it) { @@ -411,6 +418,10 @@ output_folder = it->second; } else if (it->first == "use_vd") { use_vd = true; + implementation = media::test::DecoderImplementation::kVD; + } else if (it->first == "use_vd_vda") { + use_vd_vda = true; + implementation = media::test::DecoderImplementation::kVDVDA; } else { std::cout << "unknown option: --" << it->first << "\n" << media::test::usage_msg; @@ -418,12 +429,18 @@ } } + if (use_vd && use_vd_vda) { + std::cout << "--use_vd and --use_vd_vda cannot be enabled together.\n" + << media::test::usage_msg; + return EXIT_FAILURE; + } + testing::InitGoogleTest(&argc, argv); // Set up our test environment. media::test::VideoPlayerTestEnvironment* test_environment = media::test::VideoPlayerTestEnvironment::Create( - video_path, video_metadata_path, false, use_vd, + video_path, video_metadata_path, false, implementation, base::FilePath(output_folder)); if (!test_environment) return EXIT_FAILURE;
diff --git a/media/gpu/video_decode_accelerator_tests.cc b/media/gpu/video_decode_accelerator_tests.cc index b8b94cc7..b6851aa 100644 --- a/media/gpu/video_decode_accelerator_tests.cc +++ b/media/gpu/video_decode_accelerator_tests.cc
@@ -30,7 +30,7 @@ " [-v=<level>] [--vmodule=<config>] [--disable_validator]\n" " [--output_frames=(all|corrupt)] [--output_format=(png|yuv)]\n" " [--output_limit=<number>] [--output_folder=<folder>]\n" - " [--use_vd] [--gtest_help] [--help]\n" + " ([--use_vd]|[--use_vd_vda]) [--gtest_help] [--help]\n" " [<video path>] [<video metadata path>]\n"; // Video decoder tests help message. @@ -48,6 +48,10 @@ " --disable_validator disable frame validation.\n" " --use_vd use the new VD-based video decoders, instead of\n" " the default VDA-based video decoders.\n\n" + " --use_vd_vda use the new VD-based video decoders with a wrapper" + " that translates to the VDA interface, used to test" + " interaction with older components expecting the VDA" + " interface.\n" " --output_frames write the selected video frames to disk, possible\n" " values are \"all|corrupt\".\n" " --output_format set the format of frames saved to disk, supported\n" @@ -104,8 +108,7 @@ video->FrameChecksums(), PIXEL_FORMAT_I420, std::move(frame_writer))); } - // Use the new VD-based video decoders if requested. - config.use_vd = g_env->UseVD(); + config.implementation = g_env->GetDecoderImplementation(); auto video_player = VideoPlayer::Create( config, g_env->GetGpuMemoryBufferFactory(), std::move(frame_renderer), @@ -324,8 +327,10 @@ // specified as the new video decoders only support import mode. // TODO(dstaessens): Deprecate after switching to new VD-based video decoders. TEST_F(VideoDecoderTest, FlushAtEndOfStream_Allocate) { - if (!g_env->ImportSupported() || g_env->UseVD()) + if (!g_env->ImportSupported() || + g_env->GetDecoderImplementation() != DecoderImplementation::kVDA) { GTEST_SKIP(); + } VideoDecoderClientConfig config; config.allocation_mode = AllocationMode::kAllocate; @@ -352,7 +357,7 @@ // the media::VideoDecoder interface, so the test will be skipped if --use_vd // is not specified. TEST_F(VideoDecoderTest, Reinitialize) { - if (!g_env->UseVD()) + if (g_env->GetDecoderImplementation() != DecoderImplementation::kVD) GTEST_SKIP(); // Create and initialize the video decoder. @@ -381,7 +386,7 @@ // are triggered upon destroying. TEST_F(VideoDecoderTest, DestroyBeforeInitialize) { VideoDecoderClientConfig config = VideoDecoderClientConfig(); - config.use_vd = g_env->UseVD(); + config.implementation = g_env->GetDecoderImplementation(); auto tvp = VideoPlayer::Create(config, g_env->GetGpuMemoryBufferFactory(), FrameRendererDummy::Create()); EXPECT_NE(tvp, nullptr); @@ -416,6 +421,9 @@ media::test::FrameOutputConfig frame_output_config; base::FilePath::StringType output_folder = base::FilePath::kCurrentDirectory; bool use_vd = false; + bool use_vd_vda = false; + media::test::DecoderImplementation implementation = + media::test::DecoderImplementation::kVDA; base::CommandLine::SwitchMap switches = cmd_line->GetSwitches(); for (base::CommandLine::SwitchMap::const_iterator it = switches.begin(); it != switches.end(); ++it) { @@ -459,6 +467,10 @@ output_folder = it->second; } else if (it->first == "use_vd") { use_vd = true; + implementation = media::test::DecoderImplementation::kVD; + } else if (it->first == "use_vd_vda") { + use_vd_vda = true; + implementation = media::test::DecoderImplementation::kVDVDA; } else { std::cout << "unknown option: --" << it->first << "\n" << media::test::usage_msg; @@ -466,12 +478,18 @@ } } + if (use_vd && use_vd_vda) { + std::cout << "--use_vd and --use_vd_vda cannot be enabled together.\n" + << media::test::usage_msg; + return EXIT_FAILURE; + } + testing::InitGoogleTest(&argc, argv); // Set up our test environment. media::test::VideoPlayerTestEnvironment* test_environment = media::test::VideoPlayerTestEnvironment::Create( - video_path, video_metadata_path, enable_validator, use_vd, + video_path, video_metadata_path, enable_validator, implementation, base::FilePath(output_folder), frame_output_config); if (!test_environment) return EXIT_FAILURE;
diff --git a/mojo/core/BUILD.gn b/mojo/core/BUILD.gn index a1e2184..e6fcb962 100644 --- a/mojo/core/BUILD.gn +++ b/mojo/core/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/compiler/compiler.gni") import("//build/config/nacl/config.gni") import("//testing/libfuzzer/fuzzer_test.gni") import("//testing/test.gni") @@ -164,6 +165,10 @@ } configs += [ "//build/config/compiler:noshadowing" ] + if (!is_debug && !optimize_for_size) { + configs -= [ "//build/config/compiler:default_optimization" ] + configs += [ "//build/config/compiler:optimize_max" ] + } } }
diff --git a/mojo/core/ports/BUILD.gn b/mojo/core/ports/BUILD.gn index e70ff860..33c854b 100644 --- a/mojo/core/ports/BUILD.gn +++ b/mojo/core/ports/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/compiler/compiler.gni") import("//testing/test.gni") component("ports") { @@ -36,6 +37,11 @@ if (!is_nacl) { deps = [ "//crypto" ] } + + if (!is_debug && !optimize_for_size) { + configs -= [ "//build/config/compiler:default_optimization" ] + configs += [ "//build/config/compiler:optimize_max" ] + } } source_set("tests") {
diff --git a/mojo/public/cpp/bindings/BUILD.gn b/mojo/public/cpp/bindings/BUILD.gn index 43e3cd3d..618a5ba 100644 --- a/mojo/public/cpp/bindings/BUILD.gn +++ b/mojo/public/cpp/bindings/BUILD.gn
@@ -3,6 +3,7 @@ # found in the LICENSE file. import("//build/buildflag_header.gni") +import("//build/config/compiler/compiler.gni") import("//build/config/nacl/config.gni") import("//tools/ipc_fuzzer/ipc_fuzzer.gni") @@ -117,6 +118,11 @@ if (enable_ipc_fuzzer) { all_dependent_configs = [ "//tools/ipc_fuzzer:ipc_fuzzer_config" ] } + + if (!is_debug && !optimize_for_size) { + configs -= [ "//build/config/compiler:default_optimization" ] + configs += [ "//build/config/compiler:optimize_max" ] + } } component("bindings") {
diff --git a/mojo/public/tools/bindings/pylib/mojom_tests/fileutil_unittest.py b/mojo/public/tools/bindings/pylib/mojom_tests/fileutil_unittest.py index d56faadb..cb8ff170 100644 --- a/mojo/public/tools/bindings/pylib/mojom_tests/fileutil_unittest.py +++ b/mojo/public/tools/bindings/pylib/mojom_tests/fileutil_unittest.py
@@ -9,6 +9,7 @@ import tempfile import unittest + def _GetDirAbove(dirname): """Returns the directory "above" this file containing |dirname| (which must also be "above" this file).""" @@ -19,6 +20,7 @@ if tail == dirname: return path + try: imp.find_module("mojom") except ImportError: @@ -27,7 +29,6 @@ class FileUtilTest(unittest.TestCase): - def testEnsureDirectoryExists(self): """Test that EnsureDirectoryExists fuctions correctly."""
diff --git a/mojo/public/tools/bindings/pylib/mojom_tests/generate/data_unittest.py b/mojo/public/tools/bindings/pylib/mojom_tests/generate/data_unittest.py deleted file mode 100644 index 70c92a38..0000000 --- a/mojo/public/tools/bindings/pylib/mojom_tests/generate/data_unittest.py +++ /dev/null
@@ -1,156 +0,0 @@ -# Copyright 2014 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import imp -import os.path -import sys -import unittest - -def _GetDirAbove(dirname): - """Returns the directory "above" this file containing |dirname| (which must - also be "above" this file).""" - path = os.path.abspath(__file__) - while True: - path, tail = os.path.split(path) - assert tail - if tail == dirname: - return path - -try: - imp.find_module("mojom") -except ImportError: - sys.path.append(os.path.join(_GetDirAbove("pylib"), "pylib")) -from mojom.generate import data -from mojom.generate import module as mojom - - -class DataTest(unittest.TestCase): - - def testStructDataConversion(self): - """Tests that a struct can be converted from data.""" - module = mojom.Module('test_module', 'test_namespace') - struct_data = { - 'name': 'SomeStruct', - 'enums': [], - 'constants': [], - 'fields': [ - {'name': 'field1', 'kind': 'i32'}, - {'name': 'field2', 'kind': 'i32', 'ordinal': 10}, - {'name': 'field3', 'kind': 'i32', 'default': 15}]} - - struct = data.StructFromData(module, struct_data) - struct.fields = map(lambda field: - data.StructFieldFromData(module, field, struct), struct.fields_data) - self.assertEquals(struct_data, data.StructToData(struct)) - - def testUnionDataConversion(self): - """Tests that a union can be converted from data.""" - module = mojom.Module('test_module', 'test_namespace') - union_data = { - 'name': 'SomeUnion', - 'fields': [ - {'name': 'field1', 'kind': 'i32'}, - {'name': 'field2', 'kind': 'i32', 'ordinal': 10}]} - - union = data.UnionFromData(module, union_data) - union.fields = map(lambda field: - data.UnionFieldFromData(module, field, union), union.fields_data) - self.assertEquals(union_data, data.UnionToData(union)) - - def testImportFromDataNoMissingImports(self): - """Tests that unions, structs, interfaces and enums are imported.""" - module = mojom.Module('test_module', 'test_namespace') - imported_module = mojom.Module('import_module', 'import_namespace') - #TODO(azani): Init values in module.py. - #TODO(azani): Test that values are imported. - imported_module.values = {} - imported_data = {'module' : imported_module} - - - struct = mojom.Struct('TestStruct', module=module) - imported_module.kinds[struct.spec] = struct - - union = mojom.Union('TestUnion', module=module) - imported_module.kinds[union.spec] = union - - interface = mojom.Interface('TestInterface', module=module) - imported_module.kinds[interface.spec] = interface - - enum = mojom.Enum('TestEnum', module=module) - imported_module.kinds[enum.spec] = enum - - data.ImportFromData(module, imported_data) - - # Test that the kind was imported. - self.assertIn(struct.spec, module.kinds) - self.assertEquals(struct.name, module.kinds[struct.spec].name) - - self.assertIn(union.spec, module.kinds) - self.assertEquals(union.name, module.kinds[union.spec].name) - - self.assertIn(interface.spec, module.kinds) - self.assertEquals(interface.name, module.kinds[interface.spec].name) - - self.assertIn(enum.spec, module.kinds) - self.assertEquals(enum.name, module.kinds[enum.spec].name) - - # Test that the imported kind is a copy and not the original. - self.assertIsNot(struct, module.kinds[struct.spec]) - self.assertIsNot(union, module.kinds[union.spec]) - self.assertIsNot(interface, module.kinds[interface.spec]) - self.assertIsNot(enum, module.kinds[enum.spec]) - - def testImportFromDataNoExtraneousImports(self): - """Tests that arrays, maps and interface requests are not imported.""" - module = mojom.Module('test_module', 'test_namespace') - imported_module = mojom.Module('import_module', 'import_namespace') - #TODO(azani): Init values in module.py. - imported_module.values = {} - imported_data = {'module' : imported_module} - - array = mojom.Array(mojom.INT16, length=20) - imported_module.kinds[array.spec] = array - - map_kind = mojom.Map(mojom.INT16, mojom.INT16) - imported_module.kinds[map_kind.spec] = map_kind - - interface = mojom.Interface('TestInterface', module=module) - imported_module.kinds[interface.spec] = interface - - interface_req = mojom.InterfaceRequest(interface) - imported_module.kinds[interface_req.spec] = interface_req - - data.ImportFromData(module, imported_data) - - self.assertNotIn(array.spec, module.kinds) - self.assertNotIn(map_kind.spec, module.kinds) - self.assertNotIn(interface_req.spec, module.kinds) - - def testNonInterfaceAsInterfaceRequest(self): - """Tests that a non-interface cannot be used for interface requests.""" - module = mojom.Module('test_module', 'test_namespace') - interface = mojom.Interface('TestInterface', module=module) - method_dict = { - 'name': 'Foo', - 'parameters': [{'name': 'foo', 'kind': 'r:i32'}], - } - with self.assertRaises(Exception) as e: - data.MethodFromData(module, method_dict, interface) - self.assertEquals(e.exception.__str__(), - 'Interface request requires \'i32\' to be an interface.') - - def testNonInterfaceAsAssociatedInterface(self): - """Tests that a non-interface type cannot be used for associated - interfaces.""" - module = mojom.Module('test_module', 'test_namespace') - interface = mojom.Interface('TestInterface', module=module) - method_dict = { - 'name': 'Foo', - 'parameters': [{'name': 'foo', 'kind': 'asso:i32'}], - } - with self.assertRaises(Exception) as e: - data.MethodFromData(module, method_dict, interface) - self.assertEquals( - e.exception.__str__(), - 'Associated interface requires \'i32\' to be an interface.')
diff --git a/mojo/public/tools/bindings/pylib/mojom_tests/generate/generator_unittest.py b/mojo/public/tools/bindings/pylib/mojom_tests/generate/generator_unittest.py index e037c96..1b61bf0 100644 --- a/mojo/public/tools/bindings/pylib/mojom_tests/generate/generator_unittest.py +++ b/mojo/public/tools/bindings/pylib/mojom_tests/generate/generator_unittest.py
@@ -7,6 +7,7 @@ import sys import unittest + def _GetDirAbove(dirname): """Returns the directory "above" this file containing |dirname| (which must also be "above" this file).""" @@ -17,6 +18,7 @@ if tail == dirname: return path + try: imp.find_module("mojom") except ImportError: @@ -30,12 +32,12 @@ def testToCamel(self): self.assertEquals("CamelCase", generator.ToCamel("camel_case")) self.assertEquals("CAMELCASE", generator.ToCamel("CAMEL_CASE")) - self.assertEquals("camelCase", generator.ToCamel("camel_case", - lower_initial=True)) - self.assertEquals("CamelCase", generator.ToCamel("camel case", - dilimiter=' ')) + self.assertEquals("camelCase", + generator.ToCamel("camel_case", lower_initial=True)) + self.assertEquals("CamelCase", generator.ToCamel( + "camel case", dilimiter=' ')) self.assertEquals("CaMelCaSe", generator.ToCamel("caMel_caSe")) + if __name__ == "__main__": unittest.main() -
diff --git a/mojo/public/tools/bindings/pylib/mojom_tests/generate/module_unittest.py b/mojo/public/tools/bindings/pylib/mojom_tests/generate/module_unittest.py index 75b7cd5..f1c46428 100644 --- a/mojo/public/tools/bindings/pylib/mojom_tests/generate/module_unittest.py +++ b/mojo/public/tools/bindings/pylib/mojom_tests/generate/module_unittest.py
@@ -7,6 +7,7 @@ import sys import unittest + def _GetDirAbove(dirname): """Returns the directory "above" this file containing |dirname| (which must also be "above" this file).""" @@ -17,6 +18,7 @@ if tail == dirname: return path + try: imp.find_module("mojom") except ImportError: @@ -25,7 +27,6 @@ class ModuleTest(unittest.TestCase): - def testNonInterfaceAsInterfaceRequest(self): """Tests that a non-interface cannot be used for interface requests.""" module = mojom.Module('test_module', 'test_namespace')
diff --git a/mojo/public/tools/bindings/pylib/mojom_tests/generate/pack_unittest.py b/mojo/public/tools/bindings/pylib/mojom_tests/generate/pack_unittest.py index 75f6d51..4f6146ef 100644 --- a/mojo/public/tools/bindings/pylib/mojom_tests/generate/pack_unittest.py +++ b/mojo/public/tools/bindings/pylib/mojom_tests/generate/pack_unittest.py
@@ -92,13 +92,13 @@ ordinal order and pack order for fields are all different. """ struct = mojom.Struct('test') - struct.AddField('field_3', mojom.BOOL, ordinal=3, - attributes={'MinVersion': 3}) + struct.AddField( + 'field_3', mojom.BOOL, ordinal=3, attributes={'MinVersion': 3}) struct.AddField('field_0', mojom.INT32, ordinal=0) - struct.AddField('field_1', mojom.INT64, ordinal=1, - attributes={'MinVersion': 2}) - struct.AddField('field_2', mojom.INT64, ordinal=2, - attributes={'MinVersion': 3}) + struct.AddField( + 'field_1', mojom.INT64, ordinal=1, attributes={'MinVersion': 2}) + struct.AddField( + 'field_2', mojom.INT64, ordinal=2, attributes={'MinVersion': 3}) ps = pack.PackedStruct(struct) versions = pack.GetVersionInfo(ps)
diff --git a/mojo/public/tools/bindings/pylib/mojom_tests/parse/ast_unittest.py b/mojo/public/tools/bindings/pylib/mojom_tests/parse/ast_unittest.py index dd28cdd1..5608c6541 100644 --- a/mojo/public/tools/bindings/pylib/mojom_tests/parse/ast_unittest.py +++ b/mojo/public/tools/bindings/pylib/mojom_tests/parse/ast_unittest.py
@@ -7,6 +7,7 @@ import sys import unittest + def _GetDirAbove(dirname): """Returns the directory "above" this file containing |dirname| (which must also be "above" this file).""" @@ -17,6 +18,7 @@ if tail == dirname: return path + try: imp.find_module("mojom") except ImportError:
diff --git a/mojo/public/tools/bindings/pylib/mojom_tests/parse/conditional_features_unittest.py b/mojo/public/tools/bindings/pylib/mojom_tests/parse/conditional_features_unittest.py index 4d58388..aa609be7 100644 --- a/mojo/public/tools/bindings/pylib/mojom_tests/parse/conditional_features_unittest.py +++ b/mojo/public/tools/bindings/pylib/mojom_tests/parse/conditional_features_unittest.py
@@ -137,7 +137,7 @@ def testFilterStruct(self): """Test that definitions are correctly filtered from a Struct.""" - struct_source = """ + struct_source = """ struct MyStruct { [EnableIf=blue] enum MyEnum { @@ -225,8 +225,9 @@ """ definition = parser.Parse(source, "my_file.mojom") self.assertRaises(conditional_features.EnableIfError, - conditional_features.RemoveDisabledDefinitions, - definition, ENABLED_FEATURES) + conditional_features.RemoveDisabledDefinitions, + definition, ENABLED_FEATURES) + if __name__ == '__main__': unittest.main()
diff --git a/mojo/public/tools/bindings/pylib/mojom_tests/parse/lexer_unittest.py b/mojo/public/tools/bindings/pylib/mojom_tests/parse/lexer_unittest.py index 36d8c4ab..eadc658 100644 --- a/mojo/public/tools/bindings/pylib/mojom_tests/parse/lexer_unittest.py +++ b/mojo/public/tools/bindings/pylib/mojom_tests/parse/lexer_unittest.py
@@ -7,6 +7,7 @@ import sys import unittest + def _GetDirAbove(dirname): """Returns the directory "above" this file containing |dirname| (which must also be "above" this file).""" @@ -17,6 +18,7 @@ if tail == dirname: return path + sys.path.insert(1, os.path.join(_GetDirAbove("mojo"), "third_party")) from ply import lex @@ -33,6 +35,8 @@ def _LexTokenEq(self, other): return self.type == other.type and self.value == other.value and \ self.lineno == other.lineno and self.lexpos == other.lexpos + + setattr(lex.LexToken, '__eq__', _LexTokenEq) @@ -59,43 +63,47 @@ def testValidKeywords(self): """Tests valid keywords.""" - self.assertEquals(self._SingleTokenForInput("handle"), - _MakeLexTokenForKeyword("handle")) - self.assertEquals(self._SingleTokenForInput("import"), - _MakeLexTokenForKeyword("import")) - self.assertEquals(self._SingleTokenForInput("module"), - _MakeLexTokenForKeyword("module")) - self.assertEquals(self._SingleTokenForInput("struct"), - _MakeLexTokenForKeyword("struct")) - self.assertEquals(self._SingleTokenForInput("union"), - _MakeLexTokenForKeyword("union")) - self.assertEquals(self._SingleTokenForInput("interface"), - _MakeLexTokenForKeyword("interface")) - self.assertEquals(self._SingleTokenForInput("enum"), - _MakeLexTokenForKeyword("enum")) - self.assertEquals(self._SingleTokenForInput("const"), - _MakeLexTokenForKeyword("const")) - self.assertEquals(self._SingleTokenForInput("true"), - _MakeLexTokenForKeyword("true")) - self.assertEquals(self._SingleTokenForInput("false"), - _MakeLexTokenForKeyword("false")) - self.assertEquals(self._SingleTokenForInput("default"), - _MakeLexTokenForKeyword("default")) - self.assertEquals(self._SingleTokenForInput("array"), - _MakeLexTokenForKeyword("array")) - self.assertEquals(self._SingleTokenForInput("map"), - _MakeLexTokenForKeyword("map")) - self.assertEquals(self._SingleTokenForInput("associated"), - _MakeLexTokenForKeyword("associated")) + self.assertEquals( + self._SingleTokenForInput("handle"), _MakeLexTokenForKeyword("handle")) + self.assertEquals( + self._SingleTokenForInput("import"), _MakeLexTokenForKeyword("import")) + self.assertEquals( + self._SingleTokenForInput("module"), _MakeLexTokenForKeyword("module")) + self.assertEquals( + self._SingleTokenForInput("struct"), _MakeLexTokenForKeyword("struct")) + self.assertEquals( + self._SingleTokenForInput("union"), _MakeLexTokenForKeyword("union")) + self.assertEquals( + self._SingleTokenForInput("interface"), + _MakeLexTokenForKeyword("interface")) + self.assertEquals( + self._SingleTokenForInput("enum"), _MakeLexTokenForKeyword("enum")) + self.assertEquals( + self._SingleTokenForInput("const"), _MakeLexTokenForKeyword("const")) + self.assertEquals( + self._SingleTokenForInput("true"), _MakeLexTokenForKeyword("true")) + self.assertEquals( + self._SingleTokenForInput("false"), _MakeLexTokenForKeyword("false")) + self.assertEquals( + self._SingleTokenForInput("default"), + _MakeLexTokenForKeyword("default")) + self.assertEquals( + self._SingleTokenForInput("array"), _MakeLexTokenForKeyword("array")) + self.assertEquals( + self._SingleTokenForInput("map"), _MakeLexTokenForKeyword("map")) + self.assertEquals( + self._SingleTokenForInput("associated"), + _MakeLexTokenForKeyword("associated")) def testValidIdentifiers(self): """Tests identifiers.""" - self.assertEquals(self._SingleTokenForInput("abcd"), - _MakeLexToken("NAME", "abcd")) - self.assertEquals(self._SingleTokenForInput("AbC_d012_"), - _MakeLexToken("NAME", "AbC_d012_")) - self.assertEquals(self._SingleTokenForInput("_0123"), - _MakeLexToken("NAME", "_0123")) + self.assertEquals( + self._SingleTokenForInput("abcd"), _MakeLexToken("NAME", "abcd")) + self.assertEquals( + self._SingleTokenForInput("AbC_d012_"), + _MakeLexToken("NAME", "AbC_d012_")) + self.assertEquals( + self._SingleTokenForInput("_0123"), _MakeLexToken("NAME", "_0123")) def testInvalidIdentifiers(self): with self.assertRaisesRegexp( @@ -108,63 +116,64 @@ self._TokensForInput("a$bc") def testDecimalIntegerConstants(self): - self.assertEquals(self._SingleTokenForInput("0"), - _MakeLexToken("INT_CONST_DEC", "0")) - self.assertEquals(self._SingleTokenForInput("1"), - _MakeLexToken("INT_CONST_DEC", "1")) - self.assertEquals(self._SingleTokenForInput("123"), - _MakeLexToken("INT_CONST_DEC", "123")) - self.assertEquals(self._SingleTokenForInput("10"), - _MakeLexToken("INT_CONST_DEC", "10")) + self.assertEquals( + self._SingleTokenForInput("0"), _MakeLexToken("INT_CONST_DEC", "0")) + self.assertEquals( + self._SingleTokenForInput("1"), _MakeLexToken("INT_CONST_DEC", "1")) + self.assertEquals( + self._SingleTokenForInput("123"), _MakeLexToken("INT_CONST_DEC", "123")) + self.assertEquals( + self._SingleTokenForInput("10"), _MakeLexToken("INT_CONST_DEC", "10")) def testValidTokens(self): """Tests valid tokens (which aren't tested elsewhere).""" # Keywords tested in |testValidKeywords|. # NAME tested in |testValidIdentifiers|. - self.assertEquals(self._SingleTokenForInput("@123"), - _MakeLexToken("ORDINAL", "@123")) - self.assertEquals(self._SingleTokenForInput("456"), - _MakeLexToken("INT_CONST_DEC", "456")) - self.assertEquals(self._SingleTokenForInput("0x01aB2eF3"), - _MakeLexToken("INT_CONST_HEX", "0x01aB2eF3")) - self.assertEquals(self._SingleTokenForInput("123.456"), - _MakeLexToken("FLOAT_CONST", "123.456")) - self.assertEquals(self._SingleTokenForInput("\"hello\""), - _MakeLexToken("STRING_LITERAL", "\"hello\"")) - self.assertEquals(self._SingleTokenForInput("+"), - _MakeLexToken("PLUS", "+")) - self.assertEquals(self._SingleTokenForInput("-"), - _MakeLexToken("MINUS", "-")) - self.assertEquals(self._SingleTokenForInput("&"), - _MakeLexToken("AMP", "&")) - self.assertEquals(self._SingleTokenForInput("?"), - _MakeLexToken("QSTN", "?")) - self.assertEquals(self._SingleTokenForInput("="), - _MakeLexToken("EQUALS", "=")) - self.assertEquals(self._SingleTokenForInput("=>"), - _MakeLexToken("RESPONSE", "=>")) - self.assertEquals(self._SingleTokenForInput("("), - _MakeLexToken("LPAREN", "(")) - self.assertEquals(self._SingleTokenForInput(")"), - _MakeLexToken("RPAREN", ")")) - self.assertEquals(self._SingleTokenForInput("["), - _MakeLexToken("LBRACKET", "[")) - self.assertEquals(self._SingleTokenForInput("]"), - _MakeLexToken("RBRACKET", "]")) - self.assertEquals(self._SingleTokenForInput("{"), - _MakeLexToken("LBRACE", "{")) - self.assertEquals(self._SingleTokenForInput("}"), - _MakeLexToken("RBRACE", "}")) - self.assertEquals(self._SingleTokenForInput("<"), - _MakeLexToken("LANGLE", "<")) - self.assertEquals(self._SingleTokenForInput(">"), - _MakeLexToken("RANGLE", ">")) - self.assertEquals(self._SingleTokenForInput(";"), - _MakeLexToken("SEMI", ";")) - self.assertEquals(self._SingleTokenForInput(","), - _MakeLexToken("COMMA", ",")) - self.assertEquals(self._SingleTokenForInput("."), - _MakeLexToken("DOT", ".")) + self.assertEquals( + self._SingleTokenForInput("@123"), _MakeLexToken("ORDINAL", "@123")) + self.assertEquals( + self._SingleTokenForInput("456"), _MakeLexToken("INT_CONST_DEC", "456")) + self.assertEquals( + self._SingleTokenForInput("0x01aB2eF3"), + _MakeLexToken("INT_CONST_HEX", "0x01aB2eF3")) + self.assertEquals( + self._SingleTokenForInput("123.456"), + _MakeLexToken("FLOAT_CONST", "123.456")) + self.assertEquals( + self._SingleTokenForInput("\"hello\""), + _MakeLexToken("STRING_LITERAL", "\"hello\"")) + self.assertEquals( + self._SingleTokenForInput("+"), _MakeLexToken("PLUS", "+")) + self.assertEquals( + self._SingleTokenForInput("-"), _MakeLexToken("MINUS", "-")) + self.assertEquals(self._SingleTokenForInput("&"), _MakeLexToken("AMP", "&")) + self.assertEquals( + self._SingleTokenForInput("?"), _MakeLexToken("QSTN", "?")) + self.assertEquals( + self._SingleTokenForInput("="), _MakeLexToken("EQUALS", "=")) + self.assertEquals( + self._SingleTokenForInput("=>"), _MakeLexToken("RESPONSE", "=>")) + self.assertEquals( + self._SingleTokenForInput("("), _MakeLexToken("LPAREN", "(")) + self.assertEquals( + self._SingleTokenForInput(")"), _MakeLexToken("RPAREN", ")")) + self.assertEquals( + self._SingleTokenForInput("["), _MakeLexToken("LBRACKET", "[")) + self.assertEquals( + self._SingleTokenForInput("]"), _MakeLexToken("RBRACKET", "]")) + self.assertEquals( + self._SingleTokenForInput("{"), _MakeLexToken("LBRACE", "{")) + self.assertEquals( + self._SingleTokenForInput("}"), _MakeLexToken("RBRACE", "}")) + self.assertEquals( + self._SingleTokenForInput("<"), _MakeLexToken("LANGLE", "<")) + self.assertEquals( + self._SingleTokenForInput(">"), _MakeLexToken("RANGLE", ">")) + self.assertEquals( + self._SingleTokenForInput(";"), _MakeLexToken("SEMI", ";")) + self.assertEquals( + self._SingleTokenForInput(","), _MakeLexToken("COMMA", ",")) + self.assertEquals(self._SingleTokenForInput("."), _MakeLexToken("DOT", ".")) def _TokensForInput(self, input_string): """Gets a list of tokens for the given input string."""
diff --git a/mojo/public/tools/bindings/pylib/mojom_tests/parse/parser_unittest.py b/mojo/public/tools/bindings/pylib/mojom_tests/parse/parser_unittest.py index 0999834..84e3269 100644 --- a/mojo/public/tools/bindings/pylib/mojom_tests/parse/parser_unittest.py +++ b/mojo/public/tools/bindings/pylib/mojom_tests/parse/parser_unittest.py
@@ -7,6 +7,7 @@ import sys import unittest + def _GetDirAbove(dirname): """Returns the directory "above" this file containing |dirname| (which must also be "above" this file).""" @@ -17,6 +18,7 @@ if tail == dirname: return path + try: imp.find_module("mojom") except ImportError: @@ -38,9 +40,7 @@ module my_module; """ expected = ast.Mojom( - ast.Module(('IDENTIFIER', 'my_module'), None), - ast.ImportList(), - []) + ast.Module(('IDENTIFIER', 'my_module'), None), ast.ImportList(), []) self.assertEquals(parser.Parse(source, "my_file.mojom"), expected) def testSourceWithCrLfs(self): @@ -48,9 +48,7 @@ source = "// This is a comment.\r\n\r\nmodule my_module;\r\n" expected = ast.Mojom( - ast.Module(('IDENTIFIER', 'my_module'), None), - ast.ImportList(), - []) + ast.Module(('IDENTIFIER', 'my_module'), None), ast.ImportList(), []) self.assertEquals(parser.Parse(source, "my_file.mojom"), expected) def testUnexpectedEOF(self): @@ -62,8 +60,7 @@ module my_module """ with self.assertRaisesRegexp( - parser.ParseError, - r"^my_file\.mojom: Error: Unexpected end of file$"): + parser.ParseError, r"^my_file\.mojom: Error: Unexpected end of file$"): parser.Parse(source, "my_file.mojom") def testCommentLineNumbers(self): @@ -127,7 +124,6 @@ r"^my_file\.mojom:10: Error: Unexpected 'asdf4':\n *asdf4$"): parser.Parse(source4, "my_file.mojom") - def testSimpleStruct(self): """Tests a simple .mojom source that just defines a struct.""" @@ -140,14 +136,14 @@ }; """ expected = ast.Mojom( - ast.Module(('IDENTIFIER', 'my_module'), None), - ast.ImportList(), - [ast.Struct( - 'MyStruct', - None, - ast.StructBody( - [ast.StructField('a', None, None, 'int32', None), - ast.StructField('b', None, None, 'double', None)]))]) + ast.Module(('IDENTIFIER', 'my_module'), None), ast.ImportList(), [ + ast.Struct( + 'MyStruct', None, + ast.StructBody([ + ast.StructField('a', None, None, 'int32', None), + ast.StructField('b', None, None, 'double', None) + ])) + ]) self.assertEquals(parser.Parse(source, "my_file.mojom"), expected) def testSimpleStructWithoutModule(self): @@ -159,15 +155,14 @@ double b; }; """ - expected = ast.Mojom( - None, - ast.ImportList(), - [ast.Struct( - 'MyStruct', - None, - ast.StructBody( - [ast.StructField('a', None, None, 'int32', None), - ast.StructField('b', None, None, 'double', None)]))]) + expected = ast.Mojom(None, ast.ImportList(), [ + ast.Struct( + 'MyStruct', None, + ast.StructBody([ + ast.StructField('a', None, None, 'int32', None), + ast.StructField('b', None, None, 'double', None) + ])) + ]) self.assertEquals(parser.Parse(source, "my_file.mojom"), expected) def testValidStructDefinitions(self): @@ -181,20 +176,17 @@ SomeOtherStruct b; // Invalidity detected at another stage. }; """ - expected = ast.Mojom( - None, - ast.ImportList(), - [ast.Struct( - 'MyStruct', - None, - ast.StructBody( - [ast.Enum('MyEnum', - None, - ast.EnumValueList( - ast.EnumValue('VALUE', None, None))), - ast.Const('kMyConst', None, 'double', '1.23'), - ast.StructField('a', None, None, 'int32', None), - ast.StructField('b', None, None, 'SomeOtherStruct', None)]))]) + expected = ast.Mojom(None, ast.ImportList(), [ + ast.Struct( + 'MyStruct', None, + ast.StructBody([ + ast.Enum('MyEnum', None, + ast.EnumValueList(ast.EnumValue('VALUE', None, None))), + ast.Const('kMyConst', None, 'double', '1.23'), + ast.StructField('a', None, None, 'int32', None), + ast.StructField('b', None, None, 'SomeOtherStruct', None) + ])) + ]) self.assertEquals(parser.Parse(source, "my_file.mojom"), expected) def testInvalidStructDefinitions(self): @@ -207,9 +199,8 @@ }; """ with self.assertRaisesRegexp( - parser.ParseError, - r"^my_file\.mojom:2: Error: Unexpected '\(':\n" - r" *MyMethod\(int32 a\);$"): + parser.ParseError, r"^my_file\.mojom:2: Error: Unexpected '\(':\n" + r" *MyMethod\(int32 a\);$"): parser.Parse(source1, "my_file.mojom") source2 = """\ @@ -220,9 +211,8 @@ }; """ with self.assertRaisesRegexp( - parser.ParseError, - r"^my_file\.mojom:2: Error: Unexpected 'struct':\n" - r" *struct MyInnerStruct {$"): + parser.ParseError, r"^my_file\.mojom:2: Error: Unexpected 'struct':\n" + r" *struct MyInnerStruct {$"): parser.Parse(source2, "my_file.mojom") source3 = """\ @@ -235,7 +225,7 @@ with self.assertRaisesRegexp( parser.ParseError, r"^my_file\.mojom:2: Error: Unexpected 'interface':\n" - r" *interface MyInterface {$"): + r" *interface MyInterface {$"): parser.Parse(source3, "my_file.mojom") def testMissingModuleName(self): @@ -264,9 +254,8 @@ }; """ with self.assertRaisesRegexp( - parser.ParseError, - r"^my_file\.mojom:4: Error: Unexpected 'struct':\n" - r" *struct MyStruct {$"): + parser.ParseError, r"^my_file\.mojom:4: Error: Unexpected 'struct':\n" + r" *struct MyStruct {$"): parser.Parse(source2, "my_file.mojom") def testMultipleModuleStatements(self): @@ -279,7 +268,7 @@ with self.assertRaisesRegexp( parser.ParseError, r"^my_file\.mojom:2: Error: Multiple \"module\" statements not " - r"allowed:\n *module bar;$"): + r"allowed:\n *module bar;$"): parser.Parse(source, "my_file.mojom") def testModuleStatementAfterImport(self): @@ -292,7 +281,7 @@ with self.assertRaisesRegexp( parser.ParseError, r"^my_file\.mojom:2: Error: \"module\" statements must precede imports " - r"and definitions:\n *module foo;$"): + r"and definitions:\n *module foo;$"): parser.Parse(source, "my_file.mojom") def testModuleStatementAfterDefinition(self): @@ -307,7 +296,7 @@ with self.assertRaisesRegexp( parser.ParseError, r"^my_file\.mojom:4: Error: \"module\" statements must precede imports " - r"and definitions:\n *module foo;$"): + r"and definitions:\n *module foo;$"): parser.Parse(source, "my_file.mojom") def testImportStatementAfterDefinition(self): @@ -322,7 +311,7 @@ with self.assertRaisesRegexp( parser.ParseError, r"^my_file\.mojom:4: Error: \"import\" statements must precede " - r"definitions:\n *import \"foo.mojom\";$"): + r"definitions:\n *import \"foo.mojom\";$"): parser.Parse(source, "my_file.mojom") def testEnums(self): @@ -342,24 +331,25 @@ }; """ expected = ast.Mojom( - ast.Module(('IDENTIFIER', 'my_module'), None), - ast.ImportList(), - [ast.Enum( - 'MyEnum1', - None, - ast.EnumValueList([ast.EnumValue('VALUE1', None, None), - ast.EnumValue('VALUE2', None, None)])), - ast.Enum( - 'MyEnum2', - None, - ast.EnumValueList([ast.EnumValue('VALUE1', None, '-1'), - ast.EnumValue('VALUE2', None, '0'), - ast.EnumValue('VALUE3', None, '+987'), - ast.EnumValue('VALUE4', None, '0xAF12'), - ast.EnumValue('VALUE5', None, '-0x09bcd'), - ast.EnumValue('VALUE6', None, ('IDENTIFIER', - 'VALUE5')), - ast.EnumValue('VALUE7', None, None)]))]) + ast.Module(('IDENTIFIER', 'my_module'), None), ast.ImportList(), [ + ast.Enum( + 'MyEnum1', None, + ast.EnumValueList([ + ast.EnumValue('VALUE1', None, None), + ast.EnumValue('VALUE2', None, None) + ])), + ast.Enum( + 'MyEnum2', None, + ast.EnumValueList([ + ast.EnumValue('VALUE1', None, '-1'), + ast.EnumValue('VALUE2', None, '0'), + ast.EnumValue('VALUE3', None, '+987'), + ast.EnumValue('VALUE4', None, '0xAF12'), + ast.EnumValue('VALUE5', None, '-0x09bcd'), + ast.EnumValue('VALUE6', None, ('IDENTIFIER', 'VALUE5')), + ast.EnumValue('VALUE7', None, None) + ])) + ]) self.assertEquals(parser.Parse(source, "my_file.mojom"), expected) def testInvalidEnumInitializers(self): @@ -371,25 +361,22 @@ }; """ with self.assertRaisesRegexp( - parser.ParseError, - r"^my_file\.mojom:2: Error: Unexpected '}':\n" - r" *};$"): + parser.ParseError, r"^my_file\.mojom:2: Error: Unexpected '}':\n" + r" *};$"): parser.Parse(source1, "my_file.mojom") # Floating point value. source2 = "enum MyEnum { VALUE = 0.123 };" with self.assertRaisesRegexp( - parser.ParseError, - r"^my_file\.mojom:1: Error: Unexpected '0\.123':\n" - r"enum MyEnum { VALUE = 0\.123 };$"): + parser.ParseError, r"^my_file\.mojom:1: Error: Unexpected '0\.123':\n" + r"enum MyEnum { VALUE = 0\.123 };$"): parser.Parse(source2, "my_file.mojom") # Boolean value. source2 = "enum MyEnum { VALUE = true };" with self.assertRaisesRegexp( - parser.ParseError, - r"^my_file\.mojom:1: Error: Unexpected 'true':\n" - r"enum MyEnum { VALUE = true };$"): + parser.ParseError, r"^my_file\.mojom:1: Error: Unexpected 'true':\n" + r"enum MyEnum { VALUE = true };$"): parser.Parse(source2, "my_file.mojom") def testConsts(self): @@ -404,14 +391,15 @@ }; """ expected = ast.Mojom( - ast.Module(('IDENTIFIER', 'my_module'), None), - ast.ImportList(), - [ast.Struct( - 'MyStruct', None, - ast.StructBody( - [ast.Const('kNumber', None, 'int8', '-1'), - ast.StructField('number', None, ast.Ordinal(0), 'int8', - ('IDENTIFIER', 'kNumber'))]))]) + ast.Module(('IDENTIFIER', 'my_module'), None), ast.ImportList(), [ + ast.Struct( + 'MyStruct', None, + ast.StructBody([ + ast.Const('kNumber', None, 'int8', '-1'), + ast.StructField('number', None, ast.Ordinal(0), 'int8', + ('IDENTIFIER', 'kNumber')) + ])) + ]) self.assertEquals(parser.Parse(source, "my_file.mojom"), expected) def testNoConditionals(self): @@ -425,9 +413,8 @@ }; """ with self.assertRaisesRegexp( - parser.ParseError, - r"^my_file\.mojom:4: Error: Unexpected '\?':\n" - r" *MY_ENUM_1 = 1 \? 2 : 3$"): + parser.ParseError, r"^my_file\.mojom:4: Error: Unexpected '\?':\n" + r" *MY_ENUM_1 = 1 \? 2 : 3$"): parser.Parse(source, "my_file.mojom") def testSimpleOrdinals(self): @@ -450,21 +437,24 @@ }; """ expected = ast.Mojom( - ast.Module(('IDENTIFIER', 'my_module'), None), - ast.ImportList(), - [ast.Struct( - 'MyStruct', - None, - ast.StructBody( - [ast.StructField('a0', None, ast.Ordinal(0), 'int32', None), - ast.StructField('a1', None, ast.Ordinal(1), 'int32', None), - ast.StructField('a2', None, ast.Ordinal(2), 'int32', None), - ast.StructField('a9', None, ast.Ordinal(9), 'int32', None), - ast.StructField('a10', None, ast.Ordinal(10), 'int32', None), - ast.StructField('a11', None, ast.Ordinal(11), 'int32', None), - ast.StructField('a29', None, ast.Ordinal(29), 'int32', None), - ast.StructField('a1234567890', None, ast.Ordinal(1234567890), - 'int32', None)]))]) + ast.Module(('IDENTIFIER', 'my_module'), None), ast.ImportList(), [ + ast.Struct( + 'MyStruct', None, + ast.StructBody([ + ast.StructField('a0', None, ast.Ordinal(0), 'int32', None), + ast.StructField('a1', None, ast.Ordinal(1), 'int32', None), + ast.StructField('a2', None, ast.Ordinal(2), 'int32', None), + ast.StructField('a9', None, ast.Ordinal(9), 'int32', None), + ast.StructField('a10', None, ast.Ordinal(10), 'int32', + None), + ast.StructField('a11', None, ast.Ordinal(11), 'int32', + None), + ast.StructField('a29', None, ast.Ordinal(29), 'int32', + None), + ast.StructField('a1234567890', None, + ast.Ordinal(1234567890), 'int32', None) + ])) + ]) self.assertEquals(parser.Parse(source, "my_file.mojom"), expected) def testInvalidOrdinals(self): @@ -478,8 +468,7 @@ }; """ with self.assertRaisesRegexp( - lexer.LexError, - r"^my_file\.mojom:4: Error: Missing ordinal value$"): + lexer.LexError, r"^my_file\.mojom:4: Error: Missing ordinal value$"): parser.Parse(source1, "my_file.mojom") source2 = """\ @@ -490,32 +479,28 @@ }; """ with self.assertRaisesRegexp( - lexer.LexError, - r"^my_file\.mojom:4: Error: " - r"Octal and hexadecimal ordinal values not allowed$"): + lexer.LexError, r"^my_file\.mojom:4: Error: " + r"Octal and hexadecimal ordinal values not allowed$"): parser.Parse(source2, "my_file.mojom") source3 = """\ module my_module; struct MyStruct { int32 a_invalid_octal@08; }; """ with self.assertRaisesRegexp( - lexer.LexError, - r"^my_file\.mojom:1: Error: " - r"Octal and hexadecimal ordinal values not allowed$"): + lexer.LexError, r"^my_file\.mojom:1: Error: " + r"Octal and hexadecimal ordinal values not allowed$"): parser.Parse(source3, "my_file.mojom") source4 = "module my_module; struct MyStruct { int32 a_hex@0x1aB9; };" with self.assertRaisesRegexp( - lexer.LexError, - r"^my_file\.mojom:1: Error: " - r"Octal and hexadecimal ordinal values not allowed$"): + lexer.LexError, r"^my_file\.mojom:1: Error: " + r"Octal and hexadecimal ordinal values not allowed$"): parser.Parse(source4, "my_file.mojom") source5 = "module my_module; struct MyStruct { int32 a_hex@0X0; };" with self.assertRaisesRegexp( - lexer.LexError, - r"^my_file\.mojom:1: Error: " - r"Octal and hexadecimal ordinal values not allowed$"): + lexer.LexError, r"^my_file\.mojom:1: Error: " + r"Octal and hexadecimal ordinal values not allowed$"): parser.Parse(source5, "my_file.mojom") source6 = """\ @@ -524,10 +509,9 @@ }; """ with self.assertRaisesRegexp( - parser.ParseError, - r"^my_file\.mojom:2: Error: " - r"Ordinal value 999999999999 too large:\n" - r" *int32 a_too_big@999999999999;$"): + parser.ParseError, r"^my_file\.mojom:2: Error: " + r"Ordinal value 999999999999 too large:\n" + r" *int32 a_too_big@999999999999;$"): parser.Parse(source6, "my_file.mojom") def testNestedNamespace(self): @@ -541,12 +525,11 @@ }; """ expected = ast.Mojom( - ast.Module(('IDENTIFIER', 'my.mod'), None), - ast.ImportList(), - [ast.Struct( - 'MyStruct', - None, - ast.StructBody(ast.StructField('a', None, None, 'int32', None)))]) + ast.Module(('IDENTIFIER', 'my.mod'), None), ast.ImportList(), [ + ast.Struct( + 'MyStruct', None, + ast.StructBody(ast.StructField('a', None, None, 'int32', None))) + ]) self.assertEquals(parser.Parse(source, "my_file.mojom"), expected) def testValidHandleTypes(self): @@ -567,22 +550,20 @@ > f; }; """ - expected = ast.Mojom( - None, - ast.ImportList(), - [ast.Struct( - 'MyStruct', - None, - ast.StructBody( - [ast.StructField('a', None, None, 'handle', None), - ast.StructField('b', None, None, 'handle<data_pipe_consumer>', - None), - ast.StructField('c', None, None, 'handle<data_pipe_producer>', - None), - ast.StructField('d', None, None, 'handle<message_pipe>', None), - ast.StructField('e', None, None, 'handle<shared_buffer>', - None), - ast.StructField('f', None, None, 'handle<platform>', None)]))]) + expected = ast.Mojom(None, ast.ImportList(), [ + ast.Struct( + 'MyStruct', None, + ast.StructBody([ + ast.StructField('a', None, None, 'handle', None), + ast.StructField('b', None, None, 'handle<data_pipe_consumer>', + None), + ast.StructField('c', None, None, 'handle<data_pipe_producer>', + None), + ast.StructField('d', None, None, 'handle<message_pipe>', None), + ast.StructField('e', None, None, 'handle<shared_buffer>', None), + ast.StructField('f', None, None, 'handle<platform>', None) + ])) + ]) self.assertEquals(parser.Parse(source, "my_file.mojom"), expected) def testInvalidHandleType(self): @@ -594,10 +575,9 @@ }; """ with self.assertRaisesRegexp( - parser.ParseError, - r"^my_file\.mojom:2: Error: " - r"Invalid handle type 'wtf_is_this':\n" - r" *handle<wtf_is_this> foo;$"): + parser.ParseError, r"^my_file\.mojom:2: Error: " + r"Invalid handle type 'wtf_is_this':\n" + r" *handle<wtf_is_this> foo;$"): parser.Parse(source, "my_file.mojom") def testValidDefaultValues(self): @@ -630,36 +610,35 @@ double a22 = +.123E10; }; """ - expected = ast.Mojom( - None, - ast.ImportList(), - [ast.Struct( - 'MyStruct', - None, - ast.StructBody( - [ast.StructField('a0', None, None, 'int16', '0'), - ast.StructField('a1', None, None, 'uint16', '0x0'), - ast.StructField('a2', None, None, 'uint16', '0x00'), - ast.StructField('a3', None, None, 'uint16', '0x01'), - ast.StructField('a4', None, None, 'uint16', '0xcd'), - ast.StructField('a5' , None, None, 'int32', '12345'), - ast.StructField('a6', None, None, 'int64', '-12345'), - ast.StructField('a7', None, None, 'int64', '+12345'), - ast.StructField('a8', None, None, 'uint32', '0x12cd3'), - ast.StructField('a9', None, None, 'uint32', '-0x12cD3'), - ast.StructField('a10', None, None, 'uint32', '+0x12CD3'), - ast.StructField('a11', None, None, 'bool', 'true'), - ast.StructField('a12', None, None, 'bool', 'false'), - ast.StructField('a13', None, None, 'float', '1.2345'), - ast.StructField('a14', None, None, 'float', '-1.2345'), - ast.StructField('a15', None, None, 'float', '+1.2345'), - ast.StructField('a16', None, None, 'float', '123.'), - ast.StructField('a17', None, None, 'float', '.123'), - ast.StructField('a18', None, None, 'double', '1.23E10'), - ast.StructField('a19', None, None, 'double', '1.E-10'), - ast.StructField('a20', None, None, 'double', '.5E+10'), - ast.StructField('a21', None, None, 'double', '-1.23E10'), - ast.StructField('a22', None, None, 'double', '+.123E10')]))]) + expected = ast.Mojom(None, ast.ImportList(), [ + ast.Struct( + 'MyStruct', None, + ast.StructBody([ + ast.StructField('a0', None, None, 'int16', '0'), + ast.StructField('a1', None, None, 'uint16', '0x0'), + ast.StructField('a2', None, None, 'uint16', '0x00'), + ast.StructField('a3', None, None, 'uint16', '0x01'), + ast.StructField('a4', None, None, 'uint16', '0xcd'), + ast.StructField('a5', None, None, 'int32', '12345'), + ast.StructField('a6', None, None, 'int64', '-12345'), + ast.StructField('a7', None, None, 'int64', '+12345'), + ast.StructField('a8', None, None, 'uint32', '0x12cd3'), + ast.StructField('a9', None, None, 'uint32', '-0x12cD3'), + ast.StructField('a10', None, None, 'uint32', '+0x12CD3'), + ast.StructField('a11', None, None, 'bool', 'true'), + ast.StructField('a12', None, None, 'bool', 'false'), + ast.StructField('a13', None, None, 'float', '1.2345'), + ast.StructField('a14', None, None, 'float', '-1.2345'), + ast.StructField('a15', None, None, 'float', '+1.2345'), + ast.StructField('a16', None, None, 'float', '123.'), + ast.StructField('a17', None, None, 'float', '.123'), + ast.StructField('a18', None, None, 'double', '1.23E10'), + ast.StructField('a19', None, None, 'double', '1.E-10'), + ast.StructField('a20', None, None, 'double', '.5E+10'), + ast.StructField('a21', None, None, 'double', '-1.23E10'), + ast.StructField('a22', None, None, 'double', '+.123E10') + ])) + ]) self.assertEquals(parser.Parse(source, "my_file.mojom"), expected) def testValidFixedSizeArray(self): @@ -673,35 +652,31 @@ array<array<array<int32, 1>>, 2> nested_arrays; }; """ - expected = ast.Mojom( - None, - ast.ImportList(), - [ast.Struct( - 'MyStruct', - None, - ast.StructBody( - [ast.StructField('normal_array', None, None, 'int32[]', None), - ast.StructField('fixed_size_array_one_entry', None, None, - 'int32[1]', None), - ast.StructField('fixed_size_array_ten_entries', None, None, - 'int32[10]', None), - ast.StructField('nested_arrays', None, None, - 'int32[1][][2]', None)]))]) + expected = ast.Mojom(None, ast.ImportList(), [ + ast.Struct( + 'MyStruct', None, + ast.StructBody([ + ast.StructField('normal_array', None, None, 'int32[]', None), + ast.StructField('fixed_size_array_one_entry', None, None, + 'int32[1]', None), + ast.StructField('fixed_size_array_ten_entries', None, None, + 'int32[10]', None), + ast.StructField('nested_arrays', None, None, 'int32[1][][2]', + None) + ])) + ]) self.assertEquals(parser.Parse(source, "my_file.mojom"), expected) def testValidNestedArray(self): """Tests parsing a nested array.""" source = "struct MyStruct { array<array<int32>> nested_array; };" - expected = ast.Mojom( - None, - ast.ImportList(), - [ast.Struct( - 'MyStruct', - None, + expected = ast.Mojom(None, ast.ImportList(), [ + ast.Struct( + 'MyStruct', None, ast.StructBody( - ast.StructField('nested_array', None, None, 'int32[][]', - None)))]) + ast.StructField('nested_array', None, None, 'int32[][]', None))) + ]) self.assertEquals(parser.Parse(source, "my_file.mojom"), expected) def testInvalidFixedArraySize(self): @@ -715,7 +690,7 @@ with self.assertRaisesRegexp( parser.ParseError, r"^my_file\.mojom:2: Error: Fixed array size 0 invalid:\n" - r" *array<int32, 0> zero_size_array;$"): + r" *array<int32, 0> zero_size_array;$"): parser.Parse(source1, "my_file.mojom") source2 = """\ @@ -726,7 +701,7 @@ with self.assertRaisesRegexp( parser.ParseError, r"^my_file\.mojom:2: Error: Fixed array size 999999999999 invalid:\n" - r" *array<int32, 999999999999> too_big_array;$"): + r" *array<int32, 999999999999> too_big_array;$"): parser.Parse(source2, "my_file.mojom") source3 = """\ @@ -735,8 +710,7 @@ }; """ with self.assertRaisesRegexp( - parser.ParseError, - r"^my_file\.mojom:2: Error: Unexpected 'abcdefg':\n" + parser.ParseError, r"^my_file\.mojom:2: Error: Unexpected 'abcdefg':\n" r" *array<int32, abcdefg> not_a_number;"): parser.Parse(source3, "my_file.mojom") @@ -744,62 +718,49 @@ """Tests that we can parse valid associative array structures.""" source1 = "struct MyStruct { map<string, uint8> data; };" - expected1 = ast.Mojom( - None, - ast.ImportList(), - [ast.Struct( - 'MyStruct', - None, + expected1 = ast.Mojom(None, ast.ImportList(), [ + ast.Struct( + 'MyStruct', None, ast.StructBody( - [ast.StructField('data', None, None, 'uint8{string}', None)]))]) + [ast.StructField('data', None, None, 'uint8{string}', None)])) + ]) self.assertEquals(parser.Parse(source1, "my_file.mojom"), expected1) source2 = "interface MyInterface { MyMethod(map<string, uint8> a); };" - expected2 = ast.Mojom( - None, - ast.ImportList(), - [ast.Interface( - 'MyInterface', - None, + expected2 = ast.Mojom(None, ast.ImportList(), [ + ast.Interface( + 'MyInterface', None, ast.InterfaceBody( ast.Method( - 'MyMethod', - None, - None, + 'MyMethod', None, None, ast.ParameterList( ast.Parameter('a', None, None, 'uint8{string}')), - None)))]) + None))) + ]) self.assertEquals(parser.Parse(source2, "my_file.mojom"), expected2) source3 = "struct MyStruct { map<string, array<uint8>> data; };" - expected3 = ast.Mojom( - None, - ast.ImportList(), - [ast.Struct( - 'MyStruct', - None, + expected3 = ast.Mojom(None, ast.ImportList(), [ + ast.Struct( + 'MyStruct', None, ast.StructBody( - [ast.StructField('data', None, None, 'uint8[]{string}', - None)]))]) + [ast.StructField('data', None, None, 'uint8[]{string}', None)])) + ]) self.assertEquals(parser.Parse(source3, "my_file.mojom"), expected3) def testValidMethod(self): """Tests parsing method declarations.""" source1 = "interface MyInterface { MyMethod(int32 a); };" - expected1 = ast.Mojom( - None, - ast.ImportList(), - [ast.Interface( - 'MyInterface', - None, + expected1 = ast.Mojom(None, ast.ImportList(), [ + ast.Interface( + 'MyInterface', None, ast.InterfaceBody( ast.Method( - 'MyMethod', - None, - None, + 'MyMethod', None, None, ast.ParameterList(ast.Parameter('a', None, None, 'int32')), - None)))]) + None))) + ]) self.assertEquals(parser.Parse(source1, "my_file.mojom"), expected1) source2 = """\ @@ -808,28 +769,20 @@ MyMethod2@1() => (); }; """ - expected2 = ast.Mojom( - None, - ast.ImportList(), - [ast.Interface( - 'MyInterface', - None, - ast.InterfaceBody( - [ast.Method( - 'MyMethod1', - None, - ast.Ordinal(0), - ast.ParameterList([ast.Parameter('a', None, ast.Ordinal(0), - 'int32'), - ast.Parameter('b', None, ast.Ordinal(1), - 'int64')]), - None), - ast.Method( - 'MyMethod2', - None, - ast.Ordinal(1), - ast.ParameterList(), - ast.ParameterList())]))]) + expected2 = ast.Mojom(None, ast.ImportList(), [ + ast.Interface( + 'MyInterface', None, + ast.InterfaceBody([ + ast.Method( + 'MyMethod1', None, ast.Ordinal(0), + ast.ParameterList([ + ast.Parameter('a', None, ast.Ordinal(0), 'int32'), + ast.Parameter('b', None, ast.Ordinal(1), 'int64') + ]), None), + ast.Method('MyMethod2', None, ast.Ordinal(1), + ast.ParameterList(), ast.ParameterList()) + ])) + ]) self.assertEquals(parser.Parse(source2, "my_file.mojom"), expected2) source3 = """\ @@ -837,21 +790,18 @@ MyMethod(string a) => (int32 a, bool b); }; """ - expected3 = ast.Mojom( - None, - ast.ImportList(), - [ast.Interface( - 'MyInterface', - None, + expected3 = ast.Mojom(None, ast.ImportList(), [ + ast.Interface( + 'MyInterface', None, ast.InterfaceBody( ast.Method( - 'MyMethod', - None, - None, + 'MyMethod', None, None, ast.ParameterList(ast.Parameter('a', None, None, 'string')), - ast.ParameterList([ast.Parameter('a', None, None, 'int32'), - ast.Parameter('b', None, None, - 'bool')]))))]) + ast.ParameterList([ + ast.Parameter('a', None, None, 'int32'), + ast.Parameter('b', None, None, 'bool') + ])))) + ]) self.assertEquals(parser.Parse(source3, "my_file.mojom"), expected3) def testInvalidMethods(self): @@ -864,9 +814,8 @@ }; """ with self.assertRaisesRegexp( - parser.ParseError, - r"^my_file\.mojom:2: Error: Unexpected '\)':\n" - r" *MyMethod\(string a,\);$"): + parser.ParseError, r"^my_file\.mojom:2: Error: Unexpected '\)':\n" + r" *MyMethod\(string a,\);$"): parser.Parse(source1, "my_file.mojom") # No leading commas. @@ -876,9 +825,8 @@ }; """ with self.assertRaisesRegexp( - parser.ParseError, - r"^my_file\.mojom:2: Error: Unexpected ',':\n" - r" *MyMethod\(, string a\);$"): + parser.ParseError, r"^my_file\.mojom:2: Error: Unexpected ',':\n" + r" *MyMethod\(, string a\);$"): parser.Parse(source2, "my_file.mojom") def testValidInterfaceDefinitions(self): @@ -891,25 +839,19 @@ MyMethod(int32 x) => (MyEnum y); }; """ - expected = ast.Mojom( - None, - ast.ImportList(), - [ast.Interface( - 'MyInterface', - None, - ast.InterfaceBody( - [ast.Enum('MyEnum', - None, - ast.EnumValueList( - ast.EnumValue('VALUE', None, None))), - ast.Const('kMyConst', None, 'int32', '123'), - ast.Method( - 'MyMethod', - None, - None, + expected = ast.Mojom(None, ast.ImportList(), [ + ast.Interface( + 'MyInterface', None, + ast.InterfaceBody([ + ast.Enum('MyEnum', None, + ast.EnumValueList(ast.EnumValue('VALUE', None, None))), + ast.Const('kMyConst', None, 'int32', '123'), + ast.Method( + 'MyMethod', None, None, ast.ParameterList(ast.Parameter('x', None, None, 'int32')), - ast.ParameterList(ast.Parameter('y', None, None, - 'MyEnum')))]))]) + ast.ParameterList(ast.Parameter('y', None, None, 'MyEnum'))) + ])) + ]) self.assertEquals(parser.Parse(source, "my_file.mojom"), expected) def testInvalidInterfaceDefinitions(self): @@ -924,9 +866,8 @@ }; """ with self.assertRaisesRegexp( - parser.ParseError, - r"^my_file\.mojom:2: Error: Unexpected 'struct':\n" - r" *struct MyStruct {$"): + parser.ParseError, r"^my_file\.mojom:2: Error: Unexpected 'struct':\n" + r" *struct MyStruct {$"): parser.Parse(source1, "my_file.mojom") source2 = """\ @@ -939,7 +880,7 @@ with self.assertRaisesRegexp( parser.ParseError, r"^my_file\.mojom:2: Error: Unexpected 'interface':\n" - r" *interface MyInnerInterface {$"): + r" *interface MyInnerInterface {$"): parser.Parse(source2, "my_file.mojom") source3 = """\ @@ -950,9 +891,8 @@ # The parser thinks that "int32" is a plausible name for a method, so it's # "my_field" that gives it away. with self.assertRaisesRegexp( - parser.ParseError, - r"^my_file\.mojom:2: Error: Unexpected 'my_field':\n" - r" *int32 my_field;$"): + parser.ParseError, r"^my_file\.mojom:2: Error: Unexpected 'my_field':\n" + r" *int32 my_field;$"): parser.Parse(source3, "my_file.mojom") def testValidAttributes(self): @@ -963,32 +903,29 @@ # Empty attribute list. source1 = "[] struct MyStruct {};" expected1 = ast.Mojom( - None, - ast.ImportList(), + None, ast.ImportList(), [ast.Struct('MyStruct', ast.AttributeList(), ast.StructBody())]) self.assertEquals(parser.Parse(source1, "my_file.mojom"), expected1) # One-element attribute list, with name value. source2 = "[MyAttribute=MyName] struct MyStruct {};" - expected2 = ast.Mojom( - None, - ast.ImportList(), - [ast.Struct( - 'MyStruct', - ast.AttributeList(ast.Attribute("MyAttribute", "MyName")), - ast.StructBody())]) + expected2 = ast.Mojom(None, ast.ImportList(), [ + ast.Struct('MyStruct', + ast.AttributeList(ast.Attribute("MyAttribute", "MyName")), + ast.StructBody()) + ]) self.assertEquals(parser.Parse(source2, "my_file.mojom"), expected2) # Two-element attribute list, with one string value and one integer value. source3 = "[MyAttribute1 = \"hello\", MyAttribute2 = 5] struct MyStruct {};" - expected3 = ast.Mojom( - None, - ast.ImportList(), - [ast.Struct( + expected3 = ast.Mojom(None, ast.ImportList(), [ + ast.Struct( 'MyStruct', - ast.AttributeList([ast.Attribute("MyAttribute1", "hello"), - ast.Attribute("MyAttribute2", 5)]), - ast.StructBody())]) + ast.AttributeList([ + ast.Attribute("MyAttribute1", "hello"), + ast.Attribute("MyAttribute2", 5) + ]), ast.StructBody()) + ]) self.assertEquals(parser.Parse(source3, "my_file.mojom"), expected3) # Various places that attribute list is allowed. @@ -1014,52 +951,47 @@ expected4 = ast.Mojom( ast.Module(('IDENTIFIER', 'my_module'), ast.AttributeList([ast.Attribute("Attr0", 0)])), - ast.ImportList(ast.Import( - ast.AttributeList([ast.Attribute("Attr1", 1)]), - "my_import")), - [ast.Struct( - 'MyStruct', - ast.AttributeList(ast.Attribute("Attr2", 2)), - ast.StructBody( - ast.StructField( - 'a', ast.AttributeList([ast.Attribute("Attr3", 3)]), - None, 'int32', None))), - ast.Union( - 'MyUnion', - ast.AttributeList(ast.Attribute("Attr4", 4)), - ast.UnionBody( - ast.UnionField( - 'a', ast.AttributeList([ast.Attribute("Attr5", 5)]), None, - 'int32'))), - ast.Enum( - 'MyEnum', - ast.AttributeList(ast.Attribute("Attr6", 6)), - ast.EnumValueList( - ast.EnumValue( - 'VALUE', ast.AttributeList([ast.Attribute("Attr7", 7)]), - None))), - ast.Interface( - 'MyInterface', - ast.AttributeList(ast.Attribute("Attr8", 8)), - ast.InterfaceBody( - ast.Method( - 'MyMethod', - ast.AttributeList(ast.Attribute("Attr9", 9)), - None, - ast.ParameterList( - ast.Parameter( - 'a', - ast.AttributeList([ast.Attribute("Attr10", 10)]), - None, 'int32')), - ast.ParameterList( - ast.Parameter( - 'b', - ast.AttributeList([ast.Attribute("Attr11", 11)]), - None, 'bool'))))), - ast.Const( - 'kMyConst', - ast.AttributeList(ast.Attribute("Attr12", 12)), - 'double', '1.23')]) + ast.ImportList( + ast.Import( + ast.AttributeList([ast.Attribute("Attr1", 1)]), "my_import")), + [ + ast.Struct( + 'MyStruct', ast.AttributeList(ast.Attribute("Attr2", 2)), + ast.StructBody( + ast.StructField( + 'a', ast.AttributeList([ast.Attribute("Attr3", 3)]), + None, 'int32', None))), + ast.Union( + 'MyUnion', ast.AttributeList(ast.Attribute("Attr4", 4)), + ast.UnionBody( + ast.UnionField( + 'a', ast.AttributeList([ast.Attribute("Attr5", 5)]), + None, 'int32'))), + ast.Enum( + 'MyEnum', ast.AttributeList(ast.Attribute("Attr6", 6)), + ast.EnumValueList( + ast.EnumValue( + 'VALUE', ast.AttributeList([ast.Attribute("Attr7", 7)]), + None))), + ast.Interface( + 'MyInterface', ast.AttributeList(ast.Attribute("Attr8", 8)), + ast.InterfaceBody( + ast.Method( + 'MyMethod', ast.AttributeList( + ast.Attribute("Attr9", 9)), None, + ast.ParameterList( + ast.Parameter( + 'a', + ast.AttributeList([ast.Attribute("Attr10", 10) + ]), None, 'int32')), + ast.ParameterList( + ast.Parameter( + 'b', + ast.AttributeList([ast.Attribute("Attr11", 11) + ]), None, 'bool'))))), + ast.Const('kMyConst', ast.AttributeList( + ast.Attribute("Attr12", 12)), 'double', '1.23') + ]) self.assertEquals(parser.Parse(source4, "my_file.mojom"), expected4) # TODO(vtl): Boolean attributes don't work yet. (In fact, we just |eval()| @@ -1072,25 +1004,22 @@ # Trailing commas not allowed. source1 = "[MyAttribute=MyName,] struct MyStruct {};" with self.assertRaisesRegexp( - parser.ParseError, - r"^my_file\.mojom:1: Error: Unexpected '\]':\n" - r"\[MyAttribute=MyName,\] struct MyStruct {};$"): + parser.ParseError, r"^my_file\.mojom:1: Error: Unexpected '\]':\n" + r"\[MyAttribute=MyName,\] struct MyStruct {};$"): parser.Parse(source1, "my_file.mojom") # Missing value. source2 = "[MyAttribute=] struct MyStruct {};" with self.assertRaisesRegexp( - parser.ParseError, - r"^my_file\.mojom:1: Error: Unexpected '\]':\n" - r"\[MyAttribute=\] struct MyStruct {};$"): + parser.ParseError, r"^my_file\.mojom:1: Error: Unexpected '\]':\n" + r"\[MyAttribute=\] struct MyStruct {};$"): parser.Parse(source2, "my_file.mojom") # Missing key. source3 = "[=MyName] struct MyStruct {};" with self.assertRaisesRegexp( - parser.ParseError, - r"^my_file\.mojom:1: Error: Unexpected '=':\n" - r"\[=MyName\] struct MyStruct {};$"): + parser.ParseError, r"^my_file\.mojom:1: Error: Unexpected '=':\n" + r"\[=MyName\] struct MyStruct {};$"): parser.Parse(source3, "my_file.mojom") def testValidImports(self): @@ -1098,10 +1027,9 @@ # One import (no module statement). source1 = "import \"somedir/my.mojom\";" - expected1 = ast.Mojom( - None, - ast.ImportList(ast.Import(None, "somedir/my.mojom")), - []) + expected1 = ast.Mojom(None, + ast.ImportList(ast.Import(None, "somedir/my.mojom")), + []) self.assertEquals(parser.Parse(source1, "my_file.mojom"), expected1) # Two imports (no module statement). @@ -1111,9 +1039,10 @@ """ expected2 = ast.Mojom( None, - ast.ImportList([ast.Import(None, "somedir/my1.mojom"), - ast.Import(None, "somedir/my2.mojom")]), - []) + ast.ImportList([ + ast.Import(None, "somedir/my1.mojom"), + ast.Import(None, "somedir/my2.mojom") + ]), []) self.assertEquals(parser.Parse(source2, "my_file.mojom"), expected2) # Imports with module statement. @@ -1124,9 +1053,10 @@ """ expected3 = ast.Mojom( ast.Module(('IDENTIFIER', 'my_module'), None), - ast.ImportList([ast.Import(None, "somedir/my1.mojom"), - ast.Import(None, "somedir/my2.mojom")]), - []) + ast.ImportList([ + ast.Import(None, "somedir/my1.mojom"), + ast.Import(None, "somedir/my2.mojom") + ]), []) self.assertEquals(parser.Parse(source3, "my_file.mojom"), expected3) def testInvalidImports(self): @@ -1137,9 +1067,8 @@ import invalid """ with self.assertRaisesRegexp( - parser.ParseError, - r"^my_file\.mojom:2: Error: Unexpected 'invalid':\n" - r" *import invalid$"): + parser.ParseError, r"^my_file\.mojom:2: Error: Unexpected 'invalid':\n" + r" *import invalid$"): parser.Parse(source1, "my_file.mojom") source2 = """\ @@ -1149,9 +1078,8 @@ }; """ with self.assertRaisesRegexp( - parser.ParseError, - r"^my_file\.mojom:2: Error: Unexpected 'struct':\n" - r" *struct MyStruct {$"): + parser.ParseError, r"^my_file\.mojom:2: Error: Unexpected 'struct':\n" + r" *struct MyStruct {$"): parser.Parse(source2, "my_file.mojom") source3 = """\ @@ -1161,9 +1089,8 @@ }; """ with self.assertRaisesRegexp( - parser.ParseError, - r"^my_file\.mojom:2: Error: Unexpected 'struct':\n" - r" *struct MyStruct {$"): + parser.ParseError, r"^my_file\.mojom:2: Error: Unexpected 'struct':\n" + r" *struct MyStruct {$"): parser.Parse(source3, "my_file.mojom") def testValidNullableTypes(self): @@ -1189,31 +1116,30 @@ handle<platform>? o; }; """ - expected = ast.Mojom( - None, - ast.ImportList(), - [ast.Struct( - 'MyStruct', - None, - ast.StructBody( - [ast.StructField('a', None, None,'int32?', None), - ast.StructField('b', None, None,'string?', None), - ast.StructField('c', None, None,'int32[]?', None), - ast.StructField('d', None, None,'string?[]?', None), - ast.StructField('e', None, None,'int32[]?[]?', None), - ast.StructField('f', None, None,'int32[1]?', None), - ast.StructField('g', None, None,'string?[1]?', None), - ast.StructField('h', None, None,'some_struct?', None), - ast.StructField('i', None, None,'handle?', None), - ast.StructField('j', None, None,'handle<data_pipe_consumer>?', - None), - ast.StructField('k', None, None,'handle<data_pipe_producer>?', - None), - ast.StructField('l', None, None,'handle<message_pipe>?', None), - ast.StructField('m', None, None,'handle<shared_buffer>?', - None), - ast.StructField('n', None, None,'some_interface&?', None), - ast.StructField('o', None, None,'handle<platform>?', None)]))]) + expected = ast.Mojom(None, ast.ImportList(), [ + ast.Struct( + 'MyStruct', None, + ast.StructBody([ + ast.StructField('a', None, None, 'int32?', None), + ast.StructField('b', None, None, 'string?', None), + ast.StructField('c', None, None, 'int32[]?', None), + ast.StructField('d', None, None, 'string?[]?', None), + ast.StructField('e', None, None, 'int32[]?[]?', None), + ast.StructField('f', None, None, 'int32[1]?', None), + ast.StructField('g', None, None, 'string?[1]?', None), + ast.StructField('h', None, None, 'some_struct?', None), + ast.StructField('i', None, None, 'handle?', None), + ast.StructField('j', None, None, 'handle<data_pipe_consumer>?', + None), + ast.StructField('k', None, None, 'handle<data_pipe_producer>?', + None), + ast.StructField('l', None, None, 'handle<message_pipe>?', None), + ast.StructField('m', None, None, 'handle<shared_buffer>?', + None), + ast.StructField('n', None, None, 'some_interface&?', None), + ast.StructField('o', None, None, 'handle<platform>?', None) + ])) + ]) self.assertEquals(parser.Parse(source, "my_file.mojom"), expected) def testInvalidNullableTypes(self): @@ -1224,9 +1150,8 @@ }; """ with self.assertRaisesRegexp( - parser.ParseError, - r"^my_file\.mojom:2: Error: Unexpected '\?':\n" - r" *string\?\? a;$"): + parser.ParseError, r"^my_file\.mojom:2: Error: Unexpected '\?':\n" + r" *string\?\? a;$"): parser.Parse(source1, "my_file.mojom") source2 = """\ @@ -1235,9 +1160,8 @@ }; """ with self.assertRaisesRegexp( - parser.ParseError, - r"^my_file\.mojom:2: Error: Unexpected '<':\n" - r" *handle\?<data_pipe_consumer> a;$"): + parser.ParseError, r"^my_file\.mojom:2: Error: Unexpected '<':\n" + r" *handle\?<data_pipe_consumer> a;$"): parser.Parse(source2, "my_file.mojom") source3 = """\ @@ -1246,9 +1170,8 @@ }; """ with self.assertRaisesRegexp( - parser.ParseError, - r"^my_file\.mojom:2: Error: Unexpected '&':\n" - r" *some_interface\?& a;$"): + parser.ParseError, r"^my_file\.mojom:2: Error: Unexpected '&':\n" + r" *some_interface\?& a;$"): parser.Parse(source3, "my_file.mojom") def testSimpleUnion(self): @@ -1262,15 +1185,14 @@ }; """ expected = ast.Mojom( - ast.Module(('IDENTIFIER', 'my_module'), None), - ast.ImportList(), - [ast.Union( - 'MyUnion', - None, - ast.UnionBody([ - ast.UnionField('a', None, None, 'int32'), - ast.UnionField('b', None, None, 'double') - ]))]) + ast.Module(('IDENTIFIER', 'my_module'), None), ast.ImportList(), [ + ast.Union( + 'MyUnion', None, + ast.UnionBody([ + ast.UnionField('a', None, None, 'int32'), + ast.UnionField('b', None, None, 'double') + ])) + ]) actual = parser.Parse(source, "my_file.mojom") self.assertEquals(actual, expected) @@ -1285,15 +1207,14 @@ }; """ expected = ast.Mojom( - ast.Module(('IDENTIFIER', 'my_module'), None), - ast.ImportList(), - [ast.Union( - 'MyUnion', - None, - ast.UnionBody([ - ast.UnionField('a', None, ast.Ordinal(10), 'int32'), - ast.UnionField('b', None, ast.Ordinal(30), 'double') - ]))]) + ast.Module(('IDENTIFIER', 'my_module'), None), ast.ImportList(), [ + ast.Union( + 'MyUnion', None, + ast.UnionBody([ + ast.UnionField('a', None, ast.Ordinal(10), 'int32'), + ast.UnionField('b', None, ast.Ordinal(30), 'double') + ])) + ]) actual = parser.Parse(source, "my_file.mojom") self.assertEquals(actual, expected) @@ -1307,14 +1228,11 @@ }; """ expected = ast.Mojom( - ast.Module(('IDENTIFIER', 'my_module'), None), - ast.ImportList(), - [ast.Union( - 'MyUnion', - None, - ast.UnionBody([ - ast.UnionField('s', None, None, 'SomeStruct') - ]))]) + ast.Module(('IDENTIFIER', 'my_module'), None), ast.ImportList(), [ + ast.Union( + 'MyUnion', None, + ast.UnionBody([ast.UnionField('s', None, None, 'SomeStruct')])) + ]) actual = parser.Parse(source, "my_file.mojom") self.assertEquals(actual, expected) @@ -1328,14 +1246,11 @@ }; """ expected = ast.Mojom( - ast.Module(('IDENTIFIER', 'my_module'), None), - ast.ImportList(), - [ast.Union( - 'MyUnion', - None, - ast.UnionBody([ - ast.UnionField('a', None, None, 'int32[]') - ]))]) + ast.Module(('IDENTIFIER', 'my_module'), None), ast.ImportList(), [ + ast.Union( + 'MyUnion', None, + ast.UnionBody([ast.UnionField('a', None, None, 'int32[]')])) + ]) actual = parser.Parse(source, "my_file.mojom") self.assertEquals(actual, expected) @@ -1349,14 +1264,12 @@ }; """ expected = ast.Mojom( - ast.Module(('IDENTIFIER', 'my_module'), None), - ast.ImportList(), - [ast.Union( - 'MyUnion', - None, - ast.UnionBody([ - ast.UnionField('m', None, None, 'string{int32}') - ]))]) + ast.Module(('IDENTIFIER', 'my_module'), None), ast.ImportList(), [ + ast.Union( + 'MyUnion', None, + ast.UnionBody( + [ast.UnionField('m', None, None, 'string{int32}')])) + ]) actual = parser.Parse(source, "my_file.mojom") self.assertEquals(actual, expected) @@ -1372,8 +1285,7 @@ }; """ with self.assertRaisesRegexp( - parser.ParseError, - r"^my_file\.mojom:4: Error: Unexpected 'struct':\n" + parser.ParseError, r"^my_file\.mojom:4: Error: Unexpected 'struct':\n" r" *struct MyStruct {$"): parser.Parse(source, "my_file.mojom") @@ -1406,8 +1318,7 @@ }; """ with self.assertRaisesRegexp( - parser.ParseError, - r"^my_file\.mojom:4: Error: Unexpected 'union':\n" + parser.ParseError, r"^my_file\.mojom:4: Error: Unexpected 'union':\n" r" *union MyOtherUnion {$"): parser.Parse(source, "my_file.mojom") @@ -1423,8 +1334,7 @@ }; """ with self.assertRaisesRegexp( - parser.ParseError, - r"^my_file\.mojom:4: Error: Unexpected 'enum':\n" + parser.ParseError, r"^my_file\.mojom:4: Error: Unexpected 'enum':\n" r" *enum MyEnum {$"): parser.Parse(source, "my_file.mojom") @@ -1438,39 +1348,33 @@ associated MyInterface&? d; }; """ - expected1 = ast.Mojom( - None, - ast.ImportList(), - [ast.Struct( - 'MyStruct', - None, - ast.StructBody( - [ast.StructField('a', None, None,'asso<MyInterface>', None), - ast.StructField('b', None, None,'asso<MyInterface&>', None), - ast.StructField('c', None, None,'asso<MyInterface>?', None), - ast.StructField('d', None, None,'asso<MyInterface&>?', - None)]))]) + expected1 = ast.Mojom(None, ast.ImportList(), [ + ast.Struct( + 'MyStruct', None, + ast.StructBody([ + ast.StructField('a', None, None, 'asso<MyInterface>', None), + ast.StructField('b', None, None, 'asso<MyInterface&>', None), + ast.StructField('c', None, None, 'asso<MyInterface>?', None), + ast.StructField('d', None, None, 'asso<MyInterface&>?', None) + ])) + ]) self.assertEquals(parser.Parse(source1, "my_file.mojom"), expected1) source2 = """\ interface MyInterface { MyMethod(associated A a) =>(associated B& b); };""" - expected2 = ast.Mojom( - None, - ast.ImportList(), - [ast.Interface( - 'MyInterface', - None, + expected2 = ast.Mojom(None, ast.ImportList(), [ + ast.Interface( + 'MyInterface', None, ast.InterfaceBody( ast.Method( - 'MyMethod', - None, - None, + 'MyMethod', None, None, ast.ParameterList( ast.Parameter('a', None, None, 'asso<A>')), ast.ParameterList( - ast.Parameter('b', None, None, 'asso<B&>')))))]) + ast.Parameter('b', None, None, 'asso<B&>'))))) + ]) self.assertEquals(parser.Parse(source2, "my_file.mojom"), expected2) def testInvalidAssociatedKinds(self): @@ -1484,7 +1388,7 @@ with self.assertRaisesRegexp( parser.ParseError, r"^my_file\.mojom:2: Error: Unexpected 'associated':\n" - r" *associated associated SomeInterface a;$"): + r" *associated associated SomeInterface a;$"): parser.Parse(source1, "my_file.mojom") source2 = """\ @@ -1493,9 +1397,8 @@ }; """ with self.assertRaisesRegexp( - parser.ParseError, - r"^my_file\.mojom:2: Error: Unexpected 'handle':\n" - r" *associated handle a;$"): + parser.ParseError, r"^my_file\.mojom:2: Error: Unexpected 'handle':\n" + r" *associated handle a;$"): parser.Parse(source2, "my_file.mojom") source3 = """\ @@ -1504,9 +1407,8 @@ }; """ with self.assertRaisesRegexp( - parser.ParseError, - r"^my_file\.mojom:2: Error: Unexpected '\?':\n" - r" *associated\? MyInterface& a;$"): + parser.ParseError, r"^my_file\.mojom:2: Error: Unexpected '\?':\n" + r" *associated\? MyInterface& a;$"): parser.Parse(source3, "my_file.mojom")
diff --git a/mojo/public/tools/bindings/pylib/mojom_tests/parse/run_parser.py b/mojo/public/tools/bindings/pylib/mojom_tests/parse/run_parser.py deleted file mode 100755 index cda0560..0000000 --- a/mojo/public/tools/bindings/pylib/mojom_tests/parse/run_parser.py +++ /dev/null
@@ -1,37 +0,0 @@ -#!/usr/bin/env python -# Copyright 2014 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -"""Simple testing utility to just run the mojom parser.""" - -from __future__ import print_function - -import os.path -import sys - -sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)), - os.path.pardir, os.path.pardir)) - -from mojom.parse.parser import Parse, ParseError - - -def main(argv): - if len(argv) < 2: - print("usage: %s filename" % argv[0]) - return 0 - - for filename in argv[1:]: - with open(filename) as f: - print("%s:" % filename) - try: - print(Parse(f.read(), filename)) - except ParseError, e: - print(e) - return 1 - - return 0 - - -if __name__ == '__main__': - sys.exit(main(sys.argv))
diff --git a/mojo/public/tools/bindings/pylib/mojom_tests/parse/run_translate.py b/mojo/public/tools/bindings/pylib/mojom_tests/parse/run_translate.py deleted file mode 100755 index fdb18a20..0000000 --- a/mojo/public/tools/bindings/pylib/mojom_tests/parse/run_translate.py +++ /dev/null
@@ -1,36 +0,0 @@ -#!/usr/bin/env python -# Copyright 2014 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -"""Simple testing utility to just run the mojom translate stage.""" - -from __future__ import print_function - -import os.path -import sys - -sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)), - os.path.pardir, os.path.pardir)) - -from mojom.parse.parser import Parse -from mojom.parse.translate import Translate - - -def main(argv): - if len(argv) < 2: - print("usage: %s filename" % sys.argv[0]) - return 1 - - for filename in argv[1:]: - with open(filename) as f: - print("%s:" % filename) - print(Translate( - Parse(f.read(), filename), - os.path.splitext(os.path.basename(filename))[0])) - - return 0 - - -if __name__ == '__main__': - sys.exit(main(sys.argv))
diff --git a/mojo/public/tools/bindings/pylib/mojom_tests/parse/translate_unittest.py b/mojo/public/tools/bindings/pylib/mojom_tests/parse/translate_unittest.py index 2520332..e155f69 100644 --- a/mojo/public/tools/bindings/pylib/mojom_tests/parse/translate_unittest.py +++ b/mojo/public/tools/bindings/pylib/mojom_tests/parse/translate_unittest.py
@@ -7,6 +7,7 @@ import sys import unittest + def _GetDirAbove(dirname): """Returns the directory "above" this file containing |dirname| (which must also be "above" this file).""" @@ -17,6 +18,7 @@ if tail == dirname: return path + try: imp.find_module("mojom") except ImportError: @@ -46,34 +48,45 @@ def testTranslateSimpleUnions(self): """Makes sure that a simple union is translated correctly.""" - tree = ast.Mojom( - None, - ast.ImportList(), - [ast.Union("SomeUnion", None, ast.UnionBody( - [ast.UnionField("a", None, None, "int32"), - ast.UnionField("b", None, None, "string")]))]) + tree = ast.Mojom(None, ast.ImportList(), [ + ast.Union( + "SomeUnion", None, + ast.UnionBody([ + ast.UnionField("a", None, None, "int32"), + ast.UnionField("b", None, None, "string") + ])) + ]) expected = [{ - "name": "SomeUnion", - "fields": [{"kind": "i32", "name": "a"}, - {"kind": "s", "name": "b"}]}] + "name": + "SomeUnion", + "fields": [{ + "kind": "i32", + "name": "a" + }, { + "kind": "s", + "name": "b" + }] + }] actual = translate.Translate(tree, "mojom_tree") self.assertEquals(actual["unions"], expected) def testMapTreeForTypeRaisesWithDuplicate(self): """Verifies _MapTreeForType() raises when passed two values with the same name.""" - methods = [ast.Method('dup', None, None, ast.ParameterList(), None), - ast.Method('dup', None, None, ast.ParameterList(), None)] + methods = [ + ast.Method('dup', None, None, ast.ParameterList(), None), + ast.Method('dup', None, None, ast.ParameterList(), None) + ] self.assertRaises(Exception, translate._MapTreeForType, (lambda x: x, methods, '', 'scope')) def testAssociatedKinds(self): """Tests type spec translation of associated interfaces and requests.""" # pylint: disable=W0212 - self.assertEquals(translate._MapKind("asso<SomeInterface>?"), - "?asso:x:SomeInterface") - self.assertEquals(translate._MapKind("asso<SomeInterface&>?"), - "?asso:r:x:SomeInterface") + self.assertEquals( + translate._MapKind("asso<SomeInterface>?"), "?asso:x:SomeInterface") + self.assertEquals( + translate._MapKind("asso<SomeInterface&>?"), "?asso:r:x:SomeInterface") if __name__ == "__main__":
diff --git a/net/BUILD.gn b/net/BUILD.gn index c75f0f3..85b74c2 100644 --- a/net/BUILD.gn +++ b/net/BUILD.gn
@@ -1648,6 +1648,11 @@ sources += [ "filter/brotli_source_stream_disabled.cc" ] } } + + if (!is_debug && !optimize_for_size) { + configs -= [ "//build/config/compiler:default_optimization" ] + configs += [ "//build/config/compiler:optimize_max" ] + } } # net_export.h has its own build target so that code (eg
diff --git a/net/base/network_change_notifier_fuchsia_unittest.cc b/net/base/network_change_notifier_fuchsia_unittest.cc index 6a1d59b..0cf07575 100644 --- a/net/base/network_change_notifier_fuchsia_unittest.cc +++ b/net/base/network_change_notifier_fuchsia_unittest.cc
@@ -259,7 +259,6 @@ base::test::SingleThreadTaskEnvironment::MainThreadType::IO}; testing::StrictMock<MockConnectionTypeObserver> observer_; testing::StrictMock<MockIPAddressObserver> ip_observer_; - testing::StrictMock<MockNetworkChangeObserver> network_change_observer_; fuchsia::netstack::NetstackPtr netstack_ptr_; FakeNetstackAsync netstack_; @@ -269,8 +268,6 @@ std::unique_ptr<SystemDnsConfigChangeNotifier> dns_config_notifier_; std::unique_ptr<NetworkChangeNotifierFuchsia> notifier_; - testing::InSequence seq_; - private: DISALLOW_COPY_AND_ASSIGN(NetworkChangeNotifierFuchsiaTest); }; @@ -282,29 +279,37 @@ } TEST_F(NetworkChangeNotifierFuchsiaTest, NotifyNetworkChangeOnInitialIPChange) { + // Set up expectations on the IPAddressObserver, and attach a mock + // NetworkChangeObserver. + testing::StrictMock<MockNetworkChangeObserver> network_change_observer; + { + testing::InSequence seq; + EXPECT_CALL(network_change_observer, + OnNetworkChanged(NetworkChangeNotifier::CONNECTION_NONE)); + EXPECT_CALL(network_change_observer, + OnNetworkChanged(NetworkChangeNotifier::CONNECTION_WIFI)); + } + EXPECT_CALL(ip_observer_, OnIPAddressChanged()); + + // Set an initial IP address and create the notifier. netstack_.PushInterface( CreateNetInterface(kDefaultNic, fuchsia::netstack::NetInterfaceFlagUp, fuchsia::hardware::ethernet::INFO_FEATURE_WLAN, CreateIPv4Address(169, 254, 0, 1), CreateIPv4Address(255, 255, 255, 0), {})); CreateNotifier(); - // Add and remove network_change_observer_ since it's only used in this method - // gtest gives warnings on unused mocks if put into setup/teardown. - NetworkChangeNotifier::AddNetworkChangeObserver(&network_change_observer_); - EXPECT_CALL(network_change_observer_, - OnNetworkChanged(NetworkChangeNotifier::CONNECTION_NONE)); - EXPECT_CALL(network_change_observer_, - OnNetworkChanged(NetworkChangeNotifier::CONNECTION_WIFI)); - EXPECT_CALL(ip_observer_, OnIPAddressChanged()); - // Changing the IP address will now trigger network change as well since it is - // currently out of sync + + // Add the NetworkChangeNotifier, and change the IP address. This should + // trigger a network change notification, since the IP address is out-of-sync. + NetworkChangeNotifier::AddNetworkChangeObserver(&network_change_observer); + netstack_.PushInterface(CreateNetInterface( kDefaultNic, fuchsia::netstack::NetInterfaceFlagUp, fuchsia::hardware::ethernet::INFO_FEATURE_WLAN, CreateIPv4Address(10, 0, 0, 1), CreateIPv4Address(255, 255, 0, 0), {})); NetstackNotifyInterfacesAndWaitForGetRouteTable(); - NetworkChangeNotifier::RemoveNetworkChangeObserver(&network_change_observer_); + NetworkChangeNotifier::RemoveNetworkChangeObserver(&network_change_observer); } TEST_F(NetworkChangeNotifierFuchsiaTest, NoChange) {
diff --git a/net/quic/platform/impl/quic_epoll_clock.cc b/net/quic/platform/impl/quic_epoll_clock.cc index 7a84a68..ae688c8 100644 --- a/net/quic/platform/impl/quic_epoll_clock.cc +++ b/net/quic/platform/impl/quic_epoll_clock.cc
@@ -21,14 +21,8 @@ QuicTime QuicEpollClock::Now() const { QuicTime now = CreateTimeFromMicroseconds(epoll_server_->NowInUsec()); - if (!GetQuicReloadableFlag(quic_monotonic_epoll_clock)) { - return now; - } if (now <= largest_time_) { - if (now < largest_time_) { - QUIC_RELOADABLE_FLAG_COUNT(quic_monotonic_epoll_clock); - } // Time not increasing, return |largest_time_|. return largest_time_; }
diff --git a/net/quic/platform/impl/quic_epoll_clock_test.cc b/net/quic/platform/impl/quic_epoll_clock_test.cc index d641f54..14a1678 100644 --- a/net/quic/platform/impl/quic_epoll_clock_test.cc +++ b/net/quic/platform/impl/quic_epoll_clock_test.cc
@@ -46,7 +46,6 @@ } TEST_F(QuicEpollClockTest, MonotonicityWithRealEpollClock) { - SetQuicReloadableFlag(quic_monotonic_epoll_clock, true); epoll_server::SimpleEpollServer epoll_server; QuicEpollClock clock(&epoll_server); @@ -70,11 +69,7 @@ epoll_server.set_now_in_usec(90); quic::QuicTime now = clock.Now(); - if (GetQuicReloadableFlag(quic_monotonic_epoll_clock)) { - ASSERT_EQ(last_now, now); - } else { - ASSERT_GT(last_now, now); - } + ASSERT_EQ(last_now, now); } } // namespace test
diff --git a/net/quic/quic_flags_list.h b/net/quic/quic_flags_list.h index 3a40eaed..aea67ca 100644 --- a/net/quic/quic_flags_list.h +++ b/net/quic/quic_flags_list.h
@@ -127,9 +127,6 @@ FLAGS_quic_reloadable_flag_quic_bbr_no_bytes_acked_in_startup_recovery, false) -// If true, QuicEpollClock::Now() will monotonically increase. -QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_monotonic_epoll_clock, true) - // If true, enables the BBS4 and BBS5 connection options, which reduce BBR's // pacing rate in STARTUP as more losses occur as a fraction of CWND. QUIC_FLAG(bool, @@ -276,10 +273,6 @@ FLAGS_quic_reloadable_flag_quic_ack_delay_alarm_granularity, false) -// If true, enable the 1ACK connection option to only send 1 immediate ACK after -// reordering. -QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_one_immediate_ack, true) - // If true, QuicSentPacketManager::SetSendAlgorithm(CongestionControlType) will // become a no-op if the current and the requested cc_type are the same. QUIC_FLAG( @@ -316,7 +309,7 @@ // is bundled with ACKs sent after the PTO fires. QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_bundle_retransmittable_with_pto_ack, - false) + true) // If true, use QuicClock::Now() as the source of packet receive time instead of // WallNow(). QUIC_FLAG(bool, @@ -351,7 +344,7 @@ QUIC_FLAG( bool, FLAGS_quic_reloadable_flag_quic_minimum_validation_of_coalesced_packets, - false) + true) // If true, do not send WINDOW_UPDATE if connection has been disconnected. QUIC_FLAG(bool, @@ -361,21 +354,21 @@ // If true, arm the 1st PTO with earliest in flight sent time. QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_arm_pto_with_earliest_sent_time, - false) + true) // If true, QuicSession::WritevData() will support writing data at a specified // encryption level. -QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_writevdata_at_level, false) +QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_writevdata_at_level, true) // If true, use standard deviation when calculating PTO timeout. QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_use_standard_deviation_for_pto, - false) + true) // If true, QUIC BBRv2 to avoid unnecessary PROBE_RTTs after quiescence. QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_bbr2_avoid_unnecessary_probe_rtt, - false) + true) // If true, use passed in ack_frame to calculate minimum size of the serialized // ACK frame.
diff --git a/remoting/protocol/transport_context.cc b/remoting/protocol/transport_context.cc index e6144e4..6b2f4cca 100644 --- a/remoting/protocol/transport_context.cc +++ b/remoting/protocol/transport_context.cc
@@ -33,13 +33,13 @@ base::TimeDelta::FromHours(1); void PrintIceConfig(const IceConfig& ice_config) { - HOST_LOG << "Received IceConfig:"; - HOST_LOG << " STUN: ["; + HOST_LOG << "IceConfig: {"; + HOST_LOG << " stun: ["; for (auto& stun_server : ice_config.stun_servers) { HOST_LOG << " " << stun_server.ToString() << ","; } HOST_LOG << " ]"; - HOST_LOG << " TURN: ["; + HOST_LOG << " turn: ["; for (auto& turn_server : ice_config.turn_servers) { HOST_LOG << " {"; HOST_LOG << " username: " << turn_server.credentials.username; @@ -52,6 +52,7 @@ HOST_LOG << " ]"; HOST_LOG << " expiration time: " << ice_config.expiration_time; HOST_LOG << " max_bitrate_kbps: " << ice_config.max_bitrate_kbps; + HOST_LOG << "}"; } } // namespace @@ -92,14 +93,18 @@ if (ice_config_request_[relay_mode_]) { pending_ice_config_callbacks_[relay_mode_].push_back(callback); } else { + HOST_LOG << "Using cached ICE Config."; + PrintIceConfig(ice_config_[relay_mode_]); callback.Run(ice_config_[relay_mode_]); } } void TransportContext::EnsureFreshIceConfig() { // Check if request is already pending. - if (ice_config_request_[relay_mode_]) + if (ice_config_request_[relay_mode_]) { + HOST_LOG << "ICE Config request is already pending."; return; + } // Don't need to make ICE config request if both STUN and Relay are disabled. if ((network_settings_.flags & (NetworkSettings::NAT_TRAVERSAL_STUN | @@ -132,6 +137,7 @@ ice_config_[relay_mode] = ice_config; ice_config_request_[relay_mode].reset(); + HOST_LOG << "Using newly requested ICE Config:"; PrintIceConfig(ice_config); auto& callback_list = pending_ice_config_callbacks_[relay_mode];
diff --git a/services/network/public/cpp/cors/cors.cc b/services/network/public/cpp/cors/cors.cc index 932c5f3..5e6e4e0 100644 --- a/services/network/public/cpp/cors/cors.cc +++ b/services/network/public/cpp/cors/cors.cc
@@ -455,6 +455,7 @@ "sec-ch-ua-arch", "sec-ch-ua-model", "sec-ch-ua-mobile", + "sec-ch-ua-full-version", }; if (std::find(std::begin(safe_names), std::end(safe_names), lower_name) == std::end(safe_names))
diff --git a/third_party/blink/PRESUBMIT.py b/third_party/blink/PRESUBMIT.py index 4dac3fb..288b60c 100644 --- a/third_party/blink/PRESUBMIT.py +++ b/third_party/blink/PRESUBMIT.py
@@ -60,7 +60,8 @@ # So far, non-blink interfaces are allowed only for loading / loader # interfaces so that we don't need type conversions to get through the # boundary between Blink and non-Blink. - allowed_interfaces = (r'services/network/public/mojom/load_timing_info', + allowed_interfaces = (r'services/network/public/mojom/cross_origin_embedder_policy', r'services/network/public/mojom/fetch_api', + r'services/network/public/mojom/load_timing_info', r'third_party/blink/public/mojom/worker/subresource_loader_updater') for f in input_api.AffectedFiles(file_filter=source_file_filter):
diff --git a/third_party/blink/common/BUILD.gn b/third_party/blink/common/BUILD.gn index 921cfdb..f968f0d 100644 --- a/third_party/blink/common/BUILD.gn +++ b/third_party/blink/common/BUILD.gn
@@ -106,9 +106,6 @@ "notifications/notification_mojom_traits.cc", "notifications/notification_resources.cc", "notifications/platform_notification_data.cc", - "origin_policy/origin_policy.cc", - "origin_policy/origin_policy_parser.cc", - "origin_policy/origin_policy_parser.h", "origin_trials/trial_token.cc", "origin_trials/trial_token_validator.cc", "page/page_zoom.cc", @@ -193,7 +190,6 @@ "messaging/message_port_descriptor_unittest.cc", "mime_util/mime_util_unittest.cc", "notifications/notification_mojom_traits_unittest.cc", - "origin_policy/origin_policy_unittest.cc", "origin_trials/trial_token_unittest.cc", "origin_trials/trial_token_validator_unittest.cc", "test/run_all_unittests.cc",
diff --git a/third_party/blink/common/client_hints/client_hints.cc b/third_party/blink/common/client_hints/client_hints.cc index 89de509..6325d5b8 100644 --- a/third_party/blink/common/client_hints/client_hints.cc +++ b/third_party/blink/common/client_hints/client_hints.cc
@@ -17,10 +17,20 @@ namespace blink { -const char* const kClientHintsNameMapping[] = { - "device-memory", "dpr", "width", "viewport-width", "rtt", "downlink", - "ect", "lang", "ua", "arch", "platform", "model", - "mobile"}; +const char* const kClientHintsNameMapping[] = {"device-memory", + "dpr", + "width", + "viewport-width", + "rtt", + "downlink", + "ect", + "lang", + "ua", + "ua-arch", + "ua-platform", + "ua-model", + "ua-mobile", + "ua-full-version"}; const char* const kClientHintsHeaderMapping[] = { "device-memory", @@ -36,6 +46,7 @@ "sec-ch-ua-platform", "sec-ch-ua-model", "sec-ch-ua-mobile", + "sec-ch-ua-full-version", }; const size_t kClientHintsMappingsCount = base::size(kClientHintsNameMapping); @@ -143,6 +154,7 @@ case mojom::WebClientHintsType::kUAPlatform: case mojom::WebClientHintsType::kUAModel: case mojom::WebClientHintsType::kUAMobile: + case mojom::WebClientHintsType::kUAFullVersion: if (permit_ua_hints) result.push_back(hint); break;
diff --git a/third_party/blink/common/client_hints/client_hints_unittest.cc b/third_party/blink/common/client_hints/client_hints_unittest.cc index 49824f3d..3212605a 100644 --- a/third_party/blink/common/client_hints/client_hints_unittest.cc +++ b/third_party/blink/common/client_hints/client_hints_unittest.cc
@@ -120,9 +120,10 @@ UnorderedElementsAre(mojom::WebClientHintsType::kRtt, mojom::WebClientHintsType::kLang)); - result = ParseAcceptCH("rtt, lang, ua, arch, platform, model, mobile", - /* permit_lang_hints = */ true, - /* permit_ua_hints = */ true); + result = + ParseAcceptCH("rtt, lang, ua, ua-arch, ua-platform, ua-model, ua-mobile", + /* permit_lang_hints = */ true, + /* permit_ua_hints = */ true); ASSERT_TRUE(result.has_value()); EXPECT_THAT(result.value(), UnorderedElementsAre(mojom::WebClientHintsType::kRtt,
diff --git a/third_party/blink/common/feature_policy/feature_policy.cc b/third_party/blink/common/feature_policy/feature_policy.cc index cce4d109..84342ae 100644 --- a/third_party/blink/common/feature_policy/feature_policy.cc +++ b/third_party/blink/common/feature_policy/feature_policy.cc
@@ -474,6 +474,9 @@ {mojom::FeaturePolicyFeature::kClientHintUAMobile, FeatureDefaultValue(FeaturePolicy::FeatureDefault::EnableForSelf, mojom::PolicyValueType::kBool)}, + {mojom::FeaturePolicyFeature::kClientHintUAFullVersion, + FeatureDefaultValue(FeaturePolicy::FeatureDefault::EnableForSelf, + mojom::PolicyValueType::kBool)}, {mojom::FeaturePolicyFeature::kClientHintViewportWidth, FeatureDefaultValue(FeaturePolicy::FeatureDefault::EnableForSelf, mojom::PolicyValueType::kBool)},
diff --git a/third_party/blink/common/origin_policy/OWNERS b/third_party/blink/common/origin_policy/OWNERS deleted file mode 100644 index ec8b57e..0000000 --- a/third_party/blink/common/origin_policy/OWNERS +++ /dev/null
@@ -1,2 +0,0 @@ -vogelheim@chromium.org -mkwst@chromium.org
diff --git a/third_party/blink/common/origin_policy/origin_policy.cc b/third_party/blink/common/origin_policy/origin_policy.cc deleted file mode 100644 index dbb5d42..0000000 --- a/third_party/blink/common/origin_policy/origin_policy.cc +++ /dev/null
@@ -1,20 +0,0 @@ -// Copyright 2018 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "third_party/blink/public/common/origin_policy/origin_policy.h" - -#include "third_party/blink/common/origin_policy/origin_policy_parser.h" - -namespace blink { - -OriginPolicy::~OriginPolicy() {} - -std::unique_ptr<OriginPolicy> OriginPolicy::From( - base::StringPiece manifest_text) { - return OriginPolicyParser::Parse(manifest_text); -} - -OriginPolicy::OriginPolicy() {} - -} // namespace blink
diff --git a/third_party/blink/common/origin_policy/origin_policy_parser.cc b/third_party/blink/common/origin_policy/origin_policy_parser.cc deleted file mode 100644 index 679dd22..0000000 --- a/third_party/blink/common/origin_policy/origin_policy_parser.cc +++ /dev/null
@@ -1,127 +0,0 @@ -// Copyright 2018 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "third_party/blink/common/origin_policy/origin_policy_parser.h" - -#include "base/json/json_reader.h" -#include "base/logging.h" -#include "base/memory/ptr_util.h" -#include "base/values.h" -#include "url/gurl.h" -#include "url/origin.h" - -namespace blink { - -std::unique_ptr<OriginPolicy> OriginPolicyParser::Parse( - base::StringPiece text) { - OriginPolicyParser parser; - if (!parser.DoParse(text)) - return nullptr; - return std::move(parser.policy_); -} - -OriginPolicyParser::OriginPolicyParser() {} -OriginPolicyParser::~OriginPolicyParser() {} - -bool OriginPolicyParser::DoParse(base::StringPiece policy_text) { - policy_ = base::WrapUnique(new OriginPolicy); - - if (policy_text.empty()) - return false; - - std::unique_ptr<base::Value> json = - base::JSONReader::ReadDeprecated(policy_text); - if (!json || !json->is_dict()) - return false; - - base::Value* csp = json->FindKey("content-security-policy"); - bool csp_ok = !csp || ParseContentSecurityPolicies(*csp); - - base::Value* features = json->FindKey("feature-policy"); - bool features_ok = !features || ParseFeaturePolicies(*features); - - base::Value* first_party_set = json->FindKey("first-party-set"); - bool first_party_set_ok = - !first_party_set || ParseFirstPartySet(*first_party_set); - - return csp_ok && features_ok && first_party_set_ok; -} - -bool OriginPolicyParser::ParseContentSecurityPolicies( - const base::Value& policies) { - if (!policies.is_list()) - return false; - - bool ok = true; - for (const auto& csp : policies.GetList()) { - ok &= ParseContentSecurityPolicy(csp); - } - return ok; -} - -bool OriginPolicyParser::ParseContentSecurityPolicy(const base::Value& csp) { - if (!csp.is_dict()) - return false; - - const auto* policy = csp.FindKeyOfType("policy", base::Value::Type::STRING); - if (!policy) - return false; - - const auto* report_only = - csp.FindKeyOfType("report-only", base::Value::Type::BOOLEAN); - policy_->csp_.push_back( - {policy->GetString(), report_only && report_only->GetBool()}); - return true; -} - -bool OriginPolicyParser::ParseFeaturePolicies(const base::Value& policies) { - if (!policies.is_list()) - return false; - - bool ok = true; - for (const auto& feature : policies.GetList()) { - ok &= ParseFeaturePolicy(feature); - } - return ok; -} - -bool OriginPolicyParser::ParseFeaturePolicy(const base::Value& policy) { - if (!policy.is_string()) - return false; - - policy_->features_.push_back(policy.GetString()); - return true; -} - -// This will not fail policy parsing, even if the first party set field can't -// be parsed. Therefore this function always returns true. -bool OriginPolicyParser::ParseFirstPartySet( - const base::Value& first_party_set) { - if (!first_party_set.is_list()) - return true; - - for (const auto& first_party : first_party_set.GetList()) { - if (!ParseFirstPartyOrigin(first_party)) { - policy_->first_party_set_.clear(); - return true; - } - } - - return true; -} - -bool OriginPolicyParser::ParseFirstPartyOrigin(const base::Value& first_party) { - if (!first_party.is_string()) - return false; - - GURL first_party_url(first_party.GetString()); - - if (!first_party_url.is_valid() || first_party_url.is_empty()) - return false; - - policy_->first_party_set_.insert(url::Origin::Create(first_party_url)); - return true; -} - -} // namespace blink
diff --git a/third_party/blink/common/origin_policy/origin_policy_parser.h b/third_party/blink/common/origin_policy/origin_policy_parser.h deleted file mode 100644 index 2e035424..0000000 --- a/third_party/blink/common/origin_policy/origin_policy_parser.h +++ /dev/null
@@ -1,44 +0,0 @@ -// Copyright 2018 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef THIRD_PARTY_BLINK_COMMON_ORIGIN_POLICY_ORIGIN_POLICY_PARSER_H_ -#define THIRD_PARTY_BLINK_COMMON_ORIGIN_POLICY_ORIGIN_POLICY_PARSER_H_ - -#include "third_party/blink/public/common/origin_policy/origin_policy.h" - -#include <string> -#include "base/macros.h" - -namespace base { -class Value; -} // namespace base - -namespace blink { - -class OriginPolicyParser { - public: - // Parse the given origin policy. - // Returns an empty unique_ptr if parsing fails. - static std::unique_ptr<OriginPolicy> Parse(base::StringPiece); - - private: - OriginPolicyParser(); - ~OriginPolicyParser(); - - bool DoParse(base::StringPiece); - bool ParseContentSecurityPolicies(const base::Value&); - bool ParseContentSecurityPolicy(const base::Value&); - bool ParseFeaturePolicies(const base::Value&); - bool ParseFeaturePolicy(const base::Value&); - bool ParseFirstPartySet(const base::Value&); - bool ParseFirstPartyOrigin(const base::Value&); - - std::unique_ptr<OriginPolicy> policy_; - - DISALLOW_COPY_AND_ASSIGN(OriginPolicyParser); -}; - -} // namespace blink - -#endif // THIRD_PARTY_BLINK_COMMON_ORIGIN_POLICY_ORIGIN_POLICY_PARSER_H_
diff --git a/third_party/blink/common/origin_policy/origin_policy_unittest.cc b/third_party/blink/common/origin_policy/origin_policy_unittest.cc deleted file mode 100644 index dcfc34f..0000000 --- a/third_party/blink/common/origin_policy/origin_policy_unittest.cc +++ /dev/null
@@ -1,316 +0,0 @@ -// Copyright 2018 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "third_party/blink/public/common/origin_policy/origin_policy.h" - -#include "testing/gtest/include/gtest/gtest.h" -#include "url/gurl.h" - -// Unit tests for OriginPolicy / OriginPolicyParser. -// -// These are fairly simple "smoke tests". The majority of test coverage is -// expected from wpt/origin-policy/ end-to-end tests. - -TEST(OriginPolicy, Empty) { - auto policy = blink::OriginPolicy::From(""); - ASSERT_FALSE(policy); -} - -TEST(OriginPolicy, Invalid) { - auto policy = blink::OriginPolicy::From("potato potato potato"); - ASSERT_FALSE(policy); -} - -TEST(OriginPolicy, ValidButEmpty) { - auto policy = blink::OriginPolicy::From("{}"); - ASSERT_TRUE(policy); - ASSERT_TRUE(policy->GetContentSecurityPolicies().empty()); -} - -TEST(OriginPolicy, SimpleCSP) { - auto policy = blink::OriginPolicy::From(R"( - { "content-security-policy": [{ - "policy": "script-src 'self' 'unsafe-inline'" - }] } - )"); - ASSERT_TRUE(policy); - ASSERT_EQ(policy->GetContentSecurityPolicies().size(), 1U); - ASSERT_EQ(policy->GetContentSecurityPolicies()[0].policy, - "script-src 'self' 'unsafe-inline'"); -} - -TEST(OriginPolicy, DoubleCSP) { - auto policy = blink::OriginPolicy::From(R"( - { "content-security-policy": [{ - "policy": "script-src 'self' 'unsafe-inline'", - "report-only": false - },{ - "policy": "script-src 'self' 'https://example.com/'", - "report-only": true - }] } - )"); - ASSERT_TRUE(policy); - ASSERT_EQ(policy->GetContentSecurityPolicies().size(), 2U); - ASSERT_EQ(policy->GetContentSecurityPolicies()[0].policy, - "script-src 'self' 'unsafe-inline'"); - ASSERT_FALSE(policy->GetContentSecurityPolicies()[0].report_only); - ASSERT_EQ(policy->GetContentSecurityPolicies()[1].policy, - "script-src 'self' 'https://example.com/'"); - ASSERT_TRUE(policy->GetContentSecurityPolicies()[1].report_only); -} - -TEST(OriginPolicy, HalfDoubleCSP) { - auto policy = blink::OriginPolicy::From(R"( - { "content-security-policy": [{ - "policy": "script-src 'self' 'unsafe-inline'", - },{ - "policies": "script-src 'self' 'https://example.com/'", - }] } - )"); - ASSERT_FALSE(policy); -} - -TEST(OriginPolicy, CSPWithoutCSP) { - auto policy = blink::OriginPolicy::From(R"( - { "content-security-policy": [{ - "police": "script-src 'self' 'unsafe-inline'", - "report-only": false - }] } - )"); - ASSERT_FALSE(policy); -} - -TEST(OriginPolicy, ExtraFieldsDontBreakParsing) { - auto policy = blink::OriginPolicy::From(R"( - { "potatoes": "are better than kale", - "content-security-policy": [{ - "report-only": false, - "potatoes": "are best", - "policy": "script-src 'self' 'unsafe-inline'" - }], - "other": { - "name": "Sieglinde", - "value": "best of potatoes" - }} - )"); - ASSERT_TRUE(policy); - ASSERT_EQ(policy->GetContentSecurityPolicies().size(), 1U); - ASSERT_EQ(policy->GetContentSecurityPolicies()[0].policy, - "script-src 'self' 'unsafe-inline'"); -} - -TEST(OriginPolicy, CSPDispositionEnforce) { - auto policy = blink::OriginPolicy::From(R"( - { "content-security-policy": [{ - "policy": "script-src 'self'", - "report-only": false - }] } - )"); - ASSERT_FALSE(policy->GetContentSecurityPolicies()[0].report_only); -} - -TEST(OriginPolicy, CSPDispositionReport) { - auto policy = blink::OriginPolicy::From(R"( - { "content-security-policy": [{ - "policy": "script-src 'self'", - "report-only": true - }] } - )"); - ASSERT_TRUE(policy->GetContentSecurityPolicies()[0].report_only); -} - -TEST(OriginPolicy, CSPDispositionInvalid) { - auto policy = blink::OriginPolicy::From(R"( - { "content-security-policy": [{ - "policy": "script-src 'self'", - "report-only": "potato" - }] } - )"); - ASSERT_FALSE(policy->GetContentSecurityPolicies()[0].report_only); -} - -TEST(OriginPolicy, CSPDispositionAbsent) { - auto policy = blink::OriginPolicy::From(R"( - { "content-security-policy": [{ - "policy": "script-src 'self'" - }] } - )"); - ASSERT_FALSE(policy->GetContentSecurityPolicies()[0].report_only); -} - -TEST(OriginPolicy, FeatureOne) { - auto policy = blink::OriginPolicy::From(R"( - { "feature-policy": ["geolocation 'self' http://maps.google.com"] } )"); - ASSERT_EQ(1U, policy->GetFeaturePolicies().size()); - ASSERT_EQ("geolocation 'self' http://maps.google.com", - policy->GetFeaturePolicies()[0]); -} - -TEST(OriginPolicy, FeatureTwo) { - auto policy = blink::OriginPolicy::From(R"( - { "feature-policy": ["geolocation 'self' http://maps.google.com", - "camera https://example.com"]} )"); - ASSERT_EQ(2U, policy->GetFeaturePolicies().size()); - ASSERT_EQ("geolocation 'self' http://maps.google.com", - policy->GetFeaturePolicies()[0]); - ASSERT_EQ("camera https://example.com", policy->GetFeaturePolicies()[1]); -} - -TEST(OriginPolicy, FeatureTwoPolicies) { - auto policy = blink::OriginPolicy::From(R"( - { "feature-policy": ["geolocation 'self' http://maps.google.com"], - "feature-policy": ["camera https://example.com"] } )"); - - // TODO(vogelheim): Determine whether this is the correct behaviour. - ASSERT_EQ(1U, policy->GetFeaturePolicies().size()); -} - -TEST(OriginPolicy, FeatureComma) { - auto policy = blink::OriginPolicy::From(R"( - { "feature-policy": ["geolocation 'self' http://maps.google.com, camera https://example.com"]} )"); - - // TODO: Determine what to do with this case ! - ASSERT_EQ(1U, policy->GetFeaturePolicies().size()); -} - -TEST(OriginPolicy, FirstPartySetSimpleValid) { - auto policy = blink::OriginPolicy::From(R"( - { "first-party-set": ["https://example.com/", "https://not-example.com/"] } )"); - - ASSERT_TRUE(policy); - ASSERT_EQ(2U, policy->GetFirstPartySet().size()); - ASSERT_EQ(1U, policy->GetFirstPartySet().count( - url::Origin::Create(GURL("https://example.com/")))); - ASSERT_EQ(1U, policy->GetFirstPartySet().count( - url::Origin::Create(GURL("https://not-example.com/")))); -} - -TEST(OriginPolicy, FirstPartySetInvalidUrl) { - auto policy = blink::OriginPolicy::From(R"( - { "first-party-set": ["https://example.com/", "what even is this"] } )"); - - ASSERT_TRUE(policy); - ASSERT_EQ(0U, policy->GetFirstPartySet().size()); -} - -TEST(OriginPolicy, FirstPartySetEmptyList) { - auto policy = blink::OriginPolicy::From(R"( - { "first-party-set": [ ] } )"); - - ASSERT_TRUE(policy); - ASSERT_EQ(0U, policy->GetFirstPartySet().size()); -} - -TEST(OriginPolicy, FirstPartySetWithPath) { - auto policy = blink::OriginPolicy::From(R"( - { "first-party-set": ["https://example.com/some-path"] } )"); - - ASSERT_TRUE(policy); - ASSERT_EQ(1U, policy->GetFirstPartySet().size()); - ASSERT_EQ(1U, policy->GetFirstPartySet().count( - url::Origin::Create(GURL("https://example.com/")))); -} - -TEST(OriginPolicy, FirstPartySetWithPort) { - auto policy = blink::OriginPolicy::From(R"( - { "first-party-set": ["https://example.com:1000/", "https://not-example.com/"] } )"); - - ASSERT_TRUE(policy); - ASSERT_EQ(2U, policy->GetFirstPartySet().size()); - ASSERT_EQ(1U, policy->GetFirstPartySet().count( - url::Origin::Create(GURL("https://example.com:1000/")))); - ASSERT_EQ(1U, policy->GetFirstPartySet().count( - url::Origin::Create(GURL("https://not-example.com/")))); -} - -TEST(OriginPolicy, FirstPartySetMissingScheme) { - auto policy = blink::OriginPolicy::From(R"( - { "first-party-set": ["example.com/"] } )"); - - ASSERT_TRUE(policy); - ASSERT_EQ(0U, policy->GetFirstPartySet().size()); -} - -// Since we use json_parser, and it keeps the last of duplicated elements when -// parsing, the last "first-party-set" is the "true" one. -// TODO(andypaicu): figure out if this is fine, or if it needs to change -TEST(OriginPolicy, FirstPartySetMultipleLists) { - auto policy = blink::OriginPolicy::From(R"( - { "first-party-set": ["https://example.com/"], - "first-party-set": ["https://not-example.com/"] } )"); - - ASSERT_EQ(1U, policy->GetFirstPartySet().size()); - ASSERT_EQ(1U, policy->GetFirstPartySet().count( - url::Origin::Create(GURL("https://not-example.com/")))); -} - -TEST(OriginPolicy, FirstPartySetMultipleSameOrigin) { - auto policy = blink::OriginPolicy::From(R"( - { "first-party-set": ["https://example.com/", "https://example.com/some-path", "https://example.com:443/some-other-path"] } )"); - - ASSERT_EQ(1U, policy->GetFirstPartySet().size()); - ASSERT_EQ(1U, policy->GetFirstPartySet().count( - url::Origin::Create(GURL("https://example.com/")))); -} - -TEST(OriginPolicy, FirstPartySetListItemNotAString) { - struct { - const char* policy; - } tests[] = { - {R"({ "first-party-set": [ "https://example.com", { "https://example.com/": "https://example.com/" }, "https://example.com" ] } )"}, - {R"({ "first-party-set": [ "https://example.com", [ "https://example.com/" ], "https://example.com" ] } )"}, - {R"({ "first-party-set": [ "https://example.com", 123, "https://example.com" ] } )"}, - {R"({ "first-party-set": [ "https://example.com", 123.4, "https://example.com" ] } )"}, - {R"({ "first-party-set": [ "https://example.com", true, "https://example.com" ] } )"}, - }; - - for (const auto& test : tests) { - auto policy = blink::OriginPolicy::From(test.policy); - ASSERT_TRUE(policy); - ASSERT_EQ(0U, policy->GetFirstPartySet().size()); - } -} - -TEST(OriginPolicy, FirstPartySetNotAList) { - struct { - const char* policy; - } tests[] = { - {R"({ "first-party-set": "https://example.com/" } )"}, - {R"({ "first-party-set": { "https://example.com/": "https://example.com/" } } )"}, - {R"({ "first-party-set": 1234 } )"}, - {R"({ "first-party-set": 1234.6 } )"}, - {R"({ "first-party-set": true } )"}, - }; - - for (const auto& test : tests) { - auto policy = blink::OriginPolicy::From(test.policy); - ASSERT_TRUE(policy); - ASSERT_EQ(0U, policy->GetFirstPartySet().size()); - } -} - -TEST(OriginPolicy, FirstPartySetWithCSPAndFeatures) { - auto policy = blink::OriginPolicy::From(R"( - { "first-party-set": ["https://example.com/", "https://not-example.com/"], - "feature-policy": ["geolocation 'self' http://maps.google.com"], - "content-security-policy": [{ - "policy": "script-src 'self' 'unsafe-inline'" - }] - })"); - - ASSERT_TRUE(policy); - ASSERT_EQ(2U, policy->GetFirstPartySet().size()); - ASSERT_EQ(1U, policy->GetFirstPartySet().count( - url::Origin::Create(GURL("https://example.com/")))); - ASSERT_EQ(1U, policy->GetFirstPartySet().count( - url::Origin::Create(GURL("https://not-example.com/")))); - - ASSERT_EQ(policy->GetContentSecurityPolicies().size(), 1U); - ASSERT_EQ(policy->GetContentSecurityPolicies()[0].policy, - "script-src 'self' 'unsafe-inline'"); - - ASSERT_EQ(1U, policy->GetFeaturePolicies().size()); - ASSERT_EQ("geolocation 'self' http://maps.google.com", - policy->GetFeaturePolicies()[0]); -}
diff --git a/third_party/blink/public/mojom/feature_policy/feature_policy_feature.mojom b/third_party/blink/public/mojom/feature_policy/feature_policy_feature.mojom index 2178ada..c1f16838 100644 --- a/third_party/blink/public/mojom/feature_policy/feature_policy_feature.mojom +++ b/third_party/blink/public/mojom/feature_policy/feature_policy_feature.mojom
@@ -134,6 +134,9 @@ // Storage Access API kStorageAccessAPI = 70, + // Yet Another Client Hint + kClientHintUAFullVersion = 71, + // Don't change assigned numbers of any item, and don't reuse removed slots. // Add new features at the end of the enum. // Also, run update_feature_policy_enum.py in
diff --git a/third_party/blink/public/mojom/payments/payment_app.mojom b/third_party/blink/public/mojom/payments/payment_app.mojom index c0f8ecb..d270f4f 100644 --- a/third_party/blink/public/mojom/payments/payment_app.mojom +++ b/third_party/blink/public/mojom/payments/payment_app.mojom
@@ -34,6 +34,7 @@ NO_RESPONSE, REJECT, SUCCESS, + TIMEOUT, // Response types specifically used in respondWithMinimalUI(), which is // available when features::kWebPaymentsMinimalUI is ebabled.
diff --git a/third_party/blink/public/mojom/service_worker/controller_service_worker.mojom b/third_party/blink/public/mojom/service_worker/controller_service_worker.mojom index a0d4246..2a00474 100644 --- a/third_party/blink/public/mojom/service_worker/controller_service_worker.mojom +++ b/third_party/blink/public/mojom/service_worker/controller_service_worker.mojom
@@ -48,8 +48,13 @@ // Connects a new pipe to this controller instance. // |cross_origin_embedder_policy| is the policy for the client which uses the // counterpart of |receiver|. + // |coep_reporter| is the endpoint to report the error raised by the CORP + // validation based on |cross_origin_embedder_policy|. This can be null when + // it's not supported yet. Clone(pending_receiver<ControllerServiceWorker> receiver, - network.mojom.CrossOriginEmbedderPolicy cross_origin_embedder_policy); + network.mojom.CrossOriginEmbedderPolicy cross_origin_embedder_policy, + pending_remote<network.mojom.CrossOriginEmbedderPolicyReporter>? + coep_reporter); }; // A convenient struct that packs necessary information for a service worker
diff --git a/third_party/blink/public/mojom/web_client_hints/web_client_hints_types.mojom b/third_party/blink/public/mojom/web_client_hints/web_client_hints_types.mojom index 1aa970ce..a04e112f 100644 --- a/third_party/blink/public/mojom/web_client_hints/web_client_hints_types.mojom +++ b/third_party/blink/public/mojom/web_client_hints/web_client_hints_types.mojom
@@ -29,6 +29,7 @@ kUAPlatform = 10, kUAModel = 11, kUAMobile = 12, + kUAFullVersion = 13, // Warning: Before adding a new client hint, read the warning at the top. };
diff --git a/third_party/blink/public/mojom/web_feature/web_feature.mojom b/third_party/blink/public/mojom/web_feature/web_feature.mojom index fced37a4..cac8a60 100644 --- a/third_party/blink/public/mojom/web_feature/web_feature.mojom +++ b/third_party/blink/public/mojom/web_feature/web_feature.mojom
@@ -2527,6 +2527,7 @@ kQuicTransportDatagramApis = 3186, kV8Document_GetAnimations_Method = 3187, kV8ShadowRoot_GetAnimations_Method = 3188, + kClientHintsUAFullVersion = 3189, // Add new features immediately above this line. Don't change assigned // numbers of any item, and don't reuse removed slots.
diff --git a/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py b/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py index a1710c3..d5da15e 100644 --- a/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py +++ b/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py
@@ -299,13 +299,13 @@ if (not cg_context.member_like or "CrossOrigin" in cg_context.member_like.extended_attributes): text = ("DOMWindow* ${blink_receiver} = " - "${class_name}::ToBlinkUnsafe(${v8_receiver});") + "${class_name}::ToWrappableUnsafe(${v8_receiver});") else: text = ("LocalDOMWindow* ${blink_receiver} = To<LocalDOMWindow>(" - "${class_name}::ToBlinkUnsafe(${v8_receiver}));") + "${class_name}::ToWrappableUnsafe(${v8_receiver}));") else: pattern = ("{_1}* ${blink_receiver} = " - "${class_name}::ToBlinkUnsafe(${v8_receiver});") + "${class_name}::ToWrappableUnsafe(${v8_receiver});") _1 = blink_class_name(cg_context.class_like) text = _format(pattern, _1=_1) local_vars.append(S("blink_receiver", text))
diff --git a/third_party/blink/renderer/bindings/scripts/web_idl/idl_compiler.py b/third_party/blink/renderer/bindings/scripts/web_idl/idl_compiler.py index f842a32..1ec4265 100644 --- a/third_party/blink/renderer/bindings/scripts/web_idl/idl_compiler.py +++ b/third_party/blink/renderer/bindings/scripts/web_idl/idl_compiler.py
@@ -597,9 +597,10 @@ idl_def = StubUserDefinedType(ref.identifier) if isinstance(idl_def, UserDefinedType): idl_type = self._idl_type_factory.definition_type( - user_defined_type=idl_def) + reference_type=ref, user_defined_type=idl_def) elif isinstance(idl_def, Typedef): - idl_type = self._idl_type_factory.typedef_type(typedef=idl_def) + idl_type = self._idl_type_factory.typedef_type( + reference_type=ref, typedef=idl_def) else: assert False ref.set_target_object(idl_type)
diff --git a/third_party/blink/renderer/bindings/scripts/web_idl/idl_type.py b/third_party/blink/renderer/bindings/scripts/web_idl/idl_type.py index e959eea..bde29de7 100644 --- a/third_party/blink/renderer/bindings/scripts/web_idl/idl_type.py +++ b/third_party/blink/renderer/bindings/scripts/web_idl/idl_type.py
@@ -48,13 +48,8 @@ def __init__(self): self._idl_types = [] # Factory to initialize instances of ReferenceType. - attrs_to_be_proxied = ( - set(RefById.get_all_attributes(IdlType)).difference( - # attributes not to be proxied - set(('debug_info', 'extended_attributes', 'is_optional', - 'optionality')))) self._ref_by_id_factory = RefByIdFactory( - target_attrs_with_priority=attrs_to_be_proxied) + target_attrs_with_priority=RefById.get_all_attributes(IdlType)) # |_is_frozen| is initially False and you can create new instances of # IdlType. The first invocation of |for_each| freezes the factory and # you can no longer create a new instance of IdlType. @@ -202,6 +197,12 @@ https://heycam.github.io/webidl/#dfn-type-name Note that a type name is not necessarily unique. """ + return '{}{}'.format( + self.type_name_without_extended_attributes, ''.join( + sorted(self.effective_annotations.keys()))) + + @property + def type_name_without_extended_attributes(self): raise exceptions.NotImplementedError() @property @@ -269,6 +270,23 @@ return self._unwrap(switches) @property + def effective_annotations(self): + """ + Returns the extended attributes associated with this IDL type. + https://heycam.github.io/webidl/#idl-type-extended-attribute-associated-with + + For example, given the following IDL fragments, + + typedef [ExtAttr1] long NewLong; + void f([ExtAttr2] NewLong arg); + + arg.idl_type.extended_attributes returns [ExtAttr2], + arg.idl_type.unwrap().extended_attributes returns [ExtAttr1], and + arg.idl_type.effective_annotations returns [ExtAttr1, ExtAttr2]. + """ + return self.extended_attributes + + @property def does_include_nullable_type(self): """ Returns True if this type includes a nulllable type. @@ -438,11 +456,6 @@ return False @property - def is_annotated(self): - """Returns True if this is annotated.""" - return bool(self.extended_attributes) - - @property def is_optional(self): """ Returns True if this type is used for a non-required dictionary member @@ -547,11 +560,6 @@ return '{}{}{}'.format(optional_form, ext_attr_form, syntactic_form_inner) - def _format_type_name(self, type_name_inner): - """Helper function to implement |type_name|.""" - return '{}{}'.format(type_name_inner, ''.join( - sorted(self.extended_attributes.keys()))) - def _unwrap(self, switches): return self @@ -615,10 +623,9 @@ return self._format_syntactic_form(self._name) @property - def type_name(self): + def type_name_without_extended_attributes(self): name = 'String' if self._name == 'DOMString' else self._name - return self._format_type_name( - NameStyleConverter(name).to_upper_camel_case()) + return NameStyleConverter(name).to_upper_camel_case() @property def keyword_typename(self): @@ -731,14 +738,14 @@ TypedefType and UnionType respectively. """ - def __init__(self, - user_defined_type, - debug_info=None, - pass_key=None): + def __init__(self, reference_type, user_defined_type, pass_key=None): + assert isinstance(reference_type, ReferenceType) assert isinstance(user_defined_type, UserDefinedType) IdlType.__init__( self, - debug_info=debug_info, + is_optional=reference_type.is_optional, + extended_attributes=reference_type.extended_attributes, + debug_info=reference_type.debug_info, pass_key=pass_key) WithIdentifier.__init__(self, user_defined_type.identifier) self._type_definition_object = user_defined_type @@ -752,14 +759,10 @@ @property def syntactic_form(self): - assert not self.extended_attributes - assert not self.is_optional - return self.identifier + return self._format_syntactic_form(self.identifier) @property - def type_name(self): - assert not self.extended_attributes - assert not self.is_optional + def type_name_without_extended_attributes(self): return self.identifier @property @@ -802,14 +805,14 @@ can track down the typedef'ed type to |original_type|. """ - def __init__(self, - typedef, - debug_info=None, - pass_key=None): + def __init__(self, reference_type, typedef, pass_key=None): + assert isinstance(reference_type, ReferenceType) assert isinstance(typedef, Typedef) IdlType.__init__( self, - debug_info=debug_info, + is_optional=reference_type.is_optional, + extended_attributes=reference_type.extended_attributes, + debug_info=reference_type.debug_info, pass_key=pass_key) WithIdentifier.__init__(self, typedef.identifier) self._typedef = typedef @@ -823,15 +826,11 @@ @property def syntactic_form(self): - assert not self.extended_attributes - assert not self.is_optional - return self.identifier + return self._format_syntactic_form(self.identifier) @property - def type_name(self): - assert not self.extended_attributes - assert not self.is_optional - return self.original_type.type_name + def type_name_without_extended_attributes(self): + return self.original_type.type_name_without_extended_attributes def apply_to_all_composing_elements(self, callback): try: @@ -841,6 +840,16 @@ self.original_type.apply_to_all_composing_elements(callback) @property + def effective_annotations(self): + original_annotations = self.original_type.effective_annotations + if not self.extended_attributes: + return original_annotations + if not original_annotations: + return self.extended_attributes + return ExtendedAttributes( + list(self.extended_attributes) + list(original_annotations)) + + @property def does_include_nullable_type(self): return self.original_type.does_include_nullable_type @@ -920,9 +929,8 @@ self.element_type.syntactic_form)) @property - def type_name(self): - return self._format_type_name('{}Sequence'.format( - self.element_type.type_name)) + def type_name_without_extended_attributes(self): + return '{}Sequence'.format(self.element_type.type_name) @property def is_sequence(self): @@ -952,9 +960,8 @@ self.element_type.syntactic_form)) @property - def type_name(self): - return self._format_type_name('{}Array'.format( - self.element_type.type_name)) + def type_name_without_extended_attributes(self): + return '{}Array'.format(self.element_type.type_name) @property def is_frozen_array(self): @@ -981,10 +988,11 @@ return '{}...'.format(self.element_type.syntactic_form) @property - def type_name(self): + def type_name_without_extended_attributes(self): # Blink-specific expansion of type name # The type name of a variadic type is the concatenation of the type # name of the element type and the string "Variadic". + assert not self.extended_attributes return '{}Variadic'.format(self.element_type.type_name) @property @@ -1031,9 +1039,9 @@ self.key_type.syntactic_form, self.value_type.syntactic_form)) @property - def type_name(self): - return self._format_type_name('{}{}Record'.format( - self.key_type.type_name, self.value_type.type_name)) + def type_name_without_extended_attributes(self): + return '{}{}Record'.format(self.key_type.type_name, + self.value_type.type_name) def apply_to_all_composing_elements(self, callback): try: @@ -1087,9 +1095,8 @@ self.result_type.syntactic_form)) @property - def type_name(self): - return self._format_type_name('{}Promise'.format( - self.result_type.type_name)) + def type_name_without_extended_attributes(self): + return '{}Promise'.format(self.result_type.type_name) def apply_to_all_composing_elements(self, callback): try: @@ -1154,9 +1161,8 @@ [member.syntactic_form for member in self.member_types]))) @property - def type_name(self): - return self._format_type_name('Or'.join( - [member.type_name for member in self.member_types])) + def type_name_without_extended_attributes(self): + return 'Or'.join([member.type_name for member in self.member_types]) def apply_to_all_composing_elements(self, callback): try: @@ -1243,18 +1249,16 @@ return '{}?'.format(self.inner_type.syntactic_form) @property - def type_name(self): - assert not self.extended_attributes + def type_name_without_extended_attributes(self): # https://heycam.github.io/webidl/#idl-annotated-types # Web IDL seems not supposing a case of [X] ([Y] Type)?, i.e. something # like [X] nullable<[Y] Type>, which should turn into "TypeYOrNullX". # # In case of '[Clamp] long?', it's interpreted as '([Clamp] long)?' but # the type name must be "LongOrNullClamp" instead of "LongClampOrNull". - name = self.inner_type.type_name - ext_attrs = ''.join(sorted(self.inner_type.extended_attributes.keys())) - sep_index = len(name) - len(ext_attrs) - return '{}OrNull{}'.format(name[0:sep_index], name[sep_index:]) + assert not self.extended_attributes + return '{}OrNull'.format( + self.inner_type.type_name_without_extended_attributes) def apply_to_all_composing_elements(self, callback): try: @@ -1264,6 +1268,11 @@ self.inner_type.apply_to_all_composing_elements(callback) @property + def effective_annotations(self): + assert not self.extended_attributes + return self.inner_type.effective_annotations + + @property def does_include_nullable_type(self): return True
diff --git a/third_party/blink/renderer/bindings/scripts/web_idl/idl_type_test.py b/third_party/blink/renderer/bindings/scripts/web_idl/idl_type_test.py index b8e7198..1f44473 100644 --- a/third_party/blink/renderer/bindings/scripts/web_idl/idl_type_test.py +++ b/third_party/blink/renderer/bindings/scripts/web_idl/idl_type_test.py
@@ -54,7 +54,7 @@ ext_attrs = ExtendedAttributes([ExtendedAttribute('Clamp')]) annotated_type = factory.simple_type( 'short', extended_attributes=ext_attrs) - self.assertTrue(annotated_type.is_annotated) + self.assertTrue(annotated_type.extended_attributes) self.assertTrue(annotated_type.is_numeric) optional_type = factory.simple_type('DOMString', is_optional=True) @@ -63,7 +63,7 @@ annotated_optional = factory.simple_type( 'long', is_optional=True, extended_attributes=ext_attrs) - self.assertTrue(annotated_optional.is_annotated) + self.assertTrue(annotated_optional.extended_attributes) self.assertTrue(annotated_optional.is_optional) self.assertTrue(annotated_optional.is_numeric)
diff --git a/third_party/blink/renderer/core/css/style_engine.cc b/third_party/blink/renderer/core/css/style_engine.cc index 0b15c21..ee37dca 100644 --- a/third_party/blink/renderer/core/css/style_engine.cc +++ b/third_party/blink/renderer/core/css/style_engine.cc
@@ -77,6 +77,7 @@ #include "third_party/blink/renderer/core/layout/layout_object.h" #include "third_party/blink/renderer/core/layout/layout_view.h" #include "third_party/blink/renderer/core/page/page.h" +#include "third_party/blink/renderer/core/page/page_popup_controller.h" #include "third_party/blink/renderer/core/paint/paint_layer.h" #include "third_party/blink/renderer/core/probe/core_probes.h" #include "third_party/blink/renderer/core/style/computed_style.h" @@ -93,6 +94,18 @@ namespace blink { +namespace { + +CSSFontSelector* CreateCSSFontSelectorFor(Document& document) { + DCHECK(document.GetFrame()); + if (UNLIKELY(document.GetFrame()->PagePopupOwner())) { + return PagePopupController::CreateCSSFontSelector(document); + } + return MakeGarbageCollected<CSSFontSelector>(&document); +} + +} // namespace + StyleEngine::StyleEngine(Document& document) : document_(&document), is_master_(!document.IsHTMLImport()), @@ -101,7 +114,7 @@ if (document.GetFrame()) { // We don't need to create CSSFontSelector for imported document or // HTMLTemplateElement's document, because those documents have no frame. - font_selector_ = MakeGarbageCollected<CSSFontSelector>(&document); + font_selector_ = CreateCSSFontSelectorFor(document); font_selector_->RegisterForInvalidationCallbacks(this); } if (document.IsInMainFrame()) @@ -879,14 +892,6 @@ nullptr); } -void StyleEngine::SetFontSelector(CSSFontSelector* font_selector) { - if (font_selector_) - font_selector_->UnregisterForInvalidationCallbacks(this); - font_selector_ = font_selector; - if (font_selector_) - font_selector_->RegisterForInvalidationCallbacks(this); -} - void StyleEngine::PlatformColorsChanged() { if (resolver_) resolver_->InvalidateMatchedPropertiesCache();
diff --git a/third_party/blink/renderer/core/css/style_engine.h b/third_party/blink/renderer/core/css/style_engine.h index 7586bf1..e8c07ce 100644 --- a/third_party/blink/renderer/core/css/style_engine.h +++ b/third_party/blink/renderer/core/css/style_engine.h
@@ -245,7 +245,6 @@ void UpdateLayoutTreeRebuildRoot(ContainerNode* ancestor, Node* dirty_node); CSSFontSelector* GetFontSelector() { return font_selector_; } - void SetFontSelector(CSSFontSelector*); void RemoveFontFaceRules(const HeapVector<Member<const StyleRuleFontFace>>&); // updateGenericFontFamilySettings is used from WebSettingsImpl.
diff --git a/third_party/blink/renderer/core/exported/web_page_popup_impl.cc b/third_party/blink/renderer/core/exported/web_page_popup_impl.cc index 1db3042..55ddaa7 100644 --- a/third_party/blink/renderer/core/exported/web_page_popup_impl.cc +++ b/third_party/blink/renderer/core/exported/web_page_popup_impl.cc
@@ -303,12 +303,12 @@ /* InterfaceRegistry* */ nullptr); frame->SetPagePopupOwner(popup_client_->OwnerElement()); frame->SetView(MakeGarbageCollected<LocalFrameView>(*frame)); + PagePopupSupplement::Install(*frame, *this, popup_client_); frame->Init(); frame->View()->SetParentVisible(true); frame->View()->SetSelfVisible(true); DCHECK(frame->DomWindow()); - PagePopupSupplement::Install(*frame, *this, popup_client_); DCHECK_EQ(popup_client_->OwnerElement().GetDocument().ExistingAXObjectCache(), frame->GetDocument()->ExistingAXObjectCache()); if (AXObjectCache* cache = frame->GetDocument()->ExistingAXObjectCache()) {
diff --git a/third_party/blink/renderer/core/feature_policy/feature_policy_features.json5 b/third_party/blink/renderer/core/feature_policy/feature_policy_features.json5 index 1e3dbbc3..21f7a71 100644 --- a/third_party/blink/renderer/core/feature_policy/feature_policy_features.json5 +++ b/third_party/blink/renderer/core/feature_policy/feature_policy_features.json5
@@ -99,6 +99,11 @@ depends_on: ["FeaturePolicyForClientHints"], }, { + name: "ClientHintUAFullVersion", + feature_policy_name: "ch-ua-full-version", + depends_on: ["FeaturePolicyForClientHints"], + }, + { name: "ClientHintViewportWidth", feature_policy_name: "ch-viewport-width", depends_on: ["FeaturePolicyForClientHints"],
diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.cc b/third_party/blink/renderer/core/frame/navigator_ua_data.cc index 8285c79d..22df47ae 100644 --- a/third_party/blink/renderer/core/frame/navigator_ua_data.cc +++ b/third_party/blink/renderer/core/frame/navigator_ua_data.cc
@@ -41,6 +41,10 @@ model_ = model; } +void NavigatorUAData::SetUAFullVersion(const String& ua_full_version) { + ua_full_version_ = ua_full_version; +} + bool NavigatorUAData::mobile() const { if (GetFrame() && GetFrame()->GetPage()) { return is_mobile_; @@ -71,6 +75,8 @@ values->setArchitecture(architecture_); } else if (hint == "model") { values->setModel(model_); + } else if (hint == "uaFullVersion") { + values->setUaFullVersion(ua_full_version_); } } resolver->Resolve(values);
diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.h b/third_party/blink/renderer/core/frame/navigator_ua_data.h index 6a93503b..de6461e5 100644 --- a/third_party/blink/renderer/core/frame/navigator_ua_data.h +++ b/third_party/blink/renderer/core/frame/navigator_ua_data.h
@@ -31,6 +31,7 @@ void SetPlatform(const String& brand, const String& version); void SetArchitecture(const String& architecture); void SetModel(const String& model); + void SetUAFullVersion(const String& uaFullVersion); // IDL implementation const HeapVector<Member<NavigatorUABrandVersion>>& uaList() const; @@ -47,6 +48,7 @@ String platform_version_; String architecture_; String model_; + String ua_full_version_; }; } // namespace blink
diff --git a/third_party/blink/renderer/core/frame/navigator_user_agent.cc b/third_party/blink/renderer/core/frame/navigator_user_agent.cc index e6e6c2d..68eee4b 100644 --- a/third_party/blink/renderer/core/frame/navigator_user_agent.cc +++ b/third_party/blink/renderer/core/frame/navigator_user_agent.cc
@@ -13,12 +13,13 @@ blink::UserAgentMetadata metadata = GetUserAgentMetadata(); ua_data->AddBrand(String::FromUTF8(metadata.brand), - String::FromUTF8(metadata.full_version)); + String::FromUTF8(metadata.major_version)); ua_data->SetMobile(metadata.mobile); ua_data->SetPlatform(String::FromUTF8(metadata.platform), String::FromUTF8(metadata.platform_version)); ua_data->SetArchitecture(String::FromUTF8(metadata.architecture)); ua_data->SetModel(String::FromUTF8(metadata.model)); + ua_data->SetUAFullVersion(String::FromUTF8(metadata.full_version)); return ua_data; }
diff --git a/third_party/blink/renderer/core/frame/ua_data_values.idl b/third_party/blink/renderer/core/frame/ua_data_values.idl index 655b597..3def0d4 100644 --- a/third_party/blink/renderer/core/frame/ua_data_values.idl +++ b/third_party/blink/renderer/core/frame/ua_data_values.idl
@@ -9,4 +9,5 @@ DOMString platformVersion = ""; DOMString architecture = ""; DOMString model = ""; + DOMString uaFullVersion = ""; };
diff --git a/third_party/blink/renderer/core/html/forms/color_chooser_popup_ui_controller.h b/third_party/blink/renderer/core/html/forms/color_chooser_popup_ui_controller.h index ca194f1..521e06e 100644 --- a/third_party/blink/renderer/core/html/forms/color_chooser_popup_ui_controller.h +++ b/third_party/blink/renderer/core/html/forms/color_chooser_popup_ui_controller.h
@@ -55,7 +55,6 @@ // PagePopupClient functions: void WriteDocument(SharedBuffer*) override; - void SelectFontsFromOwnerDocument(Document&) override {} Locale& GetLocale() override; void SetValueAndClosePopup(int, const String&) override; void SetValue(const String&) override;
diff --git a/third_party/blink/renderer/core/html/forms/color_chooser_ui_controller.cc b/third_party/blink/renderer/core/html/forms/color_chooser_ui_controller.cc index bd31182..8bce77a 100644 --- a/third_party/blink/renderer/core/html/forms/color_chooser_ui_controller.cc +++ b/third_party/blink/renderer/core/html/forms/color_chooser_ui_controller.cc
@@ -27,6 +27,7 @@ #include "third_party/blink/public/common/browser_interface_broker_proxy.h" #include "third_party/blink/public/web/web_local_frame_client.h" +#include "third_party/blink/renderer/core/frame/local_dom_window.h" #include "third_party/blink/renderer/core/frame/web_local_frame_impl.h" #include "third_party/blink/renderer/core/html/forms/color_chooser_client.h" #include "third_party/blink/renderer/platform/graphics/color.h" @@ -37,20 +38,19 @@ ColorChooserUIController::ColorChooserUIController( LocalFrame* frame, blink::ColorChooserClient* client) - : client_(client), frame_(frame) {} + : client_(client), + frame_(frame), + receiver_(this, frame->DomWindow()->GetExecutionContext()) {} -ColorChooserUIController::~ColorChooserUIController() {} +ColorChooserUIController::~ColorChooserUIController() = default; void ColorChooserUIController::Trace(Visitor* visitor) { + visitor->Trace(receiver_); visitor->Trace(frame_); visitor->Trace(client_); ColorChooser::Trace(visitor); } -void ColorChooserUIController::Dispose() { - receiver_.reset(); -} - void ColorChooserUIController::OpenUI() { OpenColorChooser(); } @@ -80,8 +80,10 @@ color_chooser_factory_.BindNewPipeAndPassReceiver()); color_chooser_factory_->OpenColorChooser( chooser_.BindNewPipeAndPassReceiver(), - receiver_.BindNewPipeAndPassRemote(), client_->CurrentColor().Rgb(), - client_->Suggestions()); + receiver_.BindNewPipeAndPassRemote( + frame_->DomWindow()->GetExecutionContext()->GetTaskRunner( + TaskType::kUserInteraction)), + client_->CurrentColor().Rgb(), client_->Suggestions()); receiver_.set_disconnect_handler(WTF::Bind( &ColorChooserUIController::EndChooser, WrapWeakPersistent(this))); }
diff --git a/third_party/blink/renderer/core/html/forms/color_chooser_ui_controller.h b/third_party/blink/renderer/core/html/forms/color_chooser_ui_controller.h index 6d0012a..a8a6c6a9 100644 --- a/third_party/blink/renderer/core/html/forms/color_chooser_ui_controller.h +++ b/third_party/blink/renderer/core/html/forms/color_chooser_ui_controller.h
@@ -27,12 +27,12 @@ #define THIRD_PARTY_BLINK_RENDERER_CORE_HTML_FORMS_COLOR_CHOOSER_UI_CONTROLLER_H_ #include <memory> -#include "mojo/public/cpp/bindings/receiver.h" #include "mojo/public/cpp/bindings/remote.h" #include "third_party/blink/public/mojom/choosers/color_chooser.mojom-blink.h" #include "third_party/blink/renderer/core/core_export.h" #include "third_party/blink/renderer/core/html/forms/color_chooser.h" #include "third_party/blink/renderer/platform/heap/handle.h" +#include "third_party/blink/renderer/platform/mojo/heap_mojo_receiver.h" #include "third_party/blink/renderer/platform/text/platform_locale.h" namespace blink { @@ -45,7 +45,6 @@ public mojom::blink::ColorChooserClient, public ColorChooser { USING_GARBAGE_COLLECTED_MIXIN(ColorChooserUIController); - USING_PRE_FINALIZER(ColorChooserUIController, Dispose); public: ColorChooserUIController(LocalFrame*, blink::ColorChooserClient*); @@ -73,7 +72,7 @@ private: mojo::Remote<mojom::blink::ColorChooserFactory> color_chooser_factory_; - mojo::Receiver<mojom::blink::ColorChooserClient> receiver_{this}; + HeapMojoReceiver<mojom::blink::ColorChooserClient> receiver_; }; } // namespace blink
diff --git a/third_party/blink/renderer/core/html/forms/date_time_chooser_impl.h b/third_party/blink/renderer/core/html/forms/date_time_chooser_impl.h index 1f9602a..22bca47a 100644 --- a/third_party/blink/renderer/core/html/forms/date_time_chooser_impl.h +++ b/third_party/blink/renderer/core/html/forms/date_time_chooser_impl.h
@@ -60,7 +60,6 @@ private: // PagePopupClient functions: void WriteDocument(SharedBuffer*) override; - void SelectFontsFromOwnerDocument(Document&) override {} Locale& GetLocale() override; void SetValueAndClosePopup(int, const String&) override; void SetValue(const String&) override;
diff --git a/third_party/blink/renderer/core/html/forms/html_select_element.cc b/third_party/blink/renderer/core/html/forms/html_select_element.cc index 1ed5c0a0..bdf7180 100644 --- a/third_party/blink/renderer/core/html/forms/html_select_element.cc +++ b/third_party/blink/renderer/core/html/forms/html_select_element.cc
@@ -339,8 +339,7 @@ UpdateUserAgentShadowTree(*UserAgentShadowRoot()); ResetToDefaultSelection(); select_type_->UpdateTextStyleAndContent(); - if (!UsesMenuList()) - SaveListboxActiveSelection(); + select_type_->SaveListboxActiveSelection(); } } else if (params.name == html_names::kMultipleAttr) { ParseMultipleAttribute(params.new_value); @@ -527,27 +526,7 @@ void HTMLSelectElement::SetActiveSelectionAnchor(HTMLOptionElement* option) { active_selection_anchor_ = option; - if (!UsesMenuList()) - SaveListboxActiveSelection(); -} - -void HTMLSelectElement::SaveListboxActiveSelection() { - // Cache the selection state so we can restore the old selection as the new - // selection pivots around this anchor index. - // Example: - // 1. Press the mouse button on the second OPTION - // active_selection_anchor_ points the second OPTION. - // 2. Drag the mouse pointer onto the fifth OPTION - // active_selection_end_ points the fifth OPTION, OPTIONs at 1-4 indices - // are selected. - // 3. Drag the mouse pointer onto the fourth OPTION - // active_selection_end_ points the fourth OPTION, OPTIONs at 1-3 indices - // are selected. - // UpdateListBoxSelection needs to clear selection of the fifth OPTION. - cached_state_for_active_selection_.resize(0); - for (auto* const option : GetOptionList()) { - cached_state_for_active_selection_.push_back(option->Selected()); - } + select_type_->SaveListboxActiveSelection(); } void HTMLSelectElement::SetActiveSelectionEnd(HTMLOptionElement* option) {
diff --git a/third_party/blink/renderer/core/html/forms/html_select_element.h b/third_party/blink/renderer/core/html/forms/html_select_element.h index 52643d57..736f348 100644 --- a/third_party/blink/renderer/core/html/forms/html_select_element.h +++ b/third_party/blink/renderer/core/html/forms/html_select_element.h
@@ -232,7 +232,6 @@ void ResetToDefaultSelection(ResetReason = kResetReasonOthers); void TypeAheadFind(const KeyboardEvent&); void SaveLastSelection(); - void SaveListboxActiveSelection(); // Returns the first selected OPTION, or nullptr. HTMLOptionElement* SelectedOption() const; @@ -287,7 +286,6 @@ // HTMLHRElement objects. mutable ListItems list_items_; Vector<bool> last_on_change_selection_; - Vector<bool> cached_state_for_active_selection_; TypeAhead type_ahead_; unsigned size_; Member<HTMLOptionElement> last_on_change_option_;
diff --git a/third_party/blink/renderer/core/html/forms/internal_popup_menu.cc b/third_party/blink/renderer/core/html/forms/internal_popup_menu.cc index 1712ddc..360545b 100644 --- a/third_party/blink/renderer/core/html/forms/internal_popup_menu.cc +++ b/third_party/blink/renderer/core/html/forms/internal_popup_menu.cc
@@ -414,11 +414,11 @@ PagePopupClient::AddString("},\n", data); } -void InternalPopupMenu::SelectFontsFromOwnerDocument(Document& document) { +CSSFontSelector* InternalPopupMenu::CreateCSSFontSelector( + Document& popup_document) { Document& owner_document = OwnerElement().GetDocument(); - document.GetStyleEngine().SetFontSelector( - MakeGarbageCollected<PopupMenuCSSFontSelector>( - &document, owner_document.GetStyleEngine().GetFontSelector())); + return MakeGarbageCollected<PopupMenuCSSFontSelector>( + &popup_document, owner_document.GetStyleEngine().GetFontSelector()); } void InternalPopupMenu::SetValueAndClosePopup(int num_value,
diff --git a/third_party/blink/renderer/core/html/forms/internal_popup_menu.h b/third_party/blink/renderer/core/html/forms/internal_popup_menu.h index b513ae1..b6af090 100644 --- a/third_party/blink/renderer/core/html/forms/internal_popup_menu.h +++ b/third_party/blink/renderer/core/html/forms/internal_popup_menu.h
@@ -12,6 +12,7 @@ namespace blink { class ChromeClient; +class CSSFontSelector; class PagePopup; class HTMLElement; class HTMLHRElement; @@ -49,7 +50,7 @@ // PagePopupClient functions: void WriteDocument(SharedBuffer*) override; - void SelectFontsFromOwnerDocument(Document&) override; + CSSFontSelector* CreateCSSFontSelector(Document& popup_document) override; void SetValueAndClosePopup(int, const String&) override; void SetValue(const String&) override; void CancelPopup() override;
diff --git a/third_party/blink/renderer/core/html/forms/resources/color_picker.css b/third_party/blink/renderer/core/html/forms/resources/color_picker.css index d9e69ad..3d92ad1 100644 --- a/third_party/blink/renderer/core/html/forms/resources/color_picker.css +++ b/third_party/blink/renderer/core/html/forms/resources/color_picker.css
@@ -67,7 +67,7 @@ hue-slider > canvas { border-radius: 2px; - height: 11px; + height: 12px; margin-top: 7%; width: 100%; } @@ -80,6 +80,15 @@ position: absolute; } +color-selection-ring:focus { + /* Simulate the outline using box-shadow because it follows the border radius + * (unlike outline). + */ + box-shadow: 0px 0px 0px 2px; + color: -webkit-focus-ring-color; + outline: none; +} + color-well > color-selection-ring { height: 12px; width: 12px; @@ -123,7 +132,7 @@ } color-value-container > input:not(:first-child) { - margin-left: 1%; + margin-left: 4%; } format-toggler {
diff --git a/third_party/blink/renderer/core/html/forms/resources/listPicker.js b/third_party/blink/renderer/core/html/forms/resources/listPicker.js index 8d5221d..0709fa0 100644 --- a/third_party/blink/renderer/core/html/forms/resources/listPicker.js +++ b/third_party/blink/renderer/core/html/forms/resources/listPicker.js
@@ -40,7 +40,6 @@ */ function ListPicker(element, config) { Picker.call(this, element, config); - window.pagePopupController.selectFontsFromOwnerDocument(document); this._selectElement = createElement('select'); this._selectElement.size = 20; this._element.appendChild(this._selectElement);
diff --git a/third_party/blink/renderer/core/html/forms/select_type.cc b/third_party/blink/renderer/core/html/forms/select_type.cc index ea90ceb..f5098a1 100644 --- a/third_party/blink/renderer/core/html/forms/select_type.cc +++ b/third_party/blink/renderer/core/html/forms/select_type.cc
@@ -609,6 +609,7 @@ bool DefaultEventHandler(const Event& event) override; void DidSetSuggestedOption(HTMLOptionElement* option) override; void SelectAll() override; + void SaveListboxActiveSelection() override; private: HTMLOptionElement* NextSelectableOptionPageAway(HTMLOptionElement*, @@ -625,6 +626,7 @@ SelectionMode mode); void UpdateListBoxSelection(bool deselect_other_options, bool scroll = true); + Vector<bool> cached_state_for_active_selection_; bool is_in_non_contiguous_selection_ = false; }; @@ -1014,11 +1016,11 @@ option->SetDirty(true); } else if (deselect_other_options || i >= static_cast<int>( - select_->cached_state_for_active_selection_.size())) { + cached_state_for_active_selection_.size())) { option->SetSelectedState(false); option->SetDirty(true); } else { - option->SetSelectedState(select_->cached_state_for_active_selection_[i]); + option->SetSelectedState(cached_state_for_active_selection_[i]); } ++i; } @@ -1030,6 +1032,25 @@ select_->NotifyFormStateChanged(); } +void ListBoxSelectType::SaveListboxActiveSelection() { + // Cache the selection state so we can restore the old selection as the new + // selection pivots around this anchor index. + // Example: + // 1. Press the mouse button on the second OPTION + // active_selection_anchor_ points the second OPTION. + // 2. Drag the mouse pointer onto the fifth OPTION + // active_selection_end_ points the fifth OPTION, OPTIONs at 1-4 indices + // are selected. + // 3. Drag the mouse pointer onto the fourth OPTION + // active_selection_end_ points the fourth OPTION, OPTIONs at 1-3 indices + // are selected. + // UpdateListBoxSelection needs to clear selection of the fifth OPTION. + cached_state_for_active_selection_.resize(0); + for (auto* const option : select_->GetOptionList()) { + cached_state_for_active_selection_.push_back(option->Selected()); + } +} + // ============================================================================ SelectType::SelectType(HTMLSelectElement& select) : select_(select) {} @@ -1084,6 +1105,8 @@ NOTREACHED(); } +void SelectType::SaveListboxActiveSelection() {} + void SelectType::ShowPopup() { NOTREACHED(); }
diff --git a/third_party/blink/renderer/core/html/forms/select_type.h b/third_party/blink/renderer/core/html/forms/select_type.h index f781a00..afde8e0 100644 --- a/third_party/blink/renderer/core/html/forms/select_type.h +++ b/third_party/blink/renderer/core/html/forms/select_type.h
@@ -45,6 +45,7 @@ virtual void MaximumOptionWidthMightBeChanged() const; virtual void SelectAll(); + virtual void SaveListboxActiveSelection(); virtual void ShowPopup(); virtual void HidePopup();
diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/third_party/blink/renderer/core/loader/frame_fetch_context.cc index 49e474e..6bb8779 100644 --- a/third_party/blink/renderer/core/loader/frame_fetch_context.cc +++ b/third_party/blink/renderer/core/loader/frame_fetch_context.cc
@@ -44,6 +44,7 @@ #include "third_party/blink/public/mojom/feature_policy/feature_policy.mojom-blink.h" #include "third_party/blink/public/mojom/fetch/fetch_api_request.mojom-blink.h" #include "third_party/blink/public/mojom/loader/request_context_frame_type.mojom-blink.h" +#include "third_party/blink/public/mojom/web_client_hints/web_client_hints_types.mojom-blink.h" #include "third_party/blink/public/platform/modules/service_worker/web_service_worker_network_provider.h" #include "third_party/blink/public/platform/scheduler/web_scoped_virtual_time_pauser.h" #include "third_party/blink/public/platform/web_content_settings_client.h" @@ -547,19 +548,11 @@ // // https://github.com/WICG/ua-client-hints blink::UserAgentMetadata ua = GetUserAgentMetadata(); - bool use_full_ua = - (RuntimeEnabledFeatures::FeaturePolicyForClientHintsEnabled() || - (policy && policy->IsFeatureEnabledForOrigin( - mojom::blink::FeaturePolicyFeature::kClientHintUA, - resource_origin))) && - ShouldSendClientHint(mojom::WebClientHintsType::kUA, hints_preferences, - enabled_hints); if (RuntimeEnabledFeatures::UserAgentClientHintEnabled()) { request.SetHttpHeaderField( blink::kClientHintsHeaderMapping[static_cast<size_t>( mojom::WebClientHintsType::kUA)], - AddBrandVersionQuotes( - ua.brand, use_full_ua ? ua.full_version : ua.major_version)); + AddBrandVersionQuotes(ua.brand, ua.major_version)); // We also send Sec-CH-UA-Mobile to all hints. It is a one-bit header // identifying if the browser has opted for a "mobile" experience @@ -770,6 +763,20 @@ mojom::WebClientHintsType::kUAModel)], AddQuotes(ua.model)); } + + if ((can_always_send_hints || + (RuntimeEnabledFeatures::FeaturePolicyForClientHintsEnabled() && + policy->IsFeatureEnabledForOrigin( + mojom::blink::FeaturePolicyFeature::kClientHintUAFullVersion, + resource_origin))) && + ShouldSendClientHint(mojom::blink::WebClientHintsType::kUAFullVersion, + + hints_preferences, enabled_hints)) { + request.SetHttpHeaderField( + blink::kClientHintsHeaderMapping[static_cast<size_t>( + mojom::blink::WebClientHintsType::kUAFullVersion)], + AddQuotes(ua.full_version)); + } } void FrameFetchContext::PopulateResourceRequest(
diff --git a/third_party/blink/renderer/core/loader/private/frame_client_hints_preferences_context.cc b/third_party/blink/renderer/core/loader/private/frame_client_hints_preferences_context.cc index 4ba5cec6..a8701e6 100644 --- a/third_party/blink/renderer/core/loader/private/frame_client_hints_preferences_context.cc +++ b/third_party/blink/renderer/core/loader/private/frame_client_hints_preferences_context.cc
@@ -29,6 +29,7 @@ WebFeature::kClientHintsUAPlatform, WebFeature::kClientHintsUAModel, WebFeature::kClientHintsUAMobile, + WebFeature::kClientHintsUAFullVersion, }; static_assert(static_cast<int>(mojom::WebClientHintsType::kMaxValue) + 1 ==
diff --git a/third_party/blink/renderer/core/page/page_popup_client.cc b/third_party/blink/renderer/core/page/page_popup_client.cc index b600100..11d2a62 100644 --- a/third_party/blink/renderer/core/page/page_popup_client.cc +++ b/third_party/blink/renderer/core/page/page_popup_client.cc
@@ -30,6 +30,7 @@ #include "third_party/blink/renderer/core/page/page_popup_client.h" +#include "third_party/blink/renderer/core/css/css_font_selector.h" #include "third_party/blink/renderer/core/dom/node_computed_style.h" #include "third_party/blink/renderer/core/frame/local_frame.h" #include "third_party/blink/renderer/core/page/chrome_client.h" @@ -155,4 +156,9 @@ addLiteral("},\n", data); } +CSSFontSelector* PagePopupClient::CreateCSSFontSelector( + Document& popup_document) { + return MakeGarbageCollected<CSSFontSelector>(&popup_document); +} + } // namespace blink
diff --git a/third_party/blink/renderer/core/page/page_popup_client.h b/third_party/blink/renderer/core/page/page_popup_client.h index fe542ea..014029ac 100644 --- a/third_party/blink/renderer/core/page/page_popup_client.h +++ b/third_party/blink/renderer/core/page/page_popup_client.h
@@ -39,6 +39,7 @@ namespace blink { +class CSSFontSelector; class ChromeClient; class Document; class Element; @@ -53,13 +54,12 @@ // - window.setValueAndClosePopup(number, string). virtual void WriteDocument(SharedBuffer*) = 0; - // This is called after the document is ready to do additionary setup. - virtual void SelectFontsFromOwnerDocument(Document&) = 0; - virtual Element& OwnerElement() = 0; virtual ChromeClient& GetChromeClient() = 0; + virtual CSSFontSelector* CreateCSSFontSelector(Document& popup_document); + // Returns effective zoom factor of ownerElement, or the page zoom factor if // the effective zoom factor is not available. virtual float ZoomFactor();
diff --git a/third_party/blink/renderer/core/page/page_popup_controller.cc b/third_party/blink/renderer/core/page/page_popup_controller.cc index 8a56d320..82bc0cb 100644 --- a/third_party/blink/renderer/core/page/page_popup_controller.cc +++ b/third_party/blink/renderer/core/page/page_popup_controller.cc
@@ -34,6 +34,7 @@ #include "third_party/blink/public/strings/grit/blink_strings.h" #include "third_party/blink/renderer/core/page/page_popup.h" #include "third_party/blink/renderer/core/page/page_popup_client.h" +#include "third_party/blink/renderer/core/page/page_popup_supplement.h" #include "third_party/blink/renderer/platform/text/platform_locale.h" namespace blink { @@ -60,13 +61,6 @@ popup_client_->CancelPopup(); } -void PagePopupController::selectFontsFromOwnerDocument( - Document* target_document) { - DCHECK(target_document); - if (popup_client_) - popup_client_->SelectFontsFromOwnerDocument(*target_document); -} - String PagePopupController::localizeNumberString(const String& number_string) { if (popup_client_) return popup_client_->GetLocale().ConvertToLocalizedNumber(number_string); @@ -112,4 +106,17 @@ popup_.SetWindowRect(IntRect(x, y, width, height)); } +// static +CSSFontSelector* PagePopupController::CreateCSSFontSelector( + Document& popup_document) { + LocalFrame* frame = popup_document.GetFrame(); + DCHECK(frame); + DCHECK(frame->PagePopupOwner()); + + auto* controller = PagePopupSupplement::From(*frame).GetPagePopupController(); + + DCHECK(controller->popup_client_); + return controller->popup_client_->CreateCSSFontSelector(popup_document); +} + } // namespace blink
diff --git a/third_party/blink/renderer/core/page/page_popup_controller.h b/third_party/blink/renderer/core/page/page_popup_controller.h index 005541c..0677803 100644 --- a/third_party/blink/renderer/core/page/page_popup_controller.h +++ b/third_party/blink/renderer/core/page/page_popup_controller.h
@@ -37,6 +37,7 @@ namespace blink { +class CSSFontSelector; class Document; class PagePopup; class PagePopupClient; @@ -50,7 +51,6 @@ void setValueAndClosePopup(int num_value, const String& string_value); void setValue(const String&); void closePopup(); - void selectFontsFromOwnerDocument(Document* target_document); String localizeNumberString(const String&); String formatMonth(int year, int zero_base_month); String formatShortMonth(int year, int zero_base_month); @@ -60,6 +60,8 @@ void ClearPagePopupClient(); void setWindowRect(int x, int y, int width, int height); + static CSSFontSelector* CreateCSSFontSelector(Document& popup_document); + private: PagePopup& popup_; PagePopupClient* popup_client_;
diff --git a/third_party/blink/renderer/core/page/page_popup_controller.idl b/third_party/blink/renderer/core/page/page_popup_controller.idl index 26668d7..5d7bc22 100644 --- a/third_party/blink/renderer/core/page/page_popup_controller.idl +++ b/third_party/blink/renderer/core/page/page_popup_controller.idl
@@ -38,7 +38,6 @@ void setValueAndClosePopup(long numberValue, DOMString stringValue); void setValue(DOMString value); void closePopup(); - void selectFontsFromOwnerDocument(Document targetDocument); DOMString localizeNumberString(DOMString numberString); DOMString formatMonth(long year, long zeroBaseMonth); DOMString formatShortMonth(long year, long zeroBaseMonth);
diff --git a/third_party/blink/renderer/core/paint/compositing/composited_layer_mapping.cc b/third_party/blink/renderer/core/paint/compositing/composited_layer_mapping.cc index e061885..46ce186 100644 --- a/third_party/blink/renderer/core/paint/compositing/composited_layer_mapping.cc +++ b/third_party/blink/renderer/core/paint/compositing/composited_layer_mapping.cc
@@ -44,6 +44,7 @@ #include "third_party/blink/renderer/core/html/media/html_video_element.h" #include "third_party/blink/renderer/core/html_names.h" #include "third_party/blink/renderer/core/layout/geometry/transform_state.h" +#include "third_party/blink/renderer/core/layout/layout_box_model_object.h" #include "third_party/blink/renderer/core/layout/layout_embedded_content.h" #include "third_party/blink/renderer/core/layout/layout_embedded_object.h" #include "third_party/blink/renderer/core/layout/layout_html_canvas.h" @@ -228,6 +229,26 @@ static_cast<int>(DOMNodeIds::IdForNode(owning_node))); } + // Attempt to associate each layer with the frame owner's element ID. + Document* owner = nullptr; + if (GetLayoutObject().IsLayoutEmbeddedContent()) { + auto& embedded = ToLayoutEmbeddedContent(GetLayoutObject()); + if (auto* frame_view = + DynamicTo<LocalFrameView>(embedded.GetEmbeddedContentView())) { + owner = frame_view->GetFrame().GetDocument(); + } else { + // Ignore remote and plugin frames. + } + } else { + owner = &GetLayoutObject().GetDocument(); + } + if (owner) { + graphics_layer->CcLayer()->SetFrameElementId( + CompositorElementIdFromUniqueObjectId( + DOMNodeIds::IdForNode(owner), + CompositorElementIdNamespace::kDOMNodeId)); + } + return graphics_layer; }
diff --git a/third_party/blink/renderer/core/paint/compositing/composited_layer_mapping_test.cc b/third_party/blink/renderer/core/paint/compositing/composited_layer_mapping_test.cc index e5b3290..cf1bf32 100644 --- a/third_party/blink/renderer/core/paint/compositing/composited_layer_mapping_test.cc +++ b/third_party/blink/renderer/core/paint/compositing/composited_layer_mapping_test.cc
@@ -10,7 +10,9 @@ #include "cc/trees/property_tree.h" #include "cc/trees/scroll_node.h" #include "testing/gtest/include/gtest/gtest.h" +#include "third_party/blink/renderer/core/dom/dom_node_ids.h" #include "third_party/blink/renderer/core/frame/local_frame_view.h" +#include "third_party/blink/renderer/core/html/html_frame_owner_element.h" #include "third_party/blink/renderer/core/layout/layout_box_model_object.h" #include "third_party/blink/renderer/core/layout/layout_image.h" #include "third_party/blink/renderer/core/layout/layout_view.h" @@ -1827,4 +1829,42 @@ EXPECT_EQ(squash_container_a_layer->ClippingContainer(), isolation_a_object); } +TEST_F(CompositedLayerMappingTest, FrameAttribution) { + SetBodyInnerHTML(R"HTML( + <div id='child' style='will-change: transform;'></div> + <iframe id='subframe' style='will-change: transform;'></iframe> + )HTML"); + + UpdateAllLifecyclePhasesForTest(); + + // Ensure that we correctly attribute child layers in the main frame to their + // containing document. + Element* child = GetDocument().getElementById("child"); + PaintLayer* child_paint_layer = + ToLayoutBoxModelObject(child->GetLayoutObject())->Layer(); + auto* child_layer = child_paint_layer->GraphicsLayerBacking()->CcLayer(); + EXPECT_TRUE(child_layer->frame_element_id()); + + EXPECT_EQ(child_layer->frame_element_id(), + CompositorElementIdFromUniqueObjectId( + DOMNodeIds::IdForNode(&GetDocument()), + CompositorElementIdNamespace::kDOMNodeId)); + + // Test that a layerized subframe's element ID is that of its containing + // document. + auto* subframe = + To<HTMLFrameOwnerElement>(GetDocument().getElementById("subframe")); + EXPECT_TRUE(subframe); + PaintLayer* subframe_paint_layer = + ToLayoutBoxModelObject(subframe->GetLayoutObject())->Layer(); + auto* subframe_layer = + subframe_paint_layer->GraphicsLayerBacking()->CcLayer(); + EXPECT_TRUE(subframe_layer->frame_element_id()); + + EXPECT_EQ(subframe_layer->frame_element_id(), + CompositorElementIdFromUniqueObjectId( + DOMNodeIds::IdForNode(subframe->contentDocument()), + CompositorElementIdNamespace::kDOMNodeId)); +} + } // namespace blink
diff --git a/third_party/blink/renderer/core/script/layered_api_module.h b/third_party/blink/renderer/core/script/layered_api_module.h index 86e8954..fec47185 100644 --- a/third_party/blink/renderer/core/script/layered_api_module.h +++ b/third_party/blink/renderer/core/script/layered_api_module.h
@@ -15,9 +15,6 @@ enum class Module { kBlank, - kElementsInternal, - kElementsSwitch, - kElementsToast, kElementsVirtualScroller, };
diff --git a/third_party/blink/renderer/core/script/layered_api_resources.h b/third_party/blink/renderer/core/script/layered_api_resources.h index 66f0f29..4dbe790 100644 --- a/third_party/blink/renderer/core/script/layered_api_resources.h +++ b/third_party/blink/renderer/core/script/layered_api_resources.h
@@ -29,19 +29,6 @@ const LayeredAPIResource kLayeredAPIResources[] = { {"blank/index.mjs", IDR_LAYERED_API_BLANK_INDEX_MJS, Module::kBlank}, - {"elements/internal/reflection.mjs", - IDR_LAYERED_API_ELEMENTS_INTERNAL_REFLECTION_MJS, - Module::kElementsInternal}, - - {"elements/switch/face_utils.mjs", - IDR_LAYERED_API_ELEMENTS_SWITCH_FACE_UTILS_MJS, Module::kElementsSwitch}, - {"elements/switch/index.mjs", IDR_LAYERED_API_ELEMENTS_SWITCH_INDEX_MJS, - Module::kElementsSwitch}, - {"elements/switch/style.mjs", IDR_LAYERED_API_ELEMENTS_SWITCH_STYLE_MJS, - Module::kElementsSwitch}, - {"elements/switch/track.mjs", IDR_LAYERED_API_ELEMENTS_SWITCH_TRACK_MJS, - Module::kElementsSwitch}, - {"elements/virtual-scroller/find-element.mjs", IDR_LAYERED_API_ELEMENTS_VIRTUAL_SCROLLER_FIND_ELEMENT_MJS, Module::kElementsVirtualScroller},
diff --git a/third_party/blink/renderer/core/script/modulator_impl_base.cc b/third_party/blink/renderer/core/script/modulator_impl_base.cc index 277e3b76..5e89c97 100644 --- a/third_party/blink/renderer/core/script/modulator_impl_base.cc +++ b/third_party/blink/renderer/core/script/modulator_impl_base.cc
@@ -73,13 +73,6 @@ switch (module) { case layered_api::Module::kBlank: return true; - case layered_api::Module::kElementsInternal: - // Union of conditions of KElementsSwitch and kElementsToast. - return RuntimeEnabledFeatures::BuiltInModuleSwitchElementEnabled(); - case layered_api::Module::kElementsSwitch: - return RuntimeEnabledFeatures::BuiltInModuleSwitchElementEnabled(); - case layered_api::Module::kElementsToast: - return RuntimeEnabledFeatures::BuiltInModuleAllEnabled(); case layered_api::Module::kElementsVirtualScroller: return false; } @@ -89,9 +82,6 @@ layered_api::Module module) { switch (module) { case layered_api::Module::kBlank: - case layered_api::Module::kElementsInternal: - case layered_api::Module::kElementsSwitch: - case layered_api::Module::kElementsToast: case layered_api::Module::kElementsVirtualScroller: return false; } @@ -104,15 +94,6 @@ switch (module) { case layered_api::Module::kBlank: break; - case layered_api::Module::kElementsInternal: - break; - case layered_api::Module::kElementsSwitch: - UseCounter::Count(GetExecutionContext(), - WebFeature::kBuiltInModuleSwitchImported); - break; - case layered_api::Module::kElementsToast: - UseCounter::Count(GetExecutionContext(), WebFeature::kBuiltInModuleToast); - break; case layered_api::Module::kElementsVirtualScroller: UseCounter::Count(GetExecutionContext(), WebFeature::kBuiltInModuleVirtualScroller);
diff --git a/third_party/blink/renderer/core/script/resources/layered_api/elements/internal/reflection.mjs b/third_party/blink/renderer/core/script/resources/layered_api/elements/internal/reflection.mjs deleted file mode 100644 index 085a94a..0000000 --- a/third_party/blink/renderer/core/script/resources/layered_api/elements/internal/reflection.mjs +++ /dev/null
@@ -1,63 +0,0 @@ -// Copyright 2019 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -/** - * @file Manage attribute-property reflections. - * https://html.spec.whatwg.org/C/common-dom-interfaces.html#reflecting-content-attributes-in-idl-attributes - */ - -/** - * Add a bool reflection property to the specified prototype for the specified - * attribute. - * - * @param {!Object} proto An element prototype - * @param {string} attrName An attribute name - * @param {string} propName An optional property name. attrName will be used if - * this argument is omitted. - */ -export function installBool(proto, attrName, propName = attrName) { - function getter() { - return this.hasAttribute(attrName); - } - function setter(value) { - this.toggleAttribute(attrName, Boolean(value)); - } - Object.defineProperty( - getter, 'name', - {configurable: true, enumerable: false, value: 'get ' + propName}); - Object.defineProperty( - setter, 'name', - {configurable: true, enumerable: false, value: 'set ' + propName}); - Object.defineProperty( - proto, propName, - {configurable: true, enumerable: true, get: getter, set: setter}); -} - -/** - * Add a DOMString reflection property to the specified prototype for the - * specified attribute. - * - * @param {!Element} element An element prototype - * @param {string} attrName An attribute name - * @param {string} propName An optional property name. attrName will be used if - * this argument is omitted. - */ -export function installString(proto, attrName, propName = attrName) { - function getter() { - const value = this.getAttribute(attrName); - return value === null ? '' : value; - } - function setter(value) { - this.setAttribute(attrName, value); - } - Object.defineProperty( - getter, 'name', - {configurable: true, enumerable: false, value: 'get ' + propName}); - Object.defineProperty( - setter, 'name', - {configurable: true, enumerable: false, value: 'set ' + propName}); - Object.defineProperty( - proto, propName, - {configurable: true, enumerable: true, get: getter, set: setter}); -}
diff --git a/third_party/blink/renderer/core/script/resources/layered_api/elements/switch/README.md b/third_party/blink/renderer/core/script/resources/layered_api/elements/switch/README.md deleted file mode 100644 index c8962f7..0000000 --- a/third_party/blink/renderer/core/script/resources/layered_api/elements/switch/README.md +++ /dev/null
@@ -1,3 +0,0 @@ -# Switch control element - -https://github.com/tkent-google/std-switch/blob/master/README.md
diff --git a/third_party/blink/renderer/core/script/resources/layered_api/elements/switch/face_utils.mjs b/third_party/blink/renderer/core/script/resources/layered_api/elements/switch/face_utils.mjs deleted file mode 100644 index 77002a0..0000000 --- a/third_party/blink/renderer/core/script/resources/layered_api/elements/switch/face_utils.mjs +++ /dev/null
@@ -1,56 +0,0 @@ -// Copyright 2019 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -/** - * @file Utilities for form-associated custom elements - */ - -import * as reflection from '../internal/reflection.mjs'; - -function installGetter(proto, propName, getter) { - Object.defineProperty( - getter, 'name', - {configurable: true, enumerable: false, value: 'get ' + propName}); - Object.defineProperty( - proto, propName, {configurable: true, enumerable: true, get: getter}); -} - -/** - * Add the following properties to |proto| - * - disabled - * - name - * - type - * and make the following properties and functions enumerable - * - form - * - willValidate - * - validity - * - validationMessage - * - labels - * - checkValidity() - * - reportValidity() - * - setCustomValidity(error) - * - * @param {!Object} proto An Element prototype which will have properties - */ -export function installProperties(proto) { - reflection.installBool(proto, 'disabled'); - reflection.installString(proto, 'name'); - installGetter(proto, 'type', function() { - if (!(this instanceof proto.constructor)) { - throw new TypeError( - 'The context object is not an instance of ' + proto.contructor.name); - } - return this.localName; - }); - - Object.defineProperty(proto, 'form', {enumerable: true}); - Object.defineProperty(proto, 'willValidate', {enumerable: true}); - Object.defineProperty(proto, 'validity', {enumerable: true}); - Object.defineProperty(proto, 'validationMessage', {enumerable: true}); - Object.defineProperty(proto, 'labels', {enumerable: true}); - - Object.defineProperty(proto, 'checkValidity', {enumerable: true}); - Object.defineProperty(proto, 'reportValidity', {enumerable: true}); - Object.defineProperty(proto, 'setCustomValidity', {enumerable: true}); -}
diff --git a/third_party/blink/renderer/core/script/resources/layered_api/elements/switch/index.mjs b/third_party/blink/renderer/core/script/resources/layered_api/elements/switch/index.mjs deleted file mode 100644 index 6732ffd..0000000 --- a/third_party/blink/renderer/core/script/resources/layered_api/elements/switch/index.mjs +++ /dev/null
@@ -1,221 +0,0 @@ -// Copyright 2019 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -import * as reflection from '../internal/reflection.mjs'; - -import * as face from './face_utils.mjs'; -import * as style from './style.mjs'; -import {SwitchTrack} from './track.mjs'; - -const generateStyleSheet = style.styleSheetFactory(); -const generateMaterialStyleSheet = style.materialStyleSheetFactory(); - -// https://github.com/tkent-google/std-switch/issues/2 -const STATE_ATTR = 'on'; - -function parentOrHostElement(element) { - const parent = element.parentNode; - if (!parent) { - return null; - } - if (parent.nodeType === Node.ELEMENT_NODE) { - return parent; - } - if (parent.nodeType === Node.DOCUMENT_FRAGMENT_NODE) { - return parent.host; - } - return null; -} - -function shouldUsePlatformTheme(element) { - for (; element; element = parentOrHostElement(element)) { - const themeValue = element.getAttribute('theme'); - if (themeValue === 'match-platform') { - return true; - } else if (themeValue === 'platform-agnostic') { - return false; - } - } - return false; -} - -export class StdSwitchElement extends HTMLElement { - // TODO(tkent): The following should be |static fooBar = value;| - // after enabling babel-eslint. - static get formAssociated() { - return true; - } - static get observedAttributes() { - return [STATE_ATTR]; - } - - #internals; - #track; - #containerElement; - #inUserAction = false; - #shadowRoot; - - constructor() { - super(); - if (new.target !== StdSwitchElement) { - throw new TypeError( - 'Illegal constructor: StdSwitchElement is not ' + - 'extensible for now'); - } - this.#internals = this.attachInternals(); - this.#internals.setFormValue('off'); - this.#initializeDOM(); - - this.addEventListener('click', this.#onClick); - this.addEventListener('keypress', this.#onKeyPress); - } - - attributeChangedCallback(attrName, oldValue, newValue) { - if (attrName === STATE_ATTR) { - this.#internals.setFormValue(newValue !== null ? 'on' : 'off'); - this.#track.value = newValue !== null; - if (this.#internals.ariaChecked !== undefined) { - this.#internals.ariaChecked = newValue !== null ? 'true' : 'false'; - } else { - // TODO(tkent): Remove this when we ship AOM. - this.setAttribute('aria-checked', newValue !== null ? 'true' : 'false'); - } - if (!this.#inUserAction) { - for (const element of this.#containerElement.querySelectorAll('*')) { - style.unmarkTransition(element); - } - } - } - } - - connectedCallback() { - // The element might have been disconnected when the callback is invoked. - if (!this.isConnected) { - return; - } - - // TODO(tkent): We should not add tabindex attribute. - // https://github.com/w3c/webcomponents/issues/762 - if (!this.hasAttribute('tabindex')) { - this.setAttribute('tabindex', '0'); - } - - if (this.#internals.role !== undefined) { - this.#internals.role = 'switch'; - } else { - // TODO(tkent): Remove this when we ship AOM. - if (!this.hasAttribute('role')) { - this.setAttribute('role', 'switch'); - } - } - - if (shouldUsePlatformTheme(this)) { - // TODO(tkent): Should we apply Cocoa-like on macOS and Fluent-like - // on Windows? - this.#shadowRoot.adoptedStyleSheets = - [generateStyleSheet(), generateMaterialStyleSheet()]; - } else { - this.#shadowRoot.adoptedStyleSheets = [generateStyleSheet()]; - } - } - - formResetCallback() { - this.on = this.defaultOn; - } - - #initializeDOM = () => { - const factory = this.ownerDocument; - const root = this.attachShadow({mode: 'closed'}); - this.#containerElement = factory.createElement('span'); - this.#containerElement.id = 'container'; - // Shadow elements should be invisible for a11y technologies. - this.#containerElement.setAttribute('aria-hidden', 'true'); - root.appendChild(this.#containerElement); - - this.#track = new SwitchTrack(factory); - this.#containerElement.appendChild(this.#track.element); - this.#track.value = this.on; - - const thumbElement = - this.#containerElement.appendChild(factory.createElement('span')); - thumbElement.id = 'thumb'; - thumbElement.part.add('thumb'); - - this.#shadowRoot = root; - }; - - #onClick = () => { - for (const element of this.#containerElement.querySelectorAll('*')) { - style.markTransition(element); - } - this.#inUserAction = true; - try { - this.on = !this.on; - } finally { - this.#inUserAction = false; - } - this.dispatchEvent(new Event('input', {bubbles: true})); - this.dispatchEvent(new Event('change', {bubbles: true})); - }; - - #onKeyPress = event => { - if (event.code === 'Space') { - // Do not scroll the page. - event.preventDefault(); - this.#onClick(event); - } - }; - - // -------- Boilerplate code for form-associated custom elements -------- - // They can't be in face_utils.mjs because private fields are available - // only in the class. - get form() { - return this.#internals.form; - } - get willValidate() { - return this.#internals.willValidate; - } - get validity() { - return this.#internals.validity; - } - get validationMessage() { - return this.#internals.validationMessage; - } - get labels() { - return this.#internals.labels; - } - checkValidity() { - return this.#internals.checkValidity(); - } - reportValidity() { - return this.#internals.reportValidity(); - } - setCustomValidity(error) { - if (error === undefined) { - throw new TypeError('Too few arguments'); - } - this.#internals.setValidity({customError: true}, error); - } -} - -reflection.installBool(StdSwitchElement.prototype, STATE_ATTR); -reflection.installBool( - StdSwitchElement.prototype, 'default' + STATE_ATTR, - 'default' + STATE_ATTR.charAt(0).toUpperCase() + STATE_ATTR.substring(1)); -face.installProperties(StdSwitchElement.prototype); - -// This is necessary for anyObject.toString.call(switchInstance). -Object.defineProperty(StdSwitchElement.prototype, Symbol.toStringTag, { - configurable: true, - enumerable: false, - value: 'StdSwitchElement', - writable: false, -}); - -customElements.define('std-switch', StdSwitchElement); -delete StdSwitchElement.formAssociated; -delete StdSwitchElement.observedAttributes; -delete StdSwitchElement.prototype.attributeChangedCallback; -delete StdSwitchElement.prototype.connectedCallback; -delete StdSwitchElement.prototype.formResetCallback;
diff --git a/third_party/blink/renderer/core/script/resources/layered_api/elements/switch/style.mjs b/third_party/blink/renderer/core/script/resources/layered_api/elements/switch/style.mjs deleted file mode 100644 index ded00d0..0000000 --- a/third_party/blink/renderer/core/script/resources/layered_api/elements/switch/style.mjs +++ /dev/null
@@ -1,304 +0,0 @@ -// Copyright 2019 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Style constant values. -const COLOR_ON = '#0077FF'; -const TRACK_RADIUS = '13px'; -const TRACK_BORDER_WIDTH = '2px'; -const THUMB_HEIGHT = '22px'; -const THUMB_WIDTH = '22px'; -const THUMB_MARGIN_START = '2px'; -const THUMB_MARGIN_END = '2px'; - -const MATERIAL_THUMB_SIZE = '20px'; -const RIPPLE_COLOR = 'rgba(100,100,100,0.3)'; -const RIPPLE_MAX_SIZE = '48px'; - -// Returns a function returning a CSSStyleSheet(). -// TODO(tkent): Share this stylesheet factory feature with elements/toast/. -export function styleSheetFactory() { - let styleSheet; - return () => { - if (!styleSheet) { - styleSheet = new CSSStyleSheet(); - styleSheet.replaceSync(` -:host { - block-size: 26px; - border: none; - box-sizing: border-box; - display: inline-block; - inline-size: 54px; - user-select: none; - vertical-align: middle; -} - -#container { - align-items: center; - block-size: 100%; - display: inline-flex; - inline-size: 100%; -} - -#thumb { - background: white; - block-size: ${THUMB_HEIGHT}; - border-radius: calc(${THUMB_HEIGHT} / 2); - border: 1px solid black; - box-sizing: border-box; - display: inline-block; - margin-inline-start: calc(-100% + ${THUMB_MARGIN_START}); - inline-size: ${THUMB_WIDTH}; -} - -/* :host::part(thumb-transitioning) doesn't work. crbug.com/980506 */ -#thumb[part~="thumb-transitioning"] { - transition: all linear 0.1s; -} - -:host([on]) #thumb { - border: 1px solid ${COLOR_ON}; - margin-inline-start: calc(0px - ${THUMB_WIDTH} - ${THUMB_MARGIN_END}); -} - -#track { - block-size: 100%; - border-radius: ${TRACK_RADIUS}; - border: ${TRACK_BORDER_WIDTH} solid #dddddd; - box-shadow: 0 0 0 1px #f8f8f8; - box-sizing: border-box; - display: inline-block; - inline-size: 100%; - overflow: hidden; - padding: 0px; -} - -#trackFill { - background: ${COLOR_ON}; - block-size: 100%; - border-radius: calc(${TRACK_RADIUS}) - ${TRACK_BORDER_WIDTH}); - box-shadow: none; - box-sizing: border-box; - display: inline-block; - inline-size: 0%; - vertical-align: top; -} - -#trackFill[part~="track-fill-transitioning"] { - transition: all linear 0.1s; -} - -:host([on]) #track { - border: ${TRACK_BORDER_WIDTH} solid ${COLOR_ON}; -} - -:host(:focus) { - outline-offset: 4px; -} - -:host(:focus) #track { - box-shadow: 0 0 0 2px #f8f8f8; -} - -:host([on]:focus) #track { - box-shadow: 0 0 0 2px #dddddd; -} - -:host(:focus) #thumb { - border: 2px solid black; -} - -:host([on]:focus) #thumb { - border: 2px solid ${COLOR_ON}; -} - -:host(:not(:focus-visible):focus) { - outline: none; -} - -:host(:not(:disabled):hover) #thumb { - inline-size: 26px; -} - -:host([on]:not(:disabled):hover) #thumb { - margin-inline-start: calc(0px - 26px - ${THUMB_MARGIN_END}); -} - -:host(:active) #track { - background: #dddddd; -} - -:host([on]:active) #track { - border: 2px solid #77bbff; - box-shadow: 0 0 0 2px #f8f8f8; -} - -:host([on]:active) #trackFill { - background: #77bbff; -} - -:host(:disabled) { - opacity: 0.38; -} - -/* - * display:inline-block in the :host ruleset overrides 'hidden' handling - * by the user agent. - */ -:host([hidden]) { - display: none; -} - -`); - } - return styleSheet; - }; -} - -export function materialStyleSheetFactory() { - let styleSheet; - return () => { - if (!styleSheet) { - styleSheet = new CSSStyleSheet(); - styleSheet.replaceSync(` -:host { - block-size: 20px; - inline-size: 36px; -} - -#track, -:host(:active) #track { - background: rgba(0,0,0,0.4); - block-size: 14px; - border: none; - box-shadow: none; -} - -:host([on]) #track, -:host([on]:active) #track, -:host([on]:focus) #track { - border: none; - box-shadow: none; -} - -#trackFill, -:host([on]:active) #trackFill { - background: rgba(63,81,181,0.5); -} - -#thumb, -:host(:focus) #thumb { - block-size: ${MATERIAL_THUMB_SIZE}; - border-radius: calc(${MATERIAL_THUMB_SIZE} / 2); - border: none; - box-shadow: 0 1px 5px 0 rgba(0,0,0,0.6); - inline-size: ${MATERIAL_THUMB_SIZE}; - margin-inline-start: -100%; -} - -:host([on]) #thumb, -:host([on]:focus) #thumb, -:host([on]:not(:disabled):hover) #thumb { - background: rgb(63,81,181); - border: none; - margin-inline-start: calc(0px - 20px); -} - -:host(:not(:disabled):hover) #thumb { - inline-size: ${MATERIAL_THUMB_SIZE}; -} - -/* - * Ripple effect - * - * Translucent circle is painted on the thumb if the element is :active or - * :focus-visible. It has - * - Size transition when it appears - * - Opacity transition when it disappears - * part(thumb)::before represents the former, and part(thumb)::after represents - * the latter. - */ -#thumb::before { - background: ${RIPPLE_COLOR}; - block-size: 0px; - border-radius: 0px; - content: ""; - display: inline-block; - inline-size: 0px; - left: calc(${MATERIAL_THUMB_SIZE} / 2); - position: relative; - top: calc(${MATERIAL_THUMB_SIZE} / 2); - transition: none; -} - -:host(:active) #thumb::before, -:host(:focus-visible) #thumb::before { - block-size: ${RIPPLE_MAX_SIZE}; - border-radius: calc(${RIPPLE_MAX_SIZE} / 2); - inline-size: ${RIPPLE_MAX_SIZE}; - left: calc((${MATERIAL_THUMB_SIZE} - ${RIPPLE_MAX_SIZE}) / 2); - top: calc((${MATERIAL_THUMB_SIZE} - ${RIPPLE_MAX_SIZE}) / 2); - transition: all linear 0.1s; -} - -#thumb::after { - background: ${RIPPLE_COLOR}; - block-size: ${RIPPLE_MAX_SIZE}; - border-radius: calc(${RIPPLE_MAX_SIZE} / 2); - content: ""; - display: inline-block; - inline-size: ${RIPPLE_MAX_SIZE}; - left: calc((${MATERIAL_THUMB_SIZE} - ${RIPPLE_MAX_SIZE}) / 2); - opacity: 0; - position: relative; - /* Why 18px? */ - top: calc((${MATERIAL_THUMB_SIZE} - ${RIPPLE_MAX_SIZE}) / 2 - 18px); - transition: opacity linear 0.3s; -} - -:host(:active) #thumb::after, -:host(:focus-visible) #thumb::after { - block-size: 0px; - content: ""; - inline-size: 0px; - opacity: 1; - transition: none; -} - -`); - } - return styleSheet; - }; -} - -/** - * Add '$part-transitioning' part to the element if the element already has - * a part name. - * - * TODO(tkent): We should apply custom state. - * - * @param {!Element} element - */ -export function markTransition(element) { - // Should check hasAttribute() to avoid creating a DOMTokenList instance. - if (!element.hasAttribute('part') || element.part.length < 1) { - return; - } - element.part.add(element.part[0] + '-transitioning'); -} - -/** - * Remove '$part-transitioning' part from the element if the element already has - * a part name. - * - * TODO(tkent): We should apply custom state. - * - * @param {!Element} element - */ -export function unmarkTransition(element) { - // Should check hasAttribute() to avoid creating a DOMTokenList instance. - if (!element.hasAttribute('part') || element.part.length < 1) { - return; - } - element.part.remove(element.part[0] + '-transitioning'); -}
diff --git a/third_party/blink/renderer/core/script/resources/layered_api/elements/switch/track.mjs b/third_party/blink/renderer/core/script/resources/layered_api/elements/switch/track.mjs deleted file mode 100644 index f29cdac..0000000 --- a/third_party/blink/renderer/core/script/resources/layered_api/elements/switch/track.mjs +++ /dev/null
@@ -1,70 +0,0 @@ -// Copyright 2019 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -export class SwitchTrack { - #value; - #trackElement; - #fillElement; - #slotElement; - - /** - * @param {!Document} factory A factory for elements created for this track. - */ - constructor(factory) { - this.#value = false; - this.#initializeDOM(factory); - } - - /** - * @return {!Element} - */ - get element() { - return this.#trackElement; - } - - /** - * @param {Boolean} newValue - */ - set value(newValue) { - const oldValue = this.#value; - this.#value = Boolean(newValue); - - const bar = this.#fillElement; - if (bar) { - bar.style.inlineSize = this.#value ? '100%' : '0%'; - if (oldValue !== this.#value) { - this.#addSlot(); - } - } - } - - /** - * @param {!Document} factory A factory for elements created for this track. - */ - #initializeDOM = factory => { - this.#trackElement = factory.createElement('div'); - this.#trackElement.id = 'track'; - this.#trackElement.part.add('track'); - this.#fillElement = factory.createElement('span'); - this.#fillElement.id = 'trackFill'; - this.#fillElement.part.add('track-fill'); - this.#trackElement.appendChild(this.#fillElement); - this.#slotElement = factory.createElement('slot'); - this.#addSlot(); - }; - - /** - * Add the <slot> - * - next to _fillElement if _value is true - * - as a child of _fillElement if _value is false - * This behavior is helpful to show text in the track. - */ - #addSlot = () => { - if (this.#value) { - this.#fillElement.appendChild(this.#slotElement); - } else { - this.#trackElement.appendChild(this.#slotElement); - } - }; -}
diff --git a/third_party/blink/renderer/core/script/resources/layered_api/resources.grdp b/third_party/blink/renderer/core/script/resources/layered_api/resources.grdp index 51e5256..db336a2 100644 --- a/third_party/blink/renderer/core/script/resources/layered_api/resources.grdp +++ b/third_party/blink/renderer/core/script/resources/layered_api/resources.grdp
@@ -7,11 +7,6 @@ third_party/blink/public/blink_resources.grd. --> <include name="IDR_LAYERED_API_BLANK_INDEX_MJS" file="../renderer/core/script/resources/layered_api/blank/index.mjs" type="BINDATA" skip_minify="true" compress="gzip"/> - <include name="IDR_LAYERED_API_ELEMENTS_INTERNAL_REFLECTION_MJS" file="../renderer/core/script/resources/layered_api/elements/internal/reflection.mjs" type="BINDATA" skip_minify="true" compress="gzip"/> - <include name="IDR_LAYERED_API_ELEMENTS_SWITCH_FACE_UTILS_MJS" file="../renderer/core/script/resources/layered_api/elements/switch/face_utils.mjs" type="BINDATA" skip_minify="true" compress="gzip"/> - <include name="IDR_LAYERED_API_ELEMENTS_SWITCH_INDEX_MJS" file="../renderer/core/script/resources/layered_api/elements/switch/index.mjs" type="BINDATA" skip_minify="true" compress="gzip"/> - <include name="IDR_LAYERED_API_ELEMENTS_SWITCH_STYLE_MJS" file="../renderer/core/script/resources/layered_api/elements/switch/style.mjs" type="BINDATA" skip_minify="true" compress="gzip"/> - <include name="IDR_LAYERED_API_ELEMENTS_SWITCH_TRACK_MJS" file="../renderer/core/script/resources/layered_api/elements/switch/track.mjs" type="BINDATA" skip_minify="true" compress="gzip"/> <include name="IDR_LAYERED_API_ELEMENTS_VIRTUAL_SCROLLER_FIND_ELEMENT_MJS" file="../renderer/core/script/resources/layered_api/elements/virtual-scroller/find-element.mjs" type="BINDATA" skip_minify="true" compress="gzip"/> <include name="IDR_LAYERED_API_ELEMENTS_VIRTUAL_SCROLLER_INDEX_MJS" file="../renderer/core/script/resources/layered_api/elements/virtual-scroller/index.mjs" type="BINDATA" skip_minify="true" compress="gzip"/> <include name="IDR_LAYERED_API_ELEMENTS_VIRTUAL_SCROLLER_SETS_MJS" file="../renderer/core/script/resources/layered_api/elements/virtual-scroller/sets.mjs" type="BINDATA" skip_minify="true" compress="gzip"/>
diff --git a/third_party/blink/renderer/core/testing/internals.idl b/third_party/blink/renderer/core/testing/internals.idl index e363515..991e673d 100644 --- a/third_party/blink/renderer/core/testing/internals.idl +++ b/third_party/blink/renderer/core/testing/internals.idl
@@ -193,10 +193,11 @@ readonly attribute unsigned long workerThreadCount; readonly attribute boolean isFormControlsRefreshEnabled; - // Flag for layerTreeAsText. - // The value must be kept in sync with the value of LayerTreeFlags in layers_as_json.h. + // Flag for layerTreeAsText. The value must be kept in sync with the value + // of LayerTreeFlags in layers_as_json.h. // Other flags in LayerTreeFlags are not supported in internals API. - const unsigned short LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS = 2; + const unsigned short LAYER_TREE_INCLUDES_INVALIDATIONS = 2; + const unsigned short LAYER_TREE_INCLUDES_DETAILED_INVALIDATIONS = 4; [RaisesException] DOMString layerTreeAsText(Document document, optional unsigned short flags);
diff --git a/third_party/blink/renderer/modules/accessibility/ax_layout_object.cc b/third_party/blink/renderer/modules/accessibility/ax_layout_object.cc index 24dc6bb..355c68f 100644 --- a/third_party/blink/renderer/modules/accessibility/ax_layout_object.cc +++ b/third_party/blink/renderer/modules/accessibility/ax_layout_object.cc
@@ -2143,23 +2143,60 @@ return nullptr; } +bool AXLayoutObject::ShouldUseDOMTraversal() const { + // TODO(accessibility) Look into having one method of traversal, otherwise + // it's possible for the same object to become a child of 2 different nodes, + // e.g. if it has a different layout parent and DOM parent. + + bool is_continuation = layout_object_->IsElementContinuation(); + + // Avoid calling AXNodeObject logic for continuations. + if (is_continuation) + return false; + + Node* node = GetNode(); + if (!node) + return false; + + // <map>: Handled in AddImageMapChildren (img). + if (IsA<HTMLMapElement>(*node)) + return false; + + // <ruby>: special layout handling + if (IsA<HTMLRubyElement>(*node)) + return false; + + // <table>: thead/tfoot move around + // This may mean a thead/tfoot in the middle will be bumped to the top/bottom. + // TODO(aleventhal): not sure about this, try to remove and see what breaks. + // Alternatively, we may decide to simply not support this, to simplify. + if (IsA<HTMLTableElement>(*node)) + return false; + + // For now, at least the #docment node needs to use layout traversal, because + // of validation messages, dialog, etc. + // TODO(aleventhal) figure out how to avoid double <dialog> nodes. + Element* element = GetElement(); + if (!element) + return false; + + // Pseudo elements are not visited in layout tree builder traversal, used by + // AXDOMNode::AddChildren() + // TODO(aleventhal) Actually LayoutTreeBuilderTraversal does visit pseudo + // elements, so we should try removing this check and see if anything breaks. + if (element->IsPseudoElement()) + return false; + + return true; +} + void AXLayoutObject::AddChildren() { if (IsDetached()) return; - // Avoid calling AXNodeObject logic for continuations. - bool is_continuation = layout_object_->IsElementContinuation(); - - if (auto* element = DynamicTo<Element>(GetNode())) { - if (!is_continuation && - !IsA<HTMLMapElement>( - *element) && // Handled in AddImageMapChildren (img) - !IsA<HTMLRubyElement>(*element) && // Special layout handling - !IsA<HTMLTableElement>(*element) && // thead/tfoot move around - !element->IsPseudoElement()) { // Not visited in layout traversal - AXNodeObject::AddChildren(); - return; - } + if (ShouldUseDOMTraversal()) { + AXNodeObject::AddChildren(); + return; } // If the need to add more children in addition to existing children arises, @@ -2187,6 +2224,7 @@ for (const auto& owned_child : owned_children) AddChild(owned_child); + bool is_continuation = layout_object_->IsElementContinuation(); for (const auto& child : children_) { if (!is_continuation && !child->CachedParentObject()) { // Never set continuations as a parent object. The first layout object
diff --git a/third_party/blink/renderer/modules/accessibility/ax_layout_object.h b/third_party/blink/renderer/modules/accessibility/ax_layout_object.h index c9d75b8..a8b4c88c1 100644 --- a/third_party/blink/renderer/modules/accessibility/ax_layout_object.h +++ b/third_party/blink/renderer/modules/accessibility/ax_layout_object.h
@@ -231,6 +231,7 @@ bool IsPlaceholder() const; ax::mojom::Dropeffect ParseDropeffect(String& dropeffect) const; bool SelectionShouldFollowFocus() const; + bool ShouldUseDOMTraversal() const; static ax::mojom::TextDecorationStyle TextDecorationStyleToAXTextDecorationStyle(
diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc b/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc index a3bdcfa..e4115f8 100644 --- a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc +++ b/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc
@@ -251,6 +251,36 @@ return result; } +std::string PriorityFromEnum(webrtc::Priority priority) { + switch (priority) { + case webrtc::Priority::kVeryLow: + return "very-low"; + case webrtc::Priority::kLow: + return "low"; + case webrtc::Priority::kMedium: + return "medium"; + case webrtc::Priority::kHigh: + return "high"; + } +} + +webrtc::Priority PriorityToEnum(const WTF::String& priority) { + webrtc::Priority result = webrtc::Priority::kLow; + + if (priority == "very-low") { + result = webrtc::Priority::kVeryLow; + } else if (priority == "low") { + result = webrtc::Priority::kLow; + } else if (priority == "medium") { + result = webrtc::Priority::kMedium; + } else if (priority == "high") { + result = webrtc::Priority::kHigh; + } else { + NOTREACHED(); + } + return result; +} + std::tuple<Vector<webrtc::RtpEncodingParameters>, webrtc::DegradationPreference> ToRtpParameters(const RTCRtpSendParameters* parameters) { Vector<webrtc::RtpEncodingParameters> encodings; @@ -277,19 +307,8 @@ } webrtc_encoding.active = encoding->active(); webrtc_encoding.bitrate_priority = PriorityToDouble(encoding->priority()); - // TODO(deadbeef): Make helper function once network_priority changes from a - // double to an enum. - if (encoding->networkPriority() == "very-low") { - webrtc_encoding.network_priority = webrtc::Priority::kVeryLow; - } else if (encoding->networkPriority() == "low") { - webrtc_encoding.network_priority = webrtc::Priority::kLow; - } else if (encoding->networkPriority() == "medium") { - webrtc_encoding.network_priority = webrtc::Priority::kMedium; - } else if (encoding->networkPriority() == "high") { - webrtc_encoding.network_priority = webrtc::Priority::kHigh; - } else { - NOTREACHED(); - } + webrtc_encoding.network_priority = + PriorityToEnum(encoding->networkPriority()); if (encoding->hasMaxBitrate()) { webrtc_encoding.max_bitrate_bps = clampTo<int>(encoding->maxBitrate()); } @@ -430,21 +449,8 @@ } encoding->setPriority( PriorityFromDouble(webrtc_encoding.bitrate_priority).c_str()); - // TODO(deadbeef): Make helper function and use switch statement once - // network_priority changes from a double to an enum. - std::string network_priority; - if (webrtc_encoding.network_priority == webrtc::Priority::kVeryLow) { - network_priority = "very-low"; - } else if (webrtc_encoding.network_priority == webrtc::Priority::kLow) { - network_priority = "low"; - } else if (webrtc_encoding.network_priority == webrtc::Priority::kMedium) { - network_priority = "medium"; - } else if (webrtc_encoding.network_priority == webrtc::Priority::kHigh) { - network_priority = "high"; - } else { - NOTREACHED(); - } - encoding->setNetworkPriority(network_priority.c_str()); + encoding->setNetworkPriority( + PriorityFromEnum(webrtc_encoding.network_priority).c_str()); if (webrtc_encoding.num_temporal_layers) { if (*webrtc_encoding.num_temporal_layers == 2) { encoding->setScalabilityMode("L1T2");
diff --git a/third_party/blink/renderer/modules/service_worker/BUILD.gn b/third_party/blink/renderer/modules/service_worker/BUILD.gn index f0822821..2e0e69a 100644 --- a/third_party/blink/renderer/modules/service_worker/BUILD.gn +++ b/third_party/blink/renderer/modules/service_worker/BUILD.gn
@@ -6,6 +6,8 @@ blink_modules_sources("service_worker") { sources = [ + "cross_origin_resource_policy_checker.cc", + "cross_origin_resource_policy_checker.h", "extendable_event.cc", "extendable_event.h", "extendable_message_event.cc",
diff --git a/third_party/blink/renderer/modules/service_worker/cross_origin_resource_policy_checker.cc b/third_party/blink/renderer/modules/service_worker/cross_origin_resource_policy_checker.cc new file mode 100644 index 0000000..fc87af51 --- /dev/null +++ b/third_party/blink/renderer/modules/service_worker/cross_origin_resource_policy_checker.cc
@@ -0,0 +1,56 @@ +// Copyright 2020 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "third_party/blink/renderer/modules/service_worker/cross_origin_resource_policy_checker.h" + +#include "services/network/public/cpp/cross_origin_resource_policy.h" +#include "third_party/blink/renderer/core/fetch/response.h" + +namespace blink { + +CrossOriginResourcePolicyChecker::CrossOriginResourcePolicyChecker( + network::CrossOriginEmbedderPolicy policy, + mojo::PendingRemote< + network::mojom::blink::CrossOriginEmbedderPolicyReporter> reporter) + : policy_(std::move(policy)) { + if (reporter) { + mojo::PendingRemote<network::mojom::CrossOriginEmbedderPolicyReporter> + pending_reporter_non_blink{ + reporter.PassPipe(), + network::mojom::CrossOriginEmbedderPolicyReporter::Version_}; + reporter_.Bind(std::move(pending_reporter_non_blink)); + } +} + +bool CrossOriginResourcePolicyChecker::IsBlocked( + const url::Origin& initiator_origin, + network::mojom::RequestMode request_mode, + const blink::Response& response) { + if (response.InternalURLList().IsEmpty()) { + // The response is synthesized in the service worker, so it's considered as + // the same origin. + return false; + } + base::Optional<std::string> corp_header_value; + String wtf_corp_header_value; + if (response.InternalHeaderList()->Get( + network::CrossOriginResourcePolicy::kHeaderName, + wtf_corp_header_value)) { + corp_header_value = wtf_corp_header_value.Utf8(); + } + + return network::CrossOriginResourcePolicy::IsBlockedByHeaderValue( + response.InternalURLList().back(), + response.InternalURLList().front(), initiator_origin, + corp_header_value, request_mode, initiator_origin, policy_, + reporter_ ? reporter_.get() : nullptr) + .has_value(); +} + +base::WeakPtr<CrossOriginResourcePolicyChecker> +CrossOriginResourcePolicyChecker::GetWeakPtr() { + return weak_factory_.GetWeakPtr(); +} + +} // namespace blink
diff --git a/third_party/blink/renderer/modules/service_worker/cross_origin_resource_policy_checker.h b/third_party/blink/renderer/modules/service_worker/cross_origin_resource_policy_checker.h new file mode 100644 index 0000000..dc73ce1 --- /dev/null +++ b/third_party/blink/renderer/modules/service_worker/cross_origin_resource_policy_checker.h
@@ -0,0 +1,53 @@ +// Copyright 2020 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef THIRD_PARTY_BLINK_RENDERER_MODULES_SERVICE_WORKER_CROSS_ORIGIN_RESOURCE_POLICY_CHECKER_H_ +#define THIRD_PARTY_BLINK_RENDERER_MODULES_SERVICE_WORKER_CROSS_ORIGIN_RESOURCE_POLICY_CHECKER_H_ + +#include "mojo/public/cpp/bindings/remote.h" +#include "services/network/public/cpp/cross_origin_embedder_policy.h" +#include "services/network/public/mojom/cross_origin_embedder_policy.mojom-blink-forward.h" +#include "services/network/public/mojom/cross_origin_embedder_policy.mojom.h" +#include "services/network/public/mojom/fetch_api.mojom.h" + +namespace url { +class Origin; +} // namespace url + +namespace blink { + +class Response; + +// Contains the COEP policy and the reporter for the controllee and does CORP +// validation based on it. The lifetime is bound with the Mojo connection +// between the controllee and the service worker. +class CrossOriginResourcePolicyChecker { + public: + // |reporter| can be null if reporting is not necessary. + CrossOriginResourcePolicyChecker( + network::CrossOriginEmbedderPolicy policy, + mojo::PendingRemote< + network::mojom::blink::CrossOriginEmbedderPolicyReporter> reporter); + + CrossOriginResourcePolicyChecker(const CrossOriginResourcePolicyChecker&) = + delete; + CrossOriginResourcePolicyChecker& operator=( + const CrossOriginResourcePolicyChecker&) = delete; + + bool IsBlocked(const url::Origin& initiator_origin, + network::mojom::RequestMode request_mode, + const Response& response); + + base::WeakPtr<CrossOriginResourcePolicyChecker> GetWeakPtr(); + + private: + const network::CrossOriginEmbedderPolicy policy_; + mojo::Remote<network::mojom::CrossOriginEmbedderPolicyReporter> reporter_; + + base::WeakPtrFactory<CrossOriginResourcePolicyChecker> weak_factory_{this}; +}; + +} // namespace blink + +#endif // THIRD_PARTY_BLINK_RENDERER_MODULES_SERVICE_WORKER_CROSS_ORIGIN_RESOURCE_POLICY_CHECKER_H_
diff --git a/third_party/blink/renderer/modules/service_worker/fetch_respond_with_observer.cc b/third_party/blink/renderer/modules/service_worker/fetch_respond_with_observer.cc index 88ac964..bbb1d15 100644 --- a/third_party/blink/renderer/modules/service_worker/fetch_respond_with_observer.cc +++ b/third_party/blink/renderer/modules/service_worker/fetch_respond_with_observer.cc
@@ -12,7 +12,6 @@ #include "base/metrics/histogram_macros.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/remote.h" -#include "services/network/public/cpp/cross_origin_resource_policy.h" #include "services/network/public/cpp/features.h" #include "services/network/public/mojom/fetch_api.mojom-blink.h" #include "third_party/blink/public/mojom/devtools/console_message.mojom-blink.h" @@ -25,6 +24,7 @@ #include "third_party/blink/renderer/core/execution_context/execution_context.h" #include "third_party/blink/renderer/core/fetch/body_stream_buffer.h" #include "third_party/blink/renderer/core/inspector/console_message.h" +#include "third_party/blink/renderer/modules/service_worker/cross_origin_resource_policy_checker.h" #include "third_party/blink/renderer/modules/service_worker/service_worker_global_scope.h" #include "third_party/blink/renderer/modules/service_worker/wait_until_observer.h" #include "third_party/blink/renderer/platform/bindings/exception_state.h" @@ -308,13 +308,6 @@ // Cross-Origin-Resource-Policy verification should happen before passing the // response to the client. if (base::FeatureList::IsEnabled(network::features::kCrossOriginIsolation)) { - base::Optional<std::string> corp_header_value; - WTF::String wtf_corp_header_value; - if (response->InternalHeaderList()->Get( - network::CrossOriginResourcePolicy::kHeaderName, - wtf_corp_header_value)) { - corp_header_value = wtf_corp_header_value.Utf8(); - } // The service worker script must be in the same origin with the requestor, // which is a client of the service worker. // @@ -322,9 +315,15 @@ // Hence we provide |initiator_origin| as |request_initiator_site_lock|. auto initiator_origin = url::Origin::Create(GURL(service_worker_global_scope->Url())); - if (network::CrossOriginResourcePolicy::IsBlockedByHeaderValue( - request_url_, request_url_, initiator_origin, corp_header_value, - request_mode_, initiator_origin, requestor_coep_)) { + // |corp_checker_| could be nullptr when the request is for a main resource + // or the connection to the client which initiated the request is broken. + // CORP check isn't needed in both cases because a service worker should be + // in the same origin with the main resource, and the response to the broken + // connection won't reach to the client. + if (corp_checker_ && + corp_checker_->IsBlocked( + url::Origin::Create(GURL(service_worker_global_scope->Url())), + request_mode_, *response)) { OnResponseRejected(ServiceWorkerResponseError::kDisallowedByCorp); return; } @@ -390,7 +389,7 @@ FetchRespondWithObserver::FetchRespondWithObserver( ExecutionContext* context, int fetch_event_id, - const network::CrossOriginEmbedderPolicy& requestor_coep, + base::WeakPtr<CrossOriginResourcePolicyChecker> corp_checker, const mojom::blink::FetchAPIRequest& request, WaitUntilObserver* observer) : RespondWithObserver(context, fetch_event_id, observer), @@ -399,7 +398,7 @@ redirect_mode_(request.redirect_mode), frame_type_(request.frame_type), request_context_(request.request_context_type), - requestor_coep_(requestor_coep), + corp_checker_(std::move(corp_checker)), task_runner_(context->GetTaskRunner(TaskType::kNetworking)) {} void FetchRespondWithObserver::Trace(Visitor* visitor) {
diff --git a/third_party/blink/renderer/modules/service_worker/fetch_respond_with_observer.h b/third_party/blink/renderer/modules/service_worker/fetch_respond_with_observer.h index 961d373..b96e682 100644 --- a/third_party/blink/renderer/modules/service_worker/fetch_respond_with_observer.h +++ b/third_party/blink/renderer/modules/service_worker/fetch_respond_with_observer.h
@@ -15,6 +15,7 @@ namespace blink { +class CrossOriginResourcePolicyChecker; class ExecutionContext; class ScriptValue; class WaitUntilObserver; @@ -29,11 +30,12 @@ // notifies the client. class MODULES_EXPORT FetchRespondWithObserver : public RespondWithObserver { public: - FetchRespondWithObserver(ExecutionContext*, - int fetch_event_id, - const network::CrossOriginEmbedderPolicy&, - const mojom::blink::FetchAPIRequest&, - WaitUntilObserver*); + FetchRespondWithObserver( + ExecutionContext*, + int fetch_event_id, + base::WeakPtr<CrossOriginResourcePolicyChecker> corp_checker, + const mojom::blink::FetchAPIRequest&, + WaitUntilObserver*); ~FetchRespondWithObserver() override = default; void OnResponseRejected(mojom::ServiceWorkerResponseError) override; @@ -52,7 +54,7 @@ const network::mojom::RedirectMode redirect_mode_; const mojom::RequestContextFrameType frame_type_; const mojom::RequestContextType request_context_; - const network::CrossOriginEmbedderPolicy requestor_coep_; + base::WeakPtr<CrossOriginResourcePolicyChecker> corp_checker_; scoped_refptr<base::SingleThreadTaskRunner> task_runner_; };
diff --git a/third_party/blink/renderer/modules/service_worker/service_worker_global_scope.cc b/third_party/blink/renderer/modules/service_worker/service_worker_global_scope.cc index 1af0acd..8fffd29 100644 --- a/third_party/blink/renderer/modules/service_worker/service_worker_global_scope.cc +++ b/third_party/blink/renderer/modules/service_worker/service_worker_global_scope.cc
@@ -40,6 +40,7 @@ #include "base/numerics/safe_conversions.h" #include "mojo/public/cpp/bindings/pending_remote.h" #include "services/network/public/cpp/cross_origin_embedder_policy.h" +#include "services/network/public/mojom/cross_origin_embedder_policy.mojom.h" #include "third_party/blink/public/common/features.h" #include "third_party/blink/public/mojom/appcache/appcache.mojom-blink.h" #include "third_party/blink/public/mojom/timing/worker_timing_container.mojom-blink.h" @@ -94,6 +95,7 @@ #include "third_party/blink/renderer/modules/push_messaging/push_event.h" #include "third_party/blink/renderer/modules/push_messaging/push_message_data.h" #include "third_party/blink/renderer/modules/push_messaging/push_subscription_change_event.h" +#include "third_party/blink/renderer/modules/service_worker/cross_origin_resource_policy_checker.h" #include "third_party/blink/renderer/modules/service_worker/extendable_event.h" #include "third_party/blink/renderer/modules/service_worker/extendable_message_event.h" #include "third_party/blink/renderer/modules/service_worker/fetch_event.h" @@ -628,7 +630,7 @@ // and "handle functional event task source" defined in the service worker // spec and use them when dispatching events. controller_receivers_.Add( - this, std::move(receiver), network::CrossOriginEmbedderPolicy(), + this, std::move(receiver), /*context=*/nullptr, GetThread()->GetTaskRunner(TaskType::kInternalDefault)); } @@ -1405,7 +1407,7 @@ void ServiceWorkerGlobalScope::StartFetchEvent( mojom::blink::DispatchFetchEventParamsPtr params, - const network::CrossOriginEmbedderPolicy& requestor_coep, + base::WeakPtr<CrossOriginResourcePolicyChecker> corp_checker, mojo::PendingRemote<mojom::blink::ServiceWorkerFetchResponseCallback> response_callback, DispatchFetchEventInternalCallback callback, @@ -1438,7 +1440,8 @@ auto* wait_until_observer = MakeGarbageCollected<WaitUntilObserver>( this, WaitUntilObserver::kFetch, event_id); auto* respond_with_observer = MakeGarbageCollected<FetchRespondWithObserver>( - this, event_id, requestor_coep, fetch_request, wait_until_observer); + this, event_id, std::move(corp_checker), fetch_request, + wait_until_observer); Request* request = Request::Create(ScriptController()->GetScriptState(), fetch_request, Request::ForServiceWorkerFetchEvent::kTrue); @@ -1487,20 +1490,20 @@ "ServiceWorkerGlobalScope::DispatchFetchEventForSubresource", "url", params->request->url.ElidedString().Utf8(), "queued", RequestedTermination() ? "true" : "false"); - const network::CrossOriginEmbedderPolicy& requestor_coep = - controller_receivers_.current_context(); + base::WeakPtr<CrossOriginResourcePolicyChecker> corp_checker = + controller_receivers_.current_context()->GetWeakPtr(); if (RequestedTermination()) { event_queue_->EnqueuePending( WTF::Bind(&ServiceWorkerGlobalScope::StartFetchEvent, WrapWeakPersistent(this), std::move(params), - std::move(requestor_coep), std::move(response_callback), + std::move(corp_checker), std::move(response_callback), std::move(callback)), CreateAbortCallback(&fetch_event_callbacks_), base::nullopt); } else { event_queue_->EnqueueNormal( WTF::Bind(&ServiceWorkerGlobalScope::StartFetchEvent, WrapWeakPersistent(this), std::move(params), - std::move(requestor_coep), std::move(response_callback), + std::move(corp_checker), std::move(response_callback), std::move(callback)), CreateAbortCallback(&fetch_event_callbacks_), base::nullopt); } @@ -1508,10 +1511,16 @@ void ServiceWorkerGlobalScope::Clone( mojo::PendingReceiver<mojom::blink::ControllerServiceWorker> receiver, - const network::CrossOriginEmbedderPolicy& cross_origin_embedder_policy) { + const network::CrossOriginEmbedderPolicy& cross_origin_embedder_policy, + mojo::PendingRemote< + network::mojom::blink::CrossOriginEmbedderPolicyReporter> + coep_reporter) { DCHECK(IsContextThread()); + auto checker = std::make_unique<CrossOriginResourcePolicyChecker>( + cross_origin_embedder_policy, std::move(coep_reporter)); + controller_receivers_.Add( - this, std::move(receiver), cross_origin_embedder_policy, + this, std::move(receiver), std::move(checker), GetThread()->GetTaskRunner(TaskType::kInternalDefault)); } @@ -1833,21 +1842,21 @@ DispatchFetchEventForMainResourceCallback callback) { DCHECK(IsContextThread()); - // We can use kNone as a |requestor_coep| for the main resource because it + // We can use nullptr as a |corp_checker| for the main resource because it // must be the same origin. if (params->is_offline_capability_check) { event_queue_->EnqueueOffline( WTF::Bind(&ServiceWorkerGlobalScope::StartFetchEvent, WrapWeakPersistent(this), std::move(params), - network::CrossOriginEmbedderPolicy(), - std::move(response_callback), std::move(callback)), + /*corp_checker=*/nullptr, std::move(response_callback), + std::move(callback)), CreateAbortCallback(&fetch_event_callbacks_), base::nullopt); } else { event_queue_->EnqueueNormal( WTF::Bind(&ServiceWorkerGlobalScope::StartFetchEvent, WrapWeakPersistent(this), std::move(params), - network::CrossOriginEmbedderPolicy(), - std::move(response_callback), std::move(callback)), + /*corp_checker=*/nullptr, std::move(response_callback), + std::move(callback)), CreateAbortCallback(&fetch_event_callbacks_), base::nullopt); } }
diff --git a/third_party/blink/renderer/modules/service_worker/service_worker_global_scope.h b/third_party/blink/renderer/modules/service_worker/service_worker_global_scope.h index e5d3313..27cefb9 100644 --- a/third_party/blink/renderer/modules/service_worker/service_worker_global_scope.h +++ b/third_party/blink/renderer/modules/service_worker/service_worker_global_scope.h
@@ -52,12 +52,9 @@ #include "third_party/blink/renderer/platform/wtf/forward.h" #include "third_party/blink/renderer/platform/wtf/hash_set.h" -namespace network { -struct CrossOriginEmbedderPolicy; -} - namespace blink { +class CrossOriginResourcePolicyChecker; class ExceptionState; class FetchEvent; class PendingURLLoaderFactoryBundle; @@ -378,9 +375,11 @@ response_callback, DispatchFetchEventForSubresourceCallback callback) override; void Clone( - mojo::PendingReceiver<mojom::blink::ControllerServiceWorker> reciever, - const network::CrossOriginEmbedderPolicy& cross_origin_embedder_policy) - override; + mojo::PendingReceiver<mojom::blink::ControllerServiceWorker> receiver, + const network::CrossOriginEmbedderPolicy& cross_origin_embedder_policy, + mojo::PendingRemote< + network::mojom::blink::CrossOriginEmbedderPolicyReporter> + coep_reporter) override; // Implements mojom::blink::ServiceWorker. void InitializeGlobalScope( @@ -472,7 +471,7 @@ // the event queue, and executed immediately or sometimes later. void StartFetchEvent( mojom::blink::DispatchFetchEventParamsPtr params, - const network::CrossOriginEmbedderPolicy& requestor_coep, + base::WeakPtr<CrossOriginResourcePolicyChecker> corp_checker, mojo::PendingRemote<mojom::blink::ServiceWorkerFetchResponseCallback> response_callback, DispatchFetchEventInternalCallback callback, @@ -672,7 +671,7 @@ // to the ControllerServiceWorker. It should be referred to before sending the // response back to the client. mojo::ReceiverSet<mojom::blink::ControllerServiceWorker, - network::CrossOriginEmbedderPolicy> + std::unique_ptr<CrossOriginResourcePolicyChecker>> controller_receivers_; };
diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn index fcff0b8..9f39304 100644 --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn
@@ -4,6 +4,7 @@ import("//build/buildflag_header.gni") import("//build/compiled_action.gni") +import("//build/config/compiler/compiler.gni") import("//build/config/features.gni") import("//build/config/jumbo.gni") import("//build/config/ui.gni") @@ -1613,6 +1614,11 @@ deps += [ "//third_party/pffft" ] } + if (!is_debug && !optimize_for_size) { + configs -= [ "//build/config/compiler:default_optimization" ] + configs += [ "//build/config/compiler:optimize_max" ] + } + configs -= [ "//build/config/compiler:default_symbols" ] configs += blink_symbols_config } @@ -1871,6 +1877,7 @@ "mediastream/webrtc_uma_histograms_test.cc", "mhtml/mhtml_parser_test.cc", "mojo/big_string_mojom_traits_test.cc", + "mojo/heap_mojo_receiver_set_test.cc", "mojo/heap_mojo_receiver_test.cc", "mojo/heap_mojo_remote_test.cc", "mojo/heap_mojo_unique_receiver_set_test.cc",
diff --git a/third_party/blink/renderer/platform/bindings/v8_interface_bridge.h b/third_party/blink/renderer/platform/bindings/v8_interface_bridge.h index 9ebe283..402b97c 100644 --- a/third_party/blink/renderer/platform/bindings/v8_interface_bridge.h +++ b/third_party/blink/renderer/platform/bindings/v8_interface_bridge.h
@@ -51,7 +51,13 @@ template <class V8T, class T> class V8InterfaceBridge : public V8InterfaceBridgeBase { public: - static T* ToBlinkUnsafe(v8::Local<v8::Object> value) { + static T* ToWrappable(v8::Isolate* isolate, v8::Local<v8::Value> value) { + return HasInstance(isolate, value) + ? ToWrappableUnsafe(value.As<v8::Object>()) + : nullptr; + } + + static T* ToWrappableUnsafe(v8::Local<v8::Object> value) { return ToScriptWrappable(value)->ToImpl<T>(); } @@ -65,12 +71,13 @@ return HasInstance(isolate, value); } - static T* ToImpl(v8::Local<v8::Object> value) { return ToBlinkUnsafe(value); } + static T* ToImpl(v8::Local<v8::Object> value) { + return ToWrappableUnsafe(value); + } static T* ToImplWithTypeCheck(v8::Isolate* isolate, v8::Local<v8::Value> value) { - return HasInstance(isolate, value) ? ToBlinkUnsafe(value.As<v8::Object>()) - : nullptr; + return ToWrappable(isolate, value); } static void InstallContextDependentAdapter(
diff --git a/third_party/blink/renderer/platform/graphics/compositing/content_layer_client_impl.cc b/third_party/blink/renderer/platform/graphics/compositing/content_layer_client_impl.cc index 6b05ec8..1e7e0c1 100644 --- a/third_party/blink/renderer/platform/graphics/compositing/content_layer_client_impl.cc +++ b/third_party/blink/renderer/platform/graphics/compositing/content_layer_client_impl.cc
@@ -42,9 +42,12 @@ json.SetValue("paintChunkContents", paint_chunk_debug_data_->Clone()); #endif - if ((flags & kLayerTreeIncludesPaintInvalidations) && - raster_invalidator_.GetTracking()) - raster_invalidator_.GetTracking()->AsJSON(&json); + if ((flags & (kLayerTreeIncludesInvalidations | + kLayerTreeIncludesDetailedInvalidations)) && + raster_invalidator_.GetTracking()) { + raster_invalidator_.GetTracking()->AsJSON( + &json, flags & kLayerTreeIncludesDetailedInvalidations); + } #if DCHECK_IS_ON() if (flags & kLayerTreeIncludesPaintRecords) {
diff --git a/third_party/blink/renderer/platform/graphics/compositing/layers_as_json.h b/third_party/blink/renderer/platform/graphics/compositing/layers_as_json.h index 1dfaa1ea..4be8eed2 100644 --- a/third_party/blink/renderer/platform/graphics/compositing/layers_as_json.h +++ b/third_party/blink/renderer/platform/graphics/compositing/layers_as_json.h
@@ -26,9 +26,10 @@ kLayerTreeNormal = 0, // Dump extra debugging info like layer addresses. kLayerTreeIncludesDebugInfo = 1 << 0, - kLayerTreeIncludesPaintInvalidations = 1 << 1, - kLayerTreeIncludesPaintingPhases = 1 << 2, - kLayerTreeIncludesAllLayers = 1 << 3, + kLayerTreeIncludesInvalidations = 1 << 1, + kLayerTreeIncludesDetailedInvalidations = 1 << 2, + kLayerTreeIncludesPaintingPhases = 1 << 3, + kLayerTreeIncludesAllLayers = 1 << 4, kLayerTreeIncludesCompositingReasons = 1 << 5, kLayerTreeIncludesPaintRecords = 1 << 6, // Outputs all layers as a layer tree. The default is output children
diff --git a/third_party/blink/renderer/platform/graphics/compositing/paint_artifact_compositor.cc b/third_party/blink/renderer/platform/graphics/compositing/paint_artifact_compositor.cc index b41b7108..e30313e 100644 --- a/third_party/blink/renderer/platform/graphics/compositing/paint_artifact_compositor.cc +++ b/third_party/blink/renderer/platform/graphics/compositing/paint_artifact_compositor.cc
@@ -80,8 +80,10 @@ paint_artifact); if (RuntimeEnabledFeatures::CompositeAfterPaintEnabled() && - !tracks_raster_invalidations_) - flags &= ~kLayerTreeIncludesPaintInvalidations; + !tracks_raster_invalidations_) { + flags &= ~(kLayerTreeIncludesInvalidations | + kLayerTreeIncludesDetailedInvalidations); + } LayersAsJSON layers_as_json(flags); if (RuntimeEnabledFeatures::CompositeAfterPaintEnabled()) { @@ -1636,7 +1638,7 @@ #if DCHECK_IS_ON() void PaintArtifactCompositor::ShowDebugData() { LOG(ERROR) << GetLayersAsJSON(kLayerTreeIncludesDebugInfo | - kLayerTreeIncludesPaintInvalidations) + kLayerTreeIncludesDetailedInvalidations) ->ToPrettyJSONString() .Utf8(); }
diff --git a/third_party/blink/renderer/platform/graphics/compositor_element_id.h b/third_party/blink/renderer/platform/graphics/compositor_element_id.h index 957fbf2..25b0f82 100644 --- a/third_party/blink/renderer/platform/graphics/compositor_element_id.h +++ b/third_party/blink/renderer/platform/graphics/compositor_element_id.h
@@ -25,8 +25,9 @@ kEffectClipPath, kVerticalScrollbar, kHorizontalScrollbar, + kDOMNodeId, // The following values are for internal usage only. - kMax = kHorizontalScrollbar, + kMax = kDOMNodeId, // A sentinel to indicate the maximum representable namespace id // (the maximum is one less than this value). kMaxRepresentable = 1 << kCompositorNamespaceBitCount
diff --git a/third_party/blink/renderer/platform/graphics/graphics_layer.cc b/third_party/blink/renderer/platform/graphics/graphics_layer.cc index 4616838..81da985a 100644 --- a/third_party/blink/renderer/platform/graphics/graphics_layer.cc +++ b/third_party/blink/renderer/platform/graphics/graphics_layer.cc
@@ -129,10 +129,12 @@ if (&layer != layer_.get()) return; - if ((flags & kLayerTreeIncludesPaintInvalidations) && + if ((flags & (kLayerTreeIncludesInvalidations | + kLayerTreeIncludesDetailedInvalidations)) && Client().IsTrackingRasterInvalidations() && GetRasterInvalidationTracking()) { - GetRasterInvalidationTracking()->AsJSON(&json); + GetRasterInvalidationTracking()->AsJSON( + &json, flags & kLayerTreeIncludesDetailedInvalidations); } GraphicsLayerPaintingPhase painting_phase = PaintingPhase();
diff --git a/third_party/blink/renderer/platform/graphics/paint/raster_invalidation_tracking.cc b/third_party/blink/renderer/platform/graphics/paint/raster_invalidation_tracking.cc index 1a65460..b987497 100644 --- a/third_party/blink/renderer/platform/graphics/paint/raster_invalidation_tracking.cc +++ b/third_party/blink/renderer/platform/graphics/paint/raster_invalidation_tracking.cc
@@ -78,47 +78,48 @@ return a.reason < b.reason; } -void RasterInvalidationTracking::AsJSON(JSONObject* json) const { +void RasterInvalidationTracking::AsJSON(JSONObject* json, bool detailed) const { if (!invalidations_.IsEmpty()) { // Sort to make the output more readable and easier to see the differences // by a human. - auto sorted_invalidations = invalidations_; - std::sort(sorted_invalidations.begin(), sorted_invalidations.end(), - &CompareRasterInvalidationInfo); - auto paint_invalidations_json = std::make_unique<JSONArray>(); - for (auto& info : sorted_invalidations) { - auto info_json = std::make_unique<JSONObject>(); - info_json->SetString("object", info.client_debug_name); - if (!info.rect.IsEmpty()) { - if (info.rect == LayoutRect::InfiniteIntRect()) - info_json->SetString("rect", "infinite"); - else - info_json->SetArray("rect", RectAsJSONArray(info.rect)); + auto sorted = invalidations_; + std::sort(sorted.begin(), sorted.end(), &CompareRasterInvalidationInfo); + auto invalidations_json = std::make_unique<JSONArray>(); + IntRect last_rect; + for (auto* it = sorted.begin(); it != sorted.end(); it++) { + const auto& info = *it; + if (detailed) { + auto info_json = std::make_unique<JSONObject>(); + info_json->SetArray("rect", RectAsJSONArray(info.rect)); + info_json->SetString("object", info.client_debug_name); + info_json->SetString("reason", + PaintInvalidationReasonToString(info.reason)); + invalidations_json->PushObject(std::move(info_json)); + } else if (std::none_of(sorted.begin(), it, [&info](auto& previous) { + return previous.rect.Contains(info.rect); + })) { + invalidations_json->PushArray(RectAsJSONArray(info.rect)); + last_rect = info.rect; } - info_json->SetString("reason", - PaintInvalidationReasonToString(info.reason)); - paint_invalidations_json->PushObject(std::move(info_json)); } - json->SetArray("paintInvalidations", std::move(paint_invalidations_json)); + json->SetArray("invalidations", std::move(invalidations_json)); } if (!under_invalidations_.IsEmpty()) { - auto under_paint_invalidations_json = std::make_unique<JSONArray>(); - for (auto& under_paint_invalidation : under_invalidations_) { - auto under_paint_invalidation_json = std::make_unique<JSONObject>(); - under_paint_invalidation_json->SetDouble("x", under_paint_invalidation.x); - under_paint_invalidation_json->SetDouble("y", under_paint_invalidation.y); - under_paint_invalidation_json->SetString( + auto under_invalidations_json = std::make_unique<JSONArray>(); + for (auto& under_invalidation : under_invalidations_) { + auto under_invalidation_json = std::make_unique<JSONObject>(); + under_invalidation_json->SetDouble("x", under_invalidation.x); + under_invalidation_json->SetDouble("y", under_invalidation.y); + under_invalidation_json->SetString( "oldPixel", - Color(under_paint_invalidation.old_pixel).NameForLayoutTreeAsText()); - under_paint_invalidation_json->SetString( + Color(under_invalidation.old_pixel).NameForLayoutTreeAsText()); + under_invalidation_json->SetString( "newPixel", - Color(under_paint_invalidation.new_pixel).NameForLayoutTreeAsText()); - under_paint_invalidations_json->PushObject( - std::move(under_paint_invalidation_json)); + Color(under_invalidation.new_pixel).NameForLayoutTreeAsText()); + under_invalidations_json->PushObject(std::move(under_invalidation_json)); } - json->SetArray("underPaintInvalidations", - std::move(under_paint_invalidations_json)); + json->SetArray("underInvalidations", std::move(under_invalidations_json)); } }
diff --git a/third_party/blink/renderer/platform/graphics/paint/raster_invalidation_tracking.h b/third_party/blink/renderer/platform/graphics/paint/raster_invalidation_tracking.h index 94bf0a5..2904783 100644 --- a/third_party/blink/renderer/platform/graphics/paint/raster_invalidation_tracking.h +++ b/third_party/blink/renderer/platform/graphics/paint/raster_invalidation_tracking.h
@@ -95,7 +95,7 @@ sk_sp<PaintRecord> new_record, const IntRect& new_interest_rect); - void AsJSON(JSONObject*) const; + void AsJSON(JSONObject*, bool detailed) const; void AddToLayerDebugInfo(cc::LayerDebugInfo&) const;
diff --git a/third_party/blink/renderer/platform/heap/BUILD.gn b/third_party/blink/renderer/platform/heap/BUILD.gn index dc9e81b..d868c46 100644 --- a/third_party/blink/renderer/platform/heap/BUILD.gn +++ b/third_party/blink/renderer/platform/heap/BUILD.gn
@@ -3,6 +3,7 @@ # found in the LICENSE file. import("//build/buildflag_header.gni") +import("//build/config/compiler/compiler.gni") import("//build/config/jumbo.gni") import("//build/config/sanitizers/sanitizers.gni") import("//testing/test.gni") @@ -108,6 +109,11 @@ "//third_party/icu", "//v8", ] + + if (!is_debug && !optimize_for_size) { + configs -= [ "//build/config/compiler:default_optimization" ] + configs += [ "//build/config/compiler:optimize_max" ] + } } jumbo_source_set("test_support") {
diff --git a/third_party/blink/renderer/platform/heap/heap_allocator.h b/third_party/blink/renderer/platform/heap/heap_allocator.h index b8d82780..5a4850e 100644 --- a/third_party/blink/renderer/platform/heap/heap_allocator.h +++ b/third_party/blink/renderer/platform/heap/heap_allocator.h
@@ -786,9 +786,6 @@ static void ConstructDeletedValue(blink::Member<T>& slot, bool) { slot = WTF::kHashTableDeletedValue; } - static bool IsDeletedValue(const blink::Member<T>& value) { - return value.IsHashTableDeletedValue(); - } }; template <typename T> @@ -819,6 +816,10 @@ } static PeekOutType Peek(const blink::WeakMember<T>& value) { return value; } + + static void ConstructDeletedValue(blink::WeakMember<T>& slot, bool) { + slot = WTF::kHashTableDeletedValue; + } }; template <typename T>
diff --git a/third_party/blink/renderer/platform/loader/fetch/client_hints_preferences_test.cc b/third_party/blink/renderer/platform/loader/fetch/client_hints_preferences_test.cc index e3e328e..1b6afcc 100644 --- a/third_party/blink/renderer/platform/loader/fetch/client_hints_preferences_test.cc +++ b/third_party/blink/renderer/platform/loader/fetch/client_hints_preferences_test.cc
@@ -28,31 +28,33 @@ bool expectation_ua_arch; bool expectation_ua_platform; bool expectation_ua_model; + bool expectation_ua_full_version; } cases[] = { {"width, dpr, viewportWidth", true, true, false, false, false, false, - false, false, false, false, false}, + false, false, false, false, false, false}, {"WiDtH, dPr, viewport-width, rtt, downlink, ect, lang", true, true, true, - true, true, true, true, false, false, false, false}, + true, true, true, true, false, false, false, false, false}, {"WiDtH, dPr, viewport-width, rtt, downlink, effective-connection-type", - true, true, true, true, true, false, false, false, false, false, false}, + true, true, true, true, true, false, false, false, false, false, false, + false}, {"WIDTH, DPR, VIWEPROT-Width", true, true, false, false, false, false, - false, false, false, false, false}, + false, false, false, false, false, false}, {"VIewporT-Width, wutwut, width", true, false, true, false, false, false, - false, false, false, false, false}, + false, false, false, false, false, false}, {"dprw", false, false, false, false, false, false, false, false, false, - false, false}, + false, false, false}, {"DPRW", false, false, false, false, false, false, false, false, false, - false, false}, + false, false, false}, {"ua", false, false, false, false, false, false, false, true, false, - false, false}, - {"arch", false, false, false, false, false, false, false, false, true, - false, false}, - {"platform", false, false, false, false, false, false, false, false, - false, true, false}, - {"model", false, false, false, false, false, false, false, false, false, - false, true}, - {"ua, arch, platform, model", false, false, false, false, false, false, - false, true, true, true, true}, + false, false, false}, + {"ua-arch", false, false, false, false, false, false, false, false, true, + false, false, false}, + {"ua-platform", false, false, false, false, false, false, false, false, + false, true, false, false}, + {"ua-model", false, false, false, false, false, false, false, false, + false, false, true, false}, + {"ua, ua-arch, ua-platform, ua-model, ua-full-version", false, false, + false, false, false, false, false, true, true, true, true, true}, }; for (const auto& test_case : cases) { @@ -214,23 +216,25 @@ bool expect_ua_arch; bool expect_ua_platform; bool expect_ua_model; + bool expect_ua_full_version; } test_cases[] = { {"width, dpr, viewportWidth, lang", "", 0, false, true, true, false, - false, false, false, true, false, false, false, false}, + false, false, false, true, false, false, false, false, false}, {"width, dpr, viewportWidth", "-1000", 0, false, true, true, false, false, - false, false, false, false, false, false, false}, - {"width, dpr, viewportWidth", "1000s", 0, false, true, true, false, false, - false, false, false, false, false, false, false}, - {"width, dpr, viewportWidth", "1000.5", 0, false, true, true, false, false, false, false, false, false, false, false, false}, + {"width, dpr, viewportWidth", "1000s", 0, false, true, true, false, false, + false, false, false, false, false, false, false, false}, + {"width, dpr, viewportWidth", "1000.5", 0, false, true, true, false, + false, false, false, false, false, false, false, false, false}, {"width, dpr, rtt, downlink, ect", "1000", 1000, false, true, true, false, - true, true, true, false, false, false, false, false}, + true, true, true, false, false, false, false, false, false}, {"device-memory", "-1000", 0, true, false, false, false, false, false, - false, false, false, false, false, false}, + false, false, false, false, false, false, false}, {"dpr rtt", "1000", 1000, false, false, false, false, false, false, false, - false, false, false, false, false}, - {"ua, arch, platform, model", "1000", 1000, false, false, false, false, - false, false, false, false, true, true, true, true}, + false, false, false, false, false, false}, + {"ua, ua-arch, ua-platform, ua-model, ua-full-version", "1000", 1000, + false, false, false, false, false, false, false, false, true, true, true, + true, true}, }; for (const auto& test : test_cases) {
diff --git a/third_party/blink/renderer/platform/mojo/heap_mojo_receiver_set.h b/third_party/blink/renderer/platform/mojo/heap_mojo_receiver_set.h index 26920f9..3927d9b 100644 --- a/third_party/blink/renderer/platform/mojo/heap_mojo_receiver_set.h +++ b/third_party/blink/renderer/platform/mojo/heap_mojo_receiver_set.h
@@ -6,6 +6,7 @@ #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_MOJO_HEAP_MOJO_RECEIVER_SET_H_ #include "mojo/public/cpp/bindings/receiver.h" +#include "mojo/public/cpp/bindings/receiver_set.h" #include "third_party/blink/renderer/platform/context_lifecycle_observer.h" #include "third_party/blink/renderer/platform/heap/heap.h" @@ -25,17 +26,29 @@ using ImplPointerType = typename mojo::Receiver<Interface>::ImplPointerType; explicit HeapMojoReceiverSet(ContextLifecycleNotifier* context) - : wrapper_(MakeGarbageCollected<Wrapper>(context)) {} + : wrapper_(MakeGarbageCollected<Wrapper>(context)) { + DCHECK(context); + } // Methods to redirect to mojo::ReceiverSet: mojo::ReceiverId Add(ImplPointerType impl, mojo::PendingReceiver<Interface> receiver, scoped_refptr<base::SequencedTaskRunner> task_runner) { DCHECK(task_runner); - return wrapper_->receiver_set().Add(std::move(impl), std::move(receiver)); + return wrapper_->receiver_set().Add(std::move(impl), std::move(receiver), + task_runner); } + + bool Remove(mojo::ReceiverId id) { + return wrapper_->receiver_set().Remove(id); + } + void Clear() { wrapper_->receiver_set().Clear(); } + bool HasReceiver(mojo::ReceiverId id) { + return wrapper_->receiver_set().HasReceiver(id); + } + void Trace(Visitor* visitor) { visitor->Trace(wrapper_); } private: @@ -62,7 +75,7 @@ void ContextDestroyed() override { receiver_set_.Clear(); } private: - mojo::ReceiverSet<Interface> receiver_set_; + ::mojo::ReceiverSet<Interface> receiver_set_; }; Member<Wrapper> wrapper_;
diff --git a/third_party/blink/renderer/platform/mojo/heap_mojo_receiver_set_test.cc b/third_party/blink/renderer/platform/mojo/heap_mojo_receiver_set_test.cc new file mode 100644 index 0000000..c57f182b --- /dev/null +++ b/third_party/blink/renderer/platform/mojo/heap_mojo_receiver_set_test.cc
@@ -0,0 +1,133 @@ +// Copyright 2020 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "third_party/blink/renderer/platform/mojo/heap_mojo_receiver_set.h" + +#include "base/test/null_task_runner.h" +#include "mojo/public/cpp/bindings/receiver_set.h" +#include "mojo/public/cpp/bindings/remote.h" +#include "mojo/public/interfaces/bindings/tests/sample_service.mojom-blink.h" +#include "testing/gtest/include/gtest/gtest.h" +#include "third_party/blink/renderer/platform/context_lifecycle_notifier.h" +#include "third_party/blink/renderer/platform/heap/heap_test_utilities.h" +#include "third_party/blink/renderer/platform/heap/persistent.h" +#include "third_party/blink/renderer/platform/heap_observer_list.h" + +namespace blink { + +namespace { + +class FakeContextNotifier final : public GarbageCollected<FakeContextNotifier>, + public ContextLifecycleNotifier { + USING_GARBAGE_COLLECTED_MIXIN(FakeContextNotifier); + + public: + FakeContextNotifier() = default; + + void AddContextLifecycleObserver( + ContextLifecycleObserver* observer) override { + observers_.AddObserver(observer); + } + void RemoveContextLifecycleObserver( + ContextLifecycleObserver* observer) override { + observers_.RemoveObserver(observer); + } + + void NotifyContextDestroyed() { + observers_.ForEachObserver([](ContextLifecycleObserver* observer) { + observer->ContextDestroyed(); + }); + } + + void Trace(Visitor* visitor) override { + visitor->Trace(observers_); + ContextLifecycleNotifier::Trace(visitor); + } + + private: + HeapObserverList<ContextLifecycleObserver> observers_; +}; + +class MockService : public sample::blink::Service { + public: + MockService() = default; + + void Frobinate(sample::blink::FooPtr foo, + Service::BazOptions baz, + mojo::PendingRemote<sample::blink::Port> port, + FrobinateCallback callback) override {} + void GetPort(mojo::PendingReceiver<sample::blink::Port> receiver) override {} +}; + +class GCOwner : public GarbageCollected<GCOwner> { + public: + explicit GCOwner(FakeContextNotifier* context) : receiver_set_(context) {} + void Trace(Visitor* visitor) { visitor->Trace(receiver_set_); } + + HeapMojoReceiverSet<sample::blink::Service>& receiver_set() { + return receiver_set_; + } + + private: + HeapMojoReceiverSet<sample::blink::Service> receiver_set_; +}; + +} // namespace + +class HeapMojoReceiverSetTest : public TestSupportingGC { + public: + FakeContextNotifier* context() { return context_; } + scoped_refptr<base::NullTaskRunner> task_runner() { + return null_task_runner_; + } + GCOwner* owner() { return owner_; } + + void ClearOwner() { owner_ = nullptr; } + + protected: + void SetUp() override { + context_ = MakeGarbageCollected<FakeContextNotifier>(); + owner_ = MakeGarbageCollected<GCOwner>(context()); + } + void TearDown() override {} + + Persistent<FakeContextNotifier> context_; + Persistent<GCOwner> owner_; + scoped_refptr<base::NullTaskRunner> null_task_runner_ = + base::MakeRefCounted<base::NullTaskRunner>(); +}; + +// GC the HeapMojoReceiverSet and verify that the receiver is no longer +// part of the set, and that the service was deleted. +TEST_F(HeapMojoReceiverSetTest, RemovesReceiver) { + auto receiver_set = owner()->receiver_set(); + MockService service; + auto receiver = mojo::PendingReceiver<sample::blink::Service>( + mojo::MessagePipe().handle0); + + mojo::ReceiverId rid = + receiver_set.Add(&service, std::move(receiver), task_runner()); + EXPECT_TRUE(receiver_set.HasReceiver(rid)); + + receiver_set.Remove(rid); + + EXPECT_FALSE(receiver_set.HasReceiver(rid)); +} + +TEST_F(HeapMojoReceiverSetTest, ClearLeavesSetEmpty) { + auto receiver_set = owner()->receiver_set(); + MockService service; + auto receiver = mojo::PendingReceiver<sample::blink::Service>( + mojo::MessagePipe().handle0); + + mojo::ReceiverId rid = + receiver_set.Add(&service, std::move(receiver), task_runner()); + EXPECT_TRUE(receiver_set.HasReceiver(rid)); + + receiver_set.Clear(); + + EXPECT_FALSE(receiver_set.HasReceiver(rid)); +} + +} // namespace blink
diff --git a/third_party/blink/renderer/platform/mojo/heap_mojo_remote.h b/third_party/blink/renderer/platform/mojo/heap_mojo_remote.h index a3ee535..49cc53d 100644 --- a/third_party/blink/renderer/platform/mojo/heap_mojo_remote.h +++ b/third_party/blink/renderer/platform/mojo/heap_mojo_remote.h
@@ -5,13 +5,15 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_MOJO_HEAP_MOJO_REMOTE_H_ #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_MOJO_HEAP_MOJO_REMOTE_H_ +#include <utility> + #include "mojo/public/cpp/bindings/remote.h" #include "third_party/blink/renderer/platform/context_lifecycle_observer.h" #include "third_party/blink/renderer/platform/heap/heap.h" namespace blink { -// HeapMojoRemote is a wrapper for mojo::Receiver to be owned by a +// HeapMojoRemote is a wrapper for mojo::Remote to be owned by a // garbage-collected object. Blink is expected to use HeapMojoRemote by // default. HeapMojoRemote must be associated with context. // HeapMojoRemote's constructor takes context as a mandatory parameter. @@ -22,14 +24,13 @@ DISALLOW_NEW(); public: - using ImplPointerType = typename mojo::Receiver<Interface>::ImplPointerType; - - HeapMojoRemote(ContextLifecycleNotifier* notifier) + explicit HeapMojoRemote(ContextLifecycleNotifier* notifier) : wrapper_(MakeGarbageCollected<Wrapper>(notifier)) {} - // Methods to redirect to mojo::Receiver: - ImplPointerType operator->() const { return get(); } - ImplPointerType get() const { return wrapper_->remote().get(); } + // Methods to redirect to mojo::Remote. + using Proxy = typename Interface::Proxy_; + Proxy* operator->() const { return get(); } + Proxy* get() const { return wrapper_->remote().get(); } bool is_bound() const { return wrapper_->remote().is_bound(); } bool is_connected() const { return wrapper_->remote().is_connected(); } void reset() { wrapper_->remote().reset(); } @@ -58,7 +59,7 @@ USING_GARBAGE_COLLECTED_MIXIN(Wrapper); public: - Wrapper(ContextLifecycleNotifier* notifier) { + explicit Wrapper(ContextLifecycleNotifier* notifier) { SetContextLifecycleNotifier(notifier); }
diff --git a/third_party/blink/renderer/platform/mojo/heap_mojo_unique_receiver_set_test.cc b/third_party/blink/renderer/platform/mojo/heap_mojo_unique_receiver_set_test.cc index 9ee885c..e0fcb60 100644 --- a/third_party/blink/renderer/platform/mojo/heap_mojo_unique_receiver_set_test.cc +++ b/third_party/blink/renderer/platform/mojo/heap_mojo_unique_receiver_set_test.cc
@@ -14,6 +14,7 @@ namespace blink { +namespace { class FakeContextNotifier final : public GarbageCollected<FakeContextNotifier>, public ContextLifecycleNotifier { USING_GARBAGE_COLLECTED_MIXIN(FakeContextNotifier); @@ -58,6 +59,7 @@ HeapMojoUniqueReceiverSet<sample::blink::Service> receiver_set_; }; +} // namespace class HeapMojoUniqueReceiverSetTest : public TestSupportingGC { public: FakeContextNotifier* context() { return context_; } @@ -84,6 +86,8 @@ bool service_deleted_ = false; }; +namespace { + class MockService : public sample::blink::Service { public: explicit MockService(HeapMojoUniqueReceiverSetTest* test) : test_(test) {} @@ -100,6 +104,8 @@ HeapMojoUniqueReceiverSetTest* test_; }; +} // namespace + // GC the HeapMojoUniqueReceiverSet and verify that the receiver is no longer // part of the set, and that the service was deleted. TEST_F(HeapMojoUniqueReceiverSetTest, ResetsOnGC) {
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 index 7994cba..e5bc2bde 100644 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -266,12 +266,7 @@ name: "BuiltInModuleInfra", origin_trial_feature_name: "BuiltInModuleInfra", implied_by: ["ExperimentalProductivityFeatures", - "BuiltInModuleAll", - "BuiltInModuleSwitchElement"], - }, - { - name: "BuiltInModuleSwitchElement", - implied_by: ["BuiltInModuleAll"], + "BuiltInModuleAll"], }, { name: "CacheInlineScriptCode"
diff --git a/third_party/blink/renderer/platform/wtf/BUILD.gn b/third_party/blink/renderer/platform/wtf/BUILD.gn index de3e2eb..df1e64a 100644 --- a/third_party/blink/renderer/platform/wtf/BUILD.gn +++ b/third_party/blink/renderer/platform/wtf/BUILD.gn
@@ -4,6 +4,7 @@ assert(!is_ios) +import("//build/config/compiler/compiler.gni") import("//build/config/jumbo.gni") import("//testing/test.gni") import("//third_party/blink/renderer/config.gni") @@ -238,6 +239,11 @@ sources -= [ "text/atomic_string_cf.cc" ] } + if (!is_debug && !optimize_for_size) { + configs -= [ "//build/config/compiler:default_optimization" ] + configs += [ "//build/config/compiler:optimize_max" ] + } + configs -= [ "//build/config/compiler:default_symbols" ] configs += blink_symbols_config }
diff --git a/third_party/blink/renderer/platform/wtf/linked_hash_set.h b/third_party/blink/renderer/platform/wtf/linked_hash_set.h index 55ce56a..e6919a9 100644 --- a/third_party/blink/renderer/platform/wtf/linked_hash_set.h +++ b/third_party/blink/renderer/platform/wtf/linked_hash_set.h
@@ -1045,6 +1045,10 @@ using Map = HashMap<Value, wtf_size_t>; public: + using const_iterator = typename VectorBackedLinkedList<Value>::const_iterator; + using const_reverse_iterator = + typename VectorBackedLinkedList<Value>::const_reverse_iterator; + // TODO(keinakashima): add security check struct AddResult final { STACK_ALLOCATED(); @@ -1070,7 +1074,11 @@ // TODO(keinakashima): implement size-related functions - // TODO(keinakashima): implement begin/end, rbegin/rend + const_iterator begin() const { return list_.cbegin(); } + const_iterator end() const { return list_.cend(); } + + const_reverse_iterator rbegin() const { return list_.crbegin(); } + const_reverse_iterator rend() const { return list_.crend(); } // TODO(keinakashima): implement front/back
diff --git a/third_party/blink/renderer/platform/wtf/linked_hash_set_test.cc b/third_party/blink/renderer/platform/wtf/linked_hash_set_test.cc index 6e4314c..ba809e2 100644 --- a/third_party/blink/renderer/platform/wtf/linked_hash_set_test.cc +++ b/third_party/blink/renderer/platform/wtf/linked_hash_set_test.cc
@@ -14,4 +14,11 @@ NewLinkedHashSet<int> test; } +TEST(NewLinkedHashSetTest, Iterator) { + using Set = NewLinkedHashSet<int>; + Set set; + EXPECT_TRUE(set.begin() == set.end()); + EXPECT_TRUE(set.rbegin() == set.rend()); +} + } // namespace WTF
diff --git a/third_party/blink/renderer/platform/wtf/vector_backed_linked_list.h b/third_party/blink/renderer/platform/wtf/vector_backed_linked_list.h index 928ca4f..e63c11d2 100644 --- a/third_party/blink/renderer/platform/wtf/vector_backed_linked_list.h +++ b/third_party/blink/renderer/platform/wtf/vector_backed_linked_list.h
@@ -182,6 +182,9 @@ // terminator. wtf_size_t free_head_index_ = anchor_index_; wtf_size_t size_ = 0; + + template <typename T> + friend class NewLinkedHashSet; }; template <typename VectorBackedLinkedListType> @@ -241,9 +244,18 @@ using Node = typename VectorBackedLinkedListType::Node; public: + PointerType Get() const { + DCHECK(container_->IsIndexValid(index_)); + DCHECK(!container_->IsAnchor(index_)); + const Node& node = container_->nodes_[index_]; + return &node.value_; + } + ReferenceType operator*() const { return *Get(); } PointerType operator->() const { return Get(); } + wtf_size_t GetIndex() const { return index_; } + VectorBackedLinkedListConstIterator& operator++() { DCHECK(container_->IsIndexValid(index_)); index_ = container_->nodes_[index_].next_index_; @@ -271,19 +283,12 @@ } protected: - PointerType Get() const { - DCHECK(container_->IsIndexValid(index_)); - DCHECK(!container_->IsAnchor(index_)); - const Node& node = container_->nodes_[index_]; - return &node.value_; - } - VectorBackedLinkedListConstIterator( wtf_size_t index, const VectorBackedLinkedListType* container) - : index_(index), container_(container) {} - - wtf_size_t GetIndex() const { return index_; } + : index_(index), container_(container) { + DCHECK(container_->IsIndexValid(index_)); + } private: wtf_size_t index_;
diff --git a/third_party/blink/tools/blinkpy/web_tests/controllers/repaint_overlay.py b/third_party/blink/tools/blinkpy/web_tests/controllers/repaint_overlay.py index 178bdf97..eb26037 100644 --- a/third_party/blink/tools/blinkpy/web_tests/controllers/repaint_overlay.py +++ b/third_party/blink/tools/blinkpy/web_tests/controllers/repaint_overlay.py
@@ -6,7 +6,7 @@ def result_contains_repaint_rects(text): - return isinstance(text, str) and re.search(r'"paintInvalidations": \[$', text, re.MULTILINE) is not None + return isinstance(text, str) and re.search(r'"invalidations": \[$', text, re.MULTILINE) is not None def extract_layer_tree(input_str): @@ -117,15 +117,8 @@ } if (layer.position) context.translate(layer.position[0], layer.position[1]); - - if (layer.paintInvalidations) { - var rects = []; - for (var i = 0; i < layer.paintInvalidations.length; ++i) { - if (layer.paintInvalidations[i].rect) - rects.push(layer.paintInvalidations[i].rect); - } - draw_rects(context, rects); - } + if (layer.invalidations) + draw_rects(context, layer.invalidations); context.restore(); }
diff --git a/third_party/blink/tools/blinkpy/web_tests/controllers/repaint_overlay_unittest.py b/third_party/blink/tools/blinkpy/web_tests/controllers/repaint_overlay_unittest.py index d8951392..7a14ad5 100644 --- a/third_party/blink/tools/blinkpy/web_tests/controllers/repaint_overlay_unittest.py +++ b/third_party/blink/tools/blinkpy/web_tests/controllers/repaint_overlay_unittest.py
@@ -19,19 +19,9 @@ "bounds": [800.00, 600.00], "contentsOpaque": true, "drawsContent": true, - "paintInvalidations": [ - { - "object": "object1", - "rect": [8, 108, 100, 100], - "reason": "full" - }, { - "object": "object2", - "rect": [0, 216, 800, 100], - "reason": "full" - }, { - "object": "object1", - "reason": "location change" - } + "invalidations": [ + [8, 108, 100, 100], + [0, 216, 800, 100], ] } ]
diff --git a/third_party/blink/tools/blinkpy/web_tests/models/test_results_unittest.py b/third_party/blink/tools/blinkpy/web_tests/models/test_results_unittest.py index 72bab66..9f981bb 100644 --- a/third_party/blink/tools/blinkpy/web_tests/models/test_results_unittest.py +++ b/third_party/blink/tools/blinkpy/web_tests/models/test_results_unittest.py
@@ -61,8 +61,7 @@ self.assertTrue(result.has_stderr) def test_results_has_repaint_overlay(self): - driver_output = DriverOutput( - '"paintInvalidations": [', None, None, None) + driver_output = DriverOutput('"invalidations": [', None, None, None) failures = [test_failures.FailureTextMismatch(driver_output, None)] result = TestResult('foo', failures=failures) self.assertTrue(result.has_repaint_overlay)
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 4dcb77d..f995ca5 100644 --- a/third_party/blink/tools/blinkpy/web_tests/port/test.py +++ b/third_party/blink/tools/blinkpy/web_tests/port/test.py
@@ -168,13 +168,12 @@ actual_text=None, expected_text=None, actual_image=None, expected_image=None, actual_checksum=None) - tests.add('failures/unexpected/text-mismatch-overlay.html', - actual_text='"paintInvalidations": [\nfail', - expected_text='"paintInvalidations": [\npass') - tests.add('failures/unexpected/no-text-baseline.html', - actual_text='"paintInvalidations": [\nfail', expected_text=None) - tests.add('failures/unexpected/no-text-generated.html', - actual_text=None, expected_text='"paintInvalidations": [\npass') + tests.add( + 'failures/unexpected/text-mismatch-overlay.html', + actual_text='"invalidations": [\nfail', + expected_text='"invalidations": [\npass') + tests.add('failures/unexpected/no-text-baseline.html', actual_text='"invalidations": [\nfail', expected_text=None) + tests.add('failures/unexpected/no-text-generated.html', actual_text=None, expected_text='"invalidations": [\npass') tests.add('failures/expected/keyboard.html', keyboard=True) tests.add('failures/expected/newlines_leading.html', expected_text='\nfoo\n', actual_text='foo\n')
diff --git a/third_party/blink/web_tests/FlagExpectations/layout-ng-fragment-item b/third_party/blink/web_tests/FlagExpectations/layout-ng-fragment-item index 4160b13f..f0fa0541 100644 --- a/third_party/blink/web_tests/FlagExpectations/layout-ng-fragment-item +++ b/third_party/blink/web_tests/FlagExpectations/layout-ng-fragment-item
@@ -108,13 +108,12 @@ crbug.com/626703 external/wpt/screen-orientation/orientation-reading.html [ Timeout ] crbug.com/645988 external/wpt/uievents/order-of-events/focus-eventfocus-manual.html [ Crash Failure ] crbug.com/645988 external/wpt/uievents/order-of-events/focus-events/focus-manual.html [ Failure ] -crbug.com/1002514 external/wpt/web-share/share-sharePromise-internal-slot.https.html [ Crash Failure ] +crbug.com/1002514 external/wpt/web-share/share-sharePromise-internal-slot.https.html [ Crash ] crbug.com/982194 external/wpt/webrtc/RTCPeerConnection-ondatachannel.html [ Failure Pass ] crbug.com/626703 external/wpt/webvtt/rendering/cues-with-video/processing-model/selectors/cue/outline_properties.html [ Failure ] crbug.com/626703 external/wpt/webvtt/rendering/cues-with-video/processing-model/selectors/cue/outline_shorthand.html [ Failure ] crbug.com/626703 external/wpt/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/outline_properties.html [ Failure ] crbug.com/626703 external/wpt/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/outline_shorthand.html [ Failure ] -crbug.com/982194 fast/css/getComputedStyle/computed-style-percentage-top-with-position-inline.html [ Failure ] crbug.com/835484 fast/css/outline-narrowLine.html [ Failure ] crbug.com/874695 fast/events/autoscroll-iframe-no-scrolling.html [ Pass ] crbug.com/663847 fast/events/context-no-deselect.html [ Failure ] @@ -146,44 +145,43 @@ crbug.com/451577 crbug.com/924308 http/tests/devtools/console/console-format-es6-2.js [ Crash Failure Pass Timeout ] crbug.com/451577 crbug.com/916975 http/tests/devtools/console/console-repeat-count.js [ Crash Failure Pass Timeout ] crbug.com/451577 http/tests/devtools/console/console-search.js [ Pass ] -crbug.com/967526 http/tests/devtools/console/console-uncaught-promise.js [ Failure Pass ] -crbug.com/982194 http/tests/devtools/coverage/decorations-after-script-formatter.js [ Pass Timeout ] -crbug.com/678482 http/tests/devtools/debugger/fetch-breakpoints.js [ Pass Timeout ] +crbug.com/967526 http/tests/devtools/console/console-uncaught-promise.js [ Pass ] +crbug.com/982194 http/tests/devtools/coverage/decorations-after-script-formatter.js [ Failure Pass ] +crbug.com/678482 http/tests/devtools/debugger/fetch-breakpoints.js [ Pass ] crbug.com/846997 http/tests/devtools/editor/text-editor-ctrl-d-1.js [ Pass Timeout ] -crbug.com/850358 http/tests/devtools/editor/text-editor-enter-behaviour.js [ Pass Timeout ] +crbug.com/850358 http/tests/devtools/editor/text-editor-enter-behaviour.js [ Pass ] crbug.com/846982 crbug.com/874695 http/tests/devtools/editor/text-editor-formatter.js [ Crash Pass Timeout ] crbug.com/420008 crbug.com/749738 http/tests/devtools/editor/text-editor-word-jumps.js [ Crash Pass Timeout ] crbug.com/596486 http/tests/devtools/elements/insert-node.js [ Pass ] -crbug.com/937811 http/tests/devtools/elements/shadow/elements-panel-shadow-selection-on-refresh-2.js [ Pass Timeout ] -crbug.com/937811 http/tests/devtools/elements/shadow/elements-panel-shadow-selection-on-refresh-3.js [ Pass Timeout ] +crbug.com/937811 http/tests/devtools/elements/shadow/elements-panel-shadow-selection-on-refresh-2.js [ Pass ] +crbug.com/937811 http/tests/devtools/elements/shadow/elements-panel-shadow-selection-on-refresh-3.js [ Pass ] crbug.com/959002 crbug.com/959042 http/tests/devtools/elements/styles-1/color-aware-property-value-edit.js [ Crash Pass Timeout ] -crbug.com/982194 http/tests/devtools/elements/styles-1/css-live-edit.js [ Pass Timeout ] crbug.com/959002 crbug.com/959042 http/tests/devtools/elements/styles-1/edit-resource-referred-by-multiple-styletags.js [ Crash Pass Timeout ] crbug.com/510337 http/tests/devtools/elements/styles-1/edit-value-url-with-color.js [ Pass ] crbug.com/528419 http/tests/devtools/elements/styles-2/pseudo-elements.js [ Pass ] crbug.com/959002 crbug.com/959042 http/tests/devtools/elements/styles-3/style-autocomplete.js [ Crash Pass Timeout ] crbug.com/938884 http/tests/devtools/elements/styles-3/styles-add-blank-property.js [ Pass Timeout ] -crbug.com/945665 http/tests/devtools/elements/styles-3/styles-add-new-rule-tab.js [ Failure Timeout ] +crbug.com/945665 http/tests/devtools/elements/styles-3/styles-add-new-rule-tab.js [ Failure ] crbug.com/945665 http/tests/devtools/elements/styles-3/styles-add-new-rule.js [ Failure Timeout ] crbug.com/945665 http/tests/devtools/elements/styles-3/styles-change-node-while-editing.js [ Failure ] -crbug.com/945665 http/tests/devtools/elements/styles-3/styles-disable-inherited.js [ Failure Timeout ] +crbug.com/945665 http/tests/devtools/elements/styles-3/styles-disable-inherited.js [ Failure ] crbug.com/959002 crbug.com/959042 http/tests/devtools/elements/styles-3/styles-variables.js [ Crash Pass Timeout ] -crbug.com/667560 http/tests/devtools/elements/styles-4/inline-style-sourcemap.js [ Failure Pass Timeout ] +crbug.com/667560 http/tests/devtools/elements/styles-4/inline-style-sourcemap.js [ Failure Pass ] crbug.com/959002 crbug.com/959042 http/tests/devtools/elements/styles-4/styles-keyframes.js [ Crash Pass Timeout ] crbug.com/946714 http/tests/devtools/elements/styles-4/styles-live-locations-leak.js [ Pass Timeout ] -crbug.com/982116 http/tests/devtools/elements/styles-4/styles-new-API.js [ Pass Timeout ] +crbug.com/982116 http/tests/devtools/elements/styles-4/styles-new-API.js [ Pass ] crbug.com/849978 http/tests/devtools/elements/styles-4/stylesheet-source-url-comment.js [ Pass Timeout ] crbug.com/959002 crbug.com/959042 http/tests/devtools/elements/styles-4/undo-add-new-rule.js [ Crash Pass Timeout ] -crbug.com/978304 http/tests/devtools/elements/styles-4/undo-add-property.js [ Pass Timeout ] +crbug.com/978304 http/tests/devtools/elements/styles-4/undo-add-property.js [ Pass ] crbug.com/451577 http/tests/devtools/elements/user-properties.js [ Pass ] crbug.com/941860 http/tests/devtools/extensions/extensions-events.js [ Pass ] crbug.com/246190 crbug.com/989860 http/tests/devtools/indexeddb/live-update-indexeddb-list.js [ Crash Failure Pass Timeout ] crbug.com/336481 http/tests/devtools/jump-to-previous-editing-location.js [ Pass ] crbug.com/327078 http/tests/devtools/network/long-script-content.js [ Pass ] -crbug.com/938200 http/tests/devtools/network/network-blocked-reason.js [ Failure Pass Timeout ] -crbug.com/982194 http/tests/devtools/network/network-cookies-pane.js [ Failure Timeout ] +crbug.com/938200 http/tests/devtools/network/network-blocked-reason.js [ Pass Timeout ] +crbug.com/982194 http/tests/devtools/network/network-cookies-pane.js [ Failure ] crbug.com/679833 crbug.com/762529 http/tests/devtools/network/network-datareceived.js [ Crash Failure Timeout ] -crbug.com/759632 http/tests/devtools/network/network-datasaver-warning.js [ Failure Timeout ] +crbug.com/759632 http/tests/devtools/network/network-datasaver-warning.js [ Failure ] crbug.com/945629 http/tests/devtools/network/network-filters.js [ Pass Timeout ] crbug.com/817167 crbug.com/874695 http/tests/devtools/oopif/oopif-cookies-refresh.js [ Crash Failure Pass Timeout ] crbug.com/818076 http/tests/devtools/oopif/oopif-elements-navigate-in.js [ Pass ] @@ -203,11 +201,11 @@ crbug.com/874695 http/tests/devtools/sources/debugger/debugger-proto-property.js [ Pass ] crbug.com/874695 http/tests/devtools/sxg/sxg-cert-not-found.js [ Pass ] crbug.com/874695 http/tests/devtools/sxg/sxg-disable-cache.js [ Pass ] -crbug.com/851363 http/tests/devtools/sxg/sxg-prefetch-fail.js [ Pass ] -crbug.com/851363 http/tests/devtools/sxg/sxg-prefetch.js [ Pass ] +crbug.com/851363 http/tests/devtools/sxg/sxg-prefetch-fail.js [ Failure Pass ] +crbug.com/851363 http/tests/devtools/sxg/sxg-prefetch.js [ Failure Pass ] crbug.com/420008 crbug.com/916975 http/tests/devtools/tracing/timeline-misc/timeline-event-causes.js [ Crash Failure Pass Timeout ] crbug.com/982194 http/tests/input/discard-events-to-unstable-iframe.html [ Failure ] -crbug.com/982194 http/tests/inspector-protocol/target/target-expose-devtools-protocol.js [ Failure ] +crbug.com/982194 http/tests/inspector-protocol/target/target-expose-devtools-protocol.js [ Failure Pass ] crbug.com/24182 http/tests/misc/acid3.html [ Pass ] crbug.com/874695 http/tests/misc/drag-not-loaded-image.html [ Pass ] crbug.com/874695 http/tests/permissions/chromium/test-request-worker.html [ Pass ] @@ -225,7 +223,7 @@ crbug.com/718155 virtual/android/fullscreen/full-screen-iframe-not-allowed.html [ Failure ] crbug.com/982194 virtual/audio-service/http/tests/media/video-frame-size-change.html [ Failure Pass ] crbug.com/874695 crbug.com/936165 virtual/audio-service/media/autoplay-muted.html [ Crash Pass Timeout ] -crbug.com/982194 compositing/gestures/gesture-tapHighlight-simple-nested.html [ Failure ] +crbug.com/982194 compositing/gestures/gesture-tapHighlight-simple-nested.html [ Failure Pass ] crbug.com/982194 compositing/overflow/composited-scroll-with-fractional-translation.html [ Pass ] crbug.com/982194 css2.1/t100801-c544-valgn-00-a-ag.html [ Failure ] crbug.com/982194 css2.1/t100801-c544-valgn-03-d-agi.html [ Failure ] @@ -650,7 +648,7 @@ crbug.com/982194 external/wpt/forced-colors-mode/forced-colors-mode-17.html [ Failure ] crbug.com/982194 external/wpt/forced-colors-mode/forced-colors-mode-19.html [ Failure ] crbug.com/982194 external/wpt/forced-colors-mode/forced-colors-mode-23.html [ Failure ] -crbug.com/982194 external/wpt/geolocation-API/PositionOptions.https.html [ Failure ] +crbug.com/982194 external/wpt/geolocation-API/PositionOptions.https.html [ Failure Pass ] crbug.com/982194 external/wpt/html/rendering/non-replaced-elements/tables/table-border-1.html [ Failure ] crbug.com/982194 external/wpt/html/rendering/non-replaced-elements/tables/table-border-3q.html [ Failure ] crbug.com/982194 external/wpt/html/rendering/non-replaced-elements/tables/table-border-3s.html [ Failure ] @@ -679,8 +677,8 @@ crbug.com/982194 external/wpt/infrastructure/reftest/reftest_fuzzy_ini_short.html [ Failure ] crbug.com/982194 external/wpt/intersection-observer/v2/delay-test.html [ Failure Pass ] crbug.com/982194 external/wpt/largest-contentful-paint/first-paint-equals-lcp-text.html [ Failure Pass ] -crbug.com/982194 external/wpt/mathml/presentation-markup/fractions/frac-default-padding.html [ Failure ] -crbug.com/982194 external/wpt/mathml/presentation-markup/fractions/frac-numalign-denomalign-001.html [ Failure ] +crbug.com/982194 external/wpt/mathml/presentation-markup/fractions/frac-default-padding.html [ Failure Pass ] +crbug.com/982194 external/wpt/mathml/presentation-markup/fractions/frac-numalign-denomalign-001.html [ Failure Pass ] crbug.com/982194 external/wpt/mathml/presentation-markup/fractions/frac-rendering-from-in-flow.html [ Pass ] crbug.com/982194 external/wpt/mathml/presentation-markup/mrow/legacy-mfenced-element-001.html [ Failure ] crbug.com/982194 external/wpt/mathml/presentation-markup/mrow/legacy-mrow-like-elements-002.html [ Failure ] @@ -949,41 +947,26 @@ crbug.com/982194 fast/multicol/vertical-rl/nested-columns.html [ Failure ] crbug.com/982194 fast/scroll-snap/snaps-after-scrollbar-scrolling.html [ Pass ] crbug.com/982194 fragmentation/repeating-thead-under-repeating-thead.html [ Failure ] -crbug.com/982194 http/tests/devtools/application-panel/resources-panel-iframe-idb.js [ Pass Timeout ] -crbug.com/982194 http/tests/devtools/application-panel/resources-panel-resource-preview.js [ Pass Timeout ] +crbug.com/982194 http/tests/devtools/application-panel/resources-panel-iframe-idb.js [ Pass ] +crbug.com/982194 http/tests/devtools/application-panel/resources-panel-resource-preview.js [ Pass ] crbug.com/982194 http/tests/devtools/application-panel/storage-view-reports-quota.js [ Timeout ] -crbug.com/982194 http/tests/devtools/background-services/background-services-panel.js [ Pass Timeout ] crbug.com/982194 http/tests/devtools/cache-storage/cache-data.js [ Pass ] -crbug.com/982194 http/tests/devtools/coverage/gutter-html.js [ Pass Timeout ] -crbug.com/982194 http/tests/devtools/coverage/gutter-js.js [ Pass Timeout ] -crbug.com/982194 http/tests/devtools/editor/text-editor-ctrl-d-2.js [ Pass Timeout ] -crbug.com/982194 http/tests/devtools/editor/text-editor-indent-autodetection.js [ Pass Timeout ] -crbug.com/982194 http/tests/devtools/editor/text-editor-reveal-line.js [ Pass Timeout ] +crbug.com/982194 http/tests/devtools/editor/text-editor-reveal-line.js [ Pass ] crbug.com/982194 http/tests/devtools/elements/edit/edit-dom-actions-2.js [ Pass Timeout ] -crbug.com/982194 http/tests/devtools/elements/edit/edit-dom-actions-3.js [ Pass Timeout ] -crbug.com/982194 http/tests/devtools/elements/highlight/highlight-dom-updates.js [ Pass Timeout ] -crbug.com/982194 http/tests/devtools/elements/shadow/elements-panel-shadow-selection-on-refresh-1.js [ Pass Timeout ] +crbug.com/982194 http/tests/devtools/elements/highlight/highlight-dom-updates.js [ Pass ] crbug.com/982194 http/tests/devtools/elements/styles-1/disable-property-workingcopy-update.js [ Pass Timeout ] -crbug.com/982194 http/tests/devtools/elements/styles-2/inject-stylesheet.js [ Pass Timeout ] crbug.com/982194 http/tests/devtools/elements/styles-4/styles-update-from-js.js [ Failure Timeout ] -crbug.com/982194 http/tests/devtools/elements/styles/selector-line-sourcemap-header.js [ Pass Timeout ] -crbug.com/982194 http/tests/devtools/elements/styles/selector-line.js [ Pass Timeout ] -crbug.com/982194 http/tests/devtools/extensions/extensions-timeline-api.js [ Pass Timeout ] crbug.com/982194 http/tests/devtools/indexeddb/database-refresh-view.js [ Pass ] crbug.com/982194 http/tests/devtools/network/network-eventsource.js [ Pass ] -crbug.com/982194 http/tests/devtools/network/network-search.js [ Pass Timeout ] -crbug.com/982194 http/tests/devtools/oopif/oopif-navigator.js [ Pass Timeout ] -crbug.com/982194 http/tests/devtools/oopif/oopif-storage.js [ Pass Timeout ] +crbug.com/982194 http/tests/devtools/network/network-search.js [ Pass ] +crbug.com/982194 http/tests/devtools/oopif/oopif-storage.js [ Pass ] crbug.com/982194 http/tests/devtools/persistence/persistence-external-change-breakpoints.js [ Pass ] -crbug.com/982194 http/tests/devtools/persistence/persistence-move-breakpoints-on-reload.js [ Failure Pass Timeout ] -crbug.com/982194 http/tests/devtools/persistence/persistence-move-breakpoints.js [ Pass Timeout ] crbug.com/982194 http/tests/devtools/profiler/heap-snapshot-location.js [ Pass ] crbug.com/982194 http/tests/devtools/resource-tree/resource-tree-crafted-frame-add.js [ Pass ] crbug.com/982194 http/tests/devtools/resource-tree/resource-tree-frame-in-crafted-frame.js [ Pass ] -crbug.com/982194 http/tests/devtools/resource-tree/resource-tree-frame-navigate.js [ Pass Timeout ] -crbug.com/982194 http/tests/devtools/resource-tree/resource-tree-htmlimports.js [ Pass Timeout ] +crbug.com/982194 http/tests/devtools/resource-tree/resource-tree-frame-navigate.js [ Pass ] +crbug.com/982194 http/tests/devtools/resource-tree/resource-tree-htmlimports.js [ Pass ] crbug.com/982194 http/tests/devtools/service-workers/service-worker-agents.js [ Pass ] -crbug.com/982194 http/tests/devtools/service-workers/service-worker-pause.js [ Pass Timeout ] crbug.com/982194 http/tests/devtools/service-workers/service-workers-force-update-on-page-load.js [ Pass ] crbug.com/982194 http/tests/devtools/service-workers/service-workers-redundant.js [ Pass ] crbug.com/982194 http/tests/devtools/service-workers/user-agent-override.js [ Pass ] @@ -1001,13 +984,12 @@ crbug.com/982194 jquery/data.html [ Pass ] crbug.com/982194 jquery/dimensions.html [ Pass ] crbug.com/982194 jquery/event.html [ Pass ] -crbug.com/982194 jquery/manipulation.html [ Pass Timeout ] +crbug.com/982194 jquery/manipulation.html [ Pass ] crbug.com/982194 jquery/offset.html [ Pass ] crbug.com/982194 jquery/traversing.html [ Pass ] -crbug.com/982194 media/video-canvas-draw.html [ Failure Pass ] -crbug.com/982194 paint/invalidation/svg/scroll-hit-test.xhtml [ Failure Pass ] +crbug.com/982194 media/video-canvas-draw.html [ Failure ] crbug.com/982194 virtual/android/url-bar/bottom-and-top-fixed-sticks-to-top.html [ Failure ] -crbug.com/908347 virtual/audio-service/media/autoplay/webaudio-audio-context-resume.html [ Pass ] +crbug.com/908347 virtual/audio-service/media/autoplay/webaudio-audio-context-resume.html [ Failure Pass ] crbug.com/942951 virtual/audio-service/media/controls/controls-layout-in-different-size.html [ Pass ] crbug.com/982194 virtual/audio-service/media/controls/doubletap-to-jump-backwards.html [ Pass ] crbug.com/982194 virtual/audio-service/media/picture-in-picture/v2/request-picture-in-picture-twice.html [ Failure ] @@ -1292,7 +1274,7 @@ crbug.com/982194 virtual/layout_ng_fieldset/external/wpt/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-transform-translatez.html [ Failure ] crbug.com/982194 virtual/layout_ng_fieldset/external/wpt/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-block-margins-2.html [ Failure ] crbug.com/982194 virtual/layout_ng_fieldset/fast/forms/fieldset/legend-small-after-margin-before-border-horizontal-mode.html [ Failure ] -crbug.com/982194 virtual/layout_ng_flex_box/css3/flexbox/relpos-with-percentage-top.html [ Failure ] +crbug.com/982194 virtual/layout_ng_flex_box/css3/flexbox/relpos-with-percentage-top.html [ Failure Pass ] crbug.com/982194 virtual/layout_ng_flex_box/external/wpt/css/css-flexbox/anonymous-flex-item-005.html [ Failure ] crbug.com/982194 virtual/layout_ng_flex_box/external/wpt/css/css-flexbox/flex-minimum-height-flex-items-005.xht [ Failure ] crbug.com/982194 virtual/layout_ng_flex_box/external/wpt/css/css-flexbox/flex-minimum-height-flex-items-007.xht [ Failure ] @@ -1336,7 +1318,7 @@ crbug.com/982194 virtual/layout_ng_flex_box/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-paint-ordering-002.xhtml [ Failure ] crbug.com/982194 virtual/lazyload-image/http/tests/lazyload/style-dimension.html [ Pass ] crbug.com/982194 virtual/mouseevent_fractional/fast/events/clientXY-in-zoom-and-scroll.html [ Pass ] -crbug.com/982194 virtual/not-site-per-process/http/tests/devtools/debugger/fetch-breakpoints.js [ Pass Timeout ] +crbug.com/982194 virtual/not-site-per-process/http/tests/devtools/debugger/fetch-breakpoints.js [ Pass ] crbug.com/982194 virtual/off-main-thread-css-paint/external/wpt/css/css-paint-api/invalid-image-pending-script.https.html [ Pass ] crbug.com/982194 virtual/omt-worker-fetch/external/wpt/fetch/metadata/sec-fetch-dest/frame.tentative.https.sub.html [ Timeout ] crbug.com/982194 virtual/omt-worker-fetch/external/wpt/fetch/metadata/sec-fetch-dest/iframe.tentative.https.sub.html [ Timeout ] @@ -1348,7 +1330,6 @@ crbug.com/982194 virtual/scalefactor200/css3/filters/effect-blur-hw.html [ Pass ] crbug.com/982194 virtual/scalefactor200/css3/filters/filterRegions.html [ Failure ] crbug.com/982194 virtual/scalefactor200/external/wpt/css/filter-effects/css-filters-animation-combined-001.html [ Failure ] -crbug.com/982194 virtual/scalefactor200/external/wpt/css/filter-effects/filtered-inline-is-container.html [ Failure Pass ] crbug.com/982194 virtual/scalefactor200/external/wpt/css/filter-effects/filters-test-brightness-003.html [ Pass ] crbug.com/982194 virtual/scalefactor200/external/wpt/largest-contentful-paint/first-paint-equals-lcp-text.html [ Failure Pass ] crbug.com/982194 virtual/scalefactor200/fast/hidpi/static/pointerevents/pointerevent_touch-adjustment_click_target.html [ Pass ] @@ -1357,8 +1338,8 @@ crbug.com/982194 virtual/speech-with-unified-autoplay/external/wpt/speech-api/SpeechSynthesis-speak-without-activation-fails.tentative.html [ Pass ] crbug.com/982194 virtual/stable/media/stable/video-object-fit-stable.html [ Pass ] crbug.com/982194 virtual/text-antialias/font-format-support-color-cff2-vertical.html [ Failure ] -crbug.com/982194 virtual/threaded-no-composited-antialiasing/animations/timing/animation-duration-infinite.html [ Failure Pass ] -crbug.com/982194 virtual/threaded/external/wpt/feature-policy/experimental-features/lazyload/lazyload-disabled-tentative.sub.html [ Failure Pass ] +crbug.com/982194 virtual/threaded-no-composited-antialiasing/animations/timing/animation-duration-infinite.html [ Pass ] +crbug.com/982194 virtual/threaded/external/wpt/feature-policy/experimental-features/lazyload/lazyload-disabled-tentative.sub.html [ Failure ] crbug.com/982194 virtual/threaded/external/wpt/feature-policy/experimental-features/lazyload/lazyload-enabled-tentative.sub.html [ Pass ] crbug.com/982194 virtual/threaded/external/wpt/feature-policy/experimental-features/lazyload/loading-frame-default-eager-disabled-tentative.sub.html [ Pass ] crbug.com/874695 virtual/threaded/http/tests/devtools/tracing/console-timeline.js [ Pass ] @@ -1370,11 +1351,16 @@ crbug.com/982194 virtual/web-components-v0-disabled/external/wpt/html/semantics/scripting-1/the-script-element/css-module/utf8.tentative.html [ Pass ] crbug.com/982194 virtual/web-components-v0-disabled/fast/dom/shadow/gesture-tapHighlight-shadow-tree.html [ Pass ] crbug.com/982194 wpt_internal/css/css-intrinsic-size/intrinsic-size-015.html [ Crash ] - virtual/layout_ng_fragment_traversal/* [ Skip ] crbug.com/982194 external/wpt/forced-colors-mode/forced-colors-mode-26.tentative.html [ Pass ] crbug.com/982194 external/wpt/html/semantics/embedded-content/the-img-element/image-loading-lazy-in-cross-origin-ifame-001.sub.html [ Pass ] crbug.com/982194 external/wpt/html/semantics/embedded-content/the-img-element/image-loading-lazy-in-cross-origin-ifame-002.sub.html [ Pass ] +crbug.com/982194 external/wpt/websockets/opening-handshake/005.html [ Pass ] +crbug.com/982194 virtual/cache-storage-eager-reading/external/wpt/service-workers/service-worker/windowclient-navigate.https.html [ Pass ] +crbug.com/982194 virtual/cache-storage-sequence/external/wpt/service-workers/service-worker/windowclient-navigate.https.html [ Pass ] +crbug.com/982194 virtual/layout_ng_fieldset/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-size-multicol-001.html [ Pass ] +crbug.com/982194 virtual/omt-worker-fetch/external/wpt/service-workers/service-worker/windowclient-navigate.https.html [ Pass ] crbug.com/982194 virtual/scalefactor200/external/wpt/css/filter-effects/filtered-inline-applies-to-float.html [ Pass ] +crbug.com/982194 virtual/threaded-prefer-compositing/fast/scrolling/middle-click-autoscroll-latching-clicked-node.html [ Failure Timeout ] crbug.com/982194 virtual/web-components-v0-disabled/external/wpt/html/semantics/embedded-content/the-img-element/image-loading-lazy-in-cross-origin-ifame-001.sub.html [ Pass ] crbug.com/982194 virtual/web-components-v0-disabled/external/wpt/html/semantics/embedded-content/the-img-element/image-loading-lazy-in-cross-origin-ifame-002.sub.html [ Pass ]
diff --git a/third_party/blink/web_tests/TestExpectations b/third_party/blink/web_tests/TestExpectations index 0e28d84c..9669020 100644 --- a/third_party/blink/web_tests/TestExpectations +++ b/third_party/blink/web_tests/TestExpectations
@@ -4329,7 +4329,6 @@ crbug.com/927477 virtual/import-maps-without-builtin-modules/external/wpt/import-maps/acquire-import-maps-flag/worker-request/* [ Skip ] # Excludes tests that require built-in module supports. -crbug.com/1010751 virtual/import-maps-without-builtin-modules/external/wpt/import-maps/builtin-support.tentative/* [ Skip ] crbug.com/1010751 external/wpt/import-maps/imported/* [ Skip ] # Disabled temporarliy until eager evaluation is fixed/re-baselined in DevTools. @@ -5806,11 +5805,6 @@ crbug.com/963141 [ Linux ] media/video-object-fit.html [ Pass Failure ] crbug.com/963141 [ Linux ] virtual/audio-service/media/video-object-fit.html [ Pass Failure ] -# Allow failure until its appearance gets stable. -crbug.com/972476 std-switch/switch-appearance.html [ Failure ] -crbug.com/972476 std-switch/switch-appearance-customization.html [ Failure ] -crbug.com/972476 std-switch/switch-appearance-theme.html [ Failure ] - # Sheriff 2019-05-20 crbug.com/965389 [ Mac ] media/track/track-cue-rendering-position-auto.html [ Pass Failure ] crbug.com/965389 [ Mac ] virtual/audio-service/media/track/track-cue-rendering-position-auto.html [ Pass Failure ] @@ -6705,8 +6699,6 @@ # Sheriff 2020-02-21 crbug.com/1054916 [ Linux ] external/wpt/webxr/dom-overlay/ar_dom_overlay.https.html [ Pass Failure Timeout ] -crbug.com/1055006 [ Linux ] external/wpt/std-toast/methods.html [ Pass Failure Timeout ] -crbug.com/1055006 [ Linux ] external/wpt/std-toast/options.html [ Pass Failure Timeout ] crbug.com/1048597 [ Linux Debug ] virtual/android/fullscreen/video-scrolled-iframe.html [ Pass Timeout ]
diff --git a/third_party/blink/web_tests/VirtualTestSuites b/third_party/blink/web_tests/VirtualTestSuites index 215a4d30..e3ea0c3 100644 --- a/third_party/blink/web_tests/VirtualTestSuites +++ b/third_party/blink/web_tests/VirtualTestSuites
@@ -502,9 +502,8 @@ { "prefix": "controls-refresh-hc", "bases": ["virtual/controls-refresh/color-scheme"], - "args": ["--enable-features=FormControlsRefresh", - "--force-high-contrast", - "--enable-blink-features=ForcedColors"] + "args": ["--enable-features=FormControlsRefresh,ForcedColors", + "--force-high-contrast"] }, { "prefix": "legacy-samesite",
diff --git a/third_party/blink/web_tests/WPTOverrideExpectations b/third_party/blink/web_tests/WPTOverrideExpectations index 2d6f56c..a0be342 100644 --- a/third_party/blink/web_tests/WPTOverrideExpectations +++ b/third_party/blink/web_tests/WPTOverrideExpectations
@@ -47,9 +47,6 @@ external/wpt/html/rendering/widgets/baseline-alignment-and-overflow.tentative.html [ Pass ] # wpt_subtest_failure external/wpt/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_anchor_download_block_downloads.sub.tentative.html [ Pass ] # wpt_subtest_failure external/wpt/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_block_downloads.sub.tentative.html [ Pass ] # wpt_subtest_failure -external/wpt/import-maps/builtin-support.tentative/imported/parsing-schema.tentative.html [ Pass ] # wpt_subtest_failure -external/wpt/import-maps/builtin-support.tentative/imported/resolving-not-yet-implemented.tentative.html [ Pass ] # wpt_subtest_failure -external/wpt/import-maps/builtin-support.tentative/imported/resolving-scopes.tentative.html [ Pass ] # wpt_subtest_failure external/wpt/import-maps/common/resolving.tentative.html [ Pass ] # wpt_subtest_failure external/wpt/navigation-timing/test_performance_attributes.sub.html [ Pass ] # wpt_subtest_failure external/wpt/offscreen-canvas/text/2d.text.measure.actualBoundingBox.html [ Pass ] # wpt_subtest_failure
diff --git a/third_party/blink/web_tests/compositing/overflow/do-not-repaint-if-scrolling-composited-layers.html b/third_party/blink/web_tests/compositing/overflow/do-not-repaint-if-scrolling-composited-layers.html index d5a56eb..0b905983 100644 --- a/third_party/blink/web_tests/compositing/overflow/do-not-repaint-if-scrolling-composited-layers.html +++ b/third_party/blink/web_tests/compositing/overflow/do-not-repaint-if-scrolling-composited-layers.html
@@ -17,7 +17,7 @@ // Exclude repaint in the vertical scrollbar layer which always happens on scroll. if (layer.name == "Vertical Scrollbar Layer") continue; - if (layer.paintInvalidations) + if (layer.invalidations) return true; } return false; @@ -45,7 +45,7 @@ await rAF(); if (window.internals) { - var layer_tree = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS); + var layer_tree = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_INVALIDATIONS); var repainted = hasRepaint(layer_tree); var repaintedMessage = repainted ? "repainted" : "did not repaint"; var expectedMessage = expectsRepaint ? " when expected" : " when unexpected";
diff --git a/third_party/blink/web_tests/compositing/squashing/add-remove-squashed-layers-expected.txt b/third_party/blink/web_tests/compositing/squashing/add-remove-squashed-layers-expected.txt index 5e41acd..958018c 100644 --- a/third_party/blink/web_tests/compositing/squashing/add-remove-squashed-layers-expected.txt +++ b/third_party/blink/web_tests/compositing/squashing/add-remove-squashed-layers-expected.txt
@@ -56,12 +56,8 @@ "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV id='A' class='overlap1')", "position": [80, 80], "bounds": [260, 260], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='C' class='overlap3'", - "rect": [160, 160, 100, 100], - "reason": "chunk appeared" - } + "invalidations": [ + [160, 160, 100, 100] ], "transform": 1 } @@ -99,12 +95,8 @@ "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV id='A' class='overlap1')", "position": [80, 80], "bounds": [260, 260], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='B' class='overlap2'", - "rect": [80, 80, 100, 100], - "reason": "chunk disappeared" - } + "invalidations": [ + [80, 80, 100, 100] ], "transform": 1 } @@ -142,17 +134,8 @@ "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV id='C' class='overlap3')", "position": [240, 240], "bounds": [100, 100], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='A' class='overlap1'", - "rect": [0, 0, 100, 100], - "reason": "chunk disappeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='C' class='overlap3'", - "rect": [0, 0, 100, 100], - "reason": "paint property change" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 1 } @@ -190,22 +173,9 @@ "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV id='B' class='overlap2')", "position": [160, 160], "bounds": [180, 180], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='C' class='overlap3'", - "rect": [80, 80, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='B' class='overlap2'", - "rect": [0, 0, 100, 100], - "reason": "chunk appeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='C' class='overlap3'", - "rect": [0, 0, 100, 100], - "reason": "paint property change" - } + "invalidations": [ + [80, 80, 100, 100], + [0, 0, 100, 100] ], "transform": 1 } @@ -243,27 +213,9 @@ "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV id='A' class='overlap1')", "position": [80, 80], "bounds": [180, 180], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='B' class='overlap2'", - "rect": [80, 80, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='C' class='overlap3'", - "rect": [80, 80, 100, 100], - "reason": "chunk disappeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='A' class='overlap1'", - "rect": [0, 0, 100, 100], - "reason": "chunk appeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='B' class='overlap2'", - "rect": [0, 0, 100, 100], - "reason": "paint property change" - } + "invalidations": [ + [80, 80, 100, 100], + [0, 0, 100, 100] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/compositing/squashing/add-remove-squashed-layers.html b/third_party/blink/web_tests/compositing/squashing/add-remove-squashed-layers.html index 9051b81..29b1fbdf 100644 --- a/third_party/blink/web_tests/compositing/squashing/add-remove-squashed-layers.html +++ b/third_party/blink/web_tests/compositing/squashing/add-remove-squashed-layers.html
@@ -123,31 +123,31 @@ // Case 2 internals.startTrackingRepaints(document); addOverlap3(); - document.getElementById('Case2').textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS); + document.getElementById('Case2').textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_INVALIDATIONS); internals.stopTrackingRepaints(document); // Case 3 internals.startTrackingRepaints(document); removeOverlap2(); - document.getElementById('Case3').textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS); + document.getElementById('Case3').textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_INVALIDATIONS); internals.stopTrackingRepaints(document); // Case 4 internals.startTrackingRepaints(document); removeOverlap1(); - document.getElementById('Case4').textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS); + document.getElementById('Case4').textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_INVALIDATIONS); internals.stopTrackingRepaints(document); // Case 5 internals.startTrackingRepaints(document); addOverlap2(); - document.getElementById('Case5').textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS); + document.getElementById('Case5').textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_INVALIDATIONS); internals.stopTrackingRepaints(document); // Case 6 internals.startTrackingRepaints(document); resetLayers(); - document.getElementById('Case6').textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS); + document.getElementById('Case6').textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_INVALIDATIONS); internals.stopTrackingRepaints(document); // Display the test results only after test is done so that it does not affect repaint rect results.
diff --git a/third_party/blink/web_tests/compositing/squashing/invalidations-with-large-negative-margin-inline-content-expected.txt b/third_party/blink/web_tests/compositing/squashing/invalidations-with-large-negative-margin-inline-content-expected.txt index 5f2a78bc..19b7c98 100644 --- a/third_party/blink/web_tests/compositing/squashing/invalidations-with-large-negative-margin-inline-content-expected.txt +++ b/third_party/blink/web_tests/compositing/squashing/invalidations-with-large-negative-margin-inline-content-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='chip'", - "rect": [408, 108, 20, 20], - "reason": "background" - } + "invalidations": [ + [408, 108, 20, 20] ] } ]
diff --git a/third_party/blink/web_tests/compositing/squashing/invalidations-with-large-negative-margin-inline-content.html b/third_party/blink/web_tests/compositing/squashing/invalidations-with-large-negative-margin-inline-content.html index 469b78c..95bdd49 100644 --- a/third_party/blink/web_tests/compositing/squashing/invalidations-with-large-negative-margin-inline-content.html +++ b/third_party/blink/web_tests/compositing/squashing/invalidations-with-large-negative-margin-inline-content.html
@@ -25,7 +25,7 @@ if (window.internals) { // Repaint should be at x=400px, since that is the position relative to the squashing layer. - var data = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS); + var data = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_INVALIDATIONS); internals.stopTrackingRepaints(document); var output = document.getElementById('output');
diff --git a/third_party/blink/web_tests/compositing/squashing/repaint-child-of-squashed-expected.txt b/third_party/blink/web_tests/compositing/squashing/repaint-child-of-squashed-expected.txt index b198560..6a3a279 100644 --- a/third_party/blink/web_tests/compositing/squashing/repaint-child-of-squashed-expected.txt +++ b/third_party/blink/web_tests/compositing/squashing/repaint-child-of-squashed-expected.txt
@@ -54,12 +54,8 @@ "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV class='box top')", "position": [80, 80], "bounds": [100, 100], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='inner'", - "rect": [10, 10, 50, 50], - "reason": "background" - } + "invalidations": [ + [10, 10, 50, 50] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/compositing/squashing/repaint-child-of-squashed.html b/third_party/blink/web_tests/compositing/squashing/repaint-child-of-squashed.html index 4e4d794..3a286dc4 100644 --- a/third_party/blink/web_tests/compositing/squashing/repaint-child-of-squashed.html +++ b/third_party/blink/web_tests/compositing/squashing/repaint-child-of-squashed.html
@@ -51,12 +51,12 @@ function executeTestCases() { internals.startTrackingRepaints(document); - document.getElementById('Case1').textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS); + document.getElementById('Case1').textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_INVALIDATIONS); internals.stopTrackingRepaints(document); internals.startTrackingRepaints(document); document.querySelector("#inner").style.backgroundColor = 'red'; - document.getElementById('Case2').textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS); + document.getElementById('Case2').textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_INVALIDATIONS); internals.stopTrackingRepaints(document); // Display the test results only after test is done so that it does not affect repaint rect results.
diff --git a/third_party/blink/web_tests/compositing/squashing/selection-repaint-with-gaps.html b/third_party/blink/web_tests/compositing/squashing/selection-repaint-with-gaps.html index 2778e19a..3ea28dd1 100644 --- a/third_party/blink/web_tests/compositing/squashing/selection-repaint-with-gaps.html +++ b/third_party/blink/web_tests/compositing/squashing/selection-repaint-with-gaps.html
@@ -46,7 +46,7 @@ let layerTreeAsText = []; if (window.internals) { - layerTreeAsText.push(internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS)); + layerTreeAsText.push(internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_INVALIDATIONS)); internals.stopTrackingRepaints(document); } @@ -59,7 +59,7 @@ selection.setBaseAndExtent(document.querySelector("#item1"), 0, document.querySelector("#item2"), 1); if (window.internals) { - layerTreeAsText.push(internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS)); + layerTreeAsText.push(internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_INVALIDATIONS)); internals.stopTrackingRepaints(document); }
diff --git a/third_party/blink/web_tests/compositing/squashing/squash-above-fixed-1-expected.txt b/third_party/blink/web_tests/compositing/squashing/squash-above-fixed-1-expected.txt index b630f82a..e13c02d 100644 --- a/third_party/blink/web_tests/compositing/squashing/squash-above-fixed-1-expected.txt +++ b/third_party/blink/web_tests/compositing/squashing/squash-above-fixed-1-expected.txt
@@ -58,17 +58,9 @@ "bounds": [785, 1400], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='paragraph-f' class='overlapping lime'", - "rect": [0, 500, 200, 100], - "reason": "chunk disappeared" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='paragraph-b' class='overlapping lime'", - "rect": [0, 100, 200, 100], - "reason": "chunk appeared" - } + "invalidations": [ + [0, 500, 200, 100], + [0, 100, 200, 100] ], "transform": 1 }, @@ -85,12 +77,8 @@ "bounds": [200, 100], "contentsOpaque": true, "backgroundColor": "#00FFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='paragraph-c' class='overlapping cyan'", - "rect": [0, 0, 200, 100], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 200, 100] ], "transform": 1 }, @@ -98,12 +86,8 @@ "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (relative positioned) DIV id='paragraph-d' class='overlapping lime')", "position": [0, 300], "bounds": [200, 300], - "paintInvalidations": [ - { - "object": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (relative positioned) DIV id='paragraph-d' class='overlapping lime')", - "rect": [0, 0, 200, 300], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 200, 300] ], "transform": 1 }, @@ -204,17 +188,9 @@ "bounds": [785, 1400], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='paragraph-g' class='overlapping cyan'", - "rect": [0, 600, 200, 100], - "reason": "chunk disappeared" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='paragraph-c' class='overlapping cyan'", - "rect": [0, 200, 200, 100], - "reason": "chunk appeared" - } + "invalidations": [ + [0, 600, 200, 100], + [0, 200, 200, 100] ], "transform": 1 }, @@ -231,12 +207,8 @@ "bounds": [200, 100], "contentsOpaque": true, "backgroundColor": "#00FF00", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='paragraph-d' class='overlapping lime'", - "rect": [0, 0, 200, 100], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 200, 100] ], "transform": 1 }, @@ -244,12 +216,8 @@ "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (relative positioned) DIV id='paragraph-e' class='overlapping cyan')", "position": [0, 400], "bounds": [200, 300], - "paintInvalidations": [ - { - "object": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (relative positioned) DIV id='paragraph-e' class='overlapping cyan')", - "rect": [0, 0, 200, 300], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 200, 300] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/compositing/squashing/squash-above-fixed-1.html b/third_party/blink/web_tests/compositing/squashing/squash-above-fixed-1.html index 86f719f..dfefd3f 100644 --- a/third_party/blink/web_tests/compositing/squashing/squash-above-fixed-1.html +++ b/third_party/blink/web_tests/compositing/squashing/squash-above-fixed-1.html
@@ -65,7 +65,7 @@ return new Promise(function(resolve) { // Case 1 - document.getElementById('Case1').textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS); + document.getElementById('Case1').textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_INVALIDATIONS); resolve(); }); @@ -78,7 +78,7 @@ internals.startTrackingRepaints(document); window.scrollTo(0, 80); runAfterLayoutAndPaint(function() { - document.getElementById('Case2').textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS); + document.getElementById('Case2').textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_INVALIDATIONS); internals.stopTrackingRepaints(document); resolve(); @@ -94,7 +94,7 @@ internals.startTrackingRepaints(document); window.scrollTo(0, 120); runAfterLayoutAndPaint(function() { - document.getElementById('Case3').textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS); + document.getElementById('Case3').textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_INVALIDATIONS); internals.stopTrackingRepaints(document); resolve(); @@ -110,7 +110,7 @@ internals.startTrackingRepaints(document); window.scrollTo(0, 170); runAfterLayoutAndPaint(function() { - document.getElementById('Case4').textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS); + document.getElementById('Case4').textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_INVALIDATIONS); internals.stopTrackingRepaints(document); resolve();
diff --git a/third_party/blink/web_tests/compositing/squashing/squash-above-fixed-3-expected.txt b/third_party/blink/web_tests/compositing/squashing/squash-above-fixed-3-expected.txt index 050132b2..54faad2 100644 --- a/third_party/blink/web_tests/compositing/squashing/squash-above-fixed-3-expected.txt +++ b/third_party/blink/web_tests/compositing/squashing/squash-above-fixed-3-expected.txt
@@ -147,12 +147,8 @@ "position": [100, 100], "bounds": [200, 4000], "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='innerScrolling'", - "rect": [100, 0, 100, 100], - "reason": "chunk appeared" - } + "invalidations": [ + [100, 0, 100, 100] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/compositing/squashing/squash-above-fixed-3.html b/third_party/blink/web_tests/compositing/squashing/squash-above-fixed-3.html index a1821d00..386e820f 100644 --- a/third_party/blink/web_tests/compositing/squashing/squash-above-fixed-3.html +++ b/third_party/blink/web_tests/compositing/squashing/squash-above-fixed-3.html
@@ -71,20 +71,20 @@ return; // Case 1 - document.getElementById('Case1').textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS); + document.getElementById('Case1').textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_INVALIDATIONS); // Case 2 internals.startTrackingRepaints(document); window.scrollTo(0, 10); runAfterLayoutAndPaint(function() { - document.getElementById('Case2').textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS); + document.getElementById('Case2').textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_INVALIDATIONS); internals.stopTrackingRepaints(document); // Case 3 internals.startTrackingRepaints(document); window.scrollTo(0, 110); runAfterLayoutAndPaint(function() { - document.getElementById('Case3').textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS); + document.getElementById('Case3').textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_INVALIDATIONS); internals.stopTrackingRepaints(document); // Display the test results only after test is done so that it does not affect repaint rect results.
diff --git a/third_party/blink/web_tests/compositing/squashing/squash-onto-nephew.html b/third_party/blink/web_tests/compositing/squashing/squash-onto-nephew.html index 97283d0..3c9b1790 100644 --- a/third_party/blink/web_tests/compositing/squashing/squash-onto-nephew.html +++ b/third_party/blink/web_tests/compositing/squashing/squash-onto-nephew.html
@@ -68,7 +68,7 @@ return; } - document.body.textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS); + document.body.textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_INVALIDATIONS); document.body.style.whiteSpace = 'pre'; } </script>
diff --git a/third_party/blink/web_tests/compositing/squashing/squash-onto-transform-backing.html b/third_party/blink/web_tests/compositing/squashing/squash-onto-transform-backing.html index eb318dc4..30a723c 100644 --- a/third_party/blink/web_tests/compositing/squashing/squash-onto-transform-backing.html +++ b/third_party/blink/web_tests/compositing/squashing/squash-onto-transform-backing.html
@@ -52,7 +52,7 @@ return; } - document.body.textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS); + document.body.textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_INVALIDATIONS); document.body.style.whiteSpace = 'pre'; } </script>
diff --git a/third_party/blink/web_tests/compositing/squashing/squash-paint-invalidation-fixed-position-expected.txt b/third_party/blink/web_tests/compositing/squashing/squash-paint-invalidation-fixed-position-expected.txt index 5a335bc..ceddb94 100644 --- a/third_party/blink/web_tests/compositing/squashing/squash-paint-invalidation-fixed-position-expected.txt +++ b/third_party/blink/web_tests/compositing/squashing/squash-paint-invalidation-fixed-position-expected.txt
@@ -26,12 +26,8 @@ "bounds": [100, 100], "contentsOpaque": true, "backgroundColor": "#FF0000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='foo'", - "rect": [0, 0, 100, 100], - "reason": "background" - } + "invalidations": [ + [0, 0, 100, 100] ] } ], @@ -75,12 +71,8 @@ "bounds": [100, 100], "contentsOpaque": true, "backgroundColor": "#0000FF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='foo'", - "rect": [0, 0, 100, 100], - "reason": "background" - } + "invalidations": [ + [0, 0, 100, 100] ] } ],
diff --git a/third_party/blink/web_tests/compositing/squashing/squash-paint-invalidation-fixed-position.html b/third_party/blink/web_tests/compositing/squashing/squash-paint-invalidation-fixed-position.html index 3bd59ae..ec5dbad 100644 --- a/third_party/blink/web_tests/compositing/squashing/squash-paint-invalidation-fixed-position.html +++ b/third_party/blink/web_tests/compositing/squashing/squash-paint-invalidation-fixed-position.html
@@ -20,7 +20,7 @@ document.getElementById("foo").style.background = 'red'; if (window.internals) - output += internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS) + ' '; + output += internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_INVALIDATIONS) + ' '; if (window.internals) internals.stopTrackingRepaints(document); @@ -33,7 +33,7 @@ document.getElementById("foo").style.background = 'blue'; if (window.internals) - output += internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS); + output += internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_INVALIDATIONS); if (window.internals) internals.stopTrackingRepaints(document);
diff --git a/third_party/blink/web_tests/compositing/squashing/squash-simple.html b/third_party/blink/web_tests/compositing/squashing/squash-simple.html index bbcea48..0e021af 100644 --- a/third_party/blink/web_tests/compositing/squashing/squash-simple.html +++ b/third_party/blink/web_tests/compositing/squashing/squash-simple.html
@@ -50,7 +50,7 @@ return; } - document.body.textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS); + document.body.textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_INVALIDATIONS); document.body.style.whiteSpace = 'pre'; } </script>
diff --git a/third_party/blink/web_tests/compositing/squashing/squash-three-layers.html b/third_party/blink/web_tests/compositing/squashing/squash-three-layers.html index 26d9635..7eb0411 100644 --- a/third_party/blink/web_tests/compositing/squashing/squash-three-layers.html +++ b/third_party/blink/web_tests/compositing/squashing/squash-three-layers.html
@@ -58,7 +58,7 @@ return; } - document.body.textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS); + document.body.textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_INVALIDATIONS); document.body.style.whiteSpace = 'pre'; } </script>
diff --git a/third_party/blink/web_tests/compositing/squashing/squash-transform-repainting-child-expected.txt b/third_party/blink/web_tests/compositing/squashing/squash-transform-repainting-child-expected.txt index d3ef042..7640493 100644 --- a/third_party/blink/web_tests/compositing/squashing/squash-transform-repainting-child-expected.txt +++ b/third_party/blink/web_tests/compositing/squashing/squash-transform-repainting-child-expected.txt
@@ -54,12 +54,8 @@ "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV class='box middle')", "position": [-101, -101], "bounds": [281, 281], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='box middle'", - "rect": [0, 0, 142, 142], - "reason": "background" - } + "invalidations": [ + [0, 0, 142, 142] ], "transform": 1 } @@ -97,17 +93,8 @@ "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV class='box middle')", "position": [-101, -101], "bounds": [281, 281], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='box middle'", - "rect": [0, 0, 142, 142], - "reason": "background" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV class='smallbox'", - "rect": [32, 32, 71, 71], - "reason": "background" - } + "invalidations": [ + [0, 0, 142, 142] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/compositing/squashing/squash-transform-repainting-child.html b/third_party/blink/web_tests/compositing/squashing/squash-transform-repainting-child.html index a318c0a..3c21094 100644 --- a/third_party/blink/web_tests/compositing/squashing/squash-transform-repainting-child.html +++ b/third_party/blink/web_tests/compositing/squashing/squash-transform-repainting-child.html
@@ -68,19 +68,19 @@ function executeTestCases() { internals.startTrackingRepaints(document); - document.getElementById('Case1').textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS); + document.getElementById('Case1').textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_INVALIDATIONS); internals.stopTrackingRepaints(document); eventSender.mouseMoveTo(0, 0); internals.startTrackingRepaints(document); hoverOverOuterDiv(); - document.getElementById('Case2').textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS); + document.getElementById('Case2').textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_INVALIDATIONS); internals.stopTrackingRepaints(document); eventSender.mouseMoveTo(0, 0); internals.startTrackingRepaints(document); hoverOverInnerDiv(); - document.getElementById('Case3').textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS); + document.getElementById('Case3').textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_INVALIDATIONS); internals.stopTrackingRepaints(document); // Display the test results only after test is done so that it does not affect repaint rect results.
diff --git a/third_party/blink/web_tests/compositing/squashing/squash-transform-repainting-transformed-child-expected.txt b/third_party/blink/web_tests/compositing/squashing/squash-transform-repainting-transformed-child-expected.txt index 4a764e7..657c371 100644 --- a/third_party/blink/web_tests/compositing/squashing/squash-transform-repainting-transformed-child-expected.txt +++ b/third_party/blink/web_tests/compositing/squashing/squash-transform-repainting-transformed-child-expected.txt
@@ -54,12 +54,8 @@ "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV class='box middle')", "position": [-96, -96], "bounds": [276, 276], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='box middle'", - "rect": [0, 0, 132, 132], - "reason": "background" - } + "invalidations": [ + [0, 0, 132, 132] ], "transform": 1 } @@ -97,17 +93,8 @@ "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV class='box middle')", "position": [-96, -96], "bounds": [276, 276], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='box middle'", - "rect": [0, 0, 132, 132], - "reason": "background" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV class='smallbox'", - "rect": [26, 28, 71, 72], - "reason": "background" - } + "invalidations": [ + [0, 0, 132, 132] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/compositing/squashing/squash-transform-repainting-transformed-child.html b/third_party/blink/web_tests/compositing/squashing/squash-transform-repainting-transformed-child.html index 1b54a53..6069f03 100644 --- a/third_party/blink/web_tests/compositing/squashing/squash-transform-repainting-transformed-child.html +++ b/third_party/blink/web_tests/compositing/squashing/squash-transform-repainting-transformed-child.html
@@ -69,19 +69,19 @@ function executeTestCases() { internals.startTrackingRepaints(document); - document.getElementById('Case1').textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS); + document.getElementById('Case1').textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_INVALIDATIONS); internals.stopTrackingRepaints(document); eventSender.mouseMoveTo(0, 0); internals.startTrackingRepaints(document); hoverOverOuterDiv(); - document.getElementById('Case2').textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS); + document.getElementById('Case2').textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_INVALIDATIONS); internals.stopTrackingRepaints(document); eventSender.mouseMoveTo(0, 0); internals.startTrackingRepaints(document); hoverOverInnerDiv(); - document.getElementById('Case3').textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS); + document.getElementById('Case3').textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_INVALIDATIONS); internals.stopTrackingRepaints(document); // Display the test results only after test is done so that it does not affect repaint rect results.
diff --git a/third_party/blink/web_tests/compositing/squashing/squash-transform.html b/third_party/blink/web_tests/compositing/squashing/squash-transform.html index 3218f934..e857912 100644 --- a/third_party/blink/web_tests/compositing/squashing/squash-transform.html +++ b/third_party/blink/web_tests/compositing/squashing/squash-transform.html
@@ -51,7 +51,7 @@ return; } - document.body.textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS); + document.body.textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_INVALIDATIONS); document.body.style.whiteSpace = 'pre'; } </script>
diff --git a/third_party/blink/web_tests/compositing/squashing/squashed-layer-loses-graphicslayer-expected.txt b/third_party/blink/web_tests/compositing/squashing/squashed-layer-loses-graphicslayer-expected.txt index bfd80d0..808afd3 100644 --- a/third_party/blink/web_tests/compositing/squashing/squashed-layer-loses-graphicslayer-expected.txt +++ b/third_party/blink/web_tests/compositing/squashing/squashed-layer-loses-graphicslayer-expected.txt
@@ -44,27 +44,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='C' class='overlap3'", - "rect": [300, 300, 100, 100], - "reason": "chunk appeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='B' class='overlap2'", - "rect": [220, 220, 100, 100], - "reason": "chunk appeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='A' class='overlap1'", - "rect": [140, 140, 100, 100], - "reason": "chunk appeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='forceComposited' class='underneath'", - "rect": [60, 60, 100, 100], - "reason": "chunk appeared" - } + "invalidations": [ + [300, 300, 100, 100], + [220, 220, 100, 100], + [140, 140, 100, 100], + [60, 60, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/compositing/squashing/squashed-layer-loses-graphicslayer.html b/third_party/blink/web_tests/compositing/squashing/squashed-layer-loses-graphicslayer.html index cc14866..ffdc300 100644 --- a/third_party/blink/web_tests/compositing/squashing/squashed-layer-loses-graphicslayer.html +++ b/third_party/blink/web_tests/compositing/squashing/squashed-layer-loses-graphicslayer.html
@@ -68,12 +68,12 @@ function executeTestCases() { // Case 1 - document.getElementById('Case1').textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS); + document.getElementById('Case1').textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_INVALIDATIONS); // Case 2 internals.startTrackingRepaints(document); document.getElementById("forceComposited").className = "underneath"; - document.getElementById('Case2').textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS); + document.getElementById('Case2').textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_INVALIDATIONS); internals.stopTrackingRepaints(document); // Display the test results only after test is done so that it does not affect repaint rect results.
diff --git a/third_party/blink/web_tests/compositing/squashing/squashed-repaints-expected.txt b/third_party/blink/web_tests/compositing/squashing/squashed-repaints-expected.txt index 3ee4c4b..90f8b5e 100644 --- a/third_party/blink/web_tests/compositing/squashing/squashed-repaints-expected.txt +++ b/third_party/blink/web_tests/compositing/squashing/squashed-repaints-expected.txt
@@ -56,12 +56,8 @@ "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV id='A' class='overlap1')", "position": [80, 80], "bounds": [260, 260], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='A' class='overlap1'", - "rect": [0, 0, 100, 100], - "reason": "background" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 1 } @@ -99,17 +95,9 @@ "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV id='A' class='overlap1')", "position": [80, 80], "bounds": [260, 260], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='B' class='overlap2'", - "rect": [80, 80, 100, 100], - "reason": "background" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='A' class='overlap1'", - "rect": [0, 0, 100, 100], - "reason": "background" - } + "invalidations": [ + [80, 80, 100, 100], + [0, 0, 100, 100] ], "transform": 1 } @@ -147,17 +135,9 @@ "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV id='A' class='overlap1')", "position": [80, 80], "bounds": [260, 260], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='C' class='overlap3'", - "rect": [160, 160, 100, 100], - "reason": "background" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='B' class='overlap2'", - "rect": [80, 80, 100, 100], - "reason": "background" - } + "invalidations": [ + [160, 160, 100, 100], + [80, 80, 100, 100] ], "transform": 1 } @@ -195,17 +175,9 @@ "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV id='A' class='overlap1')", "position": [80, 80], "bounds": [260, 260], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='C' class='overlap3'", - "rect": [160, 160, 100, 100], - "reason": "background" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='A' class='overlap1'", - "rect": [0, 0, 100, 100], - "reason": "background" - } + "invalidations": [ + [160, 160, 100, 100], + [0, 0, 100, 100] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/compositing/squashing/squashed-repaints.html b/third_party/blink/web_tests/compositing/squashing/squashed-repaints.html index 4236642..a245357 100644 --- a/third_party/blink/web_tests/compositing/squashing/squashed-repaints.html +++ b/third_party/blink/web_tests/compositing/squashing/squashed-repaints.html
@@ -64,33 +64,33 @@ function executeTestCases() { // Case 1 - document.getElementById('Case1').textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS); + document.getElementById('Case1').textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_INVALIDATIONS); // Case 2 internals.startTrackingRepaints(document); document.getElementById("A").style.backgroundColor = "green"; - document.getElementById('Case2').textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS); + document.getElementById('Case2').textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_INVALIDATIONS); internals.stopTrackingRepaints(document); // Case 3 internals.startTrackingRepaints(document); document.getElementById("A").style.backgroundColor = "blue"; document.getElementById("B").style.backgroundColor = "green"; - document.getElementById('Case3').textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS); + document.getElementById('Case3').textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_INVALIDATIONS); internals.stopTrackingRepaints(document); // Case 4 internals.startTrackingRepaints(document); document.getElementById("B").style.backgroundColor = "blue"; document.getElementById("C").style.backgroundColor = "green"; - document.getElementById('Case4').textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS); + document.getElementById('Case4').textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_INVALIDATIONS); internals.stopTrackingRepaints(document); // Case 5 internals.startTrackingRepaints(document); document.getElementById("C").style.backgroundColor = "blue"; document.getElementById("A").style.backgroundColor = "green"; - document.getElementById('Case5').textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS); + document.getElementById('Case5').textContent = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_INVALIDATIONS); internals.stopTrackingRepaints(document); // Display the test results only after test is done so that it does not affect repaint rect results.
diff --git a/third_party/blink/web_tests/external/wpt/client-hints/resources/echo-ua-client-hints-received.py b/third_party/blink/web_tests/external/wpt/client-hints/resources/echo-ua-client-hints-received.py index 9cf1f8e3..4af98c75 100644 --- a/third_party/blink/web_tests/external/wpt/client-hints/resources/echo-ua-client-hints-received.py +++ b/third_party/blink/web_tests/external/wpt/client-hints/resources/echo-ua-client-hints-received.py
@@ -13,6 +13,7 @@ "sec-ch-ua-arch", "sec-ch-ua-platform", "sec-ch-ua-model", + "sec-ch-ua-full-version", ] request_client_hints = {i: request.headers.get(i) for i in client_hint_headers}
diff --git a/third_party/blink/web_tests/external/wpt/client-hints/sec-ch-quotes.https.html b/third_party/blink/web_tests/external/wpt/client-hints/sec-ch-quotes.https.html index edf4fce..81fe09fb 100644 --- a/third_party/blink/web_tests/external/wpt/client-hints/sec-ch-quotes.https.html +++ b/third_party/blink/web_tests/external/wpt/client-hints/sec-ch-quotes.https.html
@@ -5,21 +5,53 @@ <script src="/resources/testharnessreport.js"></script> <script src="/common/utils.js"></script> <script> +const verify_headers = (header_list, response, verification_func) => { + header_list.forEach(header => { + const value = response.headers.get(header+"-recieved"); + if(value) { + verification_func(value); + } + }); +}; + promise_test(async (test) => { - var request_token = token(); - var client_hint_headers = [ + const request_token = token(); + const string_list_client_hint_headers = [ "sec-ch-ua", + ]; + const string_client_hint_headers = [ "sec-ch-ua-arch", "sec-ch-ua-platform", "sec-ch-ua-model", + "sec-ch-ua-full-version", + ]; + const boolean_client_hint_headers = [ + "sec-ch-mobile", ]; const response = await fetch("resources/echo-ua-client-hints-received.py"); - client_hint_headers.forEach(header => { - if(response.headers.get(header+"-recieved")) { + verify_headers(string_client_hint_headers, response, value => { + if(value) { // Check that the hints have quotes - assert_equals(response.headers.get(header+"-recieved").slice(0,1), "\""); - assert_equals(response.headers.get(header+"-recieved").slice(-1), "\""); + // TODO(yoav): this doesn't account for parameters. Need an SH parser, that verifies no parameters are present. + assert_equals(value.slice(0,1), "\""); + assert_equals(value.slice(-1), "\""); + } + }); + verify_headers(string_list_client_hint_headers, response, value => { + // Check that the hints have quotes + // TODO(yoav): this doesn't account for list parsing or parameters. Need an SH parser, that verifies this is a list of strings with a "v" parameter present in at least one value. + assert_false((typeof value) == "undefined"); + assert_equals(value.slice(0,1), "\""); + assert_equals(value.slice(-1), "\""); + }); + verify_headers(boolean_client_hint_headers, response, value => { + if(value) { + // Check that the value is a valid boolean + assert_false((typeof value) == "undefined"); + assert_equals(value.slice(0,1), "?"); + const num = value.slice(-1); + assert_true(num == "0" || num == "1"); } }); }, 'User agent client hint header values are surrounded by quotes');
diff --git a/third_party/blink/web_tests/external/wpt/client-hints/sec-ch-ua.https.html b/third_party/blink/web_tests/external/wpt/client-hints/sec-ch-ua.https.html index b293745..bc7a1a8 100644 --- a/third_party/blink/web_tests/external/wpt/client-hints/sec-ch-ua.https.html +++ b/third_party/blink/web_tests/external/wpt/client-hints/sec-ch-ua.https.html
@@ -27,7 +27,7 @@ window.onmessage = e => { try { assert_not_equals(e.data.header, "", "The `Sec-CH-UA` header is delivered."); - assert_not_equals(e.data.header, minor, "The `Sec-CH-UA` header is different after the opt-in than before."); + assert_equals(e.data.header, minor, "The `Sec-CH-UA` header did not change after the opt-in."); } catch (ex) { reject(ex); }
diff --git a/third_party/blink/web_tests/external/wpt/common/security-features/resources/common.sub.js b/third_party/blink/web_tests/external/wpt/common/security-features/resources/common.sub.js index 83b0342..aa6b5dd 100644 --- a/third_party/blink/web_tests/external/wpt/common/security-features/resources/common.sub.js +++ b/third_party/blink/web_tests/external/wpt/common/security-features/resources/common.sub.js
@@ -1111,19 +1111,19 @@ invoker: invokeFromWorker.bind(undefined, "worker", true, {type: 'module'}), }, "sharedworker-classic": { - // Classic dedicated worker loaded from same-origin. + // Classic shared worker loaded from same-origin. invoker: invokeFromWorker.bind(undefined, "sharedworker", false, {}), }, "sharedworker-classic-data": { - // Classic dedicated worker loaded from data: URL. + // Classic shared worker loaded from data: URL. invoker: invokeFromWorker.bind(undefined, "sharedworker", true, {}), }, "sharedworker-module": { - // Module dedicated worker loaded from same-origin. + // Module shared worker loaded from same-origin. invoker: invokeFromWorker.bind(undefined, "sharedworker", false, {type: 'module'}), }, "sharedworker-module-data": { - // Module dedicated worker loaded from data: URL. + // Module shared worker loaded from data: URL. invoker: invokeFromWorker.bind(undefined, "sharedworker", true, {type: 'module'}), }, }; @@ -1182,7 +1182,7 @@ if (workerType === "worker") { const worker = new Worker(url, workerOptions); worker.postMessage({subresource: subresource, - sourceContextList: sourceContextList.slice(1)}); + sourceContextList: sourceContextList.slice(1)}); return bindEvents2(worker, "message", worker, "error", window, "error"); } else if (workerType === "sharedworker") { const worker = new SharedWorker(url, workerOptions);
diff --git a/third_party/blink/web_tests/external/wpt/common/security-features/scope/worker.py b/third_party/blink/web_tests/external/wpt/common/security-features/scope/worker.py index bdad52c6..716bcb8 100644 --- a/third_party/blink/web_tests/external/wpt/common/security-features/scope/worker.py +++ b/third_party/blink/web_tests/external/wpt/common/security-features/scope/worker.py
@@ -23,6 +23,10 @@ elif delivery['deliveryType'] == 'http-rp': if delivery['key'] == 'referrerPolicy': maybe_additional_headers['Referrer-Policy'] = delivery['value'] + elif delivery['key'] == 'mixedContent' and delivery['value'] == 'opt-in': + maybe_additional_headers['Content-Security-Policy'] = 'block-all-mixed-content' + elif delivery['key'] == 'upgradeInsecureRequests' and delivery['value'] == 'upgrade': + maybe_additional_headers['Content-Security-Policy'] = 'upgrade-insecure-requests' else: error = 'invalid delivery key for http-rp: %s' % delivery['key'] else:
diff --git a/third_party/blink/web_tests/external/wpt/common/security-features/tools/spec.src.json b/third_party/blink/web_tests/external/wpt/common/security-features/tools/spec.src.json index 7cf6a06..0b5d6b7 100644 --- a/third_party/blink/web_tests/external/wpt/common/security-features/tools/spec.src.json +++ b/third_party/blink/web_tests/external/wpt/common/security-features/tools/spec.src.json
@@ -182,12 +182,6 @@ "source_context_list_schema": { // Warning: Currently, some nested patterns of contexts have different // inheritance rules for different kinds of policies. - // For example, an HTTP(S) dedicated worker inherits parent's CSP but not - // parent's referrer policy, and "worker-classic" source_context_list - // value here reflects the referrer policy spec, not CSP. - // Perhaps we have to introduce separate source_context_list entries, - // e.g. "worker-classic-CSP" to test the same nested contexts with - // different policy inheritance expectations. // The generated tests will be used to test/investigate the policy // inheritance rules, and eventually the policy inheritance rules will // be unified (https://github.com/w3ctag/design-principles/issues/111). @@ -284,8 +278,8 @@ "subresourcePolicyDeliveries": [] }, "worker-classic": { - // Warning: This is incompatible with the current CSP spec, - // so is not applicable to upgrade-insecure-requests and mixed-content tests. + // This is applicable to referrer-policy tests. + // Use "worker-classic-inherit" for CSP (mixed-content, etc.). "description": "dedicated workers shouldn't inherit its parent's policy.", "sourceContextList": [ { @@ -303,6 +297,26 @@ ], "subresourcePolicyDeliveries": [] }, + "worker-classic-inherit": { + // This is applicable to upgrade-insecure-requests and mixed-content tests. + // Use "worker-classic" for referrer-policy. + "description": "dedicated workers should inherit its parent's policy.", + "sourceContextList": [ + { + "sourceContextType": "top", + "policyDeliveries": [ + "policy" + ] + }, + { + "sourceContextType": "worker-classic", + "policyDeliveries": [ + "anotherPolicy" + ] + } + ], + "subresourcePolicyDeliveries": [] + }, "worker-classic-data": { "description": "data: dedicated workers should inherit its parent's policy.", "sourceContextList": [ @@ -320,8 +334,8 @@ "subresourcePolicyDeliveries": [] }, "worker-module": { - // Warning: This is incompatible with the current CSP spec, - // so is not applicable to upgrade-insecure-requests and mixed-content tests. + // This is applicable to referrer-policy tests. + // Use "worker-module-inherit" for CSP (mixed-content, etc.). "description": "dedicated workers shouldn't inherit its parent's policy.", "sourceContextList": [ { @@ -339,6 +353,26 @@ ], "subresourcePolicyDeliveries": [] }, + "worker-module-inherit": { + // This is applicable to upgrade-insecure-requests and mixed-content tests. + // Use "worker-module" for referrer-policy. + "description": "dedicated workers should inherit its parent's policy.", + "sourceContextList": [ + { + "sourceContextType": "top", + "policyDeliveries": [ + "policy" + ] + }, + { + "sourceContextType": "worker-module", + "policyDeliveries": [ + "anotherPolicy" + ] + } + ], + "subresourcePolicyDeliveries": [] + }, "worker-module-data": { "description": "data: dedicated workers should inherit its parent's policy.", "sourceContextList": [ @@ -355,6 +389,24 @@ ], "subresourcePolicyDeliveries": [] }, + "sharedworker-classic": { + "description": "shared workers shouldn't inherit its parent's policy.", + "sourceContextList": [ + { + "sourceContextType": "top", + "policyDeliveries": [ + "anotherPolicy" + ] + }, + { + "sourceContextType": "sharedworker-classic", + "policyDeliveries": [ + "policy" + ] + } + ], + "subresourcePolicyDeliveries": [] + }, "sharedworker-classic-data": { "description": "data: shared workers should inherit its parent's policy.", "sourceContextList": [ @@ -371,6 +423,24 @@ ], "subresourcePolicyDeliveries": [] }, + "sharedworker-module": { + "description": "shared workers shouldn't inherit its parent's policy.", + "sourceContextList": [ + { + "sourceContextType": "top", + "policyDeliveries": [ + "anotherPolicy" + ] + }, + { + "sourceContextType": "sharedworker-module", + "policyDeliveries": [ + "policy" + ] + } + ], + "subresourcePolicyDeliveries": [] + }, "sharedworker-module-data": { "description": "data: shared workers should inherit its parent's policy.", "sourceContextList": [ @@ -405,10 +475,14 @@ "iframe", "iframe-blank-inherit", "worker-classic", + "worker-classic-inherit", "worker-classic-data", "worker-module", + "worker-module-inherit", "worker-module-data", + "sharedworker-classic", "sharedworker-classic-data", + "sharedworker-module", "sharedworker-module-data" ], "redirection": [
diff --git a/third_party/blink/web_tests/external/wpt/common/security-features/tools/util.py b/third_party/blink/web_tests/external/wpt/common/security-features/tools/util.py index cb89c96..8886847 100644 --- a/third_party/blink/web_tests/external/wpt/common/security-features/tools/util.py +++ b/third_party/blink/web_tests/external/wpt/common/security-features/tools/util.py
@@ -121,7 +121,7 @@ elif obj == "anotherPolicy": policy_delivery = target_policy_delivery.get_another_policy( supported_delivery_types[0]) - elif type(obj) == dict: + elif isinstance(obj, dict): policy_delivery = PolicyDelivery(obj['deliveryType'], obj['key'], obj['value']) else: @@ -148,6 +148,16 @@ return PolicyDelivery(delivery_type, self.key, 'unsafe-url') else: return PolicyDelivery(delivery_type, self.key, 'no-referrer') + elif self.key == 'mixedContent': + if self.value == 'opt-in': + return PolicyDelivery(delivery_type, self.key, None) + else: + return PolicyDelivery(delivery_type, self.key, 'opt-in') + elif self.key == 'upgradeInsecureRequests': + if self.value == 'upgrade': + return PolicyDelivery(delivery_type, self.key, None) + else: + return PolicyDelivery(delivery_type, self.key, 'upgrade') else: raise Exception('delivery key is invalid: ' + self.key)
diff --git a/third_party/blink/web_tests/external/wpt/css/css-animations/CSSAnimation-compositeOrder.tentative.html b/third_party/blink/web_tests/external/wpt/css/css-animations/CSSAnimation-compositeOrder.tentative.html index ee204db..d55db9a2d 100644 --- a/third_party/blink/web_tests/external/wpt/css/css-animations/CSSAnimation-compositeOrder.tentative.html +++ b/third_party/blink/web_tests/external/wpt/css/css-animations/CSSAnimation-compositeOrder.tentative.html
@@ -42,9 +42,9 @@ const animA = div.animate({margin: ["100px","100px"]}, 100000); assert_equals(getComputedStyle(div).marginLeft, '100px'); div.style.animation = 'margin50 100s'; - assert_equals(getComputedStyle(div).marginLeft, '50px'); // Wait for animation starts - await waitForAnimationFrames(2); + await animA.ready; + await waitForAnimationFrames(1); assert_equals(getComputedStyle(div).marginLeft, '100px', "A higher-priority animation is not overriden by a more recent" + "one.");
diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-embedder-policy/reporting.https.html b/third_party/blink/web_tests/external/wpt/html/cross-origin-embedder-policy/reporting.https.html index d883ceb..95fe047 100644 --- a/third_party/blink/web_tests/external/wpt/html/cross-origin-embedder-policy/reporting.https.html +++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-embedder-policy/reporting.https.html
@@ -1,11 +1,12 @@ <!doctype html> <html> -<html> +<meta name="timeout" content="long"> <body> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> <script src="/common/utils.js"></script> <script src="/common/get-host-info.sub.js"></script> +<script src="/service-workers/service-worker/resources/test-helpers.sub.js"></script> <script> const HOST = get_host_info(); const REMOTE_ORIGIN = HOST.REMOTE_ORIGIN; @@ -119,6 +120,68 @@ async_test(async (t) => { try { + const IFRAME_SRC = 'resources/coep-iframe.html'; + const SCOPE = new URL(IFRAME_SRC, location).pathname; + const SCRIPT = + 'resources/sw.js?' + + `pipe=header(service-worker-allowed,${SCOPE})|` + + 'header(cross-origin-embedder-policy,require-corp%3breport-to=%22endpoint%22)|' + + 'header(cross-origin-embedder-policy-report-only,require-corp%3breport-to=%22report-only-endpoint%22)'; + + const reg = await service_worker_unregister_and_register(t, SCRIPT, SCOPE); + await wait_for_state(t, reg.installing, 'activated'); + + const iframe = document.createElement('iframe'); + t.add_cleanup(() => { + iframe.remove(); + reg.unregister(); + }); + iframe.src = IFRAME_SRC; + document.body.appendChild(iframe); + await new Promise(resolve => { + iframe.addEventListener('load', resolve, {once: true}); + }); + + document.body.appendChild(iframe); + await new Promise(resolve => { + iframe.addEventListener('load', resolve, {once: true}); + }); + + function fetchInIframe(url) { + const init = { mode: 'no-cors', cache: 'no-store' }; + iframe.contentWindow.fetch(url, init).catch(() => {}); + } + + const suffix = 'subresource-corp-sw'; + const sameOriginUrl = `/common/text-plain.txt?${suffix}`; + const blockedByPureCorp = `${REMOTE_ORIGIN}${BASE}/nothing-same-origin-corp.txt?${suffix}`; + const blockedDueToCoep = `${REMOTE_ORIGIN}/common/text-plain.txt?abc&${suffix}`; + const dest = `${REMOTE_ORIGIN}/common/text-plain.txt?xyz&${suffix}`; + const redirect = `/common/redirect.py?location=${encodeURIComponent(dest)}&${suffix}`; + + fetchInIframe(sameOriginUrl); + fetchInIframe(blockedByPureCorp); + fetchInIframe(blockedDueToCoep); + fetchInIframe(redirect); + + // Wait 3 seconds for reports to settle. + await wait(3000); + + const contextUrl = SCRIPT; + checkReportNonExistence(reports, sameOriginUrl, contextUrl); + checkReportNonExistence(reports, blockedByPureCorp, contextUrl); + checkCorpReportExistence(reports, blockedDueToCoep, contextUrl); + checkCorpReportExistence(reports, redirect, contextUrl); + checkReportNonExistence(reports, dest, contextUrl); + + t.done(); + } catch (e) { + t.step(() => { throw e }); + } +}, 'CORP for subresource requests initiated from a service worker'); + +async_test(async (t) => { + try { const iframe = document.createElement('iframe'); t.add_cleanup(() => iframe.remove()); @@ -255,4 +318,93 @@ } }, 'COEP violation on nested frame navigation'); +promise_test(async (t) => { + const iframe_src = `resources/reporting-empty-frame.html?passthrough`; + // Register a service worker that controls an iframe. + const registration = await service_worker_unregister_and_register( + t, 'resources/sw.js', iframe_src); + t.add_cleanup(() => registration.unregister()); + await wait_for_state(t, registration.installing, 'activated'); + + const iframe = document.createElement('iframe'); + t.add_cleanup(() => iframe.remove()); + + iframe.src = iframe_src; + document.body.appendChild(iframe); + await new Promise(resolve => { + iframe.addEventListener('load', resolve, {once: true}); + }); + + async function fetchInIframe(url) { + const init = { mode: 'no-cors', cache: 'no-store' }; + // Ignore errors. + return iframe.contentWindow.fetch(url, init).catch(() => {}); + } + + const suffix = 'subresource-corp-passthrough-sw'; + const sameOriginUrl = `/common/text-plain.txt?${suffix}`; + const blockedByPureCorp = `${REMOTE_ORIGIN}${BASE}/nothing-same-origin-corp.txt?${suffix}`; + const blockedDueToCoep = `${REMOTE_ORIGIN}/common/text-plain.txt?abc&${suffix}`; + const dest = `${REMOTE_ORIGIN}/common/text-plain.txt?xyz&${suffix}`; + const redirect = `/common/redirect.py?location=${encodeURIComponent(dest)}&${suffix}`; + + fetchInIframe(sameOriginUrl); + fetchInIframe(blockedByPureCorp); + fetchInIframe(blockedDueToCoep); + fetchInIframe(redirect); + + // Wait until |reports| is ready. + await wait(1000); + + checkReportNonExistence(reports, sameOriginUrl, iframe.src); + checkReportNonExistence(reports, blockedByPureCorp, iframe.src); + checkCorpReportExistence(reports, blockedDueToCoep, iframe.src); + checkCorpReportExistence(reports, redirect, iframe.src); + checkReportNonExistence(reports, dest, iframe.src); +}, 'subresource CORP in a passthrough iframe hosted by a service worker without COEP'); + +promise_test(async (t) => { + const iframe_src = `resources/reporting-empty-frame.html`; + // Register a service worker that controls an iframe. + const registration = await service_worker_unregister_and_register( + t, 'resources/sw.js', iframe_src); + t.add_cleanup(() => registration.unregister()); + await wait_for_state(t, registration.installing, 'activated'); + + const iframe = document.createElement('iframe'); + t.add_cleanup(() => iframe.remove()); + + iframe.src = iframe_src; + document.body.appendChild(iframe); + await new Promise(resolve => { + iframe.addEventListener('load', resolve, {once: true}); + }); + + async function fetchInIframe(url) { + const init = { mode: 'no-cors', cache: 'no-store' }; + // Ignore errors. + return iframe.contentWindow.fetch(url, init).catch(() => {}); + } + + const suffix = 'subresource-corp-respondwith-fetch-sw'; + const sameOriginUrl = `/common/text-plain.txt?${suffix}`; + const blockedByPureCorp = `${REMOTE_ORIGIN}${BASE}/nothing-same-origin-corp.txt?${suffix}`; + const blockedDueToCoep = `${REMOTE_ORIGIN}/common/text-plain.txt?abc&${suffix}`; + const dest = `${REMOTE_ORIGIN}/common/text-plain.txt?xyz&${suffix}`; + const redirect = `/common/redirect.py?location=${encodeURIComponent(dest)}&${suffix}`; + + fetchInIframe(sameOriginUrl); + fetchInIframe(blockedByPureCorp); + fetchInIframe(blockedDueToCoep) + fetchInIframe(redirect); + + // Wait until |reports| is ready. + await wait(1000); + + checkReportNonExistence(reports, sameOriginUrl, iframe.src); + checkReportNonExistence(reports, blockedByPureCorp, iframe.src); + checkCorpReportExistence(reports, blockedDueToCoep, iframe.src); + checkCorpReportExistence(reports, redirect, iframe.src); + checkReportNonExistence(reports, dest, iframe.src); +}, 'subresource CORP in a respondWith(fetch) iframe hosted by a service worker without COEP'); </script>$
diff --git a/third_party/blink/web_tests/external/wpt/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator_user_agent.https.html b/third_party/blink/web_tests/external/wpt/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator_user_agent.https.html index 4c83c7e..0fb9e37 100644 --- a/third_party/blink/web_tests/external/wpt/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator_user_agent.https.html +++ b/third_party/blink/web_tests/external/wpt/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator_user_agent.https.html
@@ -5,7 +5,7 @@ <script> test(t => { assert_true("userAgentData" in navigator); - }, "navigator.getUserAgent() is exposed."); + }, "navigator.userAgentData is exposed."); promise_test(async t => { const uaData = navigator.userAgentData; @@ -24,5 +24,5 @@ assert_equals(highEntropyData2["platformVersion"], "", "Platform version should be an empty string"); assert_equals(highEntropyData2["architecture"], "", "Architecture should be an empty string"); assert_equals(highEntropyData2["model"], "", "Model should be an empty string"); - }, "navigator.getUserAgent() returns a UserAgentMetadata object."); + }, "navigator.userAgentData returns a UserAgentMetadata object."); </script>
diff --git a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/@std/__dir__.headers b/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/@std/__dir__.headers deleted file mode 100644 index e7ec0d6..0000000 --- a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/@std/__dir__.headers +++ /dev/null
@@ -1 +0,0 @@ -Content-Type: text/javascript
diff --git a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/@std/blank b/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/@std/blank deleted file mode 100644 index 38e1891..0000000 --- a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/@std/blank +++ /dev/null
@@ -1 +0,0 @@ -log.push("relative:@std/blank");
diff --git a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/@std/none b/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/@std/none deleted file mode 100644 index 69e165c..0000000 --- a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/@std/none +++ /dev/null
@@ -1 +0,0 @@ -log.push("relative:@std/none");
diff --git a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/bare.sub.tentative.html b/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/bare.sub.tentative.html deleted file mode 100644 index e20424ae..0000000 --- a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/bare.sub.tentative.html +++ /dev/null
@@ -1,51 +0,0 @@ -<!DOCTYPE html> -<meta name="timeout" content="long"> -<script src="/resources/testharness.js"></script> -<script src="/resources/testharnessreport.js"></script> -<script src="../resources/test-helper.js"></script> - -<script> -// "bare/..." (i.e. without leading "./") are bare specifiers -// (not relative paths). -// -// Discussions about notations for builtin modules are ongoing, e.g. -// https://github.com/tc39/proposal-javascript-standard-library/issues/12 -// Currently the tests expects two notations are accepted. -// TODO: Once the discussions converge, update the tests. -const importMap = ` -{ - "imports": { - "bare/std-blank": "std:blank", - "bare/blank": "@std/blank", - "bare/std-none": "std:none", - "bare/none": "@std/none" - } -} -`; - -const tests = { - // Arrays of expected results for: - // - <script src type="module">, - // - <script src> (classic script), - // - static import, and - // - dynamic import. - - // Currently, Chromium's implementation resolves import maps as a part of - // specifier resolution, and thus failure in import map resolution causes - // a parse error, not fetch error. Therefore, we use Result.PARSE_ERROR - // below. https://crbug.com/928435 - - // Bare to built-in. - "bare/std-blank": - [Result.URL, Result.URL, Result.BUILTIN, Result.BUILTIN], - "bare/blank": - [Result.URL, Result.URL, Result.BUILTIN, Result.BUILTIN], - "bare/std-none": - [Result.URL, Result.URL, Result.PARSE_ERROR, Result.PARSE_ERROR], - "bare/none": - [Result.URL, Result.URL, Result.PARSE_ERROR, Result.PARSE_ERROR], -}; - -doTests(importMap, null, tests); -</script> -<body>
diff --git a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/bare/__dir__.headers b/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/bare/__dir__.headers deleted file mode 100644 index e7ec0d6..0000000 --- a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/bare/__dir__.headers +++ /dev/null
@@ -1 +0,0 @@ -Content-Type: text/javascript
diff --git a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/bare/blank b/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/bare/blank deleted file mode 100644 index 841d433a..0000000 --- a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/bare/blank +++ /dev/null
@@ -1 +0,0 @@ -log.push("relative:bare/blank");
diff --git a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/bare/none b/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/bare/none deleted file mode 100644 index 2aec0d7..0000000 --- a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/bare/none +++ /dev/null
@@ -1 +0,0 @@ -log.push("relative:bare/none");
diff --git a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/bare/std-blank b/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/bare/std-blank deleted file mode 100644 index 5ded98f..0000000 --- a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/bare/std-blank +++ /dev/null
@@ -1 +0,0 @@ -log.push("relative:bare/std-blank");
diff --git a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/bare/std-none b/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/bare/std-none deleted file mode 100644 index 1437d9f..0000000 --- a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/bare/std-none +++ /dev/null
@@ -1 +0,0 @@ -log.push("relative:bare/std-none");
diff --git a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/builtin-empty.tentative.html b/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/builtin-empty.tentative.html deleted file mode 100644 index 9ede75a..0000000 --- a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/builtin-empty.tentative.html +++ /dev/null
@@ -1,43 +0,0 @@ -<!DOCTYPE html> -<script src="/resources/testharness.js"></script> -<script src="/resources/testharnessreport.js"></script> -<script src="../resources/test-helper.js"></script> - -<script> -const importMap = ` -{ - "imports": { - "../resources/log.js?pipe=sub&name=empty": [ "@std/" ], - "../resources/log.js?pipe=sub&name=empty-fallback": [ - "@std/", - "../resources/log.js?pipe=sub&name=empty-fallback" - ] - } -} -`; - -const tests = { - // Arrays of expected results for: - // - <script src type="module">, - // - <script src> (classic script), - // - static import, and - // - dynamic import. - - // Discussions about notations are ongoing, e.g. - // https://github.com/tc39/proposal-javascript-standard-library/issues/12 - // Currently the tests expects two notations are accepted. - // TODO: Once the discussions converge, update this and related tests. - "std:": - [Result.FETCH_ERROR, Result.FETCH_ERROR, Result.FETCH_ERROR, Result.FETCH_ERROR], - "@std/": - [Result.FETCH_ERROR, Result.PARSE_ERROR, Result.FETCH_ERROR, Result.FETCH_ERROR], - - "../resources/log.js?pipe=sub&name=empty": - [Result.URL, Result.URL, Result.PARSE_ERROR, Result.PARSE_ERROR], - "../resources/log.js?pipe=sub&name=empty-fallback": - [Result.URL, Result.URL, Result.URL, Result.URL], -}; - -doTests(importMap, null, tests); -</script> -<body>
diff --git a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/builtin-import-scheme.tentative.html b/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/builtin-import-scheme.tentative.html deleted file mode 100644 index d9977ae..0000000 --- a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/builtin-import-scheme.tentative.html +++ /dev/null
@@ -1,27 +0,0 @@ -<!DOCTYPE html> -<script src="/resources/testharness.js"></script> -<script src="/resources/testharnessreport.js"></script> -<script src="../resources/test-helper.js"></script> - -<script> -const tests = { - // Arrays of expected results for: - // - <script src type="module">, - // - <script src> (classic script), - // - static import, and - // - dynamic import. - - // Currently direct use of import: URLs are disabled. - "import:std:blank": - [Result.FETCH_ERROR, Result.FETCH_ERROR, Result.FETCH_ERROR, Result.FETCH_ERROR], - "import:@std/blank": - [Result.FETCH_ERROR, Result.FETCH_ERROR, Result.FETCH_ERROR, Result.FETCH_ERROR], - "import:std:none": - [Result.FETCH_ERROR, Result.FETCH_ERROR, Result.FETCH_ERROR, Result.FETCH_ERROR], - "import:@std/none": - [Result.FETCH_ERROR, Result.FETCH_ERROR, Result.FETCH_ERROR, Result.FETCH_ERROR], -}; - -doTests(null, null, tests); -</script> -<body>
diff --git a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/builtin.tentative.html b/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/builtin.tentative.html deleted file mode 100644 index 497bb5c..0000000 --- a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/builtin.tentative.html +++ /dev/null
@@ -1,30 +0,0 @@ -<!DOCTYPE html> -<script src="/resources/testharness.js"></script> -<script src="/resources/testharnessreport.js"></script> -<script src="../resources/test-helper.js"></script> - -<script> -const tests = { - // Arrays of expected results for: - // - <script src type="module">, - // - <script src> (classic script), - // - static import, and - // - dynamic import. - - // Discussions about notations are ongoing, e.g. - // https://github.com/tc39/proposal-javascript-standard-library/issues/12 - // Currently the tests expects two notations are accepted. - // TODO: Once the discussions converge, update this and related tests. - "std:blank": - [Result.BUILTIN, Result.FETCH_ERROR, Result.BUILTIN, Result.BUILTIN], - "@std/blank": - [Result.URL, Result.URL, Result.BUILTIN, Result.BUILTIN], - "std:none": - [Result.FETCH_ERROR, Result.FETCH_ERROR, Result.FETCH_ERROR, Result.FETCH_ERROR], - "@std/none": - [Result.URL, Result.URL, Result.FETCH_ERROR, Result.FETCH_ERROR], -}; - -doTests(null, null, tests); -</script> -<body>
diff --git a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/data.sub.tentative.html b/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/data.sub.tentative.html deleted file mode 100644 index 0377a78..0000000 --- a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/data.sub.tentative.html +++ /dev/null
@@ -1,51 +0,0 @@ -<!DOCTYPE html> -<meta name="timeout" content="long"> -<script src="/resources/testharness.js"></script> -<script src="/resources/testharnessreport.js"></script> -<script src="../resources/test-helper.js"></script> - -<script> -// "bare/..." (i.e. without leading "./") are bare specifiers -// (not relative paths). -// -// Discussions about notations for builtin modules are ongoing, e.g. -// https://github.com/tc39/proposal-javascript-standard-library/issues/12 -// Currently the tests expects two notations are accepted. -// TODO: Once the discussions converge, update the tests. -const importMap = ` -{ - "imports": { - "data:text/javascript,log.push('data:std-blank')": "std:blank", - "data:text/javascript,log.push('data:blank')": "@std/blank", - "data:text/javascript,log.push('data:std-none')": "std:none", - "data:text/javascript,log.push('data:none')": "@std/none" - } -} -`; - -const tests = { - // Arrays of expected results for: - // - <script src type="module">, - // - <script src> (classic script), - // - static import, and - // - dynamic import. - - // Currently, Chromium's implementation resolves import maps as a part of - // specifier resolution, and thus failure in import map resolution causes - // a parse error, not fetch error. Therefore, we use Result.PARSE_ERROR - // below. https://crbug.com/928435 - - // data: to built-in. - "data:text/javascript,log.push('data:std-blank')": - [Result.URL, Result.URL, Result.BUILTIN, Result.BUILTIN], - "data:text/javascript,log.push('data:blank')": - [Result.URL, Result.URL, Result.BUILTIN, Result.BUILTIN], - "data:text/javascript,log.push('data:std-none')": - [Result.URL, Result.URL, Result.PARSE_ERROR, Result.PARSE_ERROR], - "data:text/javascript,log.push('data:none')": - [Result.URL, Result.URL, Result.PARSE_ERROR, Result.PARSE_ERROR], -}; - -doTests(importMap, null, tests); -</script> -<body>
diff --git a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/fallback-disallowed.sub.tentative.html b/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/fallback-disallowed.sub.tentative.html deleted file mode 100644 index 7efe90eb75..0000000 --- a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/fallback-disallowed.sub.tentative.html +++ /dev/null
@@ -1,80 +0,0 @@ -<!DOCTYPE html> -<meta name="timeout" content="long"> -<script src="/resources/testharness.js"></script> -<script src="/resources/testharnessreport.js"></script> -<script src="../resources/test-helper.js"></script> - -<script> -// Fallbacks from external URLs (such as HTTPS URLs) are -// blocked by ongoing spec discussions, for example -// https://github.com/WICG/import-maps/issues/76. -// https://crbug.com/928435 -// -// This test, as well as Chromium's implementation, rejects broader range of -// fallbacks (not only those from HTTPS), to avoid potential spec and -// interoperability issues. -// The only allowed fallback pattern is fallbacks from bare specifiers with -// two elements, which are listed in fallback.sub.tentative.html. -const importMap = ` -{ - "imports": { - "bare": "../resources/log.js?pipe=sub&name=bare", - - "../resources/log.js?pipe=sub&name=http-to-builtin": [ - "../resources/log.js?pipe=sub&name=http-to-builtin", - "@std/blank" - ], - - "../resources/log.js?pipe=sub&name=fallback-to-different-url-1": [ - "@std/blank", - "../resources/log.js?pipe=sub&name=something-different" - ], - "../resources/log.js?pipe=sub&name=fallback-to-different-url-2": [ - "@std/none", - "../resources/log.js?pipe=sub&name=something-different2" - ], - "../resources/log.js?pipe=sub&name=fallback-to-different-origin-1": [ - "@std/blank", - "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=fallback-to-different-origin-1" - ], - "../resources/log.js?pipe=sub&name=fallback-to-different-origin-2": [ - "@std/none", - "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=fallback-to-different-origin-2" - ], - - "../resources/log.js?pipe=sub&name=more-than-two-values-1": [ - "@std/none", - "@std/blank", - "../resources/log.js?pipe=sub&name=more-than-two-values-1" - ], - "../resources/log.js?pipe=sub&name=more-than-two-values-2": [ - "@std/none", - "../resources/log.js?pipe=sub&name=more-than-two-values-2", - "@std/blank" - ], - "../resources/log.js?pipe=sub&name=fallback-from-http": [ - "../resources/log.js?pipe=sub&name=non-built-in", - "../resources/log.js?pipe=sub&name=fallback-from-http" - ], - "../resources/log.js?pipe=sub&name=fallback-from-data-1": [ - "data:text/plain,", - "../resources/log.js?pipe=sub&name=fallback-from-http" - ], - "../resources/log.js?pipe=sub&name=fallback-from-data-2": [ - "data:text/javascript,log.push('dataURL')", - "../resources/log.js?pipe=sub&name=fallback-from-http" - ] - } -} -`; -const tests = {}; -for (const key in JSON.parse(importMap).imports) { - if (key === "bare") { - continue; - } - tests[key] = - [Result.URL, Result.URL, Result.PARSE_ERROR, Result.PARSE_ERROR]; -} -doTests(importMap, null, tests); -</script> -<body>
diff --git a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/fallback.sub.tentative.html b/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/fallback.sub.tentative.html deleted file mode 100644 index 45cf6dc1..0000000 --- a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/fallback.sub.tentative.html +++ /dev/null
@@ -1,85 +0,0 @@ -<!DOCTYPE html> -<meta name="timeout" content="long"> -<script src="/resources/testharness.js"></script> -<script src="/resources/testharnessreport.js"></script> -<script src="../resources/test-helper.js"></script> - -<script> -// This tests is for fallbacks with the pattern of -// `"https://some.external/url": ["@std/x", "https://some.external/url"]` -// which maps "https://some.external/url" to "@std/x" if "@std/x" is -// implemented, or leaves it unmodified otherwise. -// -// This is the primary use case where fallback should work. -// Some other patterns of fallbacks are intentionally blocked due to ongoing -// spec issues. See fallback-disallowed.sub.tentative.html. -const importMap = ` -{ - "imports": { - "../resources/log.js?pipe=sub&name=blank": [ - "@std/blank", - "../resources/log.js?pipe=sub&name=blank" - ], - "../resources/log.js?pipe=sub&name=none": [ - "@std/none", - "../resources/log.js?pipe=sub&name=none" - ], - "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=cross-origin-blank": [ - "@std/blank", - "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=cross-origin-blank" - ], - "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=cross-origin-none": [ - "@std/none", - "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=cross-origin-none" - ], - - "../resources/log.js?pipe=sub&name=std-blank": [ - "std:blank", - "../resources/log.js?pipe=sub&name=std-blank" - ], - "../resources/log.js?pipe=sub&name=std-none": [ - "std:none", - "../resources/log.js?pipe=sub&name=std-none" - ], - "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=std-cross-origin-blank": [ - "std:blank", - "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=std-cross-origin-blank" - ], - "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=std-cross-origin-none": [ - "std:none", - "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=std-cross-origin-none" - ] - - } -} -`; -const tests = { - // Arrays of expected results for: - // - <script src type="module">, - // - <script src> (classic script), - // - static import, and - // - dynamic import. - // Result.URL indicates that the specifier was not re-mapped by import maps, - // i.e. either considered as a relative path, or fallback occured. - "../resources/log.js?pipe=sub&name=blank": - [Result.URL, Result.URL, Result.BUILTIN, Result.BUILTIN], - "../resources/log.js?pipe=sub&name=none": - [Result.URL, Result.URL, Result.URL, Result.URL], - "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=cross-origin-blank": - [Result.URL, Result.URL, Result.BUILTIN, Result.BUILTIN], - "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=cross-origin-none": - [Result.URL, Result.URL, Result.URL, Result.URL], - - "../resources/log.js?pipe=sub&name=std-blank": - [Result.URL, Result.URL, Result.BUILTIN, Result.BUILTIN], - "../resources/log.js?pipe=sub&name=std-none": - [Result.URL, Result.URL, Result.URL, Result.URL], - "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=std-cross-origin-blank": - [Result.URL, Result.URL, Result.BUILTIN, Result.BUILTIN], - "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=std-cross-origin-none": - [Result.URL, Result.URL, Result.URL, Result.URL], -}; - -doTests(importMap, null, tests); -</script> -<body>
diff --git a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/http.sub.tentative.html b/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/http.sub.tentative.html deleted file mode 100644 index 7689ae13..0000000 --- a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/http.sub.tentative.html +++ /dev/null
@@ -1,50 +0,0 @@ -<!DOCTYPE html> -<script src="/resources/testharness.js"></script> -<script src="/resources/testharnessreport.js"></script> -<script src="../resources/test-helper.js"></script> - -<script> -// "bare/..." (i.e. without leading "./") are bare specifiers -// (not relative paths). -// -// Discussions about notations for builtin modules are ongoing, e.g. -// https://github.com/tc39/proposal-javascript-standard-library/issues/12 -// Currently the tests expects two notations are accepted. -// TODO: Once the discussions converge, update the tests. -const importMap = ` -{ - "imports": { - "../resources/log.js?pipe=sub&name=std-blank": "std:blank", - "../resources/log.js?pipe=sub&name=blank": "@std/blank", - "../resources/log.js?pipe=sub&name=std-none": "std:none", - "../resources/log.js?pipe=sub&name=none": "@std/none" - } -} -`; - -const tests = { - // Arrays of expected results for: - // - <script src type="module">, - // - <script src> (classic script), - // - static import, and - // - dynamic import. - - // Currently, Chromium's implementation resolves import maps as a part of - // specifier resolution, and thus failure in import map resolution causes - // a parse error, not fetch error. Therefore, we use Result.PARSE_ERROR - // below. https://crbug.com/928435 - - // HTTP(S) to built-in. - "{{location[server]}}/import-maps/resources/log.js?pipe=sub&name=std-blank": - [Result.URL, Result.URL, Result.BUILTIN, Result.BUILTIN], - "{{location[server]}}/import-maps/resources/log.js?pipe=sub&name=blank": - [Result.URL, Result.URL, Result.BUILTIN, Result.BUILTIN], - "{{location[server]}}/import-maps/resources/log.js?pipe=sub&name=std-none": - [Result.URL, Result.URL, Result.PARSE_ERROR, Result.PARSE_ERROR], - "{{location[server]}}/import-maps/resources/log.js?pipe=sub&name=none": - [Result.URL, Result.URL, Result.PARSE_ERROR, Result.PARSE_ERROR], -}; - -doTests(importMap, null, tests); -</script> -<body>
diff --git a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/parsing-addresses.tentative-expected.txt b/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/parsing-addresses.tentative-expected.txt deleted file mode 100644 index 96e3eae..0000000 --- a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/parsing-addresses.tentative-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -This is a testharness.js-based test. -PASS Relative URL-like addresses / should accept strings prefixed with ./, ../, or / -FAIL Relative URL-like addresses / should not accept strings prefixed with ./, ../, or / for data: base URLs test helper does not support data: base URLs -PASS Relative URL-like addresses / should accept the literal strings ./, ../, or / with no suffix -PASS Relative URL-like addresses / should ignore percent-encoded variants of ./, ../, or / -PASS Built-in module addresses / should accept URLs using the built-in module scheme -PASS Built-in module addresses / should ignore percent-encoded variants of the built-in module scheme -PASS Built-in module addresses / should allow built-in module URLs that contain "/" or "\" -FAIL Absolute URL addresses / should only accept absolute URL addresses with fetch schemes assert_equals: expected "{\"imports\":{\"about\":[\"about:good\"],\"blob\":[\"blob:good\"],\"data\":[\"data:good\"],\"file\":[\"file:///good\"],\"filesystem\":[\"filesystem:good\"],\"ftp\":[\"ftp://good/\"],\"http\":[\"http://good/\"],\"https\":[\"https://good/\"],\"import\":[],\"javascript\":[],\"mailto\":[],\"wss\":[]},\"scopes\":{}}" but got "{\"imports\":{\"about\":[\"about:good\"],\"blob\":[\"blob:good\"],\"data\":[\"data:good\"],\"file\":[\"file:///good\"],\"filesystem\":[],\"ftp\":[\"ftp://good/\"],\"http\":[\"http://good/\"],\"https\":[\"https://good/\"],\"import\":[\"import:bad\"],\"javascript\":[\"javascript:bad\"],\"mailto\":[\"mailto:bad\"],\"wss\":[\"wss://bad/\"]},\"scopes\":{}}" -FAIL Absolute URL addresses / should only accept absolute URL addresses with fetch schemes inside arrays assert_equals: expected "{\"imports\":{\"about\":[\"about:good\"],\"blob\":[\"blob:good\"],\"data\":[\"data:good\"],\"file\":[\"file:///good\"],\"filesystem\":[\"filesystem:good\"],\"ftp\":[\"ftp://good/\"],\"http\":[\"http://good/\"],\"https\":[\"https://good/\"],\"import\":[],\"javascript\":[],\"mailto\":[],\"wss\":[]},\"scopes\":{}}" but got "{\"imports\":{\"about\":[\"about:good\"],\"blob\":[\"blob:good\"],\"data\":[\"data:good\"],\"file\":[\"file:///good\"],\"filesystem\":[],\"ftp\":[\"ftp://good/\"],\"http\":[\"http://good/\"],\"https\":[\"https://good/\"],\"import\":[\"import:bad\"],\"javascript\":[\"javascript:bad\"],\"mailto\":[\"mailto:bad\"],\"wss\":[\"wss://bad/\"]},\"scopes\":{}}" -FAIL Absolute URL addresses / should parse absolute URLs, ignoring unparseable ones assert_equals: expected "{\"imports\":{\"invalidButParseable1\":[\"https://example.org/\"],\"invalidButParseable2\":[\"https://example.com///\"],\"noPercentDecoding\":[\"https://example.com/%41\"],\"percentDecoding\":[\"https://example.com/\"],\"prettyNormal\":[\"https://example.net/\"],\"unparseable1\":[],\"unparseable2\":[],\"unparseable3\":[]},\"scopes\":{}}" but got "{\"imports\":{\"invalidButParseable1\":[\"https://example.org/\"],\"invalidButParseable2\":[\"https://example.com///\"],\"noPercentDecoding\":[\"https://example.com/A\"],\"percentDecoding\":[\"https://example.com/\"],\"prettyNormal\":[\"https://example.net/\"],\"unparseable1\":[\"https://ex%20ample.org/\"],\"unparseable2\":[],\"unparseable3\":[]},\"scopes\":{}}" -FAIL Absolute URL addresses / should parse absolute URLs, ignoring unparseable ones inside arrays assert_equals: expected "{\"imports\":{\"invalidButParseable1\":[\"https://example.org/\"],\"invalidButParseable2\":[\"https://example.com///\"],\"noPercentDecoding\":[\"https://example.com/%41\"],\"percentDecoding\":[\"https://example.com/\"],\"prettyNormal\":[\"https://example.net/\"],\"unparseable1\":[],\"unparseable2\":[],\"unparseable3\":[]},\"scopes\":{}}" but got "{\"imports\":{\"invalidButParseable1\":[\"https://example.org/\"],\"invalidButParseable2\":[\"https://example.com///\"],\"noPercentDecoding\":[\"https://example.com/A\"],\"percentDecoding\":[\"https://example.com/\"],\"prettyNormal\":[\"https://example.net/\"],\"unparseable1\":[\"https://ex%20ample.org/\"],\"unparseable2\":[],\"unparseable3\":[]},\"scopes\":{}}" -PASS Failing addresses: mismatched trailing slashes / should warn for the simple case -PASS Failing addresses: mismatched trailing slashes / should warn for a mismatch alone in an array -PASS Failing addresses: mismatched trailing slashes / should warn for a mismatch alongside non-mismatches in an array -PASS Other invalid addresses / should ignore unprefixed strings that are not absolute URLs -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/parsing-addresses.tentative.html b/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/parsing-addresses.tentative.html deleted file mode 100644 index 0cc92ce..0000000 --- a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/parsing-addresses.tentative.html +++ /dev/null
@@ -1,11 +0,0 @@ -<!DOCTYPE html> -<html> -<script src="/resources/testharness.js"></script> -<script src="/resources/testharnessreport.js"></script> -<script src="../../resources/jest-test-helper.js"></script> -<script type="module" src="resources/helpers/parsing.js"></script> - -<!-- -Imported from https://github.com/WICG/import-maps/blob/master/reference-implementation/__tests__/parsing-addresses.js ---> -<script type="module" src="resources/parsing-addresses.js"></script>
diff --git a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/parsing-schema.tentative-expected.txt b/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/parsing-schema.tentative-expected.txt deleted file mode 100644 index 090d564..0000000 --- a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/parsing-schema.tentative-expected.txt +++ /dev/null
@@ -1,16 +0,0 @@ -This is a testharness.js-based test. -PASS Invalid JSON -PASS Mismatching the top-level schema / should throw for top-level non-objects -PASS Mismatching the top-level schema / should throw if imports is a non-object -PASS Mismatching the top-level schema / should throw if scopes is a non-object -PASS Mismatching the top-level schema / should ignore unspecified top-level entries -FAIL Mismatching the specifier map schema / should ignore entries where the address is not a string, array, or null assert_equals: expected "{\"imports\":{\"bar\":[\"https://example.com/\"]},\"scopes\":{}}" but got "{\"imports\":{\"bar\":[\"https://example.com/\"],\"foo\":[]},\"scopes\":{}}" -PASS Mismatching the specifier map schema / should ignore entries where the specifier key is an empty string -PASS Mismatching the specifier map schema / should ignore members of an address array that are not strings -PASS Mismatching the specifier map schema / should throw if a scope's value is not an object -PASS Normalization / should normalize empty import maps to have imports and scopes keys -PASS Normalization / should normalize an import map without imports to have imports -PASS Normalization / should normalize an import map without scopes to have scopes -PASS Normalization / should normalize addresses to arrays -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/parsing-schema.tentative.html b/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/parsing-schema.tentative.html deleted file mode 100644 index 9e3bca29..0000000 --- a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/parsing-schema.tentative.html +++ /dev/null
@@ -1,11 +0,0 @@ -<!DOCTYPE html> -<html> -<script src="/resources/testharness.js"></script> -<script src="/resources/testharnessreport.js"></script> -<script src="../../resources/jest-test-helper.js"></script> -<script type="module" src="resources/helpers/parsing.js"></script> - -<!-- -Imported from https://github.com/WICG/import-maps/blob/master/reference-implementation/__tests__/parsing-schema.js ---> -<script type="module" src="resources/parsing-schema.js"></script>
diff --git a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/parsing-scope-keys.tentative-expected.txt b/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/parsing-scope-keys.tentative-expected.txt deleted file mode 100644 index a50431d4..0000000 --- a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/parsing-scope-keys.tentative-expected.txt +++ /dev/null
@@ -1,12 +0,0 @@ -This is a testharness.js-based test. -PASS Relative URL scope keys / should work with no prefix -PASS Relative URL scope keys / should work with ./, ../, and / prefixes -PASS Relative URL scope keys / should work with /s, ?s, and #s -PASS Relative URL scope keys / should work with an empty string scope key -PASS Relative URL scope keys / should work with / suffixes -PASS Relative URL scope keys / should deduplicate based on URL parsing rules -PASS Absolute URL scope keys / should accept all absolute URL scope keys, with or without fetch schemes -FAIL Absolute URL scope keys / should parse absolute URL scope keys, ignoring unparseable ones assert_equals: expected "{\"imports\":{},\"scopes\":{\"https://base.example/path1/path2/example.org\":{},\"https://example.com/%41\":{},\"https://example.com///\":{},\"https://example.com/foo/\":{},\"https://example.net/\":{}}}" but got "{\"imports\":{},\"scopes\":{\"https://base.example/path1/path2/example.org\":{},\"https://ex%20ample.org/\":{},\"https://example.com///\":{},\"https://example.com/A\":{},\"https://example.com/foo/\":{},\"https://example.net/\":{}}}" -FAIL Absolute URL scope keys / should ignore relative URL scope keys when the base URL is a data: URL test helper does not support data: base URLs -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/parsing-scope-keys.tentative.html b/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/parsing-scope-keys.tentative.html deleted file mode 100644 index be23c64..0000000 --- a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/parsing-scope-keys.tentative.html +++ /dev/null
@@ -1,11 +0,0 @@ -<!DOCTYPE html> -<html> -<script src="/resources/testharness.js"></script> -<script src="/resources/testharnessreport.js"></script> -<script src="../../resources/jest-test-helper.js"></script> -<script type="module" src="resources/helpers/parsing.js"></script> - -<!-- -Imported from https://github.com/WICG/import-maps/blob/master/reference-implementation/__tests__/parsing-scope-keys.js ---> -<script type="module" src="resources/parsing-scope-keys.js"></script>
diff --git a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/parsing-specifier-keys.tentative-expected.txt b/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/parsing-specifier-keys.tentative-expected.txt deleted file mode 100644 index dd9937092..0000000 --- a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/parsing-specifier-keys.tentative-expected.txt +++ /dev/null
@@ -1,10 +0,0 @@ -This is a testharness.js-based test. -PASS Relative URL-like specifier keys / should absolutize strings prefixed with ./, ../, or / into the corresponding URLs -FAIL Relative URL-like specifier keys / should not absolutize strings prefixed with ./, ../, or / with a data: URL base test helper does not support data: base URLs -PASS Relative URL-like specifier keys / should absolutize the literal strings ./, ../, or / with no suffix -PASS Relative URL-like specifier keys / should treat percent-encoded variants of ./, ../, or / as bare specifiers -FAIL Absolute URL specifier keys / should only accept absolute URL specifier keys with fetch schemes, treating others as bare specifiers assert_equals: expected "{\"imports\":{\"about:good\":[\"https://base.example/about\"],\"blob:good\":[\"https://base.example/blob\"],\"data:good\":[\"https://base.example/data\"],\"file:///good\":[\"https://base.example/file\"],\"filesystem:good\":[\"https://base.example/filesystem\"],\"ftp://good/\":[\"https://base.example/ftp/\"],\"http://good/\":[\"https://base.example/http/\"],\"https://good/\":[\"https://base.example/https/\"],\"import:bad\":[\"https://base.example/import\"],\"javascript:bad\":[\"https://base.example/javascript\"],\"mailto:bad\":[\"https://base.example/mailto\"],\"wss:bad\":[\"https://base.example/wss\"]},\"scopes\":{}}" but got "{\"imports\":{\"about:good\":[\"https://base.example/about\"],\"blob:good\":[\"https://base.example/blob\"],\"data:good\":[\"https://base.example/data\"],\"file:///good\":[\"https://base.example/file\"],\"filesystem:good\":[\"https://base.example/filesystem\"],\"ftp://good/\":[\"https://base.example/ftp/\"],\"http://good/\":[\"https://base.example/http/\"],\"https://good/\":[\"https://base.example/https/\"],\"import:bad\":[\"https://base.example/import\"],\"javascript:bad\":[\"https://base.example/javascript\"],\"mailto:bad\":[\"https://base.example/mailto\"],\"wss://bad/\":[\"https://base.example/wss\"]},\"scopes\":{}}" -FAIL Absolute URL specifier keys / should parse absolute URLs, treating unparseable ones as bare specifiers assert_equals: expected "{\"imports\":{\"http://[www.example.com]/\":[\"https://base.example/unparseable3/\"],\"https://ex ample.org/\":[\"https://base.example/unparseable1/\"],\"https://example.com/\":[\"https://base.example/percentDecoding/\"],\"https://example.com/%41\":[\"https://base.example/noPercentDecoding\"],\"https://example.com///\":[\"https://base.example/invalidButParseable2/\"],\"https://example.com:demo\":[\"https://base.example/unparseable2\"],\"https://example.net/\":[\"https://base.example/prettyNormal/\"],\"https://example.org/\":[\"https://base.example/invalidButParseable1/\"]},\"scopes\":{}}" but got "{\"imports\":{\"http://[www.example.com]/\":[\"https://base.example/unparseable3/\"],\"https://ex%20ample.org/\":[\"https://base.example/unparseable1/\"],\"https://example.com/\":[\"https://base.example/percentDecoding/\"],\"https://example.com///\":[\"https://base.example/invalidButParseable2/\"],\"https://example.com/A\":[\"https://base.example/noPercentDecoding\"],\"https://example.com:demo\":[\"https://base.example/unparseable2\"],\"https://example.net/\":[\"https://base.example/prettyNormal/\"],\"https://example.org/\":[\"https://base.example/invalidButParseable1/\"]},\"scopes\":{}}" -PASS Absolute URL specifier keys / should parse built-in module specifier keys, including with a "/" -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/parsing-specifier-keys.tentative.html b/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/parsing-specifier-keys.tentative.html deleted file mode 100644 index 7bc2d47..0000000 --- a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/parsing-specifier-keys.tentative.html +++ /dev/null
@@ -1,11 +0,0 @@ -<!DOCTYPE html> -<html> -<script src="/resources/testharness.js"></script> -<script src="/resources/testharnessreport.js"></script> -<script src="../../resources/jest-test-helper.js"></script> -<script type="module" src="resources/helpers/parsing.js"></script> - -<!-- -Imported from https://github.com/WICG/import-maps/blob/master/reference-implementation/__tests__/parsing-specifier-keys.js ---> -<script type="module" src="resources/parsing-specifier-keys.js"></script>
diff --git a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/resolving-builtins.tentative-expected.txt b/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/resolving-builtins.tentative-expected.txt deleted file mode 100644 index d028af0..0000000 --- a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/resolving-builtins.tentative-expected.txt +++ /dev/null
@@ -1,16 +0,0 @@ -This is a testharness.js-based test. -PASS Unmapped built-in module specifiers / should resolve "std:blank" to "std:blank" -FAIL Unmapped built-in module specifiers / should error resolving "std:none" assert_throws_js: function "() => resolveUnderTest(NONE)" did not throw -PASS Remapping built-in module specifiers / should remap built-in modules -PASS Remapping built-in module specifiers / should remap built-in modules with slashes -FAIL Remapping built-in module specifiers / should remap built-in modules with fallbacks Failed to resolve module specifier std:blank: Import Map: "std:blank" matches with "std:blank" but fails to be mapped (no viable URLs) -FAIL Remapping built-in module specifiers / should remap built-in modules with slashes and fallbacks Failed to resolve module specifier std:blank/: Import Map: "std:blank/" matches with "std:blank/" but fails to be mapped (no viable URLs) -PASS Remapping to built-in modules / should remap to "std:blank" -PASS Remapping to built-in modules / should fail when remapping to "std:blank/" -FAIL Remapping to built-in modules / should remap to "std:blank/for-testing" Failed to resolve module specifier /blank/for-testing: Import Map: "https://example.com/blank/for-testing" matches with "https://example.com/blank/" but fails to be mapped (no viable URLs) -PASS Remapping to built-in modules / should remap to "std:blank" for URL-like specifiers -PASS Remapping to built-in modules / should fail when remapping to "std:none" -FAIL Fallbacks with built-in module addresses / should resolve to "std:blank" Failed to resolve module specifier blank: Import Map: "blank" matches with "blank" but fails to be mapped (no viable URLs) -FAIL Fallbacks with built-in module addresses / should fall back past "std:none" Failed to resolve module specifier none: Import Map: "none" matches with "none" but fails to be mapped (no viable URLs) -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/resolving-builtins.tentative.html b/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/resolving-builtins.tentative.html deleted file mode 100644 index 065cfa3..0000000 --- a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/resolving-builtins.tentative.html +++ /dev/null
@@ -1,11 +0,0 @@ -<!DOCTYPE html> -<html> -<script src="/resources/testharness.js"></script> -<script src="/resources/testharnessreport.js"></script> -<script src="../../resources/jest-test-helper.js"></script> -<script type="module" src="resources/helpers/parsing.js"></script> - -<!-- -Imported from https://github.com/WICG/import-maps/blob/master/reference-implementation/__tests__/resolving-builtins.js ---> -<script type="module" src="resources/resolving-builtins.js"></script>
diff --git a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/resolving-not-yet-implemented.tentative.html b/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/resolving-not-yet-implemented.tentative.html deleted file mode 100644 index 3bdd591f..0000000 --- a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/resolving-not-yet-implemented.tentative.html +++ /dev/null
@@ -1,11 +0,0 @@ -<!DOCTYPE html> -<html> -<script src="/resources/testharness.js"></script> -<script src="/resources/testharnessreport.js"></script> -<script src="../../resources/jest-test-helper.js"></script> -<script type="module" src="resources/helpers/parsing.js"></script> - -<!-- -Imported from https://github.com/WICG/import-maps/blob/master/reference-implementation/__tests__/resolving-not-yet-implemented.js ---> -<script type="module" src="resources/resolving-not-yet-implemented.js"></script>
diff --git a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/resolving-scopes.tentative.html b/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/resolving-scopes.tentative.html deleted file mode 100644 index 33b4935..0000000 --- a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/resolving-scopes.tentative.html +++ /dev/null
@@ -1,11 +0,0 @@ -<!DOCTYPE html> -<html> -<script src="/resources/testharness.js"></script> -<script src="/resources/testharnessreport.js"></script> -<script src="../../resources/jest-test-helper.js"></script> -<script type="module" src="resources/helpers/parsing.js"></script> - -<!-- -Imported from https://github.com/WICG/import-maps/blob/master/reference-implementation/__tests__/resolving-scopes.js ---> -<script type="module" src="resources/resolving-scopes.js"></script>
diff --git a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/resolving.tentative-expected.txt b/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/resolving.tentative-expected.txt deleted file mode 100644 index a7ed2ebf..0000000 --- a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/resolving.tentative-expected.txt +++ /dev/null
@@ -1,26 +0,0 @@ -This is a testharness.js-based test. -PASS Unmapped / should resolve ./ specifiers as URLs -PASS Unmapped / should resolve ../ specifiers as URLs -PASS Unmapped / should resolve / specifiers as URLs -PASS Unmapped / should parse absolute fetch-scheme URLs -FAIL Unmapped / should fail for absolute non-fetch-scheme URLs assert_throws_js: function "() => resolveUnderTest('mailto:bad')" did not throw -FAIL Unmapped / should fail for strings not parseable as absolute URLs and not starting with ./ ../ or / assert_throws_js: function "() => resolveUnderTest('https://ex ample.org/')" did not throw -PASS Mapped using the "imports" key only (no scopes) / should fail when the mapping is to an empty array -PASS Mapped using the "imports" key only (no scopes) / Package-like scenarios / should work for package main modules -PASS Mapped using the "imports" key only (no scopes) / Package-like scenarios / should work for package submodules -PASS Mapped using the "imports" key only (no scopes) / Package-like scenarios / should work for package names that end in a slash by just passing through -PASS Mapped using the "imports" key only (no scopes) / Package-like scenarios / should still fail for package modules that are not declared -PASS Mapped using the "imports" key only (no scopes) / Package-like scenarios / should fail for package submodules that map to nowhere -PASS Mapped using the "imports" key only (no scopes) / Tricky specifiers / should work for explicitly-mapped specifiers that happen to have a slash -PASS Mapped using the "imports" key only (no scopes) / Tricky specifiers / should work when the specifier has punctuation -PASS Mapped using the "imports" key only (no scopes) / Tricky specifiers / should fail for attempting to get a submodule of something not declared with a trailing slash -PASS Mapped using the "imports" key only (no scopes) / URL-like specifiers / should remap to other URLs -PASS Mapped using the "imports" key only (no scopes) / URL-like specifiers / should fail for URLs that remap to empty arrays -PASS Mapped using the "imports" key only (no scopes) / URL-like specifiers / should remap URLs that are just composed from / and . -PASS Mapped using the "imports" key only (no scopes) / URL-like specifiers / should remap URLs that are prefix-matched by keys with trailing slashes -PASS Mapped using the "imports" key only (no scopes) / URL-like specifiers / should use the last entry's address when URL-like specifiers parse to the same absolute URL -PASS Mapped using the "imports" key only (no scopes) / Overlapping entries with trailing slashes / should favor the most-specific key (no empty arrays) -PASS Mapped using the "imports" key only (no scopes) / Overlapping entries with trailing slashes / should favor the most-specific key when empty arrays are involved for less-specific keys -PASS Mapped using the "imports" key only (no scopes) / Overlapping entries with trailing slashes / should favor the most-specific key when empty arrays are involved for more-specific keys -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/resolving.tentative.html b/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/resolving.tentative.html deleted file mode 100644 index 1d24eb20..0000000 --- a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/resolving.tentative.html +++ /dev/null
@@ -1,11 +0,0 @@ -<!DOCTYPE html> -<html> -<script src="/resources/testharness.js"></script> -<script src="/resources/testharnessreport.js"></script> -<script src="../../resources/jest-test-helper.js"></script> -<script type="module" src="resources/helpers/parsing.js"></script> - -<!-- -Imported from https://github.com/WICG/import-maps/blob/master/reference-implementation/__tests__/resolving.js ---> -<script type="module" src="resources/resolving.js"></script>
diff --git a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/resources/helpers/parsing.js b/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/resources/helpers/parsing.js deleted file mode 100644 index 3000f782..0000000 --- a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/resources/helpers/parsing.js +++ /dev/null
@@ -1,44 +0,0 @@ -'use strict'; -const { parseFromString } = require('../../lib/parser.js'); - -// Local modifications from upstream: -// Currently warnings and scopes are not checked in expectSpecifierMap(). -exports.expectSpecifierMap = (input, baseURL, output, warnings = []) => { - expect(parseFromString(`{ "imports": ${input} }`, baseURL)) - .toEqual({ imports: output, scopes: {} }); -}; - -exports.expectScopes = (inputArray, baseURL, outputArray, warnings = []) => { - const checkWarnings = testWarningHandler(warnings); - - const inputScopesAsStrings = inputArray.map(scopePrefix => `${JSON.stringify(scopePrefix)}: {}`); - const inputString = `{ "scopes": { ${inputScopesAsStrings.join(', ')} } }`; - - const outputScopesObject = {}; - for (const outputScopePrefix of outputArray) { - outputScopesObject[outputScopePrefix] = {}; - } - - expect(parseFromString(inputString, baseURL)).toEqual({ imports: {}, scopes: outputScopesObject }); - - checkWarnings(); -}; - -exports.expectBad = (input, baseURL, warnings = []) => { - const checkWarnings = testWarningHandler(warnings); - expect(parseFromString(input, baseURL)).toThrow('TypeError'); - checkWarnings(); -}; - -exports.expectWarnings = (input, baseURL, output, warnings = []) => { - const checkWarnings = testWarningHandler(warnings); - expect(parseFromString(input, baseURL)).toEqual(output); - - checkWarnings(); -}; - -function testWarningHandler(expectedWarnings) { - // We don't check warnings on WPT tests, because there are no - // ways to catch console warnings from JavaScript. - return () => {}; -}
diff --git a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/resources/parsing-addresses.js b/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/resources/parsing-addresses.js deleted file mode 100644 index 0f5fc73..0000000 --- a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/resources/parsing-addresses.js +++ /dev/null
@@ -1,351 +0,0 @@ -'use strict'; -const { expectSpecifierMap } = require('./helpers/parsing.js'); -const { BUILT_IN_MODULE_SCHEME } = require('../lib/utils.js'); - -describe('Relative URL-like addresses', () => { - it('should accept strings prefixed with ./, ../, or /', () => { - expectSpecifierMap( - `{ - "dotSlash": "./foo", - "dotDotSlash": "../foo", - "slash": "/foo" - }`, - 'https://base.example/path1/path2/path3', - { - dotSlash: [expect.toMatchURL('https://base.example/path1/path2/foo')], - dotDotSlash: [expect.toMatchURL('https://base.example/path1/foo')], - slash: [expect.toMatchURL('https://base.example/foo')] - } - ); - }); - - it('should not accept strings prefixed with ./, ../, or / for data: base URLs', () => { - expectSpecifierMap( - `{ - "dotSlash": "./foo", - "dotDotSlash": "../foo", - "slash": "/foo" - }`, - 'data:text/html,test', - { - dotSlash: [], - dotDotSlash: [], - slash: [] - }, - [ - `Invalid address "./foo" for the specifier key "dotSlash".`, - `Invalid address "../foo" for the specifier key "dotDotSlash".`, - `Invalid address "/foo" for the specifier key "slash".` - ] - ); - }); - - it('should accept the literal strings ./, ../, or / with no suffix', () => { - expectSpecifierMap( - `{ - "dotSlash": "./", - "dotDotSlash": "../", - "slash": "/" - }`, - 'https://base.example/path1/path2/path3', - { - dotSlash: [expect.toMatchURL('https://base.example/path1/path2/')], - dotDotSlash: [expect.toMatchURL('https://base.example/path1/')], - slash: [expect.toMatchURL('https://base.example/')] - } - ); - }); - - it('should ignore percent-encoded variants of ./, ../, or /', () => { - expectSpecifierMap( - `{ - "dotSlash1": "%2E/", - "dotDotSlash1": "%2E%2E/", - "dotSlash2": ".%2F", - "dotDotSlash2": "..%2F", - "slash2": "%2F", - "dotSlash3": "%2E%2F", - "dotDotSlash3": "%2E%2E%2F" - }`, - 'https://base.example/path1/path2/path3', - { - dotSlash1: [], - dotDotSlash1: [], - dotSlash2: [], - dotDotSlash2: [], - slash2: [], - dotSlash3: [], - dotDotSlash3: [] - }, - [ - `Invalid address "%2E/" for the specifier key "dotSlash1".`, - `Invalid address "%2E%2E/" for the specifier key "dotDotSlash1".`, - `Invalid address ".%2F" for the specifier key "dotSlash2".`, - `Invalid address "..%2F" for the specifier key "dotDotSlash2".`, - `Invalid address "%2F" for the specifier key "slash2".`, - `Invalid address "%2E%2F" for the specifier key "dotSlash3".`, - `Invalid address "%2E%2E%2F" for the specifier key "dotDotSlash3".` - ] - ); - }); -}); - -describe('Built-in module addresses', () => { - it('should accept URLs using the built-in module scheme', () => { - expectSpecifierMap( - `{ - "foo": "${BUILT_IN_MODULE_SCHEME}:foo" - }`, - 'https://base.example/path1/path2/path3', - { - foo: [expect.toMatchURL(`${BUILT_IN_MODULE_SCHEME}:foo`)] - } - ); - }); - - it('should ignore percent-encoded variants of the built-in module scheme', () => { - expectSpecifierMap( - `{ - "foo": "${encodeURIComponent(BUILT_IN_MODULE_SCHEME + ':')}foo" - }`, - 'https://base.example/path1/path2/path3', - { - foo: [] - }, - [`Invalid address "${encodeURIComponent(BUILT_IN_MODULE_SCHEME + ':')}foo" for the specifier key "foo".`] - ); - }); - - it('should allow built-in module URLs that contain "/" or "\\"', () => { - expectSpecifierMap( - `{ - "slashEnd": "${BUILT_IN_MODULE_SCHEME}:foo/", - "slashMiddle": "${BUILT_IN_MODULE_SCHEME}:foo/bar", - "backslash": "${BUILT_IN_MODULE_SCHEME}:foo\\\\baz" - }`, - 'https://base.example/path1/path2/path3', - { - slashEnd: [expect.toMatchURL(`${BUILT_IN_MODULE_SCHEME}:foo/`)], - slashMiddle: [expect.toMatchURL(`${BUILT_IN_MODULE_SCHEME}:foo/bar`)], - backslash: [expect.toMatchURL(`${BUILT_IN_MODULE_SCHEME}:foo\\baz`)] - } - ); - }); -}); - -describe('Absolute URL addresses', () => { - it('should only accept absolute URL addresses with fetch schemes', () => { - expectSpecifierMap( - `{ - "about": "about:good", - "blob": "blob:good", - "data": "data:good", - "file": "file:///good", - "filesystem": "filesystem:good", - "http": "http://good/", - "https": "https://good/", - "ftp": "ftp://good/", - "import": "import:bad", - "mailto": "mailto:bad", - "javascript": "javascript:bad", - "wss": "wss:bad" - }`, - 'https://base.example/path1/path2/path3', - { - about: [expect.toMatchURL('about:good')], - blob: [expect.toMatchURL('blob:good')], - data: [expect.toMatchURL('data:good')], - file: [expect.toMatchURL('file:///good')], - filesystem: [expect.toMatchURL('filesystem:good')], - http: [expect.toMatchURL('http://good/')], - https: [expect.toMatchURL('https://good/')], - ftp: [expect.toMatchURL('ftp://good/')], - import: [], - mailto: [], - javascript: [], - wss: [] - }, - [ - `Invalid address "import:bad" for the specifier key "import".`, - `Invalid address "mailto:bad" for the specifier key "mailto".`, - `Invalid address "javascript:bad" for the specifier key "javascript".`, - `Invalid address "wss:bad" for the specifier key "wss".` - ] - ); - }); - - it('should only accept absolute URL addresses with fetch schemes inside arrays', () => { - expectSpecifierMap( - `{ - "about": ["about:good"], - "blob": ["blob:good"], - "data": ["data:good"], - "file": ["file:///good"], - "filesystem": ["filesystem:good"], - "http": ["http://good/"], - "https": ["https://good/"], - "ftp": ["ftp://good/"], - "import": ["import:bad"], - "mailto": ["mailto:bad"], - "javascript": ["javascript:bad"], - "wss": ["wss:bad"] - }`, - 'https://base.example/path1/path2/path3', - { - about: [expect.toMatchURL('about:good')], - blob: [expect.toMatchURL('blob:good')], - data: [expect.toMatchURL('data:good')], - file: [expect.toMatchURL('file:///good')], - filesystem: [expect.toMatchURL('filesystem:good')], - http: [expect.toMatchURL('http://good/')], - https: [expect.toMatchURL('https://good/')], - ftp: [expect.toMatchURL('ftp://good/')], - import: [], - mailto: [], - javascript: [], - wss: [] - }, - [ - `Invalid address "import:bad" for the specifier key "import".`, - `Invalid address "mailto:bad" for the specifier key "mailto".`, - `Invalid address "javascript:bad" for the specifier key "javascript".`, - `Invalid address "wss:bad" for the specifier key "wss".` - ] - ); - }); - - it('should parse absolute URLs, ignoring unparseable ones', () => { - expectSpecifierMap( - `{ - "unparseable1": "https://ex ample.org/", - "unparseable2": "https://example.com:demo", - "unparseable3": "http://[www.example.com]/", - "invalidButParseable1": "https:example.org", - "invalidButParseable2": "https://///example.com///", - "prettyNormal": "https://example.net", - "percentDecoding": "https://ex%41mple.com/", - "noPercentDecoding": "https://example.com/%41" - }`, - 'https://base.example/path1/path2/path3', - { - unparseable1: [], - unparseable2: [], - unparseable3: [], - invalidButParseable1: [expect.toMatchURL('https://example.org/')], - invalidButParseable2: [expect.toMatchURL('https://example.com///')], - prettyNormal: [expect.toMatchURL('https://example.net/')], - percentDecoding: [expect.toMatchURL('https://example.com/')], - noPercentDecoding: [expect.toMatchURL('https://example.com/%41')] - }, - [ - `Invalid address "https://ex ample.org/" for the specifier key "unparseable1".`, - `Invalid address "https://example.com:demo" for the specifier key "unparseable2".`, - `Invalid address "http://[www.example.com]/" for the specifier key "unparseable3".` - ] - ); - }); - - it('should parse absolute URLs, ignoring unparseable ones inside arrays', () => { - expectSpecifierMap( - `{ - "unparseable1": ["https://ex ample.org/"], - "unparseable2": ["https://example.com:demo"], - "unparseable3": ["http://[www.example.com]/"], - "invalidButParseable1": ["https:example.org"], - "invalidButParseable2": ["https://///example.com///"], - "prettyNormal": ["https://example.net"], - "percentDecoding": ["https://ex%41mple.com/"], - "noPercentDecoding": ["https://example.com/%41"] - }`, - 'https://base.example/path1/path2/path3', - { - unparseable1: [], - unparseable2: [], - unparseable3: [], - invalidButParseable1: [expect.toMatchURL('https://example.org/')], - invalidButParseable2: [expect.toMatchURL('https://example.com///')], - prettyNormal: [expect.toMatchURL('https://example.net/')], - percentDecoding: [expect.toMatchURL('https://example.com/')], - noPercentDecoding: [expect.toMatchURL('https://example.com/%41')] - }, - [ - `Invalid address "https://ex ample.org/" for the specifier key "unparseable1".`, - `Invalid address "https://example.com:demo" for the specifier key "unparseable2".`, - `Invalid address "http://[www.example.com]/" for the specifier key "unparseable3".` - ] - ); - }); -}); - -describe('Failing addresses: mismatched trailing slashes', () => { - it('should warn for the simple case', () => { - expectSpecifierMap( - `{ - "trailer/": "/notrailer", - "${BUILT_IN_MODULE_SCHEME}:trailer/": "/bim-notrailer" - }`, - 'https://base.example/path1/path2/path3', - { - 'trailer/': [], - [`${BUILT_IN_MODULE_SCHEME}:trailer/`]: [] - }, - [ - `Invalid address "https://base.example/notrailer" for package specifier key "trailer/". Package addresses must end with "/".`, - `Invalid address "https://base.example/bim-notrailer" for package specifier key "${BUILT_IN_MODULE_SCHEME}:trailer/". Package addresses must end with "/".` - ] - ); - }); - - it('should warn for a mismatch alone in an array', () => { - expectSpecifierMap( - `{ - "trailer/": ["/notrailer"], - "${BUILT_IN_MODULE_SCHEME}:trailer/": ["/bim-notrailer"] - }`, - 'https://base.example/path1/path2/path3', - { - 'trailer/': [], - [`${BUILT_IN_MODULE_SCHEME}:trailer/`]: [] - }, - [ - `Invalid address "https://base.example/notrailer" for package specifier key "trailer/". Package addresses must end with "/".`, - `Invalid address "https://base.example/bim-notrailer" for package specifier key "${BUILT_IN_MODULE_SCHEME}:trailer/". Package addresses must end with "/".` - ] - ); - }); - - it('should warn for a mismatch alongside non-mismatches in an array', () => { - expectSpecifierMap( - `{ - "trailer/": ["/atrailer/", "/notrailer"], - "${BUILT_IN_MODULE_SCHEME}:trailer/": ["/bim-atrailer/", "/bim-notrailer"] - }`, - 'https://base.example/path1/path2/path3', - { - 'trailer/': [expect.toMatchURL('https://base.example/atrailer/')], - [`${BUILT_IN_MODULE_SCHEME}:trailer/`]: [expect.toMatchURL('https://base.example/bim-atrailer/')] - }, - [ - `Invalid address "https://base.example/notrailer" for package specifier key "trailer/". Package addresses must end with "/".`, - `Invalid address "https://base.example/bim-notrailer" for package specifier key "${BUILT_IN_MODULE_SCHEME}:trailer/". Package addresses must end with "/".` - ] - ); - }); -}); - -describe('Other invalid addresses', () => { - it('should ignore unprefixed strings that are not absolute URLs', () => { - for (const bad of ['bar', '\\bar', '~bar', '#bar', '?bar']) { - expectSpecifierMap( - `{ - "foo": ${JSON.stringify(bad)} - }`, - 'https://base.example/path1/path2/path3', - { - foo: [] - }, - [`Invalid address "${bad}" for the specifier key "foo".`] - ); - } - }); -});
diff --git a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/resources/parsing-schema.js b/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/resources/parsing-schema.js deleted file mode 100644 index 72b6e625..0000000 --- a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/resources/parsing-schema.js +++ /dev/null
@@ -1,139 +0,0 @@ -'use strict'; -const { parseFromString } = require('../lib/parser.js'); -const { expectBad, expectWarnings, expectSpecifierMap } = require('./helpers/parsing.js'); - -const nonObjectStrings = ['null', 'true', '1', '"foo"', '[]']; - -test('Invalid JSON', () => { - expect(parseFromString('{ imports: {} }', 'https://base.example/')).toThrow('SyntaxError'); -}); - -describe('Mismatching the top-level schema', () => { - it('should throw for top-level non-objects', () => { - for (const nonObject of nonObjectStrings) { - expectBad(nonObject, 'https://base.example/'); - } - }); - - it('should throw if imports is a non-object', () => { - for (const nonObject of nonObjectStrings) { - expectBad(`{ "imports": ${nonObject} }`, 'https://base.example/'); - } - }); - - it('should throw if scopes is a non-object', () => { - for (const nonObject of nonObjectStrings) { - expectBad(`{ "scopes": ${nonObject} }`, 'https://base.example/'); - } - }); - - it('should ignore unspecified top-level entries', () => { - expectWarnings( - `{ - "imports": {}, - "new-feature": {}, - "scops": {} - }`, - 'https://base.example/', - { imports: {}, scopes: {} }, - [ - `Invalid top-level key "new-feature". Only "imports" and "scopes" can be present.`, - `Invalid top-level key "scops". Only "imports" and "scopes" can be present.` - ] - ); - }); -}); - -describe('Mismatching the specifier map schema', () => { - const invalidAddressStrings = ['true', '1', '{}']; - const invalidInsideArrayStrings = ['null', 'true', '1', '{}', '[]']; - - it('should ignore entries where the address is not a string, array, or null', () => { - for (const invalid of invalidAddressStrings) { - expectSpecifierMap( - `{ - "foo": ${invalid}, - "bar": ["https://example.com/"] - }`, - 'https://base.example/', - { - bar: [expect.toMatchURL('https://example.com/')] - }, - [ - `Invalid address ${invalid} for the specifier key "foo". ` + - `Addresses must be strings, arrays, or null.` - ] - ); - } - }); - - it('should ignore entries where the specifier key is an empty string', () => { - expectSpecifierMap( - `{ - "": ["https://example.com/"] - }`, - 'https://base.example/', - {}, - [`Invalid empty string specifier key.`] - ); - }); - - it('should ignore members of an address array that are not strings', () => { - for (const invalid of invalidInsideArrayStrings) { - expectSpecifierMap( - `{ - "foo": ["https://example.com/", ${invalid}], - "bar": ["https://example.com/"] - }`, - 'https://base.example/', - { - foo: [expect.toMatchURL('https://example.com/')], - bar: [expect.toMatchURL('https://example.com/')] - }, - [ - `Invalid address ${invalid} inside the address array for the specifier key "foo". ` + - `Address arrays must only contain strings.` - ] - ); - } - }); - - it('should throw if a scope\'s value is not an object', () => { - for (const invalid of nonObjectStrings) { - expectBad(`{ "scopes": { "https://scope.example/": ${invalid} } }`, 'https://base.example/'); - } - }); -}); - -describe('Normalization', () => { - it('should normalize empty import maps to have imports and scopes keys', () => { - expect(parseFromString(`{}`, 'https://base.example/')) - .toEqual({ imports: {}, scopes: {} }); - }); - - it('should normalize an import map without imports to have imports', () => { - expect(parseFromString(`{ "scopes": {} }`, 'https://base.example/')) - .toEqual({ imports: {}, scopes: {} }); - }); - - it('should normalize an import map without scopes to have scopes', () => { - expect(parseFromString(`{ "imports": {} }`, 'https://base.example/')) - .toEqual({ imports: {}, scopes: {} }); - }); - - it('should normalize addresses to arrays', () => { - expectSpecifierMap( - `{ - "foo": "https://example.com/1", - "bar": ["https://example.com/2"], - "baz": null - }`, - 'https://base.example/', - { - foo: [expect.toMatchURL('https://example.com/1')], - bar: [expect.toMatchURL('https://example.com/2')], - baz: [] - } - ); - }); -});
diff --git a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/resources/parsing-scope-keys.js b/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/resources/parsing-scope-keys.js deleted file mode 100644 index 4993f3a..0000000 --- a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/resources/parsing-scope-keys.js +++ /dev/null
@@ -1,144 +0,0 @@ -'use strict'; -const { expectScopes } = require('./helpers/parsing.js'); - -describe('Relative URL scope keys', () => { - it('should work with no prefix', () => { - expectScopes( - ['foo'], - 'https://base.example/path1/path2/path3', - ['https://base.example/path1/path2/foo'] - ); - }); - - it('should work with ./, ../, and / prefixes', () => { - expectScopes( - ['./foo', '../foo', '/foo'], - 'https://base.example/path1/path2/path3', - [ - 'https://base.example/path1/path2/foo', - 'https://base.example/path1/foo', - 'https://base.example/foo' - ] - ); - }); - - it('should work with /s, ?s, and #s', () => { - expectScopes( - ['foo/bar?baz#qux'], - 'https://base.example/path1/path2/path3', - ['https://base.example/path1/path2/foo/bar?baz#qux'] - ); - }); - - it('should work with an empty string scope key', () => { - expectScopes( - [''], - 'https://base.example/path1/path2/path3', - ['https://base.example/path1/path2/path3'] - ); - }); - - it('should work with / suffixes', () => { - expectScopes( - ['foo/', './foo/', '../foo/', '/foo/', '/foo//'], - 'https://base.example/path1/path2/path3', - [ - 'https://base.example/path1/path2/foo/', - 'https://base.example/path1/path2/foo/', - 'https://base.example/path1/foo/', - 'https://base.example/foo/', - 'https://base.example/foo//' - ] - ); - }); - - it('should deduplicate based on URL parsing rules', () => { - expectScopes( - ['foo/\\', 'foo//', 'foo\\\\'], - 'https://base.example/path1/path2/path3', - ['https://base.example/path1/path2/foo//'] - ); - }); -}); - -describe('Absolute URL scope keys', () => { - it('should accept all absolute URL scope keys, with or without fetch schemes', () => { - expectScopes( - [ - 'about:good', - 'blob:good', - 'data:good', - 'file:///good', - 'filesystem:http://example.com/good/', - 'http://good/', - 'https://good/', - 'ftp://good/', - 'import:bad', - 'mailto:bad', - 'javascript:bad', - 'wss:ba' - ], - 'https://base.example/path1/path2/path3', - [ - 'about:good', - 'blob:good', - 'data:good', - 'file:///good', - 'filesystem:http://example.com/good/', - 'http://good/', - 'https://good/', - 'ftp://good/', - 'import:bad', - 'mailto:bad', - 'javascript:bad', - 'wss://ba/' - ], - [] - ); - }); - - it('should parse absolute URL scope keys, ignoring unparseable ones', () => { - expectScopes( - [ - 'https://ex ample.org/', - 'https://example.com:demo', - 'http://[www.example.com]/', - 'https:example.org', - 'https://///example.com///', - 'https://example.net', - 'https://ex%41mple.com/foo/', - 'https://example.com/%41' - ], - 'https://base.example/path1/path2/path3', - [ - 'https://base.example/path1/path2/example.org', // tricky case! remember we have a base URL - 'https://example.com///', - 'https://example.net/', - 'https://example.com/foo/', - 'https://example.com/%41' - ], - [ - 'Invalid scope "https://ex ample.org/" (parsed against base URL "https://base.example/path1/path2/path3").', - 'Invalid scope "https://example.com:demo" (parsed against base URL "https://base.example/path1/path2/path3").', - 'Invalid scope "http://[www.example.com]/" (parsed against base URL "https://base.example/path1/path2/path3").' - ] - ); - }); - - it('should ignore relative URL scope keys when the base URL is a data: URL', () => { - expectScopes( - [ - './foo', - '../foo', - '/foo' - ], - 'data:text/html,test', - [], - [ - 'Invalid scope "./foo" (parsed against base URL "data:text/html,test").', - 'Invalid scope "../foo" (parsed against base URL "data:text/html,test").', - 'Invalid scope "/foo" (parsed against base URL "data:text/html,test").' - ] - ); - }); -});
diff --git a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/resources/parsing-specifier-keys.js b/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/resources/parsing-specifier-keys.js deleted file mode 100644 index 9eb423a..0000000 --- a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/resources/parsing-specifier-keys.js +++ /dev/null
@@ -1,159 +0,0 @@ -'use strict'; -const { expectSpecifierMap } = require('./helpers/parsing.js'); -const { BUILT_IN_MODULE_SCHEME } = require('../lib/utils.js'); - -const BLANK = `${BUILT_IN_MODULE_SCHEME}:blank`; - -describe('Relative URL-like specifier keys', () => { - it('should absolutize strings prefixed with ./, ../, or / into the corresponding URLs', () => { - expectSpecifierMap( - `{ - "./foo": "/dotslash", - "../foo": "/dotdotslash", - "/foo": "/slash" - }`, - 'https://base.example/path1/path2/path3', - { - 'https://base.example/path1/path2/foo': [expect.toMatchURL('https://base.example/dotslash')], - 'https://base.example/path1/foo': [expect.toMatchURL('https://base.example/dotdotslash')], - 'https://base.example/foo': [expect.toMatchURL('https://base.example/slash')] - } - ); - }); - - it('should not absolutize strings prefixed with ./, ../, or / with a data: URL base', () => { - expectSpecifierMap( - `{ - "./foo": "https://example.com/dotslash", - "../foo": "https://example.com/dotdotslash", - "/foo": "https://example.com/slash" - }`, - 'data:text/html,test', - { - './foo': [expect.toMatchURL('https://example.com/dotslash')], - '../foo': [expect.toMatchURL('https://example.com/dotdotslash')], - '/foo': [expect.toMatchURL('https://example.com/slash')] - } - ); - }); - - it('should absolutize the literal strings ./, ../, or / with no suffix', () => { - expectSpecifierMap( - `{ - "./": "/dotslash/", - "../": "/dotdotslash/", - "/": "/slash/" - }`, - 'https://base.example/path1/path2/path3', - { - 'https://base.example/path1/path2/': [expect.toMatchURL('https://base.example/dotslash/')], - 'https://base.example/path1/': [expect.toMatchURL('https://base.example/dotdotslash/')], - 'https://base.example/': [expect.toMatchURL('https://base.example/slash/')] - } - ); - }); - - it('should treat percent-encoded variants of ./, ../, or / as bare specifiers', () => { - expectSpecifierMap( - `{ - "%2E/": "/dotSlash1/", - "%2E%2E/": "/dotDotSlash1/", - ".%2F": "/dotSlash2", - "..%2F": "/dotDotSlash2", - "%2F": "/slash2", - "%2E%2F": "/dotSlash3", - "%2E%2E%2F": "/dotDotSlash3" - }`, - 'https://base.example/path1/path2/path3', - { - '%2E/': [expect.toMatchURL('https://base.example/dotSlash1/')], - '%2E%2E/': [expect.toMatchURL('https://base.example/dotDotSlash1/')], - '.%2F': [expect.toMatchURL('https://base.example/dotSlash2')], - '..%2F': [expect.toMatchURL('https://base.example/dotDotSlash2')], - '%2F': [expect.toMatchURL('https://base.example/slash2')], - '%2E%2F': [expect.toMatchURL('https://base.example/dotSlash3')], - '%2E%2E%2F': [expect.toMatchURL('https://base.example/dotDotSlash3')] - } - ); - }); -}); - -describe('Absolute URL specifier keys', () => { - it('should only accept absolute URL specifier keys with fetch schemes, treating others as bare specifiers', () => { - expectSpecifierMap( - `{ - "about:good": "/about", - "blob:good": "/blob", - "data:good": "/data", - "file:///good": "/file", - "filesystem:good": "/filesystem", - "http://good/": "/http/", - "https://good/": "/https/", - "ftp://good/": "/ftp/", - "import:bad": "/import", - "mailto:bad": "/mailto", - "javascript:bad": "/javascript", - "wss:bad": "/wss" - }`, - 'https://base.example/path1/path2/path3', - { - 'about:good': [expect.toMatchURL('https://base.example/about')], - 'blob:good': [expect.toMatchURL('https://base.example/blob')], - 'data:good': [expect.toMatchURL('https://base.example/data')], - 'file:///good': [expect.toMatchURL('https://base.example/file')], - 'filesystem:good': [expect.toMatchURL('https://base.example/filesystem')], - 'http://good/': [expect.toMatchURL('https://base.example/http/')], - 'https://good/': [expect.toMatchURL('https://base.example/https/')], - 'ftp://good/': [expect.toMatchURL('https://base.example/ftp/')], - 'import:bad': [expect.toMatchURL('https://base.example/import')], - 'mailto:bad': [expect.toMatchURL('https://base.example/mailto')], - 'javascript:bad': [expect.toMatchURL('https://base.example/javascript')], - 'wss:bad': [expect.toMatchURL('https://base.example/wss')] - } - ); - }); - - it('should parse absolute URLs, treating unparseable ones as bare specifiers', () => { - expectSpecifierMap( - `{ - "https://ex ample.org/": "/unparseable1/", - "https://example.com:demo": "/unparseable2", - "http://[www.example.com]/": "/unparseable3/", - "https:example.org": "/invalidButParseable1/", - "https://///example.com///": "/invalidButParseable2/", - "https://example.net": "/prettyNormal/", - "https://ex%41mple.com/": "/percentDecoding/", - "https://example.com/%41": "/noPercentDecoding" - }`, - 'https://base.example/path1/path2/path3', - { - 'https://ex ample.org/': [expect.toMatchURL('https://base.example/unparseable1/')], - 'https://example.com:demo': [expect.toMatchURL('https://base.example/unparseable2')], - 'http://[www.example.com]/': [expect.toMatchURL('https://base.example/unparseable3/')], - 'https://example.org/': [expect.toMatchURL('https://base.example/invalidButParseable1/')], - 'https://example.com///': [expect.toMatchURL('https://base.example/invalidButParseable2/')], - 'https://example.net/': [expect.toMatchURL('https://base.example/prettyNormal/')], - 'https://example.com/': [expect.toMatchURL('https://base.example/percentDecoding/')], - 'https://example.com/%41': [expect.toMatchURL('https://base.example/noPercentDecoding')] - } - ); - }); - - it('should parse built-in module specifier keys, including with a "/"', () => { - expectSpecifierMap( - `{ - "${BLANK}": "/blank", - "${BLANK}/": "/blank/", - "${BLANK}/foo": "/blank/foo", - "${BLANK}\\\\foo": "/blank/backslashfoo" - }`, - 'https://base.example/path1/path2/path3', - { - [BLANK]: [expect.toMatchURL('https://base.example/blank')], - [`${BLANK}/`]: [expect.toMatchURL('https://base.example/blank/')], - [`${BLANK}/foo`]: [expect.toMatchURL('https://base.example/blank/foo')], - [`${BLANK}\\foo`]: [expect.toMatchURL('https://base.example/blank/backslashfoo')] - } - ); - }); -});
diff --git a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/resources/resolving-builtins.js b/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/resources/resolving-builtins.js deleted file mode 100644 index a9383df..0000000 --- a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/resources/resolving-builtins.js +++ /dev/null
@@ -1,158 +0,0 @@ -'use strict'; -const { URL } = require('url'); -const { parseFromString } = require('../lib/parser.js'); -const { resolve } = require('../lib/resolver.js'); -const { BUILT_IN_MODULE_SCHEME } = require('../lib/utils.js'); - -const mapBaseURL = new URL('https://example.com/app/index.html'); -const scriptURL = new URL('https://example.com/js/app.mjs'); - -const BLANK = `${BUILT_IN_MODULE_SCHEME}:blank`; -const NONE = `${BUILT_IN_MODULE_SCHEME}:none`; - -function makeResolveUnderTest(mapString) { - const map = parseFromString(mapString, mapBaseURL); - return specifier => resolve(specifier, map, scriptURL); -} - -describe('Unmapped built-in module specifiers', () => { - const resolveUnderTest = makeResolveUnderTest(`{}`); - - it(`should resolve "${BLANK}" to "${BLANK}"`, () => { - expect(resolveUnderTest(BLANK)).toMatchURL(BLANK); - }); - - it(`should error resolving "${NONE}"`, () => { - expect(() => resolveUnderTest(NONE)).toThrow(TypeError); - }); -}); - -describe('Remapping built-in module specifiers', () => { - it('should remap built-in modules', () => { - const resolveUnderTest = makeResolveUnderTest(`{ - "imports": { - "${BLANK}": "./blank.mjs", - "${NONE}": "./none.mjs" - } - }`); - - expect(resolveUnderTest(BLANK)).toMatchURL('https://example.com/app/blank.mjs'); - expect(resolveUnderTest(NONE)).toMatchURL('https://example.com/app/none.mjs'); - }); - - it('should remap built-in modules with slashes', () => { - const resolveUnderTest = makeResolveUnderTest(`{ - "imports": { - "${BLANK}/": "./blank-slash/", - "${BLANK}/foo": "./blank-foo.mjs", - "${NONE}/": "./none-slash/", - "${NONE}/foo": "./none-foo.mjs" - } - }`); - - expect(resolveUnderTest(`${BLANK}/`)).toMatchURL('https://example.com/app/blank-slash/'); - expect(resolveUnderTest(`${BLANK}/foo`)).toMatchURL('https://example.com/app/blank-foo.mjs'); - expect(resolveUnderTest(`${BLANK}/bar`)).toMatchURL('https://example.com/app/blank-slash/bar'); - expect(resolveUnderTest(`${NONE}/`)).toMatchURL('https://example.com/app/none-slash/'); - expect(resolveUnderTest(`${NONE}/foo`)).toMatchURL('https://example.com/app/none-foo.mjs'); - expect(resolveUnderTest(`${NONE}/bar`)).toMatchURL('https://example.com/app/none-slash/bar'); - }); - - it('should remap built-in modules with fallbacks', () => { - const resolveUnderTest = makeResolveUnderTest(`{ - "imports": { - "${BLANK}": ["${BLANK}", "./blank.mjs"], - "${NONE}": ["${NONE}", "./none.mjs"] - } - }`); - - expect(resolveUnderTest(BLANK)).toMatchURL(BLANK); - expect(resolveUnderTest(NONE)).toMatchURL('https://example.com/app/none.mjs'); - }); - - it('should remap built-in modules with slashes and fallbacks', () => { - // NOTE: `${BLANK}/for-testing` is not per spec, just for these tests. - // See resolver.js. - const resolveUnderTest = makeResolveUnderTest(`{ - "imports": { - "${BLANK}/": ["${BLANK}/", "./blank/"], - "${BLANK}/for-testing": ["${BLANK}/for-testing", "./blank-for-testing-special"], - "${NONE}/": ["${NONE}/", "./none/"], - "${NONE}/foo": ["${NONE}/foo", "./none-foo-special"] - } - }`); - - // Built-in modules only resolve for exact matches, so this will trigger the fallback. - expect(resolveUnderTest(`${BLANK}/`)).toMatchURL('https://example.com/app/blank/'); - expect(resolveUnderTest(`${BLANK}/foo`)).toMatchURL('https://example.com/app/blank/foo'); - - // This would fall back in a real implementation; it's only because we've gone against - // spec in the reference implementation (to make this testable) that this maps. - expect(resolveUnderTest(`${BLANK}/for-testing`)).toMatchURL(`${BLANK}/for-testing`); - - expect(resolveUnderTest(`${NONE}/`)).toMatchURL('https://example.com/app/none/'); - expect(resolveUnderTest(`${NONE}/bar`)).toMatchURL('https://example.com/app/none/bar'); - expect(resolveUnderTest(`${NONE}/foo`)).toMatchURL('https://example.com/app/none-foo-special'); - }); -}); - -describe('Remapping to built-in modules', () => { - const resolveUnderTest = makeResolveUnderTest(`{ - "imports": { - "blank": "${BLANK}", - "/blank": "${BLANK}", - "/blank/": "${BLANK}/", - "/blank-for-testing": "${BLANK}/for-testing", - "none": "${NONE}", - "/none": "${NONE}" - } - }`); - - it(`should remap to "${BLANK}"`, () => { - expect(resolveUnderTest('blank')).toMatchURL(BLANK); - expect(resolveUnderTest('/blank')).toMatchURL(BLANK); - }); - - it(`should fail when remapping to "${BLANK}/"`, () => { - expect(() => resolveUnderTest('/blank/')).toThrow(TypeError); - }); - - it(`should remap to "${BLANK}/for-testing"`, () => { - expect(resolveUnderTest('/blank/for-testing')).toMatchURL(`${BLANK}/for-testing`); - expect(resolveUnderTest('/blank-for-testing')).toMatchURL(`${BLANK}/for-testing`); - }); - - it(`should remap to "${BLANK}" for URL-like specifiers`, () => { - expect(resolveUnderTest('/blank')).toMatchURL(BLANK); - expect(resolveUnderTest('https://example.com/blank')).toMatchURL(BLANK); - expect(resolveUnderTest('https://///example.com/blank')).toMatchURL(BLANK); - }); - - it(`should fail when remapping to "${NONE}"`, () => { - expect(() => resolveUnderTest('none')).toThrow(TypeError); - expect(() => resolveUnderTest('/none')).toThrow(TypeError); - }); -}); - -describe('Fallbacks with built-in module addresses', () => { - const resolveUnderTest = makeResolveUnderTest(`{ - "imports": { - "blank": [ - "${BLANK}", - "./blank-fallback.mjs" - ], - "none": [ - "${NONE}", - "./none-fallback.mjs" - ] - } - }`); - - it(`should resolve to "${BLANK}"`, () => { - expect(resolveUnderTest('blank')).toMatchURL(BLANK); - }); - - it(`should fall back past "${NONE}"`, () => { - expect(resolveUnderTest('none')).toMatchURL('https://example.com/app/none-fallback.mjs'); - }); -});
diff --git a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/resources/resolving-not-yet-implemented.js b/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/resources/resolving-not-yet-implemented.js deleted file mode 100644 index 93d782f..0000000 --- a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/resources/resolving-not-yet-implemented.js +++ /dev/null
@@ -1,47 +0,0 @@ -'use strict'; -const { URL } = require('url'); -const { parseFromString } = require('../lib/parser.js'); -const { resolve } = require('../lib/resolver.js'); -const { BUILT_IN_MODULE_SCHEME } = require('../lib/utils.js'); - -const mapBaseURL = new URL('https://example.com/app/index.html'); -const scriptURL = new URL('https://example.com/js/app.mjs'); - -const BLANK = `${BUILT_IN_MODULE_SCHEME}:blank`; - -function makeResolveUnderTest(mapString) { - const map = parseFromString(mapString, mapBaseURL); - return specifier => resolve(specifier, map, scriptURL); -} - -describe('Fallbacks that are not [built-in, fetch scheme]', () => { - const resolveUnderTest = makeResolveUnderTest(`{ - "imports": { - "bad1": [ - "${BLANK}", - "${BLANK}" - ], - "bad2": [ - "${BLANK}", - "/bad2-1.mjs", - "/bad2-2.mjs" - ], - "bad3": [ - "/bad3-1.mjs", - "/bad3-2.mjs" - ] - } - }`); - - it('should fail for [built-in, built-in]', () => { - expect(() => resolveUnderTest('bad1')).toThrow(/not yet implemented/); - }); - - it('should fail for [built-in, fetch scheme, fetch scheme]', () => { - expect(() => resolveUnderTest('bad2')).toThrow(/not yet implemented/); - }); - - it('should fail for [fetch scheme, fetch scheme]', () => { - expect(() => resolveUnderTest('bad3')).toThrow(/not yet implemented/); - }); -});
diff --git a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/resources/resolving-scopes.js b/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/resources/resolving-scopes.js deleted file mode 100644 index ca19a66..0000000 --- a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/resources/resolving-scopes.js +++ /dev/null
@@ -1,230 +0,0 @@ -'use strict'; -const { URL } = require('url'); -const { parseFromString } = require('../lib/parser.js'); -const { resolve } = require('../lib/resolver.js'); - -const mapBaseURL = new URL('https://example.com/app/index.html'); - -function makeResolveUnderTest(mapString) { - const map = parseFromString(mapString, mapBaseURL); - return (specifier, baseURL) => resolve(specifier, map, baseURL); -} - -describe('Mapped using scope instead of "imports"', () => { - const jsNonDirURL = new URL('https://example.com/js'); - const jsPrefixedURL = new URL('https://example.com/jsiscool'); - const inJSDirURL = new URL('https://example.com/js/app.mjs'); - const topLevelURL = new URL('https://example.com/app.mjs'); - - it('should fail when the mapping is to an empty array', () => { - const resolveUnderTest = makeResolveUnderTest(`{ - "scopes": { - "/js/": { - "moment": null, - "lodash": [] - } - } - }`); - - expect(() => resolveUnderTest('moment', inJSDirURL)).toThrow(TypeError); - expect(() => resolveUnderTest('lodash', inJSDirURL)).toThrow(TypeError); - }); - - describe('Exact vs. prefix based matching', () => { - it('should match correctly when both are in the map', () => { - const resolveUnderTest = makeResolveUnderTest(`{ - "scopes": { - "/js": { - "moment": "/only-triggered-by-exact/moment", - "moment/": "/only-triggered-by-exact/moment/" - }, - "/js/": { - "moment": "/triggered-by-any-subpath/moment", - "moment/": "/triggered-by-any-subpath/moment/" - } - } - }`); - - expect(resolveUnderTest('moment', jsNonDirURL)).toMatchURL('https://example.com/only-triggered-by-exact/moment'); - expect(resolveUnderTest('moment/foo', jsNonDirURL)).toMatchURL('https://example.com/only-triggered-by-exact/moment/foo'); - - expect(resolveUnderTest('moment', inJSDirURL)).toMatchURL('https://example.com/triggered-by-any-subpath/moment'); - expect(resolveUnderTest('moment/foo', inJSDirURL)).toMatchURL('https://example.com/triggered-by-any-subpath/moment/foo'); - - expect(() => resolveUnderTest('moment', jsPrefixedURL)).toThrow(TypeError); - expect(() => resolveUnderTest('moment/foo', jsPrefixedURL)).toThrow(TypeError); - }); - - it('should match correctly when only an exact match is in the map', () => { - const resolveUnderTest = makeResolveUnderTest(`{ - "scopes": { - "/js": { - "moment": "/only-triggered-by-exact/moment", - "moment/": "/only-triggered-by-exact/moment/" - } - } - }`); - - expect(resolveUnderTest('moment', jsNonDirURL)).toMatchURL('https://example.com/only-triggered-by-exact/moment'); - expect(resolveUnderTest('moment/foo', jsNonDirURL)).toMatchURL('https://example.com/only-triggered-by-exact/moment/foo'); - - expect(() => resolveUnderTest('moment', inJSDirURL)).toThrow(TypeError); - expect(() => resolveUnderTest('moment/foo', inJSDirURL)).toThrow(TypeError); - - expect(() => resolveUnderTest('moment', jsPrefixedURL)).toThrow(TypeError); - expect(() => resolveUnderTest('moment/foo', jsPrefixedURL)).toThrow(TypeError); - }); - - it('should match correctly when only a prefix match is in the map', () => { - const resolveUnderTest = makeResolveUnderTest(`{ - "scopes": { - "/js/": { - "moment": "/triggered-by-any-subpath/moment", - "moment/": "/triggered-by-any-subpath/moment/" - } - } - }`); - - expect(() => resolveUnderTest('moment', jsNonDirURL)).toThrow(TypeError); - expect(() => resolveUnderTest('moment/foo', jsNonDirURL)).toThrow(TypeError); - - expect(resolveUnderTest('moment', inJSDirURL)).toMatchURL('https://example.com/triggered-by-any-subpath/moment'); - expect(resolveUnderTest('moment/foo', inJSDirURL)).toMatchURL('https://example.com/triggered-by-any-subpath/moment/foo'); - - expect(() => resolveUnderTest('moment', jsPrefixedURL)).toThrow(TypeError); - expect(() => resolveUnderTest('moment/foo', jsPrefixedURL)).toThrow(TypeError); - }); - }); - - describe('Package-like scenarios', () => { - const resolveUnderTest = makeResolveUnderTest(`{ - "imports": { - "moment": "/node_modules/moment/src/moment.js", - "moment/": "/node_modules/moment/src/", - "lodash-dot": "./node_modules/lodash-es/lodash.js", - "lodash-dot/": "./node_modules/lodash-es/", - "lodash-dotdot": "../node_modules/lodash-es/lodash.js", - "lodash-dotdot/": "../node_modules/lodash-es/" - }, - "scopes": { - "/": { - "moment": "/node_modules_3/moment/src/moment.js", - "vue": "/node_modules_3/vue/dist/vue.runtime.esm.js" - }, - "/js/": { - "lodash-dot": "./node_modules_2/lodash-es/lodash.js", - "lodash-dot/": "./node_modules_2/lodash-es/", - "lodash-dotdot": "../node_modules_2/lodash-es/lodash.js", - "lodash-dotdot/": "../node_modules_2/lodash-es/" - } - } - }`); - - it('should resolve scoped', () => { - expect(resolveUnderTest('lodash-dot', inJSDirURL)).toMatchURL('https://example.com/app/node_modules_2/lodash-es/lodash.js'); - expect(resolveUnderTest('lodash-dotdot', inJSDirURL)).toMatchURL('https://example.com/node_modules_2/lodash-es/lodash.js'); - expect(resolveUnderTest('lodash-dot/foo', inJSDirURL)).toMatchURL('https://example.com/app/node_modules_2/lodash-es/foo'); - expect(resolveUnderTest('lodash-dotdot/foo', inJSDirURL)).toMatchURL('https://example.com/node_modules_2/lodash-es/foo'); - }); - - it('should apply best scope match', () => { - expect(resolveUnderTest('moment', topLevelURL)).toMatchURL('https://example.com/node_modules_3/moment/src/moment.js'); - expect(resolveUnderTest('moment', inJSDirURL)).toMatchURL('https://example.com/node_modules_3/moment/src/moment.js'); - expect(resolveUnderTest('vue', inJSDirURL)).toMatchURL('https://example.com/node_modules_3/vue/dist/vue.runtime.esm.js'); - }); - - it('should fallback to "imports"', () => { - expect(resolveUnderTest('moment/foo', topLevelURL)).toMatchURL('https://example.com/node_modules/moment/src/foo'); - expect(resolveUnderTest('moment/foo', inJSDirURL)).toMatchURL('https://example.com/node_modules/moment/src/foo'); - expect(resolveUnderTest('lodash-dot', topLevelURL)).toMatchURL('https://example.com/app/node_modules/lodash-es/lodash.js'); - expect(resolveUnderTest('lodash-dotdot', topLevelURL)).toMatchURL('https://example.com/node_modules/lodash-es/lodash.js'); - expect(resolveUnderTest('lodash-dot/foo', topLevelURL)).toMatchURL('https://example.com/app/node_modules/lodash-es/foo'); - expect(resolveUnderTest('lodash-dotdot/foo', topLevelURL)).toMatchURL('https://example.com/node_modules/lodash-es/foo'); - }); - - it('should still fail for package-like specifiers that are not declared', () => { - expect(() => resolveUnderTest('underscore/', inJSDirURL)).toThrow(TypeError); - expect(() => resolveUnderTest('underscore/foo', inJSDirURL)).toThrow(TypeError); - }); - }); - - describe('The scope inheritance example from the README', () => { - const resolveUnderTest = makeResolveUnderTest(`{ - "imports": { - "a": "/a-1.mjs", - "b": "/b-1.mjs", - "c": "/c-1.mjs" - }, - "scopes": { - "/scope2/": { - "a": "/a-2.mjs" - }, - "/scope2/scope3/": { - "b": "/b-3.mjs" - } - } - }`); - - const scope1URL = new URL('https://example.com/scope1/foo.mjs'); - const scope2URL = new URL('https://example.com/scope2/foo.mjs'); - const scope3URL = new URL('https://example.com/scope2/scope3/foo.mjs'); - - it('should fall back to "imports" when none match', () => { - expect(resolveUnderTest('a', scope1URL)).toMatchURL('https://example.com/a-1.mjs'); - expect(resolveUnderTest('b', scope1URL)).toMatchURL('https://example.com/b-1.mjs'); - expect(resolveUnderTest('c', scope1URL)).toMatchURL('https://example.com/c-1.mjs'); - }); - - it('should use a direct scope override', () => { - expect(resolveUnderTest('a', scope2URL)).toMatchURL('https://example.com/a-2.mjs'); - expect(resolveUnderTest('b', scope2URL)).toMatchURL('https://example.com/b-1.mjs'); - expect(resolveUnderTest('c', scope2URL)).toMatchURL('https://example.com/c-1.mjs'); - }); - - it('should use an indirect scope override', () => { - expect(resolveUnderTest('a', scope3URL)).toMatchURL('https://example.com/a-2.mjs'); - expect(resolveUnderTest('b', scope3URL)).toMatchURL('https://example.com/b-3.mjs'); - expect(resolveUnderTest('c', scope3URL)).toMatchURL('https://example.com/c-1.mjs'); - }); - }); - - describe('Relative URL scope keys', () => { - const resolveUnderTest = makeResolveUnderTest(`{ - "imports": { - "a": "/a-1.mjs", - "b": "/b-1.mjs", - "c": "/c-1.mjs" - }, - "scopes": { - "": { - "a": "/a-empty-string.mjs" - }, - "./": { - "b": "/b-dot-slash.mjs" - }, - "../": { - "c": "/c-dot-dot-slash.mjs" - } - } - }`); - const inSameDirAsMap = new URL('./foo.mjs', mapBaseURL); - const inDirAboveMap = new URL('../foo.mjs', mapBaseURL); - - it('should resolve an empty string scope using the import map URL', () => { - expect(resolveUnderTest('a', mapBaseURL)).toMatchURL('https://example.com/a-empty-string.mjs'); - expect(resolveUnderTest('a', inSameDirAsMap)).toMatchURL('https://example.com/a-1.mjs'); - }); - - it('should resolve a ./ scope using the import map URL\'s directory', () => { - expect(resolveUnderTest('b', mapBaseURL)).toMatchURL('https://example.com/b-dot-slash.mjs'); - expect(resolveUnderTest('b', inSameDirAsMap)).toMatchURL('https://example.com/b-dot-slash.mjs'); - }); - - it('should resolve a ../ scope using the import map URL\'s directory', () => { - expect(resolveUnderTest('c', mapBaseURL)).toMatchURL('https://example.com/c-dot-dot-slash.mjs'); - expect(resolveUnderTest('c', inSameDirAsMap)).toMatchURL('https://example.com/c-dot-dot-slash.mjs'); - expect(resolveUnderTest('c', inDirAboveMap)).toMatchURL('https://example.com/c-dot-dot-slash.mjs'); - }); - }); -}); -
diff --git a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/resources/resolving.js b/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/resources/resolving.js deleted file mode 100644 index 29ee31cc..0000000 --- a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/imported/resources/resolving.js +++ /dev/null
@@ -1,270 +0,0 @@ -'use strict'; -const { URL } = require('url'); -const { parseFromString } = require('../lib/parser.js'); -const { resolve } = require('../lib/resolver.js'); - -const mapBaseURL = new URL('https://example.com/app/index.html'); -const scriptURL = new URL('https://example.com/js/app.mjs'); - -function makeResolveUnderTest(mapString) { - const map = parseFromString(mapString, mapBaseURL); - return specifier => resolve(specifier, map, scriptURL); -} - -describe('Unmapped', () => { - const resolveUnderTest = makeResolveUnderTest(`{}`); - - it('should resolve ./ specifiers as URLs', () => { - expect(resolveUnderTest('./foo')).toMatchURL('https://example.com/js/foo'); - expect(resolveUnderTest('./foo/bar')).toMatchURL('https://example.com/js/foo/bar'); - expect(resolveUnderTest('./foo/../bar')).toMatchURL('https://example.com/js/bar'); - expect(resolveUnderTest('./foo/../../bar')).toMatchURL('https://example.com/bar'); - }); - - it('should resolve ../ specifiers as URLs', () => { - expect(resolveUnderTest('../foo')).toMatchURL('https://example.com/foo'); - expect(resolveUnderTest('../foo/bar')).toMatchURL('https://example.com/foo/bar'); - expect(resolveUnderTest('../../../foo/bar')).toMatchURL('https://example.com/foo/bar'); - }); - - it('should resolve / specifiers as URLs', () => { - expect(resolveUnderTest('/foo')).toMatchURL('https://example.com/foo'); - expect(resolveUnderTest('/foo/bar')).toMatchURL('https://example.com/foo/bar'); - expect(resolveUnderTest('/../../foo/bar')).toMatchURL('https://example.com/foo/bar'); - expect(resolveUnderTest('/../foo/../bar')).toMatchURL('https://example.com/bar'); - }); - - it('should parse absolute fetch-scheme URLs', () => { - expect(resolveUnderTest('about:good')).toMatchURL('about:good'); - expect(resolveUnderTest('https://example.net')).toMatchURL('https://example.net/'); - expect(resolveUnderTest('https://ex%41mple.com/')).toMatchURL('https://example.com/'); - expect(resolveUnderTest('https:example.org')).toMatchURL('https://example.org/'); - expect(resolveUnderTest('https://///example.com///')).toMatchURL('https://example.com///'); - }); - - it('should fail for absolute non-fetch-scheme URLs', () => { - expect(() => resolveUnderTest('mailto:bad')).toThrow(TypeError); - expect(() => resolveUnderTest('import:bad')).toThrow(TypeError); - expect(() => resolveUnderTest('javascript:bad')).toThrow(TypeError); - expect(() => resolveUnderTest('wss:bad')).toThrow(TypeError); - }); - - it('should fail for strings not parseable as absolute URLs and not starting with ./ ../ or /', () => { - expect(() => resolveUnderTest('foo')).toThrow(TypeError); - expect(() => resolveUnderTest('\\foo')).toThrow(TypeError); - expect(() => resolveUnderTest(':foo')).toThrow(TypeError); - expect(() => resolveUnderTest('@foo')).toThrow(TypeError); - expect(() => resolveUnderTest('%2E/foo')).toThrow(TypeError); - expect(() => resolveUnderTest('%2E%2E/foo')).toThrow(TypeError); - expect(() => resolveUnderTest('.%2Ffoo')).toThrow(TypeError); - expect(() => resolveUnderTest('https://ex ample.org/')).toThrow(TypeError); - expect(() => resolveUnderTest('https://example.com:demo')).toThrow(TypeError); - expect(() => resolveUnderTest('http://[www.example.com]/')).toThrow(TypeError); - }); -}); - -describe('Mapped using the "imports" key only (no scopes)', () => { - it('should fail when the mapping is to an empty array', () => { - const resolveUnderTest = makeResolveUnderTest(`{ - "imports": { - "moment": null, - "lodash": [] - } - }`); - - expect(() => resolveUnderTest('moment')).toThrow(TypeError); - expect(() => resolveUnderTest('lodash')).toThrow(TypeError); - }); - - describe('Package-like scenarios', () => { - const resolveUnderTest = makeResolveUnderTest(`{ - "imports": { - "moment": "/node_modules/moment/src/moment.js", - "moment/": "/node_modules/moment/src/", - "lodash-dot": "./node_modules/lodash-es/lodash.js", - "lodash-dot/": "./node_modules/lodash-es/", - "lodash-dotdot": "../node_modules/lodash-es/lodash.js", - "lodash-dotdot/": "../node_modules/lodash-es/", - "nowhere/": [] - } - }`); - - it('should work for package main modules', () => { - expect(resolveUnderTest('moment')).toMatchURL('https://example.com/node_modules/moment/src/moment.js'); - expect(resolveUnderTest('lodash-dot')).toMatchURL('https://example.com/app/node_modules/lodash-es/lodash.js'); - expect(resolveUnderTest('lodash-dotdot')).toMatchURL('https://example.com/node_modules/lodash-es/lodash.js'); - }); - - it('should work for package submodules', () => { - expect(resolveUnderTest('moment/foo')).toMatchURL('https://example.com/node_modules/moment/src/foo'); - expect(resolveUnderTest('lodash-dot/foo')).toMatchURL('https://example.com/app/node_modules/lodash-es/foo'); - expect(resolveUnderTest('lodash-dotdot/foo')).toMatchURL('https://example.com/node_modules/lodash-es/foo'); - }); - - it('should work for package names that end in a slash by just passing through', () => { - // TODO: is this the right behavior, or should we throw? - expect(resolveUnderTest('moment/')).toMatchURL('https://example.com/node_modules/moment/src/'); - }); - - it('should still fail for package modules that are not declared', () => { - expect(() => resolveUnderTest('underscore/')).toThrow(TypeError); - expect(() => resolveUnderTest('underscore/foo')).toThrow(TypeError); - }); - - it('should fail for package submodules that map to nowhere', () => { - expect(() => resolveUnderTest('nowhere/foo')).toThrow(TypeError); - }); - }); - - describe('Tricky specifiers', () => { - const resolveUnderTest = makeResolveUnderTest(`{ - "imports": { - "package/withslash": "/node_modules/package-with-slash/index.mjs", - "not-a-package": "/lib/not-a-package.mjs", - ".": "/lib/dot.mjs", - "..": "/lib/dotdot.mjs", - "..\\\\": "/lib/dotdotbackslash.mjs", - "%2E": "/lib/percent2e.mjs", - "%2F": "/lib/percent2f.mjs" - } - }`); - - it('should work for explicitly-mapped specifiers that happen to have a slash', () => { - expect(resolveUnderTest('package/withslash')).toMatchURL('https://example.com/node_modules/package-with-slash/index.mjs'); - }); - - it('should work when the specifier has punctuation', () => { - expect(resolveUnderTest('.')).toMatchURL('https://example.com/lib/dot.mjs'); - expect(resolveUnderTest('..')).toMatchURL('https://example.com/lib/dotdot.mjs'); - expect(resolveUnderTest('..\\')).toMatchURL('https://example.com/lib/dotdotbackslash.mjs'); - expect(resolveUnderTest('%2E')).toMatchURL('https://example.com/lib/percent2e.mjs'); - expect(resolveUnderTest('%2F')).toMatchURL('https://example.com/lib/percent2f.mjs'); - }); - - it('should fail for attempting to get a submodule of something not declared with a trailing slash', () => { - expect(() => resolveUnderTest('not-a-package/foo')).toThrow(TypeError); - }); - }); - - describe('URL-like specifiers', () => { - const resolveUnderTest = makeResolveUnderTest(`{ - "imports": { - "/node_modules/als-polyfill/index.mjs": "std:kv-storage", - - "/lib/foo.mjs": "./more/bar.mjs", - "./dotrelative/foo.mjs": "/lib/dot.mjs", - "../dotdotrelative/foo.mjs": "/lib/dotdot.mjs", - - "/lib/no.mjs": null, - "./dotrelative/no.mjs": [], - - "/": "/lib/slash-only/", - "./": "/lib/dotslash-only/", - - "/test/": "/lib/url-trailing-slash/", - "./test/": "/lib/url-trailing-slash-dot/", - - "/test": "/lib/test1.mjs", - "../test": "/lib/test2.mjs" - } - }`); - - it('should remap to other URLs', () => { - expect(resolveUnderTest('https://example.com/lib/foo.mjs')).toMatchURL('https://example.com/app/more/bar.mjs'); - expect(resolveUnderTest('https://///example.com/lib/foo.mjs')).toMatchURL('https://example.com/app/more/bar.mjs'); - expect(resolveUnderTest('/lib/foo.mjs')).toMatchURL('https://example.com/app/more/bar.mjs'); - - expect(resolveUnderTest('https://example.com/app/dotrelative/foo.mjs')).toMatchURL('https://example.com/lib/dot.mjs'); - expect(resolveUnderTest('../app/dotrelative/foo.mjs')).toMatchURL('https://example.com/lib/dot.mjs'); - - expect(resolveUnderTest('https://example.com/dotdotrelative/foo.mjs')).toMatchURL('https://example.com/lib/dotdot.mjs'); - expect(resolveUnderTest('../dotdotrelative/foo.mjs')).toMatchURL('https://example.com/lib/dotdot.mjs'); - }); - - it('should fail for URLs that remap to empty arrays', () => { - expect(() => resolveUnderTest('https://example.com/lib/no.mjs')).toThrow(TypeError); - expect(() => resolveUnderTest('/lib/no.mjs')).toThrow(TypeError); - expect(() => resolveUnderTest('../lib/no.mjs')).toThrow(TypeError); - - expect(() => resolveUnderTest('https://example.com/app/dotrelative/no.mjs')).toThrow(TypeError); - expect(() => resolveUnderTest('/app/dotrelative/no.mjs')).toThrow(TypeError); - expect(() => resolveUnderTest('../app/dotrelative/no.mjs')).toThrow(TypeError); - }); - - it('should remap URLs that are just composed from / and .', () => { - expect(resolveUnderTest('https://example.com/')).toMatchURL('https://example.com/lib/slash-only/'); - expect(resolveUnderTest('/')).toMatchURL('https://example.com/lib/slash-only/'); - expect(resolveUnderTest('../')).toMatchURL('https://example.com/lib/slash-only/'); - - expect(resolveUnderTest('https://example.com/app/')).toMatchURL('https://example.com/lib/dotslash-only/'); - expect(resolveUnderTest('/app/')).toMatchURL('https://example.com/lib/dotslash-only/'); - expect(resolveUnderTest('../app/')).toMatchURL('https://example.com/lib/dotslash-only/'); - }); - - it('should remap URLs that are prefix-matched by keys with trailing slashes', () => { - expect(resolveUnderTest('/test/foo.mjs')).toMatchURL('https://example.com/lib/url-trailing-slash/foo.mjs'); - expect(resolveUnderTest('https://example.com/app/test/foo.mjs')).toMatchURL('https://example.com/lib/url-trailing-slash-dot/foo.mjs'); - }); - - it('should use the last entry\'s address when URL-like specifiers parse to the same absolute URL', () => { - expect(resolveUnderTest('/test')).toMatchURL('https://example.com/lib/test2.mjs'); - }); - }); - - describe('Overlapping entries with trailing slashes', () => { - it('should favor the most-specific key (no empty arrays)', () => { - const resolveUnderTest = makeResolveUnderTest(`{ - "imports": { - "a": "/1", - "a/": "/2/", - "a/b": "/3", - "a/b/": "/4/" - } - }`); - - expect(resolveUnderTest('a')).toMatchURL('https://example.com/1'); - expect(resolveUnderTest('a/')).toMatchURL('https://example.com/2/'); - expect(resolveUnderTest('a/b')).toMatchURL('https://example.com/3'); - expect(resolveUnderTest('a/b/')).toMatchURL('https://example.com/4/'); - expect(resolveUnderTest('a/b/c')).toMatchURL('https://example.com/4/c'); - }); - - it('should favor the most-specific key when empty arrays are involved for less-specific keys', () => { - const resolveUnderTest = makeResolveUnderTest(`{ - "imports": { - "a": [], - "a/": [], - "a/b": "/3", - "a/b/": "/4/" - } - }`); - - expect(() => resolveUnderTest('a')).toThrow(TypeError); - expect(() => resolveUnderTest('a/')).toThrow(TypeError); - expect(() => resolveUnderTest('a/x')).toThrow(TypeError); - expect(resolveUnderTest('a/b')).toMatchURL('https://example.com/3'); - expect(resolveUnderTest('a/b/')).toMatchURL('https://example.com/4/'); - expect(resolveUnderTest('a/b/c')).toMatchURL('https://example.com/4/c'); - expect(() => resolveUnderTest('a/x/c')).toThrow(TypeError); - }); - - it('should favor the most-specific key when empty arrays are involved for more-specific keys', () => { - const resolveUnderTest = makeResolveUnderTest(`{ - "imports": { - "a": "/1", - "a/": "/2/", - "a/b": [], - "a/b/": [] - } - }`); - - expect(resolveUnderTest('a')).toMatchURL('https://example.com/1'); - expect(resolveUnderTest('a/')).toMatchURL('https://example.com/2/'); - expect(resolveUnderTest('a/x')).toMatchURL('https://example.com/2/x'); - expect(() => resolveUnderTest('a/b')).toThrow(TypeError); - expect(() => resolveUnderTest('a/b/')).toThrow(TypeError); - expect(() => resolveUnderTest('a/b/c')).toThrow(TypeError); - expect(resolveUnderTest('a/x/c')).toMatchURL('https://example.com/2/x/c'); - }); - }); -});
diff --git a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/static-import.py b/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/static-import.py deleted file mode 100644 index 8d0f5d9..0000000 --- a/third_party/blink/web_tests/external/wpt/import-maps/builtin-support.tentative/static-import.py +++ /dev/null
@@ -1,5 +0,0 @@ -def main(request, response): - return ( - (('Content-Type', 'text/javascript'),), - 'import "{}";\n'.format(request.GET.first('url')) - )
diff --git a/third_party/blink/web_tests/external/wpt/import-maps/resources/jest-test-helper.js b/third_party/blink/web_tests/external/wpt/import-maps/resources/jest-test-helper.js deleted file mode 100644 index 752c987df..0000000 --- a/third_party/blink/web_tests/external/wpt/import-maps/resources/jest-test-helper.js +++ /dev/null
@@ -1,132 +0,0 @@ -// Hacky glue code to run Jest-based tests as WPT tests. -// TODO(https://github.com/WICG/import-maps/issues/170): Consider better ways -// to write and run tests. - -setup({allow_uncaught_exception : true}); - -const exports = {}; - -function require(name) { - return Object.assign({ - 'URL': URL, - 'parseFromString': parseFromString, - 'resolve': resolve, - 'BUILT_IN_MODULE_SCHEME': 'std' - }, exports); -} - -// Sort keys and then stringify for comparison. -function stringifyImportMap(importMap) { - function getKeys(m) { - if (typeof m !== 'object') - return []; - - let keys = []; - for (const key in m) { - keys.push(key); - keys = keys.concat(getKeys(m[key])); - } - return keys; - } - return JSON.stringify(importMap, getKeys(importMap).sort()); -} - -function expect(v) { - return { - toMatchURL: expected => assert_equals(v, expected), - toThrow: expected => { - if (v.localName === 'iframe') { - // `v` is the result of parseFromString(), and thus toThrow() - // should be examining the error in that iframe. - assert_throws_js(v.contentWindow[expected], () => { throw v.contentWindow.windowError }); - } else if (expected.test && expected.test('not yet implemented')) { - // We override /not yet implemented/ expectation. - assert_throws_js(TypeError, v); - } else { - assert_throws_js(expected, v); - } - }, - toEqual: expected => { - if (v.localName === 'iframe') { - // `v` is the result of parseFromString(), and thus toEqual() is - // expected to compare parsed import maps. - // We sort keys when stringifying for normalization. - const actualParsedImportMap = JSON.parse( - internals.getParsedImportMap(v.contentDocument)); - assert_equals( - stringifyImportMap(actualParsedImportMap), - stringifyImportMap(expected) - ); - } else { - assert_object_equals(v, expected); - } - } - }; -} - -expect.toMatchURL = expected => expected; - -const test_harness_test = test; -test = it; - -let current_message = ''; -function describe(message, f) { - const old = current_message; - if (current_message !== '') { - current_message += ' / '; - } - current_message += message; - f(); - current_message = old; -} -function it(message, f) { - const old = current_message; - if (current_message !== '') { - current_message += ' / '; - } - current_message += message; - test_harness_test(t => t.step_func(f)(), current_message); - current_message = old; -} - -// Creates a new Document (via <iframe>) and add an inline import map. -// Currently document.write() is used to make everything synchronous, which -// is just needed for running the existing Jest-based tests easily. -function parseFromString(mapString, mapBaseURL) { - // We can't test data: base URLs because <base> rejects data: URLs. - if (new URL(mapBaseURL).protocol === 'data:') { - throw Error('test helper does not support data: base URLs'); - } - - const iframe = document.createElement('iframe'); - document.body.appendChild(iframe); - iframe.contentDocument.write(` - <base href="${mapBaseURL}"> - <script> - var scriptError; - var windowError; - function onScriptError(event) { - scriptError = event.error; - } - function onWindowError(event) { - windowError = event.error; - return false; - } - window.addEventListener('error', onWindowError); - </sc` + `ript> - <script type="importmap" onerror="onScriptError(event)"> - ${mapString} - </sc` + `ript> - `); - iframe.contentDocument.close(); - - return iframe; -} - -// URL resolution is tested using Chromium's `internals`. -// TODO(hiroshige): Remove the Chromium-specific dependency. -function resolve(specifier, map, baseURL) { - return internals.resolveModuleSpecifier(specifier, - baseURL, - map.contentDocument); -}
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/fetch/cross-http.keep-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/fetch/cross-http.keep-scheme.https.html new file mode 100644 index 0000000..3241aea --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/fetch/cross-http.keep-scheme.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for fetch to cross-http origin and keep-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-http", + "redirection": "keep-scheme", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "sharedworker-classic" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/fetch/cross-http.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/fetch/cross-http.no-redirect.https.html new file mode 100644 index 0000000..22bc15d --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/fetch/cross-http.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-http", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "sharedworker-classic" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/fetch/cross-http.swap-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/fetch/cross-http.swap-scheme.https.html new file mode 100644 index 0000000..b0ba399 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/fetch/cross-http.swap-scheme.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for fetch to cross-http origin and swap-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-http", + "redirection": "swap-scheme", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "sharedworker-classic" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/fetch/cross-https.swap-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/fetch/cross-https.swap-scheme.https.html new file mode 100644 index 0000000..65f6ddba --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/fetch/cross-https.swap-scheme.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for fetch to cross-https origin and swap-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-https", + "redirection": "swap-scheme", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "sharedworker-classic" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/fetch/same-http.keep-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/fetch/same-http.keep-scheme.https.html new file mode 100644 index 0000000..f9f1aa6 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/fetch/same-http.keep-scheme.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for fetch to same-http origin and keep-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "keep-scheme", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "sharedworker-classic" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/fetch/same-http.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/fetch/same-http.no-redirect.https.html new file mode 100644 index 0000000..b3b51be3 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/fetch/same-http.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "sharedworker-classic" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/fetch/same-http.swap-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/fetch/same-http.swap-scheme.https.html new file mode 100644 index 0000000..da19d07 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/fetch/same-http.swap-scheme.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for fetch to same-http origin and swap-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "swap-scheme", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "sharedworker-classic" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/fetch/same-https.keep-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/fetch/same-https.keep-scheme.https.html new file mode 100644 index 0000000..f0d5f1a --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/fetch/same-https.keep-scheme.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Allowed content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of allowed content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/"> + <meta name="assert" content="Mixed-Content: Expects allowed for fetch to same-https origin and keep-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "keep-scheme", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "sharedworker-classic" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/fetch/same-https.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/fetch/same-https.no-redirect.https.html new file mode 100644 index 0000000..b976e9c --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/fetch/same-https.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Allowed content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of allowed content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/"> + <meta name="assert" content="Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "sharedworker-classic" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/fetch/same-https.swap-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/fetch/same-https.swap-scheme.https.html new file mode 100644 index 0000000..7710e60 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/fetch/same-https.swap-scheme.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for fetch to same-https origin and swap-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-https", + "redirection": "swap-scheme", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "sharedworker-classic" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/websocket/cross-ws.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/websocket/cross-ws.no-redirect.https.html new file mode 100644 index 0000000..76adf42 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/websocket/cross-ws.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for websocket to cross-ws origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-ws", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "sharedworker-classic" + } + ], + "source_scheme": "https", + "subresource": "websocket", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/websocket/same-ws.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/websocket/same-ws.no-redirect.https.html new file mode 100644 index 0000000..37e9bb9 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/websocket/same-ws.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-ws", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "sharedworker-classic" + } + ], + "source_scheme": "https", + "subresource": "websocket", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/websocket/same-wss.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/websocket/same-wss.no-redirect.https.html new file mode 100644 index 0000000..2d42204 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/websocket/same-wss.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Allowed content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of allowed content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/"> + <meta name="assert" content="Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-wss", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "sharedworker-classic" + } + ], + "source_scheme": "https", + "subresource": "websocket", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/xhr/cross-http.keep-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/xhr/cross-http.keep-scheme.https.html new file mode 100644 index 0000000..9d89753d --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/xhr/cross-http.keep-scheme.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for xhr to cross-http origin and keep-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-http", + "redirection": "keep-scheme", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "sharedworker-classic" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/xhr/cross-http.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/xhr/cross-http.no-redirect.https.html new file mode 100644 index 0000000..5db7dcd --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/xhr/cross-http.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-http", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "sharedworker-classic" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/xhr/cross-http.swap-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/xhr/cross-http.swap-scheme.https.html new file mode 100644 index 0000000..9adbb92c --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/xhr/cross-http.swap-scheme.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for xhr to cross-http origin and swap-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-http", + "redirection": "swap-scheme", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "sharedworker-classic" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/xhr/cross-https.swap-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/xhr/cross-https.swap-scheme.https.html new file mode 100644 index 0000000..7fda4cb --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/xhr/cross-https.swap-scheme.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for xhr to cross-https origin and swap-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-https", + "redirection": "swap-scheme", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "sharedworker-classic" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/xhr/same-http.keep-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/xhr/same-http.keep-scheme.https.html new file mode 100644 index 0000000..dc9b7e4 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/xhr/same-http.keep-scheme.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for xhr to same-http origin and keep-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "keep-scheme", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "sharedworker-classic" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/xhr/same-http.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/xhr/same-http.no-redirect.https.html new file mode 100644 index 0000000..84dd3a17 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/xhr/same-http.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "sharedworker-classic" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/xhr/same-http.swap-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/xhr/same-http.swap-scheme.https.html new file mode 100644 index 0000000..8b00bc6 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/xhr/same-http.swap-scheme.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for xhr to same-http origin and swap-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "swap-scheme", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "sharedworker-classic" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/xhr/same-https.keep-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/xhr/same-https.keep-scheme.https.html new file mode 100644 index 0000000..62b09270 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/xhr/same-https.keep-scheme.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Allowed content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of allowed content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/"> + <meta name="assert" content="Mixed-Content: Expects allowed for xhr to same-https origin and keep-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "keep-scheme", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "sharedworker-classic" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/xhr/same-https.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/xhr/same-https.no-redirect.https.html new file mode 100644 index 0000000..9a4eef4 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/xhr/same-https.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Allowed content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of allowed content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/"> + <meta name="assert" content="Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "sharedworker-classic" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/xhr/same-https.swap-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/xhr/same-https.swap-scheme.https.html new file mode 100644 index 0000000..a1ef6b6 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-classic.http-rp/opt-in/xhr/same-https.swap-scheme.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for xhr to same-https origin and swap-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-https", + "redirection": "swap-scheme", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "sharedworker-classic" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/fetch/cross-http.keep-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/fetch/cross-http.keep-scheme.https.html new file mode 100644 index 0000000..a6e2e97 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/fetch/cross-http.keep-scheme.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for fetch to cross-http origin and keep-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-http", + "redirection": "keep-scheme", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "sharedworker-module" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/fetch/cross-http.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/fetch/cross-http.no-redirect.https.html new file mode 100644 index 0000000..c68737e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/fetch/cross-http.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-http", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "sharedworker-module" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/fetch/cross-http.swap-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/fetch/cross-http.swap-scheme.https.html new file mode 100644 index 0000000..cd0457e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/fetch/cross-http.swap-scheme.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for fetch to cross-http origin and swap-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-http", + "redirection": "swap-scheme", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "sharedworker-module" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/fetch/cross-https.swap-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/fetch/cross-https.swap-scheme.https.html new file mode 100644 index 0000000..c9ff175 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/fetch/cross-https.swap-scheme.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for fetch to cross-https origin and swap-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-https", + "redirection": "swap-scheme", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "sharedworker-module" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/fetch/same-http.keep-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/fetch/same-http.keep-scheme.https.html new file mode 100644 index 0000000..bf41044 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/fetch/same-http.keep-scheme.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for fetch to same-http origin and keep-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "keep-scheme", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "sharedworker-module" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/fetch/same-http.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/fetch/same-http.no-redirect.https.html new file mode 100644 index 0000000..d259586 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/fetch/same-http.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "sharedworker-module" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/fetch/same-http.swap-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/fetch/same-http.swap-scheme.https.html new file mode 100644 index 0000000..fb5a3c5 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/fetch/same-http.swap-scheme.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for fetch to same-http origin and swap-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "swap-scheme", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "sharedworker-module" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/fetch/same-https.keep-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/fetch/same-https.keep-scheme.https.html new file mode 100644 index 0000000..b5b4d5cf --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/fetch/same-https.keep-scheme.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Allowed content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of allowed content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/"> + <meta name="assert" content="Mixed-Content: Expects allowed for fetch to same-https origin and keep-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "keep-scheme", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "sharedworker-module" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/fetch/same-https.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/fetch/same-https.no-redirect.https.html new file mode 100644 index 0000000..31a4813 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/fetch/same-https.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Allowed content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of allowed content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/"> + <meta name="assert" content="Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "sharedworker-module" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/fetch/same-https.swap-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/fetch/same-https.swap-scheme.https.html new file mode 100644 index 0000000..f6a6a88 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/fetch/same-https.swap-scheme.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for fetch to same-https origin and swap-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-https", + "redirection": "swap-scheme", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "sharedworker-module" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/websocket/cross-ws.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/websocket/cross-ws.no-redirect.https.html new file mode 100644 index 0000000..44b9ada --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/websocket/cross-ws.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for websocket to cross-ws origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-ws", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "sharedworker-module" + } + ], + "source_scheme": "https", + "subresource": "websocket", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/websocket/same-ws.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/websocket/same-ws.no-redirect.https.html new file mode 100644 index 0000000..cb200026 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/websocket/same-ws.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-ws", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "sharedworker-module" + } + ], + "source_scheme": "https", + "subresource": "websocket", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/websocket/same-wss.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/websocket/same-wss.no-redirect.https.html new file mode 100644 index 0000000..3ae337f --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/websocket/same-wss.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Allowed content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of allowed content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/"> + <meta name="assert" content="Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-wss", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "sharedworker-module" + } + ], + "source_scheme": "https", + "subresource": "websocket", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/xhr/cross-http.keep-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/xhr/cross-http.keep-scheme.https.html new file mode 100644 index 0000000..d95d066 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/xhr/cross-http.keep-scheme.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for xhr to cross-http origin and keep-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-http", + "redirection": "keep-scheme", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "sharedworker-module" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/xhr/cross-http.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/xhr/cross-http.no-redirect.https.html new file mode 100644 index 0000000..20b04dca --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/xhr/cross-http.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-http", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "sharedworker-module" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/xhr/cross-http.swap-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/xhr/cross-http.swap-scheme.https.html new file mode 100644 index 0000000..bc7bb44 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/xhr/cross-http.swap-scheme.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for xhr to cross-http origin and swap-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-http", + "redirection": "swap-scheme", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "sharedworker-module" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/xhr/cross-https.swap-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/xhr/cross-https.swap-scheme.https.html new file mode 100644 index 0000000..6b0a8ed --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/xhr/cross-https.swap-scheme.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for xhr to cross-https origin and swap-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-https", + "redirection": "swap-scheme", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "sharedworker-module" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/xhr/same-http.keep-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/xhr/same-http.keep-scheme.https.html new file mode 100644 index 0000000..25bcd552 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/xhr/same-http.keep-scheme.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for xhr to same-http origin and keep-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "keep-scheme", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "sharedworker-module" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/xhr/same-http.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/xhr/same-http.no-redirect.https.html new file mode 100644 index 0000000..3742c6e9 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/xhr/same-http.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "sharedworker-module" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/xhr/same-http.swap-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/xhr/same-http.swap-scheme.https.html new file mode 100644 index 0000000..890ce32 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/xhr/same-http.swap-scheme.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for xhr to same-http origin and swap-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "swap-scheme", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "sharedworker-module" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/xhr/same-https.keep-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/xhr/same-https.keep-scheme.https.html new file mode 100644 index 0000000..e9f4543 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/xhr/same-https.keep-scheme.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Allowed content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of allowed content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/"> + <meta name="assert" content="Mixed-Content: Expects allowed for xhr to same-https origin and keep-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "keep-scheme", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "sharedworker-module" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/xhr/same-https.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/xhr/same-https.no-redirect.https.html new file mode 100644 index 0000000..3e4dc50 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/xhr/same-https.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Allowed content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of allowed content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/"> + <meta name="assert" content="Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "sharedworker-module" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/xhr/same-https.swap-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/xhr/same-https.swap-scheme.https.html new file mode 100644 index 0000000..b62ddcc --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/sharedworker-module.http-rp/opt-in/xhr/same-https.swap-scheme.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for xhr to same-https origin and swap-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-https", + "redirection": "swap-scheme", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "sharedworker-module" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/cross-http.keep-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/cross-http.keep-scheme.https.html new file mode 100644 index 0000000..167671af --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/cross-http.keep-scheme.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for fetch to cross-http origin and keep-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-http", + "redirection": "keep-scheme", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/cross-http.keep-scheme.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/cross-http.keep-scheme.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/cross-http.keep-scheme.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/cross-http.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/cross-http.no-redirect.https.html new file mode 100644 index 0000000..07d0a90 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/cross-http.no-redirect.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-http", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/cross-http.no-redirect.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/cross-http.no-redirect.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/cross-http.no-redirect.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/cross-http.swap-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/cross-http.swap-scheme.https.html new file mode 100644 index 0000000..f02532f2 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/cross-http.swap-scheme.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for fetch to cross-http origin and swap-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-http", + "redirection": "swap-scheme", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/cross-http.swap-scheme.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/cross-http.swap-scheme.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/cross-http.swap-scheme.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/cross-https.swap-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/cross-https.swap-scheme.https.html new file mode 100644 index 0000000..7580539 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/cross-https.swap-scheme.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for fetch to cross-https origin and swap-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-https", + "redirection": "swap-scheme", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/cross-https.swap-scheme.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/cross-https.swap-scheme.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/cross-https.swap-scheme.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/same-http.keep-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/same-http.keep-scheme.https.html new file mode 100644 index 0000000..6138b29 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/same-http.keep-scheme.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for fetch to same-http origin and keep-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "keep-scheme", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/same-http.keep-scheme.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/same-http.keep-scheme.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/same-http.keep-scheme.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/same-http.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/same-http.no-redirect.https.html new file mode 100644 index 0000000..c819c77 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/same-http.no-redirect.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/same-http.no-redirect.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/same-http.no-redirect.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/same-http.no-redirect.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/same-http.swap-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/same-http.swap-scheme.https.html new file mode 100644 index 0000000..aee998f --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/same-http.swap-scheme.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for fetch to same-http origin and swap-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "swap-scheme", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/same-http.swap-scheme.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/same-http.swap-scheme.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/same-http.swap-scheme.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/same-https.keep-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/same-https.keep-scheme.https.html new file mode 100644 index 0000000..b49db87 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/same-https.keep-scheme.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Allowed content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of allowed content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/"> + <meta name="assert" content="Mixed-Content: Expects allowed for fetch to same-https origin and keep-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "keep-scheme", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/same-https.keep-scheme.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/same-https.keep-scheme.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/same-https.keep-scheme.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/same-https.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/same-https.no-redirect.https.html new file mode 100644 index 0000000..4efd034 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/same-https.no-redirect.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Allowed content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of allowed content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/"> + <meta name="assert" content="Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/same-https.no-redirect.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/same-https.no-redirect.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/same-https.no-redirect.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/same-https.swap-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/same-https.swap-scheme.https.html new file mode 100644 index 0000000..354bfcd --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/same-https.swap-scheme.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for fetch to same-https origin and swap-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-https", + "redirection": "swap-scheme", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/same-https.swap-scheme.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/same-https.swap-scheme.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch/same-https.swap-scheme.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/websocket/cross-ws.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/websocket/cross-ws.no-redirect.https.html new file mode 100644 index 0000000..76ceb7e0 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/websocket/cross-ws.no-redirect.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for websocket to cross-ws origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-ws", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "websocket", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/websocket/cross-ws.no-redirect.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/websocket/cross-ws.no-redirect.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/websocket/cross-ws.no-redirect.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/websocket/same-ws.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/websocket/same-ws.no-redirect.https.html new file mode 100644 index 0000000..f4c63eb --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/websocket/same-ws.no-redirect.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-ws", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "websocket", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/websocket/same-ws.no-redirect.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/websocket/same-ws.no-redirect.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/websocket/same-ws.no-redirect.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/websocket/same-wss.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/websocket/same-wss.no-redirect.https.html new file mode 100644 index 0000000..a55efd489 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/websocket/same-wss.no-redirect.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Allowed content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of allowed content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/"> + <meta name="assert" content="Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-wss", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "websocket", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/websocket/same-wss.no-redirect.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/websocket/same-wss.no-redirect.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/websocket/same-wss.no-redirect.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/worker-classic/same-http.keep-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/worker-classic/same-http.keep-scheme.https.html new file mode 100644 index 0000000..62c3752 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/worker-classic/same-http.keep-scheme.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for worker-classic to same-http origin and keep-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "keep-scheme", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "worker-classic", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/worker-classic/same-http.keep-scheme.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/worker-classic/same-http.keep-scheme.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/worker-classic/same-http.keep-scheme.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/worker-classic/same-http.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/worker-classic/same-http.no-redirect.https.html new file mode 100644 index 0000000..a899122 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/worker-classic/same-http.no-redirect.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for worker-classic to same-http origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "worker-classic", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/worker-classic/same-http.no-redirect.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/worker-classic/same-http.no-redirect.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/worker-classic/same-http.no-redirect.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/worker-classic/same-https.keep-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/worker-classic/same-https.keep-scheme.https.html new file mode 100644 index 0000000..1c12bcc --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/worker-classic/same-https.keep-scheme.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Allowed content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of allowed content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/"> + <meta name="assert" content="Mixed-Content: Expects allowed for worker-classic to same-https origin and keep-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "keep-scheme", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "worker-classic", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/worker-classic/same-https.keep-scheme.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/worker-classic/same-https.keep-scheme.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/worker-classic/same-https.keep-scheme.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/worker-classic/same-https.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/worker-classic/same-https.no-redirect.https.html new file mode 100644 index 0000000..f8b2261c --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/worker-classic/same-https.no-redirect.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Allowed content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of allowed content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/"> + <meta name="assert" content="Mixed-Content: Expects allowed for worker-classic to same-https origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "worker-classic", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/worker-classic/same-https.no-redirect.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/worker-classic/same-https.no-redirect.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/worker-classic/same-https.no-redirect.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/worker-module/same-http.keep-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/worker-module/same-http.keep-scheme.https.html new file mode 100644 index 0000000..999ce20 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/worker-module/same-http.keep-scheme.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for worker-module to same-http origin and keep-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "keep-scheme", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "worker-module", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/worker-module/same-http.keep-scheme.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/worker-module/same-http.keep-scheme.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/worker-module/same-http.keep-scheme.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/worker-module/same-http.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/worker-module/same-http.no-redirect.https.html new file mode 100644 index 0000000..147e166 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/worker-module/same-http.no-redirect.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for worker-module to same-http origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "worker-module", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/worker-module/same-http.no-redirect.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/worker-module/same-http.no-redirect.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/worker-module/same-http.no-redirect.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/worker-module/same-https.keep-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/worker-module/same-https.keep-scheme.https.html new file mode 100644 index 0000000..0b03466 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/worker-module/same-https.keep-scheme.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Allowed content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of allowed content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/"> + <meta name="assert" content="Mixed-Content: Expects allowed for worker-module to same-https origin and keep-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "keep-scheme", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "worker-module", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/worker-module/same-https.keep-scheme.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/worker-module/same-https.keep-scheme.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/worker-module/same-https.keep-scheme.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/worker-module/same-https.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/worker-module/same-https.no-redirect.https.html new file mode 100644 index 0000000..516ddea --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/worker-module/same-https.no-redirect.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Allowed content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of allowed content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/"> + <meta name="assert" content="Mixed-Content: Expects allowed for worker-module to same-https origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "worker-module", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/worker-module/same-https.no-redirect.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/worker-module/same-https.no-redirect.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/worker-module/same-https.no-redirect.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/cross-http.keep-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/cross-http.keep-scheme.https.html new file mode 100644 index 0000000..26646cc --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/cross-http.keep-scheme.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for xhr to cross-http origin and keep-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-http", + "redirection": "keep-scheme", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/cross-http.keep-scheme.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/cross-http.keep-scheme.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/cross-http.keep-scheme.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/cross-http.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/cross-http.no-redirect.https.html new file mode 100644 index 0000000..6aebcd8 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/cross-http.no-redirect.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-http", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/cross-http.no-redirect.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/cross-http.no-redirect.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/cross-http.no-redirect.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/cross-http.swap-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/cross-http.swap-scheme.https.html new file mode 100644 index 0000000..50f17e4d --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/cross-http.swap-scheme.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for xhr to cross-http origin and swap-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-http", + "redirection": "swap-scheme", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/cross-http.swap-scheme.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/cross-http.swap-scheme.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/cross-http.swap-scheme.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/cross-https.swap-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/cross-https.swap-scheme.https.html new file mode 100644 index 0000000..2e9259f --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/cross-https.swap-scheme.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for xhr to cross-https origin and swap-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-https", + "redirection": "swap-scheme", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/cross-https.swap-scheme.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/cross-https.swap-scheme.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/cross-https.swap-scheme.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/same-http.keep-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/same-http.keep-scheme.https.html new file mode 100644 index 0000000..5784f62 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/same-http.keep-scheme.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for xhr to same-http origin and keep-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "keep-scheme", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/same-http.keep-scheme.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/same-http.keep-scheme.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/same-http.keep-scheme.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/same-http.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/same-http.no-redirect.https.html new file mode 100644 index 0000000..a90e61b8 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/same-http.no-redirect.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/same-http.no-redirect.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/same-http.no-redirect.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/same-http.no-redirect.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/same-http.swap-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/same-http.swap-scheme.https.html new file mode 100644 index 0000000..894ff3f --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/same-http.swap-scheme.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for xhr to same-http origin and swap-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "swap-scheme", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/same-http.swap-scheme.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/same-http.swap-scheme.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/same-http.swap-scheme.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/same-https.keep-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/same-https.keep-scheme.https.html new file mode 100644 index 0000000..e2c4c3a --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/same-https.keep-scheme.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Allowed content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of allowed content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/"> + <meta name="assert" content="Mixed-Content: Expects allowed for xhr to same-https origin and keep-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "keep-scheme", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/same-https.keep-scheme.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/same-https.keep-scheme.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/same-https.keep-scheme.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/same-https.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/same-https.no-redirect.https.html new file mode 100644 index 0000000..7685f25 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/same-https.no-redirect.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Allowed content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of allowed content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/"> + <meta name="assert" content="Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/same-https.no-redirect.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/same-https.no-redirect.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/same-https.no-redirect.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/same-https.swap-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/same-https.swap-scheme.https.html new file mode 100644 index 0000000..4c3d7d1 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/same-https.swap-scheme.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for xhr to same-https origin and swap-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-https", + "redirection": "swap-scheme", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/same-https.swap-scheme.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/same-https.swap-scheme.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr/same-https.swap-scheme.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/opt-in/fetch/cross-http.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/opt-in/fetch/cross-http.no-redirect.https.html new file mode 100644 index 0000000..35cbe86 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/opt-in/fetch/cross-http.no-redirect.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-http", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/opt-in/fetch/same-http.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/opt-in/fetch/same-http.no-redirect.https.html new file mode 100644 index 0000000..88b8a7b --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/opt-in/fetch/same-http.no-redirect.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/opt-in/fetch/same-https.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/opt-in/fetch/same-https.no-redirect.https.html new file mode 100644 index 0000000..2d278da --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/opt-in/fetch/same-https.no-redirect.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Allowed content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of allowed content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/"> + <meta name="assert" content="Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/opt-in/websocket/cross-ws.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/opt-in/websocket/cross-ws.no-redirect.https.html new file mode 100644 index 0000000..d54e7378 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/opt-in/websocket/cross-ws.no-redirect.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for websocket to cross-ws origin and no-redirect redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-ws", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "websocket", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/opt-in/websocket/same-ws.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/opt-in/websocket/same-ws.no-redirect.https.html new file mode 100644 index 0000000..6c2d581 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/opt-in/websocket/same-ws.no-redirect.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-ws", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "websocket", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/opt-in/websocket/same-wss.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/opt-in/websocket/same-wss.no-redirect.https.html new file mode 100644 index 0000000..370d4af --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/opt-in/websocket/same-wss.no-redirect.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Allowed content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of allowed content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/"> + <meta name="assert" content="Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-wss", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "websocket", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/opt-in/worker-classic/same-http.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/opt-in/worker-classic/same-http.no-redirect.https.html new file mode 100644 index 0000000..a76175a --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/opt-in/worker-classic/same-http.no-redirect.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for worker-classic to same-http origin and no-redirect redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "worker-classic", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/opt-in/worker-classic/same-https.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/opt-in/worker-classic/same-https.no-redirect.https.html new file mode 100644 index 0000000..65d6185 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/opt-in/worker-classic/same-https.no-redirect.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Allowed content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of allowed content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/"> + <meta name="assert" content="Mixed-Content: Expects allowed for worker-classic to same-https origin and no-redirect redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "worker-classic", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/opt-in/worker-module/same-http.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/opt-in/worker-module/same-http.no-redirect.https.html new file mode 100644 index 0000000..84b7a60f --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/opt-in/worker-module/same-http.no-redirect.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for worker-module to same-http origin and no-redirect redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "worker-module", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/opt-in/worker-module/same-https.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/opt-in/worker-module/same-https.no-redirect.https.html new file mode 100644 index 0000000..b72ca11 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/opt-in/worker-module/same-https.no-redirect.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Allowed content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of allowed content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/"> + <meta name="assert" content="Mixed-Content: Expects allowed for worker-module to same-https origin and no-redirect redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "worker-module", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/opt-in/xhr/cross-http.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/opt-in/xhr/cross-http.no-redirect.https.html new file mode 100644 index 0000000..35f1a04 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/opt-in/xhr/cross-http.no-redirect.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-http", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/opt-in/xhr/same-http.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/opt-in/xhr/same-http.no-redirect.https.html new file mode 100644 index 0000000..ebe9597 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/opt-in/xhr/same-http.no-redirect.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/opt-in/xhr/same-https.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/opt-in/xhr/same-https.no-redirect.https.html new file mode 100644 index 0000000..80841a9 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/opt-in/xhr/same-https.no-redirect.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Allowed content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of allowed content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/"> + <meta name="assert" content="Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/fetch/cross-http.keep-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/fetch/cross-http.keep-scheme.https.html new file mode 100644 index 0000000..2a0139ab --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/fetch/cross-http.keep-scheme.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for fetch to cross-http origin and keep-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-http", + "redirection": "keep-scheme", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/fetch/cross-http.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/fetch/cross-http.no-redirect.https.html new file mode 100644 index 0000000..c8f33e5 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/fetch/cross-http.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-http", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/fetch/cross-http.swap-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/fetch/cross-http.swap-scheme.https.html new file mode 100644 index 0000000..a6e51b1f --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/fetch/cross-http.swap-scheme.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for fetch to cross-http origin and swap-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-http", + "redirection": "swap-scheme", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/fetch/same-http.keep-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/fetch/same-http.keep-scheme.https.html new file mode 100644 index 0000000..41447ce --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/fetch/same-http.keep-scheme.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for fetch to same-http origin and keep-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "keep-scheme", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/fetch/same-http.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/fetch/same-http.no-redirect.https.html new file mode 100644 index 0000000..a7d17f2 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/fetch/same-http.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/fetch/same-http.swap-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/fetch/same-http.swap-scheme.https.html new file mode 100644 index 0000000..1fc527f --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/fetch/same-http.swap-scheme.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for fetch to same-http origin and swap-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "swap-scheme", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/fetch/same-https.keep-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/fetch/same-https.keep-scheme.https.html new file mode 100644 index 0000000..8c137b28 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/fetch/same-https.keep-scheme.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Allowed content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of allowed content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/"> + <meta name="assert" content="Mixed-Content: Expects allowed for fetch to same-https origin and keep-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "keep-scheme", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/fetch/same-https.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/fetch/same-https.no-redirect.https.html new file mode 100644 index 0000000..6ea5b04 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/fetch/same-https.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Allowed content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of allowed content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/"> + <meta name="assert" content="Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/websocket/cross-ws.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/websocket/cross-ws.no-redirect.https.html new file mode 100644 index 0000000..cd89e387 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/websocket/cross-ws.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for websocket to cross-ws origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-ws", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "websocket", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/websocket/same-ws.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/websocket/same-ws.no-redirect.https.html new file mode 100644 index 0000000..bc425d9 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/websocket/same-ws.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-ws", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "websocket", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/websocket/same-wss.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/websocket/same-wss.no-redirect.https.html new file mode 100644 index 0000000..c7208db --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/websocket/same-wss.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Allowed content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of allowed content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/"> + <meta name="assert" content="Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-wss", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "websocket", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/worker-classic/same-http.keep-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/worker-classic/same-http.keep-scheme.https.html new file mode 100644 index 0000000..9f3f5ae --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/worker-classic/same-http.keep-scheme.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for worker-classic to same-http origin and keep-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "keep-scheme", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "worker-classic", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/worker-classic/same-http.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/worker-classic/same-http.no-redirect.https.html new file mode 100644 index 0000000..71834a3 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/worker-classic/same-http.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for worker-classic to same-http origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "worker-classic", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/worker-classic/same-https.keep-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/worker-classic/same-https.keep-scheme.https.html new file mode 100644 index 0000000..f883209 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/worker-classic/same-https.keep-scheme.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Allowed content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of allowed content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/"> + <meta name="assert" content="Mixed-Content: Expects allowed for worker-classic to same-https origin and keep-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "keep-scheme", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "worker-classic", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/worker-classic/same-https.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/worker-classic/same-https.no-redirect.https.html new file mode 100644 index 0000000..d6b0d56 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/worker-classic/same-https.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Allowed content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of allowed content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/"> + <meta name="assert" content="Mixed-Content: Expects allowed for worker-classic to same-https origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "worker-classic", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/worker-module/same-http.keep-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/worker-module/same-http.keep-scheme.https.html new file mode 100644 index 0000000..5a3fe34 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/worker-module/same-http.keep-scheme.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for worker-module to same-http origin and keep-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "keep-scheme", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "worker-module", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/worker-module/same-http.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/worker-module/same-http.no-redirect.https.html new file mode 100644 index 0000000..43f355c --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/worker-module/same-http.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for worker-module to same-http origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "worker-module", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/worker-module/same-https.keep-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/worker-module/same-https.keep-scheme.https.html new file mode 100644 index 0000000..1710a72 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/worker-module/same-https.keep-scheme.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Allowed content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of allowed content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/"> + <meta name="assert" content="Mixed-Content: Expects allowed for worker-module to same-https origin and keep-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "keep-scheme", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "worker-module", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/worker-module/same-https.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/worker-module/same-https.no-redirect.https.html new file mode 100644 index 0000000..bc9af1419 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/worker-module/same-https.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Allowed content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of allowed content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/"> + <meta name="assert" content="Mixed-Content: Expects allowed for worker-module to same-https origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "worker-module", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/xhr/cross-http.keep-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/xhr/cross-http.keep-scheme.https.html new file mode 100644 index 0000000..595dea3 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/xhr/cross-http.keep-scheme.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for xhr to cross-http origin and keep-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-http", + "redirection": "keep-scheme", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/xhr/cross-http.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/xhr/cross-http.no-redirect.https.html new file mode 100644 index 0000000..86bc76d0 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/xhr/cross-http.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-http", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/xhr/cross-http.swap-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/xhr/cross-http.swap-scheme.https.html new file mode 100644 index 0000000..58ec420 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/xhr/cross-http.swap-scheme.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for xhr to cross-http origin and swap-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-http", + "redirection": "swap-scheme", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/xhr/same-http.keep-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/xhr/same-http.keep-scheme.https.html new file mode 100644 index 0000000..04e6f11 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/xhr/same-http.keep-scheme.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for xhr to same-http origin and keep-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "keep-scheme", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/xhr/same-http.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/xhr/same-http.no-redirect.https.html new file mode 100644 index 0000000..013fc26 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/xhr/same-http.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/xhr/same-http.swap-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/xhr/same-http.swap-scheme.https.html new file mode 100644 index 0000000..37e2a3a --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/xhr/same-http.swap-scheme.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for xhr to same-http origin and swap-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "swap-scheme", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/xhr/same-https.keep-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/xhr/same-https.keep-scheme.https.html new file mode 100644 index 0000000..6fdf8df --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/xhr/same-https.keep-scheme.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Allowed content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of allowed content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/"> + <meta name="assert" content="Mixed-Content: Expects allowed for xhr to same-https origin and keep-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "keep-scheme", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/xhr/same-https.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/xhr/same-https.no-redirect.https.html new file mode 100644 index 0000000..0db3796 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-classic-inherit.meta/unset/xhr/same-https.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Allowed content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of allowed content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/"> + <meta name="assert" content="Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/cross-http.keep-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/cross-http.keep-scheme.https.html new file mode 100644 index 0000000..ee7f92d --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/cross-http.keep-scheme.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for fetch to cross-http origin and keep-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-http", + "redirection": "keep-scheme", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/cross-http.keep-scheme.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/cross-http.keep-scheme.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/cross-http.keep-scheme.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/cross-http.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/cross-http.no-redirect.https.html new file mode 100644 index 0000000..11cf0b3 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/cross-http.no-redirect.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-http", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/cross-http.no-redirect.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/cross-http.no-redirect.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/cross-http.no-redirect.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/cross-http.swap-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/cross-http.swap-scheme.https.html new file mode 100644 index 0000000..5d4e1f9 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/cross-http.swap-scheme.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for fetch to cross-http origin and swap-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-http", + "redirection": "swap-scheme", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/cross-http.swap-scheme.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/cross-http.swap-scheme.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/cross-http.swap-scheme.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/cross-https.swap-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/cross-https.swap-scheme.https.html new file mode 100644 index 0000000..716b3e45 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/cross-https.swap-scheme.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for fetch to cross-https origin and swap-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-https", + "redirection": "swap-scheme", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/cross-https.swap-scheme.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/cross-https.swap-scheme.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/cross-https.swap-scheme.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/same-http.keep-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/same-http.keep-scheme.https.html new file mode 100644 index 0000000..2a89687 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/same-http.keep-scheme.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for fetch to same-http origin and keep-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "keep-scheme", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/same-http.keep-scheme.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/same-http.keep-scheme.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/same-http.keep-scheme.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/same-http.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/same-http.no-redirect.https.html new file mode 100644 index 0000000..1c32d7b --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/same-http.no-redirect.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/same-http.no-redirect.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/same-http.no-redirect.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/same-http.no-redirect.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/same-http.swap-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/same-http.swap-scheme.https.html new file mode 100644 index 0000000..7c30ff0 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/same-http.swap-scheme.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for fetch to same-http origin and swap-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "swap-scheme", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/same-http.swap-scheme.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/same-http.swap-scheme.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/same-http.swap-scheme.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/same-https.keep-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/same-https.keep-scheme.https.html new file mode 100644 index 0000000..cc76742 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/same-https.keep-scheme.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Allowed content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of allowed content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/"> + <meta name="assert" content="Mixed-Content: Expects allowed for fetch to same-https origin and keep-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "keep-scheme", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/same-https.keep-scheme.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/same-https.keep-scheme.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/same-https.keep-scheme.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/same-https.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/same-https.no-redirect.https.html new file mode 100644 index 0000000..b4ce4f5 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/same-https.no-redirect.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Allowed content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of allowed content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/"> + <meta name="assert" content="Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/same-https.no-redirect.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/same-https.no-redirect.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/same-https.no-redirect.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/same-https.swap-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/same-https.swap-scheme.https.html new file mode 100644 index 0000000..44c0c28 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/same-https.swap-scheme.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for fetch to same-https origin and swap-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-https", + "redirection": "swap-scheme", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/same-https.swap-scheme.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/same-https.swap-scheme.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch/same-https.swap-scheme.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/websocket/cross-ws.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/websocket/cross-ws.no-redirect.https.html new file mode 100644 index 0000000..f746214 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/websocket/cross-ws.no-redirect.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for websocket to cross-ws origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-ws", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "websocket", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/websocket/cross-ws.no-redirect.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/websocket/cross-ws.no-redirect.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/websocket/cross-ws.no-redirect.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/websocket/same-ws.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/websocket/same-ws.no-redirect.https.html new file mode 100644 index 0000000..a947104 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/websocket/same-ws.no-redirect.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-ws", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "websocket", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/websocket/same-ws.no-redirect.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/websocket/same-ws.no-redirect.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/websocket/same-ws.no-redirect.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/websocket/same-wss.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/websocket/same-wss.no-redirect.https.html new file mode 100644 index 0000000..4fa28864 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/websocket/same-wss.no-redirect.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Allowed content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of allowed content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/"> + <meta name="assert" content="Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-wss", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "websocket", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/websocket/same-wss.no-redirect.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/websocket/same-wss.no-redirect.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/websocket/same-wss.no-redirect.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/worker-classic/same-http.keep-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/worker-classic/same-http.keep-scheme.https.html new file mode 100644 index 0000000..c4301ea --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/worker-classic/same-http.keep-scheme.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for worker-classic to same-http origin and keep-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "keep-scheme", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "worker-classic", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/worker-classic/same-http.keep-scheme.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/worker-classic/same-http.keep-scheme.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/worker-classic/same-http.keep-scheme.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/worker-classic/same-http.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/worker-classic/same-http.no-redirect.https.html new file mode 100644 index 0000000..842b0a6 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/worker-classic/same-http.no-redirect.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for worker-classic to same-http origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "worker-classic", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/worker-classic/same-http.no-redirect.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/worker-classic/same-http.no-redirect.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/worker-classic/same-http.no-redirect.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/worker-classic/same-https.keep-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/worker-classic/same-https.keep-scheme.https.html new file mode 100644 index 0000000..449ab3e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/worker-classic/same-https.keep-scheme.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Allowed content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of allowed content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/"> + <meta name="assert" content="Mixed-Content: Expects allowed for worker-classic to same-https origin and keep-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "keep-scheme", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "worker-classic", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/worker-classic/same-https.keep-scheme.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/worker-classic/same-https.keep-scheme.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/worker-classic/same-https.keep-scheme.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/worker-classic/same-https.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/worker-classic/same-https.no-redirect.https.html new file mode 100644 index 0000000..f8a3b43 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/worker-classic/same-https.no-redirect.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Allowed content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of allowed content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/"> + <meta name="assert" content="Mixed-Content: Expects allowed for worker-classic to same-https origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "worker-classic", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/worker-classic/same-https.no-redirect.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/worker-classic/same-https.no-redirect.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/worker-classic/same-https.no-redirect.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/worker-module/same-http.keep-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/worker-module/same-http.keep-scheme.https.html new file mode 100644 index 0000000..0dd696e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/worker-module/same-http.keep-scheme.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for worker-module to same-http origin and keep-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "keep-scheme", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "worker-module", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/worker-module/same-http.keep-scheme.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/worker-module/same-http.keep-scheme.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/worker-module/same-http.keep-scheme.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/worker-module/same-http.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/worker-module/same-http.no-redirect.https.html new file mode 100644 index 0000000..09338d4 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/worker-module/same-http.no-redirect.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for worker-module to same-http origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "worker-module", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/worker-module/same-http.no-redirect.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/worker-module/same-http.no-redirect.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/worker-module/same-http.no-redirect.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/worker-module/same-https.keep-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/worker-module/same-https.keep-scheme.https.html new file mode 100644 index 0000000..24c3462 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/worker-module/same-https.keep-scheme.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Allowed content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of allowed content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/"> + <meta name="assert" content="Mixed-Content: Expects allowed for worker-module to same-https origin and keep-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "keep-scheme", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "worker-module", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/worker-module/same-https.keep-scheme.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/worker-module/same-https.keep-scheme.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/worker-module/same-https.keep-scheme.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/worker-module/same-https.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/worker-module/same-https.no-redirect.https.html new file mode 100644 index 0000000..41849c9 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/worker-module/same-https.no-redirect.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Allowed content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of allowed content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/"> + <meta name="assert" content="Mixed-Content: Expects allowed for worker-module to same-https origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "worker-module", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/worker-module/same-https.no-redirect.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/worker-module/same-https.no-redirect.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/worker-module/same-https.no-redirect.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/cross-http.keep-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/cross-http.keep-scheme.https.html new file mode 100644 index 0000000..0e633f7 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/cross-http.keep-scheme.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for xhr to cross-http origin and keep-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-http", + "redirection": "keep-scheme", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/cross-http.keep-scheme.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/cross-http.keep-scheme.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/cross-http.keep-scheme.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/cross-http.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/cross-http.no-redirect.https.html new file mode 100644 index 0000000..5d46b0a --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/cross-http.no-redirect.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-http", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/cross-http.no-redirect.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/cross-http.no-redirect.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/cross-http.no-redirect.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/cross-http.swap-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/cross-http.swap-scheme.https.html new file mode 100644 index 0000000..59bca8b --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/cross-http.swap-scheme.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for xhr to cross-http origin and swap-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-http", + "redirection": "swap-scheme", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/cross-http.swap-scheme.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/cross-http.swap-scheme.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/cross-http.swap-scheme.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/cross-https.swap-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/cross-https.swap-scheme.https.html new file mode 100644 index 0000000..06e4eacf --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/cross-https.swap-scheme.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for xhr to cross-https origin and swap-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-https", + "redirection": "swap-scheme", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/cross-https.swap-scheme.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/cross-https.swap-scheme.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/cross-https.swap-scheme.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/same-http.keep-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/same-http.keep-scheme.https.html new file mode 100644 index 0000000..15dccac --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/same-http.keep-scheme.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for xhr to same-http origin and keep-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "keep-scheme", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/same-http.keep-scheme.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/same-http.keep-scheme.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/same-http.keep-scheme.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/same-http.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/same-http.no-redirect.https.html new file mode 100644 index 0000000..6d915751 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/same-http.no-redirect.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/same-http.no-redirect.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/same-http.no-redirect.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/same-http.no-redirect.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/same-http.swap-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/same-http.swap-scheme.https.html new file mode 100644 index 0000000..5bff5900c --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/same-http.swap-scheme.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for xhr to same-http origin and swap-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "swap-scheme", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/same-http.swap-scheme.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/same-http.swap-scheme.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/same-http.swap-scheme.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/same-https.keep-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/same-https.keep-scheme.https.html new file mode 100644 index 0000000..2fbcdfcf --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/same-https.keep-scheme.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Allowed content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of allowed content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/"> + <meta name="assert" content="Mixed-Content: Expects allowed for xhr to same-https origin and keep-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "keep-scheme", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/same-https.keep-scheme.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/same-https.keep-scheme.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/same-https.keep-scheme.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/same-https.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/same-https.no-redirect.https.html new file mode 100644 index 0000000..8623005 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/same-https.no-redirect.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Allowed content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of allowed content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/"> + <meta name="assert" content="Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/same-https.no-redirect.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/same-https.no-redirect.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/same-https.no-redirect.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/same-https.swap-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/same-https.swap-scheme.https.html new file mode 100644 index 0000000..e739804 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/same-https.swap-scheme.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for xhr to same-https origin and swap-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-https", + "redirection": "swap-scheme", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/same-https.swap-scheme.https.html.headers b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/same-https.swap-scheme.https.html.headers new file mode 100644 index 0000000..46e2255e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr/same-https.swap-scheme.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: block-all-mixed-content
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/opt-in/fetch/cross-http.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/opt-in/fetch/cross-http.no-redirect.https.html new file mode 100644 index 0000000..a1e27a62 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/opt-in/fetch/cross-http.no-redirect.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-http", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/opt-in/fetch/same-http.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/opt-in/fetch/same-http.no-redirect.https.html new file mode 100644 index 0000000..ecedfa2 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/opt-in/fetch/same-http.no-redirect.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/opt-in/fetch/same-https.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/opt-in/fetch/same-https.no-redirect.https.html new file mode 100644 index 0000000..cd4f95c1 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/opt-in/fetch/same-https.no-redirect.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Allowed content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of allowed content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/"> + <meta name="assert" content="Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/opt-in/websocket/cross-ws.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/opt-in/websocket/cross-ws.no-redirect.https.html new file mode 100644 index 0000000..1dc7867c --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/opt-in/websocket/cross-ws.no-redirect.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for websocket to cross-ws origin and no-redirect redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-ws", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "websocket", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/opt-in/websocket/same-ws.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/opt-in/websocket/same-ws.no-redirect.https.html new file mode 100644 index 0000000..cf290a42 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/opt-in/websocket/same-ws.no-redirect.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-ws", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "websocket", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/opt-in/websocket/same-wss.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/opt-in/websocket/same-wss.no-redirect.https.html new file mode 100644 index 0000000..d04ffa93 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/opt-in/websocket/same-wss.no-redirect.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Allowed content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of allowed content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/"> + <meta name="assert" content="Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-wss", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "websocket", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/opt-in/worker-classic/same-http.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/opt-in/worker-classic/same-http.no-redirect.https.html new file mode 100644 index 0000000..ca66814 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/opt-in/worker-classic/same-http.no-redirect.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for worker-classic to same-http origin and no-redirect redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "worker-classic", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/opt-in/worker-classic/same-https.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/opt-in/worker-classic/same-https.no-redirect.https.html new file mode 100644 index 0000000..a0d81cd3 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/opt-in/worker-classic/same-https.no-redirect.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Allowed content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of allowed content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/"> + <meta name="assert" content="Mixed-Content: Expects allowed for worker-classic to same-https origin and no-redirect redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "worker-classic", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/opt-in/worker-module/same-http.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/opt-in/worker-module/same-http.no-redirect.https.html new file mode 100644 index 0000000..9e5e2fc --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/opt-in/worker-module/same-http.no-redirect.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for worker-module to same-http origin and no-redirect redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "worker-module", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/opt-in/worker-module/same-https.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/opt-in/worker-module/same-https.no-redirect.https.html new file mode 100644 index 0000000..35d9495 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/opt-in/worker-module/same-https.no-redirect.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Allowed content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of allowed content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/"> + <meta name="assert" content="Mixed-Content: Expects allowed for worker-module to same-https origin and no-redirect redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "worker-module", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/opt-in/xhr/cross-http.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/opt-in/xhr/cross-http.no-redirect.https.html new file mode 100644 index 0000000..1bda93c9b --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/opt-in/xhr/cross-http.no-redirect.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-http", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/opt-in/xhr/same-http.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/opt-in/xhr/same-http.no-redirect.https.html new file mode 100644 index 0000000..e6f04aa --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/opt-in/xhr/same-http.no-redirect.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/opt-in/xhr/same-https.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/opt-in/xhr/same-https.no-redirect.https.html new file mode 100644 index 0000000..a4ac042 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/opt-in/xhr/same-https.no-redirect.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Allowed content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of allowed content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/"> + <meta name="assert" content="Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/fetch/cross-http.keep-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/fetch/cross-http.keep-scheme.https.html new file mode 100644 index 0000000..6b09b996 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/fetch/cross-http.keep-scheme.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for fetch to cross-http origin and keep-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-http", + "redirection": "keep-scheme", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/fetch/cross-http.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/fetch/cross-http.no-redirect.https.html new file mode 100644 index 0000000..70b4dac --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/fetch/cross-http.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-http", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/fetch/cross-http.swap-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/fetch/cross-http.swap-scheme.https.html new file mode 100644 index 0000000..06120d2 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/fetch/cross-http.swap-scheme.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for fetch to cross-http origin and swap-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-http", + "redirection": "swap-scheme", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/fetch/same-http.keep-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/fetch/same-http.keep-scheme.https.html new file mode 100644 index 0000000..27d657f --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/fetch/same-http.keep-scheme.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for fetch to same-http origin and keep-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "keep-scheme", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/fetch/same-http.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/fetch/same-http.no-redirect.https.html new file mode 100644 index 0000000..6dbfdd5 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/fetch/same-http.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/fetch/same-http.swap-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/fetch/same-http.swap-scheme.https.html new file mode 100644 index 0000000..7e20764 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/fetch/same-http.swap-scheme.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for fetch to same-http origin and swap-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "swap-scheme", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/fetch/same-https.keep-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/fetch/same-https.keep-scheme.https.html new file mode 100644 index 0000000..86c2680 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/fetch/same-https.keep-scheme.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Allowed content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of allowed content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/"> + <meta name="assert" content="Mixed-Content: Expects allowed for fetch to same-https origin and keep-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "keep-scheme", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/fetch/same-https.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/fetch/same-https.no-redirect.https.html new file mode 100644 index 0000000..3fae4c64 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/fetch/same-https.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Allowed content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of allowed content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/"> + <meta name="assert" content="Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/websocket/cross-ws.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/websocket/cross-ws.no-redirect.https.html new file mode 100644 index 0000000..89989156 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/websocket/cross-ws.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for websocket to cross-ws origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-ws", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "websocket", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/websocket/same-ws.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/websocket/same-ws.no-redirect.https.html new file mode 100644 index 0000000..8e909d42 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/websocket/same-ws.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-ws", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "websocket", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/websocket/same-wss.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/websocket/same-wss.no-redirect.https.html new file mode 100644 index 0000000..3fc9351 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/websocket/same-wss.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Allowed content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of allowed content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/"> + <meta name="assert" content="Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-wss", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "websocket", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/worker-classic/same-http.keep-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/worker-classic/same-http.keep-scheme.https.html new file mode 100644 index 0000000..9e7d811a --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/worker-classic/same-http.keep-scheme.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for worker-classic to same-http origin and keep-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "keep-scheme", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "worker-classic", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/worker-classic/same-http.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/worker-classic/same-http.no-redirect.https.html new file mode 100644 index 0000000..4e784ea --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/worker-classic/same-http.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for worker-classic to same-http origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "worker-classic", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/worker-classic/same-https.keep-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/worker-classic/same-https.keep-scheme.https.html new file mode 100644 index 0000000..e1e1e8f --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/worker-classic/same-https.keep-scheme.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Allowed content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of allowed content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/"> + <meta name="assert" content="Mixed-Content: Expects allowed for worker-classic to same-https origin and keep-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "keep-scheme", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "worker-classic", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/worker-classic/same-https.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/worker-classic/same-https.no-redirect.https.html new file mode 100644 index 0000000..b82125e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/worker-classic/same-https.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Allowed content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of allowed content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/"> + <meta name="assert" content="Mixed-Content: Expects allowed for worker-classic to same-https origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "worker-classic", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/worker-module/same-http.keep-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/worker-module/same-http.keep-scheme.https.html new file mode 100644 index 0000000..3d647f7 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/worker-module/same-http.keep-scheme.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for worker-module to same-http origin and keep-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "keep-scheme", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "worker-module", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/worker-module/same-http.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/worker-module/same-http.no-redirect.https.html new file mode 100644 index 0000000..731c425 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/worker-module/same-http.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for worker-module to same-http origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "worker-module", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/worker-module/same-https.keep-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/worker-module/same-https.keep-scheme.https.html new file mode 100644 index 0000000..4cec52a --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/worker-module/same-https.keep-scheme.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Allowed content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of allowed content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/"> + <meta name="assert" content="Mixed-Content: Expects allowed for worker-module to same-https origin and keep-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "keep-scheme", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "worker-module", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/worker-module/same-https.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/worker-module/same-https.no-redirect.https.html new file mode 100644 index 0000000..6656c26b --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/worker-module/same-https.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Allowed content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of allowed content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/"> + <meta name="assert" content="Mixed-Content: Expects allowed for worker-module to same-https origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "worker-module", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/xhr/cross-http.keep-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/xhr/cross-http.keep-scheme.https.html new file mode 100644 index 0000000..ecb166c --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/xhr/cross-http.keep-scheme.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for xhr to cross-http origin and keep-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-http", + "redirection": "keep-scheme", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/xhr/cross-http.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/xhr/cross-http.no-redirect.https.html new file mode 100644 index 0000000..4c6dbb0 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/xhr/cross-http.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-http", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/xhr/cross-http.swap-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/xhr/cross-http.swap-scheme.https.html new file mode 100644 index 0000000..caa9aa15 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/xhr/cross-http.swap-scheme.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for xhr to cross-http origin and swap-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-http", + "redirection": "swap-scheme", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/xhr/same-http.keep-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/xhr/same-http.keep-scheme.https.html new file mode 100644 index 0000000..adb8c9e4 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/xhr/same-http.keep-scheme.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for xhr to same-http origin and keep-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "keep-scheme", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/xhr/same-http.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/xhr/same-http.no-redirect.https.html new file mode 100644 index 0000000..8f1ebcc --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/xhr/same-http.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/xhr/same-http.swap-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/xhr/same-http.swap-scheme.https.html new file mode 100644 index 0000000..8f7caed --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/xhr/same-http.swap-scheme.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Blockable content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of blockable content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable"> + <meta name="assert" content="Mixed-Content: Expects blocked for xhr to same-http origin and swap-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http", + "redirection": "swap-scheme", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/xhr/same-https.keep-scheme.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/xhr/same-https.keep-scheme.https.html new file mode 100644 index 0000000..d7462ed --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/xhr/same-https.keep-scheme.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Allowed content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of allowed content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/"> + <meta name="assert" content="Mixed-Content: Expects allowed for xhr to same-https origin and keep-scheme redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "keep-scheme", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/xhr/same-https.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/xhr/same-https.no-redirect.https.html new file mode 100644 index 0000000..1b2234a --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/worker-module-inherit.meta/unset/xhr/same-https.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` --> +<html> + <head> + <title>Mixed-Content: Allowed content</title> + <meta charset='utf-8'> + <meta name="description" content="Test behavior of allowed content."> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="http://www.w3.org/TR/mixed-content/"> + <meta name="assert" content="Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "mixedContent", + "value": "opt-in" + } + ], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/generic/spec_json.js b/third_party/blink/web_tests/external/wpt/mixed-content/generic/spec_json.js index c36a535f..79bd666 100644 --- a/third_party/blink/web_tests/external/wpt/mixed-content/generic/spec_json.js +++ b/third_party/blink/web_tests/external/wpt/mixed-content/generic/spec_json.js
@@ -1 +1 @@ -var SPEC_JSON = {"selection_pattern": "%(source_context_list)s.%(delivery_type)s/%(delivery_value)s/%(subresource)s/%(origin)s.%(redirection)s.%(source_scheme)s", "test_file_path_pattern": "gen/%(source_context_list)s.%(delivery_type)s/%(delivery_value)s/%(subresource)s/%(origin)s.%(redirection)s.%(source_scheme)s.html", "excluded_tests": [{"name": "Workers are same-origin only", "expansion": "*", "source_scheme": "*", "source_context_list": "*", "delivery_type": "*", "delivery_value": "*", "redirection": "*", "subresource": ["worker-classic", "worker-module", "sharedworker-classic", "sharedworker-module"], "origin": ["cross-https", "cross-http", "cross-http-downgrade", "cross-wss", "cross-ws", "cross-ws-downgrade"], "expectation": "*"}, {"name": "Workers are same-origin only (redirects)", "expansion": "*", "source_scheme": "*", "source_context_list": "*", "delivery_type": "*", "delivery_value": "*", "redirection": ["swap-origin", "swap-scheme"], "subresource": ["worker-classic", "worker-module", "sharedworker-classic", "sharedworker-module"], "origin": "*", "expectation": "*"}, {"name": "Websockets are ws/wss-only", "expansion": "*", "source_scheme": "*", "source_context_list": "*", "delivery_type": "*", "delivery_value": "*", "redirection": "*", "subresource": "websocket", "origin": ["same-https", "same-http", "same-http-downgrade", "cross-https", "cross-http", "cross-http-downgrade"], "expectation": "*"}, {"name": "Websockets are no-redirect only", "expansion": "*", "source_scheme": "*", "source_context_list": "*", "delivery_type": "*", "delivery_value": "*", "redirection": ["keep-origin", "swap-origin", "keep-scheme", "swap-scheme", "downgrade"], "subresource": "websocket", "origin": "*", "expectation": "*"}, {"name": "ws/wss are websocket-only", "expansion": "*", "source_scheme": "*", "source_context_list": "*", "delivery_type": "*", "delivery_value": "*", "redirection": "*", "subresource": ["area-tag", "a-tag", "fetch", "iframe-tag", "img-tag", "script-tag", "sharedworker-classic", "sharedworker-import-data", "sharedworker-module", "worker-classic", "worker-import-data", "worker-module", "worklet-animation", "worklet-animation-import-data", "worklet-audio", "worklet-audio-import-data", "worklet-layout", "worklet-layout-import-data", "worklet-paint", "worklet-paint-import-data", "xhr"], "origin": ["same-wss", "same-ws", "same-ws-downgrade", "cross-wss", "cross-ws", "cross-ws-downgrade"], "expectation": "*"}, {"name": "Skip-redundant-no-opt-in", "expansion": "*", "source_scheme": "*", "source_context_list": "*", "delivery_type": "http-rp", "delivery_value": null, "redirection": "*", "subresource": "*", "origin": "*", "expectation": "*"}, {"name": "Skip-redundant-for-opt-in-method", "expansion": "*", "source_scheme": "*", "source_context_list": "*", "delivery_type": "meta", "delivery_value": "opt-in", "redirection": ["keep-scheme", "swap-scheme"], "subresource": "*", "origin": "*", "expectation": "*"}, {"name": "source_context_list values not yet tested", "expansion": "*", "source_scheme": "*", "source_context_list": ["req", "srcdoc-inherit", "srcdoc", "iframe", "iframe-blank-inherit", "worker-classic", "worker-module"], "delivery_type": "*", "delivery_value": "*", "redirection": "*", "subresource": "*", "origin": "*", "expectation": "*"}, {"name": "subresource values not yet tested", "expansion": "*", "source_scheme": "*", "source_context_list": "*", "delivery_type": "*", "delivery_value": "*", "redirection": "*", "subresource": ["a-tag", "area-tag", "iframe-tag"], "origin": "*", "expectation": "*"}, {"name": "redirections that mixed-content tests don't care", "expansion": "*", "source_scheme": "*", "source_context_list": "*", "delivery_type": "*", "delivery_value": "*", "redirection": ["keep-origin", "swap-origin", "downgrade"], "origin": "*", "subresource": "*", "expectation": "*"}], "source_context_schema": {"supported_subresource": {"top": "*", "iframe": "*", "iframe-blank": "*", "srcdoc": "*", "worker-classic": ["xhr", "fetch", "websocket", "worker-classic", "worker-module"], "worker-module": ["xhr", "fetch", "websocket", "worker-classic", "worker-module"], "worker-classic-data": ["xhr", "fetch", "websocket"], "worker-module-data": ["xhr", "fetch", "websocket"], "sharedworker-classic": ["xhr", "fetch", "websocket"], "sharedworker-module": ["xhr", "fetch", "websocket"], "sharedworker-classic-data": ["xhr", "fetch", "websocket"], "sharedworker-module-data": ["xhr", "fetch", "websocket"]}, "supported_delivery_type": {"top": ["http-rp", "meta"], "iframe": ["http-rp", "meta"], "iframe-blank": ["meta"], "srcdoc": ["meta"], "worker-classic": ["http-rp"], "worker-module": ["http-rp"], "worker-classic-data": [], "worker-module-data": [], "sharedworker-classic": ["http-rp"], "sharedworker-module": ["http-rp"], "sharedworker-classic-data": [], "sharedworker-module-data": []}}, "source_context_list_schema": {"top": {"description": "Policy set by the top-level Document", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["policy"]}], "subresourcePolicyDeliveries": []}, "req": {"description": "Subresource request's policy should override Document's policy", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["anotherPolicy"]}], "subresourcePolicyDeliveries": ["nonNullPolicy"]}, "srcdoc-inherit": {"description": "srcdoc iframe without its own policy should inherit parent Document's policy", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["policy"]}, {"sourceContextType": "srcdoc"}], "subresourcePolicyDeliveries": []}, "srcdoc": {"description": "srcdoc iframe's policy should override parent Document's policy", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["anotherPolicy"]}, {"sourceContextType": "srcdoc", "policyDeliveries": ["nonNullPolicy"]}], "subresourcePolicyDeliveries": []}, "iframe": {"description": "external iframe's policy should override parent Document's policy", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["anotherPolicy"]}, {"sourceContextType": "iframe", "policyDeliveries": ["policy"]}], "subresourcePolicyDeliveries": []}, "iframe-blank-inherit": {"description": "blank iframe should inherit parent Document's policy", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["policy"]}, {"sourceContextType": "iframe-blank"}], "subresourcePolicyDeliveries": []}, "worker-classic": {"description": "dedicated workers shouldn't inherit its parent's policy.", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["anotherPolicy"]}, {"sourceContextType": "worker-classic", "policyDeliveries": ["policy"]}], "subresourcePolicyDeliveries": []}, "worker-classic-data": {"description": "data: dedicated workers should inherit its parent's policy.", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["policy"]}, {"sourceContextType": "worker-classic-data", "policyDeliveries": []}], "subresourcePolicyDeliveries": []}, "worker-module": {"description": "dedicated workers shouldn't inherit its parent's policy.", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["anotherPolicy"]}, {"sourceContextType": "worker-module", "policyDeliveries": ["policy"]}], "subresourcePolicyDeliveries": []}, "worker-module-data": {"description": "data: dedicated workers should inherit its parent's policy.", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["policy"]}, {"sourceContextType": "worker-module-data", "policyDeliveries": []}], "subresourcePolicyDeliveries": []}, "sharedworker-classic-data": {"description": "data: shared workers should inherit its parent's policy.", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["policy"]}, {"sourceContextType": "sharedworker-classic-data", "policyDeliveries": []}], "subresourcePolicyDeliveries": []}, "sharedworker-module-data": {"description": "data: shared workers should inherit its parent's policy.", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["policy"]}, {"sourceContextType": "sharedworker-module-data", "policyDeliveries": []}], "subresourcePolicyDeliveries": []}}, "test_expansion_schema": {"expansion": ["default", "override"], "source_scheme": ["http", "https"], "source_context_list": ["top", "req", "srcdoc-inherit", "srcdoc", "iframe", "iframe-blank-inherit", "worker-classic", "worker-classic-data", "worker-module", "worker-module-data", "sharedworker-classic-data", "sharedworker-module-data"], "redirection": ["no-redirect", "keep-origin", "swap-origin", "keep-scheme", "swap-scheme", "downgrade"], "origin": ["same-https", "same-http", "same-http-downgrade", "cross-https", "cross-http", "cross-http-downgrade", "same-wss", "same-ws", "same-ws-downgrade", "cross-wss", "cross-ws", "cross-ws-downgrade"], "subresource": ["a-tag", "area-tag", "audio-tag", "beacon", "fetch", "iframe-tag", "img-tag", "link-css-tag", "link-prefetch-tag", "object-tag", "picture-tag", "script-tag", "sharedworker-classic", "sharedworker-import-data", "sharedworker-module", "video-tag", "websocket", "worker-classic", "worker-import-data", "worker-module", "worklet-animation", "worklet-animation-import-data", "worklet-audio", "worklet-audio-import-data", "worklet-layout", "worklet-layout-import-data", "worklet-paint", "worklet-paint-import-data", "xhr"], "delivery_type": ["http-rp", "meta"], "delivery_value": [null, "opt-in"], "expectation": ["allowed", "blocked"]}, "test_description_template": "Mixed-Content: Expects %(expectation)s for %(subresource)s to %(origin)s origin and %(redirection)s redirection from %(source_scheme)s context.", "test_page_title_template": "Mixed-Content: %(title)s", "specification": [{"name": "optionally-blockable", "title": "Optionally-blockable content", "description": "Test behavior of optionally-blockable content", "specification_url": "http://www.w3.org/TR/mixed-content/#category-optionally-blockable", "test_expansion": [{"name": "opt-in-blocks", "expansion": "default", "source_scheme": "https", "source_context_list": "*", "delivery_type": "*", "delivery_value": "opt-in", "redirection": "*", "subresource": ["audio-tag", "img-tag", "video-tag"], "origin": ["cross-http", "same-http"], "expectation": "blocked"}, {"name": "opt-in-blocks-redirects", "expansion": "default", "source_scheme": "https", "source_context_list": "*", "delivery_type": "*", "delivery_value": "opt-in", "redirection": "swap-scheme", "subresource": ["audio-tag", "img-tag", "video-tag"], "origin": ["same-https", "cross-https"], "expectation": "blocked"}, {"name": "no-opt-in-allows", "expansion": "default", "source_scheme": "https", "source_context_list": "*", "delivery_type": "*", "delivery_value": null, "redirection": "*", "subresource": ["audio-tag", "img-tag", "video-tag"], "origin": ["cross-http", "same-http"], "expectation": "allowed"}]}, {"name": "blockable", "title": "Blockable content", "description": "Test behavior of blockable content.", "specification_url": "http://www.w3.org/TR/mixed-content/#category-blockable", "test_expansion": [{"name": "opt-in-blocks", "expansion": "default", "source_scheme": "https", "source_context_list": "*", "delivery_type": "*", "delivery_value": "opt-in", "redirection": "*", "subresource": ["a-tag", "beacon", "fetch", "link-css-tag", "link-prefetch-tag", "object-tag", "picture-tag", "script-tag", "sharedworker-classic", "sharedworker-import-data", "sharedworker-module", "websocket", "worker-classic", "worker-import-data", "worker-module", "worklet-animation", "worklet-animation-import-data", "worklet-audio", "worklet-audio-import-data", "worklet-layout", "worklet-layout-import-data", "worklet-paint", "worklet-paint-import-data", "xhr"], "origin": ["cross-http", "same-http"], "expectation": "blocked"}, {"name": "opt-in-blocks-redirects", "expansion": "default", "source_scheme": "https", "source_context_list": "*", "delivery_type": "*", "delivery_value": "opt-in", "redirection": "swap-scheme", "subresource": ["a-tag", "beacon", "fetch", "link-css-tag", "link-prefetch-tag", "object-tag", "picture-tag", "script-tag", "sharedworker-classic", "sharedworker-import-data", "sharedworker-module", "websocket", "worker-classic", "worker-import-data", "worker-module", "worklet-animation", "worklet-animation-import-data", "worklet-audio", "worklet-audio-import-data", "worklet-layout", "worklet-layout-import-data", "worklet-paint", "worklet-paint-import-data", "xhr"], "origin": ["same-https", "cross-https"], "expectation": "blocked"}, {"name": "no-opt-in-blocks", "expansion": "default", "source_scheme": "https", "source_context_list": "*", "delivery_type": "*", "delivery_value": null, "redirection": "*", "subresource": ["a-tag", "beacon", "fetch", "link-css-tag", "link-prefetch-tag", "object-tag", "picture-tag", "script-tag", "sharedworker-classic", "sharedworker-import-data", "sharedworker-module", "websocket", "worker-classic", "worker-import-data", "worker-module", "worklet-animation", "worklet-animation-import-data", "worklet-audio", "worklet-audio-import-data", "worklet-layout", "worklet-layout-import-data", "worklet-paint", "worklet-paint-import-data", "xhr"], "origin": ["cross-http", "same-http"], "expectation": "blocked"}, {"name": "ws-downgrade-blocks", "expansion": "default", "source_scheme": "https", "source_context_list": "*", "delivery_type": "*", "delivery_value": "*", "redirection": "*", "subresource": "websocket", "origin": ["cross-ws", "same-ws"], "expectation": "blocked"}]}, {"name": "allowed", "title": "Allowed content", "description": "Test behavior of allowed content.", "specification_url": "http://www.w3.org/TR/mixed-content/", "test_expansion": [{"name": "allowed", "expansion": "default", "source_scheme": "https", "source_context_list": "*", "delivery_type": "*", "delivery_value": "*", "redirection": ["no-redirect", "keep-scheme"], "subresource": "*", "origin": ["same-https"], "expectation": "allowed"}, {"name": "websocket-allowed", "expansion": "default", "source_scheme": "https", "source_context_list": "*", "delivery_type": "*", "delivery_value": "*", "redirection": ["no-redirect", "keep-scheme"], "subresource": "websocket", "origin": ["same-wss"], "expectation": "allowed"}]}], "delivery_key": "mixedContent", "subresource_schema": {"supported_delivery_type": {"a-tag": [], "area-tag": [], "audio-tag": [], "beacon": [], "fetch": [], "iframe-tag": [], "img-tag": [], "link-css-tag": [], "link-prefetch-tag": [], "object-tag": [], "picture-tag": [], "script-tag": [], "sharedworker-classic": [], "sharedworker-import-data": [], "sharedworker-module": [], "video-tag": [], "websocket": [], "worker-classic": [], "worker-import-data": [], "worker-module": [], "worklet-animation": [], "worklet-animation-import-data": [], "worklet-audio": [], "worklet-audio-import-data": [], "worklet-layout": [], "worklet-layout-import-data": [], "worklet-paint": [], "worklet-paint-import-data": [], "xhr": []}}}; +var SPEC_JSON = {"selection_pattern": "%(source_context_list)s.%(delivery_type)s/%(delivery_value)s/%(subresource)s/%(origin)s.%(redirection)s.%(source_scheme)s", "test_file_path_pattern": "gen/%(source_context_list)s.%(delivery_type)s/%(delivery_value)s/%(subresource)s/%(origin)s.%(redirection)s.%(source_scheme)s.html", "excluded_tests": [{"name": "Workers are same-origin only", "expansion": "*", "source_scheme": "*", "source_context_list": "*", "delivery_type": "*", "delivery_value": "*", "redirection": "*", "subresource": ["worker-classic", "worker-module", "sharedworker-classic", "sharedworker-module"], "origin": ["cross-https", "cross-http", "cross-http-downgrade", "cross-wss", "cross-ws", "cross-ws-downgrade"], "expectation": "*"}, {"name": "Workers are same-origin only (redirects)", "expansion": "*", "source_scheme": "*", "source_context_list": "*", "delivery_type": "*", "delivery_value": "*", "redirection": ["swap-origin", "swap-scheme"], "subresource": ["worker-classic", "worker-module", "sharedworker-classic", "sharedworker-module"], "origin": "*", "expectation": "*"}, {"name": "Websockets are ws/wss-only", "expansion": "*", "source_scheme": "*", "source_context_list": "*", "delivery_type": "*", "delivery_value": "*", "redirection": "*", "subresource": "websocket", "origin": ["same-https", "same-http", "same-http-downgrade", "cross-https", "cross-http", "cross-http-downgrade"], "expectation": "*"}, {"name": "Websockets are no-redirect only", "expansion": "*", "source_scheme": "*", "source_context_list": "*", "delivery_type": "*", "delivery_value": "*", "redirection": ["keep-origin", "swap-origin", "keep-scheme", "swap-scheme", "downgrade"], "subresource": "websocket", "origin": "*", "expectation": "*"}, {"name": "ws/wss are websocket-only", "expansion": "*", "source_scheme": "*", "source_context_list": "*", "delivery_type": "*", "delivery_value": "*", "redirection": "*", "subresource": ["area-tag", "a-tag", "fetch", "iframe-tag", "img-tag", "script-tag", "sharedworker-classic", "sharedworker-import-data", "sharedworker-module", "worker-classic", "worker-import-data", "worker-module", "worklet-animation", "worklet-animation-import-data", "worklet-audio", "worklet-audio-import-data", "worklet-layout", "worklet-layout-import-data", "worklet-paint", "worklet-paint-import-data", "xhr"], "origin": ["same-wss", "same-ws", "same-ws-downgrade", "cross-wss", "cross-ws", "cross-ws-downgrade"], "expectation": "*"}, {"name": "Skip-redundant-no-opt-in", "expansion": "*", "source_scheme": "*", "source_context_list": "*", "delivery_type": "http-rp", "delivery_value": null, "redirection": "*", "subresource": "*", "origin": "*", "expectation": "*"}, {"name": "Skip-redundant-for-opt-in-method", "expansion": "*", "source_scheme": "*", "source_context_list": "*", "delivery_type": "meta", "delivery_value": "opt-in", "redirection": ["keep-scheme", "swap-scheme"], "subresource": "*", "origin": "*", "expectation": "*"}, {"name": "source_context_list values not yet tested", "expansion": "*", "source_scheme": "*", "source_context_list": ["req", "srcdoc-inherit", "srcdoc", "iframe", "iframe-blank-inherit"], "delivery_type": "*", "delivery_value": "*", "redirection": "*", "subresource": "*", "origin": "*", "expectation": "*"}, {"name": "source_context_list values not for CSP tests", "expansion": "*", "source_scheme": "*", "source_context_list": ["worker-classic", "worker-module"], "delivery_type": "*", "delivery_value": "*", "redirection": "*", "subresource": "*", "origin": "*", "expectation": "*"}, {"name": "subresource values not yet tested", "expansion": "*", "source_scheme": "*", "source_context_list": "*", "delivery_type": "*", "delivery_value": "*", "redirection": "*", "subresource": ["a-tag", "area-tag", "iframe-tag"], "origin": "*", "expectation": "*"}, {"name": "redirections that mixed-content tests don't care", "expansion": "*", "source_scheme": "*", "source_context_list": "*", "delivery_type": "*", "delivery_value": "*", "redirection": ["keep-origin", "swap-origin", "downgrade"], "origin": "*", "subresource": "*", "expectation": "*"}], "source_context_schema": {"supported_subresource": {"top": "*", "iframe": "*", "iframe-blank": "*", "srcdoc": "*", "worker-classic": ["xhr", "fetch", "websocket", "worker-classic", "worker-module"], "worker-module": ["xhr", "fetch", "websocket", "worker-classic", "worker-module"], "worker-classic-data": ["xhr", "fetch", "websocket"], "worker-module-data": ["xhr", "fetch", "websocket"], "sharedworker-classic": ["xhr", "fetch", "websocket"], "sharedworker-module": ["xhr", "fetch", "websocket"], "sharedworker-classic-data": ["xhr", "fetch", "websocket"], "sharedworker-module-data": ["xhr", "fetch", "websocket"]}, "supported_delivery_type": {"top": ["http-rp", "meta"], "iframe": ["http-rp", "meta"], "iframe-blank": ["meta"], "srcdoc": ["meta"], "worker-classic": ["http-rp"], "worker-module": ["http-rp"], "worker-classic-data": [], "worker-module-data": [], "sharedworker-classic": ["http-rp"], "sharedworker-module": ["http-rp"], "sharedworker-classic-data": [], "sharedworker-module-data": []}}, "source_context_list_schema": {"top": {"description": "Policy set by the top-level Document", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["policy"]}], "subresourcePolicyDeliveries": []}, "req": {"description": "Subresource request's policy should override Document's policy", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["anotherPolicy"]}], "subresourcePolicyDeliveries": ["nonNullPolicy"]}, "srcdoc-inherit": {"description": "srcdoc iframe without its own policy should inherit parent Document's policy", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["policy"]}, {"sourceContextType": "srcdoc"}], "subresourcePolicyDeliveries": []}, "srcdoc": {"description": "srcdoc iframe's policy should override parent Document's policy", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["anotherPolicy"]}, {"sourceContextType": "srcdoc", "policyDeliveries": ["nonNullPolicy"]}], "subresourcePolicyDeliveries": []}, "iframe": {"description": "external iframe's policy should override parent Document's policy", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["anotherPolicy"]}, {"sourceContextType": "iframe", "policyDeliveries": ["policy"]}], "subresourcePolicyDeliveries": []}, "iframe-blank-inherit": {"description": "blank iframe should inherit parent Document's policy", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["policy"]}, {"sourceContextType": "iframe-blank"}], "subresourcePolicyDeliveries": []}, "worker-classic": {"description": "dedicated workers shouldn't inherit its parent's policy.", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["anotherPolicy"]}, {"sourceContextType": "worker-classic", "policyDeliveries": ["policy"]}], "subresourcePolicyDeliveries": []}, "worker-classic-inherit": {"description": "dedicated workers should inherit its parent's policy.", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["policy"]}, {"sourceContextType": "worker-classic", "policyDeliveries": ["anotherPolicy"]}], "subresourcePolicyDeliveries": []}, "worker-classic-data": {"description": "data: dedicated workers should inherit its parent's policy.", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["policy"]}, {"sourceContextType": "worker-classic-data", "policyDeliveries": []}], "subresourcePolicyDeliveries": []}, "worker-module": {"description": "dedicated workers shouldn't inherit its parent's policy.", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["anotherPolicy"]}, {"sourceContextType": "worker-module", "policyDeliveries": ["policy"]}], "subresourcePolicyDeliveries": []}, "worker-module-inherit": {"description": "dedicated workers should inherit its parent's policy.", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["policy"]}, {"sourceContextType": "worker-module", "policyDeliveries": ["anotherPolicy"]}], "subresourcePolicyDeliveries": []}, "worker-module-data": {"description": "data: dedicated workers should inherit its parent's policy.", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["policy"]}, {"sourceContextType": "worker-module-data", "policyDeliveries": []}], "subresourcePolicyDeliveries": []}, "sharedworker-classic": {"description": "shared workers shouldn't inherit its parent's policy.", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["anotherPolicy"]}, {"sourceContextType": "sharedworker-classic", "policyDeliveries": ["policy"]}], "subresourcePolicyDeliveries": []}, "sharedworker-classic-data": {"description": "data: shared workers should inherit its parent's policy.", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["policy"]}, {"sourceContextType": "sharedworker-classic-data", "policyDeliveries": []}], "subresourcePolicyDeliveries": []}, "sharedworker-module": {"description": "shared workers shouldn't inherit its parent's policy.", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["anotherPolicy"]}, {"sourceContextType": "sharedworker-module", "policyDeliveries": ["policy"]}], "subresourcePolicyDeliveries": []}, "sharedworker-module-data": {"description": "data: shared workers should inherit its parent's policy.", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["policy"]}, {"sourceContextType": "sharedworker-module-data", "policyDeliveries": []}], "subresourcePolicyDeliveries": []}}, "test_expansion_schema": {"expansion": ["default", "override"], "source_scheme": ["http", "https"], "source_context_list": ["top", "req", "srcdoc-inherit", "srcdoc", "iframe", "iframe-blank-inherit", "worker-classic", "worker-classic-inherit", "worker-classic-data", "worker-module", "worker-module-inherit", "worker-module-data", "sharedworker-classic", "sharedworker-classic-data", "sharedworker-module", "sharedworker-module-data"], "redirection": ["no-redirect", "keep-origin", "swap-origin", "keep-scheme", "swap-scheme", "downgrade"], "origin": ["same-https", "same-http", "same-http-downgrade", "cross-https", "cross-http", "cross-http-downgrade", "same-wss", "same-ws", "same-ws-downgrade", "cross-wss", "cross-ws", "cross-ws-downgrade"], "subresource": ["a-tag", "area-tag", "audio-tag", "beacon", "fetch", "iframe-tag", "img-tag", "link-css-tag", "link-prefetch-tag", "object-tag", "picture-tag", "script-tag", "sharedworker-classic", "sharedworker-import-data", "sharedworker-module", "video-tag", "websocket", "worker-classic", "worker-import-data", "worker-module", "worklet-animation", "worklet-animation-import-data", "worklet-audio", "worklet-audio-import-data", "worklet-layout", "worklet-layout-import-data", "worklet-paint", "worklet-paint-import-data", "xhr"], "delivery_type": ["http-rp", "meta"], "delivery_value": [null, "opt-in"], "expectation": ["allowed", "blocked"]}, "test_description_template": "Mixed-Content: Expects %(expectation)s for %(subresource)s to %(origin)s origin and %(redirection)s redirection from %(source_scheme)s context.", "test_page_title_template": "Mixed-Content: %(title)s", "specification": [{"name": "optionally-blockable", "title": "Optionally-blockable content", "description": "Test behavior of optionally-blockable content", "specification_url": "http://www.w3.org/TR/mixed-content/#category-optionally-blockable", "test_expansion": [{"name": "opt-in-blocks", "expansion": "default", "source_scheme": "https", "source_context_list": "*", "delivery_type": "*", "delivery_value": "opt-in", "redirection": "*", "subresource": ["audio-tag", "img-tag", "video-tag"], "origin": ["cross-http", "same-http"], "expectation": "blocked"}, {"name": "opt-in-blocks-redirects", "expansion": "default", "source_scheme": "https", "source_context_list": "*", "delivery_type": "*", "delivery_value": "opt-in", "redirection": "swap-scheme", "subresource": ["audio-tag", "img-tag", "video-tag"], "origin": ["same-https", "cross-https"], "expectation": "blocked"}, {"name": "no-opt-in-allows", "expansion": "default", "source_scheme": "https", "source_context_list": "*", "delivery_type": "*", "delivery_value": null, "redirection": "*", "subresource": ["audio-tag", "img-tag", "video-tag"], "origin": ["cross-http", "same-http"], "expectation": "allowed"}]}, {"name": "blockable", "title": "Blockable content", "description": "Test behavior of blockable content.", "specification_url": "http://www.w3.org/TR/mixed-content/#category-blockable", "test_expansion": [{"name": "opt-in-blocks", "expansion": "default", "source_scheme": "https", "source_context_list": "*", "delivery_type": "*", "delivery_value": "opt-in", "redirection": "*", "subresource": ["a-tag", "beacon", "fetch", "link-css-tag", "link-prefetch-tag", "object-tag", "picture-tag", "script-tag", "sharedworker-classic", "sharedworker-import-data", "sharedworker-module", "websocket", "worker-classic", "worker-import-data", "worker-module", "worklet-animation", "worklet-animation-import-data", "worklet-audio", "worklet-audio-import-data", "worklet-layout", "worklet-layout-import-data", "worklet-paint", "worklet-paint-import-data", "xhr"], "origin": ["cross-http", "same-http"], "expectation": "blocked"}, {"name": "opt-in-blocks-redirects", "expansion": "default", "source_scheme": "https", "source_context_list": "*", "delivery_type": "*", "delivery_value": "opt-in", "redirection": "swap-scheme", "subresource": ["a-tag", "beacon", "fetch", "link-css-tag", "link-prefetch-tag", "object-tag", "picture-tag", "script-tag", "sharedworker-classic", "sharedworker-import-data", "sharedworker-module", "websocket", "worker-classic", "worker-import-data", "worker-module", "worklet-animation", "worklet-animation-import-data", "worklet-audio", "worklet-audio-import-data", "worklet-layout", "worklet-layout-import-data", "worklet-paint", "worklet-paint-import-data", "xhr"], "origin": ["same-https", "cross-https"], "expectation": "blocked"}, {"name": "no-opt-in-blocks", "expansion": "default", "source_scheme": "https", "source_context_list": "*", "delivery_type": "*", "delivery_value": null, "redirection": "*", "subresource": ["a-tag", "beacon", "fetch", "link-css-tag", "link-prefetch-tag", "object-tag", "picture-tag", "script-tag", "sharedworker-classic", "sharedworker-import-data", "sharedworker-module", "websocket", "worker-classic", "worker-import-data", "worker-module", "worklet-animation", "worklet-animation-import-data", "worklet-audio", "worklet-audio-import-data", "worklet-layout", "worklet-layout-import-data", "worklet-paint", "worklet-paint-import-data", "xhr"], "origin": ["cross-http", "same-http"], "expectation": "blocked"}, {"name": "ws-downgrade-blocks", "expansion": "default", "source_scheme": "https", "source_context_list": "*", "delivery_type": "*", "delivery_value": "*", "redirection": "*", "subresource": "websocket", "origin": ["cross-ws", "same-ws"], "expectation": "blocked"}]}, {"name": "allowed", "title": "Allowed content", "description": "Test behavior of allowed content.", "specification_url": "http://www.w3.org/TR/mixed-content/", "test_expansion": [{"name": "allowed", "expansion": "default", "source_scheme": "https", "source_context_list": "*", "delivery_type": "*", "delivery_value": "*", "redirection": ["no-redirect", "keep-scheme"], "subresource": "*", "origin": ["same-https"], "expectation": "allowed"}, {"name": "websocket-allowed", "expansion": "default", "source_scheme": "https", "source_context_list": "*", "delivery_type": "*", "delivery_value": "*", "redirection": ["no-redirect", "keep-scheme"], "subresource": "websocket", "origin": ["same-wss"], "expectation": "allowed"}]}], "delivery_key": "mixedContent", "subresource_schema": {"supported_delivery_type": {"a-tag": [], "area-tag": [], "audio-tag": [], "beacon": [], "fetch": [], "iframe-tag": [], "img-tag": [], "link-css-tag": [], "link-prefetch-tag": [], "object-tag": [], "picture-tag": [], "script-tag": [], "sharedworker-classic": [], "sharedworker-import-data": [], "sharedworker-module": [], "video-tag": [], "websocket": [], "worker-classic": [], "worker-import-data": [], "worker-module": [], "worklet-animation": [], "worklet-animation-import-data": [], "worklet-audio": [], "worklet-audio-import-data": [], "worklet-layout": [], "worklet-layout-import-data": [], "worklet-paint": [], "worklet-paint-import-data": [], "xhr": []}}};
diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/spec.src.json b/third_party/blink/web_tests/external/wpt/mixed-content/spec.src.json index 1684370..5d92d77 100644 --- a/third_party/blink/web_tests/external/wpt/mixed-content/spec.src.json +++ b/third_party/blink/web_tests/external/wpt/mixed-content/spec.src.json
@@ -291,9 +291,22 @@ "srcdoc-inherit", "srcdoc", "iframe", - "iframe-blank-inherit", + "iframe-blank-inherit" + ], + "delivery_type": "*", + "delivery_value": "*", + "redirection": "*", + "subresource": "*", + "origin": "*", + "expectation": "*" + }, + { + "name": "source_context_list values not for CSP tests", + "expansion": "*", + "source_scheme": "*", + "source_context_list": [ "worker-classic", - "worker-module", + "worker-module" ], "delivery_type": "*", "delivery_value": "*",
diff --git a/third_party/blink/web_tests/external/wpt/referrer-policy/spec.src.json b/third_party/blink/web_tests/external/wpt/referrer-policy/spec.src.json index 9063428..47055ab 100644 --- a/third_party/blink/web_tests/external/wpt/referrer-policy/spec.src.json +++ b/third_party/blink/web_tests/external/wpt/referrer-policy/spec.src.json
@@ -690,7 +690,9 @@ "source_scheme": "*", "source_context_list": [ "iframe-blank-inherit", + "sharedworker-classic", "sharedworker-classic-data", + "sharedworker-module", "sharedworker-module-data", "worker-classic-data", "worker-module-data" @@ -702,6 +704,21 @@ "origin": "*", "expectation": "*" }, + { + "name": "source_context_list values not for referrer-policy tests", + "expansion": "*", + "source_scheme": "*", + "source_context_list": [ + "worker-classic-inherit", + "worker-module-inherit" + ], + "delivery_type": "*", + "delivery_value": "*", + "redirection": "*", + "subresource": "*", + "origin": "*", + "expectation": "*" + } ], "source_context_schema": { "supported_delivery_type": {
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/fetch/cross-http-downgrade.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/fetch/cross-http-downgrade.downgrade.https.html new file mode 100644 index 0000000..61b8771 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/fetch/cross-http-downgrade.downgrade.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "cross-http-downgrade", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "sharedworker-classic" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/fetch/cross-http-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/fetch/cross-http-downgrade.no-redirect.https.html new file mode 100644 index 0000000..cf33de98 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/fetch/cross-http-downgrade.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "cross-http-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "sharedworker-classic" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/fetch/cross-https.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/fetch/cross-https.downgrade.https.html new file mode 100644 index 0000000..d8cb387 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/fetch/cross-https.downgrade.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for fetch to cross-https origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "cross-https", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "sharedworker-classic" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/fetch/same-http-downgrade.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/fetch/same-http-downgrade.downgrade.https.html new file mode 100644 index 0000000..f6f20b96 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/fetch/same-http-downgrade.downgrade.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-http-downgrade", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "sharedworker-classic" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/fetch/same-http-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/fetch/same-http-downgrade.no-redirect.https.html new file mode 100644 index 0000000..ed733b3 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/fetch/same-http-downgrade.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-http-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "sharedworker-classic" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/fetch/same-https.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/fetch/same-https.downgrade.https.html new file mode 100644 index 0000000..123082b --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/fetch/same-https.downgrade.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for fetch to same-https origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "sharedworker-classic" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/websocket/cross-ws-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/websocket/cross-ws-downgrade.no-redirect.https.html new file mode 100644 index 0000000..72bd9333 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/websocket/cross-ws-downgrade.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for websocket to cross-ws-downgrade origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "cross-ws-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "sharedworker-classic" + } + ], + "source_scheme": "https", + "subresource": "websocket", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/websocket/same-ws-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/websocket/same-ws-downgrade.no-redirect.https.html new file mode 100644 index 0000000..dcbf07f7 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/websocket/same-ws-downgrade.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for websocket to same-ws-downgrade origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-ws-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "sharedworker-classic" + } + ], + "source_scheme": "https", + "subresource": "websocket", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/xhr/cross-http-downgrade.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/xhr/cross-http-downgrade.downgrade.https.html new file mode 100644 index 0000000..bdc7fb2 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/xhr/cross-http-downgrade.downgrade.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "cross-http-downgrade", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "sharedworker-classic" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/xhr/cross-http-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/xhr/cross-http-downgrade.no-redirect.https.html new file mode 100644 index 0000000..8f18e37 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/xhr/cross-http-downgrade.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "cross-http-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "sharedworker-classic" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/xhr/cross-https.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/xhr/cross-https.downgrade.https.html new file mode 100644 index 0000000..a43a316 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/xhr/cross-https.downgrade.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for xhr to cross-https origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "cross-https", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "sharedworker-classic" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/xhr/same-http-downgrade.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/xhr/same-http-downgrade.downgrade.https.html new file mode 100644 index 0000000..c060ae2 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/xhr/same-http-downgrade.downgrade.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-http-downgrade", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "sharedworker-classic" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/xhr/same-http-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/xhr/same-http-downgrade.no-redirect.https.html new file mode 100644 index 0000000..30bea81 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/xhr/same-http-downgrade.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-http-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "sharedworker-classic" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/xhr/same-https.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/xhr/same-https.downgrade.https.html new file mode 100644 index 0000000..a6d63979 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/xhr/same-https.downgrade.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for xhr to same-https origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "sharedworker-classic" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/fetch/cross-http-downgrade.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/fetch/cross-http-downgrade.downgrade.https.html new file mode 100644 index 0000000..1369927 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/fetch/cross-http-downgrade.downgrade.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "cross-http-downgrade", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "sharedworker-module" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/fetch/cross-http-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/fetch/cross-http-downgrade.no-redirect.https.html new file mode 100644 index 0000000..f33ac5c --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/fetch/cross-http-downgrade.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "cross-http-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "sharedworker-module" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/fetch/cross-https.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/fetch/cross-https.downgrade.https.html new file mode 100644 index 0000000..3054462 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/fetch/cross-https.downgrade.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for fetch to cross-https origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "cross-https", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "sharedworker-module" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/fetch/same-http-downgrade.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/fetch/same-http-downgrade.downgrade.https.html new file mode 100644 index 0000000..c2db82d --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/fetch/same-http-downgrade.downgrade.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-http-downgrade", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "sharedworker-module" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/fetch/same-http-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/fetch/same-http-downgrade.no-redirect.https.html new file mode 100644 index 0000000..683d3683 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/fetch/same-http-downgrade.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-http-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "sharedworker-module" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/fetch/same-https.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/fetch/same-https.downgrade.https.html new file mode 100644 index 0000000..9f7061e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/fetch/same-https.downgrade.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for fetch to same-https origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "sharedworker-module" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/websocket/cross-ws-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/websocket/cross-ws-downgrade.no-redirect.https.html new file mode 100644 index 0000000..845eea6 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/websocket/cross-ws-downgrade.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for websocket to cross-ws-downgrade origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "cross-ws-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "sharedworker-module" + } + ], + "source_scheme": "https", + "subresource": "websocket", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/websocket/same-ws-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/websocket/same-ws-downgrade.no-redirect.https.html new file mode 100644 index 0000000..c982b10a --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/websocket/same-ws-downgrade.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for websocket to same-ws-downgrade origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-ws-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "sharedworker-module" + } + ], + "source_scheme": "https", + "subresource": "websocket", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/xhr/cross-http-downgrade.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/xhr/cross-http-downgrade.downgrade.https.html new file mode 100644 index 0000000..24dc6fc --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/xhr/cross-http-downgrade.downgrade.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "cross-http-downgrade", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "sharedworker-module" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/xhr/cross-http-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/xhr/cross-http-downgrade.no-redirect.https.html new file mode 100644 index 0000000..1eaa99d --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/xhr/cross-http-downgrade.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "cross-http-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "sharedworker-module" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/xhr/cross-https.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/xhr/cross-https.downgrade.https.html new file mode 100644 index 0000000..dd536795 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/xhr/cross-https.downgrade.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for xhr to cross-https origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "cross-https", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "sharedworker-module" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/xhr/same-http-downgrade.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/xhr/same-http-downgrade.downgrade.https.html new file mode 100644 index 0000000..1d24f75 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/xhr/same-http-downgrade.downgrade.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-http-downgrade", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "sharedworker-module" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/xhr/same-http-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/xhr/same-http-downgrade.no-redirect.https.html new file mode 100644 index 0000000..0433b4e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/xhr/same-http-downgrade.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-http-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "sharedworker-module" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/xhr/same-https.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/xhr/same-https.downgrade.https.html new file mode 100644 index 0000000..85419739 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/xhr/same-https.downgrade.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for xhr to same-https origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "sharedworker-module" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/fetch/cross-http-downgrade.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/fetch/cross-http-downgrade.downgrade.https.html new file mode 100644 index 0000000..6343f36 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/fetch/cross-http-downgrade.downgrade.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "cross-http-downgrade", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/fetch/cross-http-downgrade.downgrade.https.html.headers b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/fetch/cross-http-downgrade.downgrade.https.html.headers new file mode 100644 index 0000000..602d9dc3 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/fetch/cross-http-downgrade.downgrade.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: upgrade-insecure-requests
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/fetch/cross-http-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/fetch/cross-http-downgrade.no-redirect.https.html new file mode 100644 index 0000000..577b857 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/fetch/cross-http-downgrade.no-redirect.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "cross-http-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/fetch/cross-http-downgrade.no-redirect.https.html.headers b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/fetch/cross-http-downgrade.no-redirect.https.html.headers new file mode 100644 index 0000000..602d9dc3 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/fetch/cross-http-downgrade.no-redirect.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: upgrade-insecure-requests
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/fetch/cross-https.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/fetch/cross-https.downgrade.https.html new file mode 100644 index 0000000..e05cc38 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/fetch/cross-https.downgrade.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for fetch to cross-https origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "cross-https", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/fetch/cross-https.downgrade.https.html.headers b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/fetch/cross-https.downgrade.https.html.headers new file mode 100644 index 0000000..602d9dc3 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/fetch/cross-https.downgrade.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: upgrade-insecure-requests
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/fetch/same-http-downgrade.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/fetch/same-http-downgrade.downgrade.https.html new file mode 100644 index 0000000..5353e644 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/fetch/same-http-downgrade.downgrade.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-http-downgrade", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/fetch/same-http-downgrade.downgrade.https.html.headers b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/fetch/same-http-downgrade.downgrade.https.html.headers new file mode 100644 index 0000000..602d9dc3 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/fetch/same-http-downgrade.downgrade.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: upgrade-insecure-requests
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/fetch/same-http-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/fetch/same-http-downgrade.no-redirect.https.html new file mode 100644 index 0000000..eddd8cb2 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/fetch/same-http-downgrade.no-redirect.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-http-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/fetch/same-http-downgrade.no-redirect.https.html.headers b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/fetch/same-http-downgrade.no-redirect.https.html.headers new file mode 100644 index 0000000..602d9dc3 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/fetch/same-http-downgrade.no-redirect.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: upgrade-insecure-requests
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/fetch/same-https.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/fetch/same-https.downgrade.https.html new file mode 100644 index 0000000..0f1e15c --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/fetch/same-https.downgrade.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for fetch to same-https origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/fetch/same-https.downgrade.https.html.headers b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/fetch/same-https.downgrade.https.html.headers new file mode 100644 index 0000000..602d9dc3 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/fetch/same-https.downgrade.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: upgrade-insecure-requests
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/websocket/cross-ws-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/websocket/cross-ws-downgrade.no-redirect.https.html new file mode 100644 index 0000000..2aba803 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/websocket/cross-ws-downgrade.no-redirect.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for websocket to cross-ws-downgrade origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "cross-ws-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "websocket", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/websocket/cross-ws-downgrade.no-redirect.https.html.headers b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/websocket/cross-ws-downgrade.no-redirect.https.html.headers new file mode 100644 index 0000000..602d9dc3 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/websocket/cross-ws-downgrade.no-redirect.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: upgrade-insecure-requests
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/websocket/same-ws-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/websocket/same-ws-downgrade.no-redirect.https.html new file mode 100644 index 0000000..f60d181f --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/websocket/same-ws-downgrade.no-redirect.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for websocket to same-ws-downgrade origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-ws-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "websocket", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/websocket/same-ws-downgrade.no-redirect.https.html.headers b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/websocket/same-ws-downgrade.no-redirect.https.html.headers new file mode 100644 index 0000000..602d9dc3 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/websocket/same-ws-downgrade.no-redirect.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: upgrade-insecure-requests
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/worker-classic/same-http-downgrade.downgrade.https-expected.txt b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/worker-classic/same-http-downgrade.downgrade.https-expected.txt new file mode 100644 index 0000000..87009a4 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/worker-classic/same-http-downgrade.downgrade.https-expected.txt
@@ -0,0 +1,4 @@ +This is a testharness.js-based test. +FAIL Upgrade-Insecure-Requests: Expects allowed for worker-classic to same-http-downgrade origin and downgrade redirection from https context. assert_equals: The resource request should be 'allowed'. expected "allowed" but got "blocked" +Harness: the test ran to completion. +
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/worker-classic/same-http-downgrade.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/worker-classic/same-http-downgrade.downgrade.https.html new file mode 100644 index 0000000..42ed603 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/worker-classic/same-http-downgrade.downgrade.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for worker-classic to same-http-downgrade origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-http-downgrade", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "worker-classic", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/worker-classic/same-http-downgrade.downgrade.https.html.headers b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/worker-classic/same-http-downgrade.downgrade.https.html.headers new file mode 100644 index 0000000..602d9dc3 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/worker-classic/same-http-downgrade.downgrade.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: upgrade-insecure-requests
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/worker-classic/same-http-downgrade.no-redirect.https-expected.txt b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/worker-classic/same-http-downgrade.no-redirect.https-expected.txt new file mode 100644 index 0000000..643d31a --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/worker-classic/same-http-downgrade.no-redirect.https-expected.txt
@@ -0,0 +1,4 @@ +This is a testharness.js-based test. +FAIL Upgrade-Insecure-Requests: Expects allowed for worker-classic to same-http-downgrade origin and no-redirect redirection from https context. assert_equals: The resource request should be 'allowed'. expected "allowed" but got "blocked" +Harness: the test ran to completion. +
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/worker-classic/same-http-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/worker-classic/same-http-downgrade.no-redirect.https.html new file mode 100644 index 0000000..7a20a8e3 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/worker-classic/same-http-downgrade.no-redirect.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for worker-classic to same-http-downgrade origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-http-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "worker-classic", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/worker-classic/same-http-downgrade.no-redirect.https.html.headers b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/worker-classic/same-http-downgrade.no-redirect.https.html.headers new file mode 100644 index 0000000..602d9dc3 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/worker-classic/same-http-downgrade.no-redirect.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: upgrade-insecure-requests
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/worker-classic/same-https.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/worker-classic/same-https.downgrade.https.html new file mode 100644 index 0000000..5a958a0 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/worker-classic/same-https.downgrade.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for worker-classic to same-https origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "worker-classic", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/worker-classic/same-https.downgrade.https.html.headers b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/worker-classic/same-https.downgrade.https.html.headers new file mode 100644 index 0000000..602d9dc3 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/worker-classic/same-https.downgrade.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: upgrade-insecure-requests
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/worker-module/same-http-downgrade.downgrade.https-expected.txt b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/worker-module/same-http-downgrade.downgrade.https-expected.txt new file mode 100644 index 0000000..182f777 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/worker-module/same-http-downgrade.downgrade.https-expected.txt
@@ -0,0 +1,4 @@ +This is a testharness.js-based test. +FAIL Upgrade-Insecure-Requests: Expects allowed for worker-module to same-http-downgrade origin and downgrade redirection from https context. assert_equals: The resource request should be 'allowed'. expected "allowed" but got "blocked" +Harness: the test ran to completion. +
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/worker-module/same-http-downgrade.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/worker-module/same-http-downgrade.downgrade.https.html new file mode 100644 index 0000000..2c1fb20 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/worker-module/same-http-downgrade.downgrade.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for worker-module to same-http-downgrade origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-http-downgrade", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "worker-module", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/worker-module/same-http-downgrade.downgrade.https.html.headers b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/worker-module/same-http-downgrade.downgrade.https.html.headers new file mode 100644 index 0000000..602d9dc3 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/worker-module/same-http-downgrade.downgrade.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: upgrade-insecure-requests
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/worker-module/same-http-downgrade.no-redirect.https-expected.txt b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/worker-module/same-http-downgrade.no-redirect.https-expected.txt new file mode 100644 index 0000000..e7c151b --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/worker-module/same-http-downgrade.no-redirect.https-expected.txt
@@ -0,0 +1,4 @@ +This is a testharness.js-based test. +FAIL Upgrade-Insecure-Requests: Expects allowed for worker-module to same-http-downgrade origin and no-redirect redirection from https context. assert_equals: The resource request should be 'allowed'. expected "allowed" but got "blocked" +Harness: the test ran to completion. +
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/worker-module/same-http-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/worker-module/same-http-downgrade.no-redirect.https.html new file mode 100644 index 0000000..9f82d37 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/worker-module/same-http-downgrade.no-redirect.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for worker-module to same-http-downgrade origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-http-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "worker-module", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/worker-module/same-http-downgrade.no-redirect.https.html.headers b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/worker-module/same-http-downgrade.no-redirect.https.html.headers new file mode 100644 index 0000000..602d9dc3 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/worker-module/same-http-downgrade.no-redirect.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: upgrade-insecure-requests
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/worker-module/same-https.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/worker-module/same-https.downgrade.https.html new file mode 100644 index 0000000..72efc13 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/worker-module/same-https.downgrade.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for worker-module to same-https origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "worker-module", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/worker-module/same-https.downgrade.https.html.headers b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/worker-module/same-https.downgrade.https.html.headers new file mode 100644 index 0000000..602d9dc3 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/worker-module/same-https.downgrade.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: upgrade-insecure-requests
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/xhr/cross-http-downgrade.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/xhr/cross-http-downgrade.downgrade.https.html new file mode 100644 index 0000000..ff1bcf3 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/xhr/cross-http-downgrade.downgrade.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "cross-http-downgrade", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/xhr/cross-http-downgrade.downgrade.https.html.headers b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/xhr/cross-http-downgrade.downgrade.https.html.headers new file mode 100644 index 0000000..602d9dc3 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/xhr/cross-http-downgrade.downgrade.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: upgrade-insecure-requests
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/xhr/cross-http-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/xhr/cross-http-downgrade.no-redirect.https.html new file mode 100644 index 0000000..41ef5301 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/xhr/cross-http-downgrade.no-redirect.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "cross-http-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/xhr/cross-http-downgrade.no-redirect.https.html.headers b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/xhr/cross-http-downgrade.no-redirect.https.html.headers new file mode 100644 index 0000000..602d9dc3 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/xhr/cross-http-downgrade.no-redirect.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: upgrade-insecure-requests
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/xhr/cross-https.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/xhr/cross-https.downgrade.https.html new file mode 100644 index 0000000..88ae7c1 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/xhr/cross-https.downgrade.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for xhr to cross-https origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "cross-https", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/xhr/cross-https.downgrade.https.html.headers b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/xhr/cross-https.downgrade.https.html.headers new file mode 100644 index 0000000..602d9dc3 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/xhr/cross-https.downgrade.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: upgrade-insecure-requests
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/xhr/same-http-downgrade.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/xhr/same-http-downgrade.downgrade.https.html new file mode 100644 index 0000000..4846c1b --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/xhr/same-http-downgrade.downgrade.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-http-downgrade", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/xhr/same-http-downgrade.downgrade.https.html.headers b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/xhr/same-http-downgrade.downgrade.https.html.headers new file mode 100644 index 0000000..602d9dc3 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/xhr/same-http-downgrade.downgrade.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: upgrade-insecure-requests
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/xhr/same-http-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/xhr/same-http-downgrade.no-redirect.https.html new file mode 100644 index 0000000..5ac1a65 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/xhr/same-http-downgrade.no-redirect.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-http-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/xhr/same-http-downgrade.no-redirect.https.html.headers b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/xhr/same-http-downgrade.no-redirect.https.html.headers new file mode 100644 index 0000000..602d9dc3 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/xhr/same-http-downgrade.no-redirect.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: upgrade-insecure-requests
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/xhr/same-https.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/xhr/same-https.downgrade.https.html new file mode 100644 index 0000000..72c31fa --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/xhr/same-https.downgrade.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for xhr to same-https origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/xhr/same-https.downgrade.https.html.headers b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/xhr/same-https.downgrade.https.html.headers new file mode 100644 index 0000000..602d9dc3 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/xhr/same-https.downgrade.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: upgrade-insecure-requests
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/fetch/cross-http-downgrade.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/fetch/cross-http-downgrade.downgrade.https.html new file mode 100644 index 0000000..d9755ca --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/fetch/cross-http-downgrade.downgrade.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="No upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects blocked for fetch to cross-http-downgrade origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-http-downgrade", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/fetch/cross-http-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/fetch/cross-http-downgrade.no-redirect.https.html new file mode 100644 index 0000000..6b81774 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/fetch/cross-http-downgrade.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="No upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects blocked for fetch to cross-http-downgrade origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-http-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/fetch/cross-https.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/fetch/cross-https.downgrade.https.html new file mode 100644 index 0000000..cb5ceb2 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/fetch/cross-https.downgrade.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="No upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects blocked for fetch to cross-https origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-https", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/fetch/same-http-downgrade.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/fetch/same-http-downgrade.downgrade.https.html new file mode 100644 index 0000000..a4f8fa0 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/fetch/same-http-downgrade.downgrade.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="No upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects blocked for fetch to same-http-downgrade origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http-downgrade", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/fetch/same-http-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/fetch/same-http-downgrade.no-redirect.https.html new file mode 100644 index 0000000..c7bd3df --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/fetch/same-http-downgrade.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="No upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects blocked for fetch to same-http-downgrade origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/fetch/same-https.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/fetch/same-https.downgrade.https.html new file mode 100644 index 0000000..e75a0162 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/fetch/same-https.downgrade.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="No upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects blocked for fetch to same-https origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-https", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/websocket/cross-ws-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/websocket/cross-ws-downgrade.no-redirect.https.html new file mode 100644 index 0000000..3a65178 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/websocket/cross-ws-downgrade.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="No upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects blocked for websocket to cross-ws-downgrade origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-ws-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "websocket", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/websocket/same-ws-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/websocket/same-ws-downgrade.no-redirect.https.html new file mode 100644 index 0000000..bd36ad5 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/websocket/same-ws-downgrade.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="No upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects blocked for websocket to same-ws-downgrade origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-ws-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "websocket", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/worker-classic/same-http-downgrade.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/worker-classic/same-http-downgrade.downgrade.https.html new file mode 100644 index 0000000..68248b6 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/worker-classic/same-http-downgrade.downgrade.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="No upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects blocked for worker-classic to same-http-downgrade origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http-downgrade", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "worker-classic", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/worker-classic/same-http-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/worker-classic/same-http-downgrade.no-redirect.https.html new file mode 100644 index 0000000..151e396 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/worker-classic/same-http-downgrade.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="No upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects blocked for worker-classic to same-http-downgrade origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "worker-classic", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/worker-classic/same-https.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/worker-classic/same-https.downgrade.https.html new file mode 100644 index 0000000..6fdc141 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/worker-classic/same-https.downgrade.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="No upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects blocked for worker-classic to same-https origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-https", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "worker-classic", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/worker-module/same-http-downgrade.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/worker-module/same-http-downgrade.downgrade.https.html new file mode 100644 index 0000000..f168e1ea --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/worker-module/same-http-downgrade.downgrade.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="No upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects blocked for worker-module to same-http-downgrade origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http-downgrade", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "worker-module", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/worker-module/same-http-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/worker-module/same-http-downgrade.no-redirect.https.html new file mode 100644 index 0000000..3e42f05 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/worker-module/same-http-downgrade.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="No upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects blocked for worker-module to same-http-downgrade origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "worker-module", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/worker-module/same-https.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/worker-module/same-https.downgrade.https.html new file mode 100644 index 0000000..02723ea --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/worker-module/same-https.downgrade.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="No upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects blocked for worker-module to same-https origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-https", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "worker-module", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/xhr/cross-http-downgrade.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/xhr/cross-http-downgrade.downgrade.https.html new file mode 100644 index 0000000..8a7fe50 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/xhr/cross-http-downgrade.downgrade.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="No upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects blocked for xhr to cross-http-downgrade origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-http-downgrade", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/xhr/cross-http-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/xhr/cross-http-downgrade.no-redirect.https.html new file mode 100644 index 0000000..36b2828 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/xhr/cross-http-downgrade.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="No upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects blocked for xhr to cross-http-downgrade origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-http-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/xhr/cross-https.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/xhr/cross-https.downgrade.https.html new file mode 100644 index 0000000..b89fdb90 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/xhr/cross-https.downgrade.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="No upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects blocked for xhr to cross-https origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-https", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/xhr/same-http-downgrade.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/xhr/same-http-downgrade.downgrade.https.html new file mode 100644 index 0000000..f90e276e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/xhr/same-http-downgrade.downgrade.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="No upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects blocked for xhr to same-http-downgrade origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http-downgrade", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/xhr/same-http-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/xhr/same-http-downgrade.no-redirect.https.html new file mode 100644 index 0000000..7cd85dc --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/xhr/same-http-downgrade.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="No upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects blocked for xhr to same-http-downgrade origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/xhr/same-https.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/xhr/same-https.downgrade.https.html new file mode 100644 index 0000000..9549a31 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/xhr/same-https.downgrade.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="No upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects blocked for xhr to same-https origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-https", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/fetch/cross-http-downgrade.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/fetch/cross-http-downgrade.downgrade.https.html new file mode 100644 index 0000000..3a45df5b --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/fetch/cross-http-downgrade.downgrade.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and downgrade redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "cross-http-downgrade", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/fetch/cross-http-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/fetch/cross-http-downgrade.no-redirect.https.html new file mode 100644 index 0000000..b7817aa --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/fetch/cross-http-downgrade.no-redirect.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and no-redirect redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "cross-http-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/fetch/cross-https.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/fetch/cross-https.downgrade.https.html new file mode 100644 index 0000000..bbe8f055 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/fetch/cross-https.downgrade.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for fetch to cross-https origin and downgrade redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "cross-https", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/fetch/same-http-downgrade.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/fetch/same-http-downgrade.downgrade.https.html new file mode 100644 index 0000000..322d17c --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/fetch/same-http-downgrade.downgrade.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and downgrade redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-http-downgrade", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/fetch/same-http-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/fetch/same-http-downgrade.no-redirect.https.html new file mode 100644 index 0000000..0614927 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/fetch/same-http-downgrade.no-redirect.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and no-redirect redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-http-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/fetch/same-https.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/fetch/same-https.downgrade.https.html new file mode 100644 index 0000000..268ceb2 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/fetch/same-https.downgrade.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for fetch to same-https origin and downgrade redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/websocket/cross-ws-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/websocket/cross-ws-downgrade.no-redirect.https.html new file mode 100644 index 0000000..4318032 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/websocket/cross-ws-downgrade.no-redirect.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for websocket to cross-ws-downgrade origin and no-redirect redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "cross-ws-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "websocket", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/websocket/same-ws-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/websocket/same-ws-downgrade.no-redirect.https.html new file mode 100644 index 0000000..22a41d2 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/websocket/same-ws-downgrade.no-redirect.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for websocket to same-ws-downgrade origin and no-redirect redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-ws-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "websocket", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/worker-classic/same-http-downgrade.downgrade.https-expected.txt b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/worker-classic/same-http-downgrade.downgrade.https-expected.txt new file mode 100644 index 0000000..87009a4 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/worker-classic/same-http-downgrade.downgrade.https-expected.txt
@@ -0,0 +1,4 @@ +This is a testharness.js-based test. +FAIL Upgrade-Insecure-Requests: Expects allowed for worker-classic to same-http-downgrade origin and downgrade redirection from https context. assert_equals: The resource request should be 'allowed'. expected "allowed" but got "blocked" +Harness: the test ran to completion. +
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/worker-classic/same-http-downgrade.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/worker-classic/same-http-downgrade.downgrade.https.html new file mode 100644 index 0000000..91efc3fe --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/worker-classic/same-http-downgrade.downgrade.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for worker-classic to same-http-downgrade origin and downgrade redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-http-downgrade", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "worker-classic", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/worker-classic/same-http-downgrade.no-redirect.https-expected.txt b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/worker-classic/same-http-downgrade.no-redirect.https-expected.txt new file mode 100644 index 0000000..643d31a --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/worker-classic/same-http-downgrade.no-redirect.https-expected.txt
@@ -0,0 +1,4 @@ +This is a testharness.js-based test. +FAIL Upgrade-Insecure-Requests: Expects allowed for worker-classic to same-http-downgrade origin and no-redirect redirection from https context. assert_equals: The resource request should be 'allowed'. expected "allowed" but got "blocked" +Harness: the test ran to completion. +
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/worker-classic/same-http-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/worker-classic/same-http-downgrade.no-redirect.https.html new file mode 100644 index 0000000..e33fe74 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/worker-classic/same-http-downgrade.no-redirect.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for worker-classic to same-http-downgrade origin and no-redirect redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-http-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "worker-classic", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/worker-classic/same-https.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/worker-classic/same-https.downgrade.https.html new file mode 100644 index 0000000..33ce6b6e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/worker-classic/same-https.downgrade.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for worker-classic to same-https origin and downgrade redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "worker-classic", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/worker-module/same-http-downgrade.downgrade.https-expected.txt b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/worker-module/same-http-downgrade.downgrade.https-expected.txt new file mode 100644 index 0000000..182f777 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/worker-module/same-http-downgrade.downgrade.https-expected.txt
@@ -0,0 +1,4 @@ +This is a testharness.js-based test. +FAIL Upgrade-Insecure-Requests: Expects allowed for worker-module to same-http-downgrade origin and downgrade redirection from https context. assert_equals: The resource request should be 'allowed'. expected "allowed" but got "blocked" +Harness: the test ran to completion. +
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/worker-module/same-http-downgrade.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/worker-module/same-http-downgrade.downgrade.https.html new file mode 100644 index 0000000..33faa24 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/worker-module/same-http-downgrade.downgrade.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for worker-module to same-http-downgrade origin and downgrade redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-http-downgrade", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "worker-module", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/worker-module/same-http-downgrade.no-redirect.https-expected.txt b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/worker-module/same-http-downgrade.no-redirect.https-expected.txt new file mode 100644 index 0000000..e7c151b --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/worker-module/same-http-downgrade.no-redirect.https-expected.txt
@@ -0,0 +1,4 @@ +This is a testharness.js-based test. +FAIL Upgrade-Insecure-Requests: Expects allowed for worker-module to same-http-downgrade origin and no-redirect redirection from https context. assert_equals: The resource request should be 'allowed'. expected "allowed" but got "blocked" +Harness: the test ran to completion. +
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/worker-module/same-http-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/worker-module/same-http-downgrade.no-redirect.https.html new file mode 100644 index 0000000..cc4c777c --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/worker-module/same-http-downgrade.no-redirect.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for worker-module to same-http-downgrade origin and no-redirect redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-http-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "worker-module", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/worker-module/same-https.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/worker-module/same-https.downgrade.https.html new file mode 100644 index 0000000..f955230 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/worker-module/same-https.downgrade.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for worker-module to same-https origin and downgrade redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "worker-module", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/xhr/cross-http-downgrade.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/xhr/cross-http-downgrade.downgrade.https.html new file mode 100644 index 0000000..ab564874 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/xhr/cross-http-downgrade.downgrade.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and downgrade redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "cross-http-downgrade", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/xhr/cross-http-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/xhr/cross-http-downgrade.no-redirect.https.html new file mode 100644 index 0000000..71b5ca0 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/xhr/cross-http-downgrade.no-redirect.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and no-redirect redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "cross-http-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/xhr/cross-https.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/xhr/cross-https.downgrade.https.html new file mode 100644 index 0000000..e8a08fc --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/xhr/cross-https.downgrade.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for xhr to cross-https origin and downgrade redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "cross-https", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/xhr/same-http-downgrade.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/xhr/same-http-downgrade.downgrade.https.html new file mode 100644 index 0000000..6125ad0 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/xhr/same-http-downgrade.downgrade.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and downgrade redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-http-downgrade", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/xhr/same-http-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/xhr/same-http-downgrade.no-redirect.https.html new file mode 100644 index 0000000..9cf1a16 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/xhr/same-http-downgrade.no-redirect.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and no-redirect redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-http-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/xhr/same-https.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/xhr/same-https.downgrade.https.html new file mode 100644 index 0000000..b3e64a9 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/xhr/same-https.downgrade.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for xhr to same-https origin and downgrade redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-classic" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/fetch/cross-http-downgrade.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/fetch/cross-http-downgrade.downgrade.https.html new file mode 100644 index 0000000..da211f791 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/fetch/cross-http-downgrade.downgrade.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "cross-http-downgrade", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/fetch/cross-http-downgrade.downgrade.https.html.headers b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/fetch/cross-http-downgrade.downgrade.https.html.headers new file mode 100644 index 0000000..602d9dc3 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/fetch/cross-http-downgrade.downgrade.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: upgrade-insecure-requests
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/fetch/cross-http-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/fetch/cross-http-downgrade.no-redirect.https.html new file mode 100644 index 0000000..5168cfed4 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/fetch/cross-http-downgrade.no-redirect.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "cross-http-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/fetch/cross-http-downgrade.no-redirect.https.html.headers b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/fetch/cross-http-downgrade.no-redirect.https.html.headers new file mode 100644 index 0000000..602d9dc3 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/fetch/cross-http-downgrade.no-redirect.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: upgrade-insecure-requests
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/fetch/cross-https.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/fetch/cross-https.downgrade.https.html new file mode 100644 index 0000000..4323601 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/fetch/cross-https.downgrade.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for fetch to cross-https origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "cross-https", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/fetch/cross-https.downgrade.https.html.headers b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/fetch/cross-https.downgrade.https.html.headers new file mode 100644 index 0000000..602d9dc3 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/fetch/cross-https.downgrade.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: upgrade-insecure-requests
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/fetch/same-http-downgrade.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/fetch/same-http-downgrade.downgrade.https.html new file mode 100644 index 0000000..f29fa9d --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/fetch/same-http-downgrade.downgrade.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-http-downgrade", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/fetch/same-http-downgrade.downgrade.https.html.headers b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/fetch/same-http-downgrade.downgrade.https.html.headers new file mode 100644 index 0000000..602d9dc3 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/fetch/same-http-downgrade.downgrade.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: upgrade-insecure-requests
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/fetch/same-http-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/fetch/same-http-downgrade.no-redirect.https.html new file mode 100644 index 0000000..9a7dce9 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/fetch/same-http-downgrade.no-redirect.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-http-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/fetch/same-http-downgrade.no-redirect.https.html.headers b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/fetch/same-http-downgrade.no-redirect.https.html.headers new file mode 100644 index 0000000..602d9dc3 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/fetch/same-http-downgrade.no-redirect.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: upgrade-insecure-requests
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/fetch/same-https.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/fetch/same-https.downgrade.https.html new file mode 100644 index 0000000..7526831 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/fetch/same-https.downgrade.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for fetch to same-https origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/fetch/same-https.downgrade.https.html.headers b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/fetch/same-https.downgrade.https.html.headers new file mode 100644 index 0000000..602d9dc3 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/fetch/same-https.downgrade.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: upgrade-insecure-requests
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/websocket/cross-ws-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/websocket/cross-ws-downgrade.no-redirect.https.html new file mode 100644 index 0000000..be9a348 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/websocket/cross-ws-downgrade.no-redirect.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for websocket to cross-ws-downgrade origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "cross-ws-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "websocket", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/websocket/cross-ws-downgrade.no-redirect.https.html.headers b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/websocket/cross-ws-downgrade.no-redirect.https.html.headers new file mode 100644 index 0000000..602d9dc3 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/websocket/cross-ws-downgrade.no-redirect.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: upgrade-insecure-requests
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/websocket/same-ws-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/websocket/same-ws-downgrade.no-redirect.https.html new file mode 100644 index 0000000..0f7e54ed --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/websocket/same-ws-downgrade.no-redirect.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for websocket to same-ws-downgrade origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-ws-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "websocket", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/websocket/same-ws-downgrade.no-redirect.https.html.headers b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/websocket/same-ws-downgrade.no-redirect.https.html.headers new file mode 100644 index 0000000..602d9dc3 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/websocket/same-ws-downgrade.no-redirect.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: upgrade-insecure-requests
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-classic/same-http-downgrade.downgrade.https-expected.txt b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-classic/same-http-downgrade.downgrade.https-expected.txt new file mode 100644 index 0000000..87009a4 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-classic/same-http-downgrade.downgrade.https-expected.txt
@@ -0,0 +1,4 @@ +This is a testharness.js-based test. +FAIL Upgrade-Insecure-Requests: Expects allowed for worker-classic to same-http-downgrade origin and downgrade redirection from https context. assert_equals: The resource request should be 'allowed'. expected "allowed" but got "blocked" +Harness: the test ran to completion. +
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-classic/same-http-downgrade.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-classic/same-http-downgrade.downgrade.https.html new file mode 100644 index 0000000..707fffa --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-classic/same-http-downgrade.downgrade.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for worker-classic to same-http-downgrade origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-http-downgrade", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "worker-classic", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-classic/same-http-downgrade.downgrade.https.html.headers b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-classic/same-http-downgrade.downgrade.https.html.headers new file mode 100644 index 0000000..602d9dc3 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-classic/same-http-downgrade.downgrade.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: upgrade-insecure-requests
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-classic/same-http-downgrade.no-redirect.https-expected.txt b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-classic/same-http-downgrade.no-redirect.https-expected.txt new file mode 100644 index 0000000..643d31a --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-classic/same-http-downgrade.no-redirect.https-expected.txt
@@ -0,0 +1,4 @@ +This is a testharness.js-based test. +FAIL Upgrade-Insecure-Requests: Expects allowed for worker-classic to same-http-downgrade origin and no-redirect redirection from https context. assert_equals: The resource request should be 'allowed'. expected "allowed" but got "blocked" +Harness: the test ran to completion. +
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-classic/same-http-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-classic/same-http-downgrade.no-redirect.https.html new file mode 100644 index 0000000..f3e96e7 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-classic/same-http-downgrade.no-redirect.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for worker-classic to same-http-downgrade origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-http-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "worker-classic", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-classic/same-http-downgrade.no-redirect.https.html.headers b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-classic/same-http-downgrade.no-redirect.https.html.headers new file mode 100644 index 0000000..602d9dc3 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-classic/same-http-downgrade.no-redirect.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: upgrade-insecure-requests
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-classic/same-https.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-classic/same-https.downgrade.https.html new file mode 100644 index 0000000..3bd618a --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-classic/same-https.downgrade.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for worker-classic to same-https origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "worker-classic", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-classic/same-https.downgrade.https.html.headers b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-classic/same-https.downgrade.https.html.headers new file mode 100644 index 0000000..602d9dc3 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-classic/same-https.downgrade.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: upgrade-insecure-requests
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-module/same-http-downgrade.downgrade.https-expected.txt b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-module/same-http-downgrade.downgrade.https-expected.txt new file mode 100644 index 0000000..182f777 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-module/same-http-downgrade.downgrade.https-expected.txt
@@ -0,0 +1,4 @@ +This is a testharness.js-based test. +FAIL Upgrade-Insecure-Requests: Expects allowed for worker-module to same-http-downgrade origin and downgrade redirection from https context. assert_equals: The resource request should be 'allowed'. expected "allowed" but got "blocked" +Harness: the test ran to completion. +
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-module/same-http-downgrade.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-module/same-http-downgrade.downgrade.https.html new file mode 100644 index 0000000..3b13bd0f --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-module/same-http-downgrade.downgrade.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for worker-module to same-http-downgrade origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-http-downgrade", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "worker-module", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-module/same-http-downgrade.downgrade.https.html.headers b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-module/same-http-downgrade.downgrade.https.html.headers new file mode 100644 index 0000000..602d9dc3 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-module/same-http-downgrade.downgrade.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: upgrade-insecure-requests
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-module/same-http-downgrade.no-redirect.https-expected.txt b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-module/same-http-downgrade.no-redirect.https-expected.txt new file mode 100644 index 0000000..e7c151b --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-module/same-http-downgrade.no-redirect.https-expected.txt
@@ -0,0 +1,4 @@ +This is a testharness.js-based test. +FAIL Upgrade-Insecure-Requests: Expects allowed for worker-module to same-http-downgrade origin and no-redirect redirection from https context. assert_equals: The resource request should be 'allowed'. expected "allowed" but got "blocked" +Harness: the test ran to completion. +
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-module/same-http-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-module/same-http-downgrade.no-redirect.https.html new file mode 100644 index 0000000..f5bd175 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-module/same-http-downgrade.no-redirect.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for worker-module to same-http-downgrade origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-http-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "worker-module", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-module/same-http-downgrade.no-redirect.https.html.headers b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-module/same-http-downgrade.no-redirect.https.html.headers new file mode 100644 index 0000000..602d9dc3 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-module/same-http-downgrade.no-redirect.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: upgrade-insecure-requests
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-module/same-https.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-module/same-https.downgrade.https.html new file mode 100644 index 0000000..1a410c33 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-module/same-https.downgrade.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for worker-module to same-https origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "worker-module", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-module/same-https.downgrade.https.html.headers b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-module/same-https.downgrade.https.html.headers new file mode 100644 index 0000000..602d9dc3 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-module/same-https.downgrade.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: upgrade-insecure-requests
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/xhr/cross-http-downgrade.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/xhr/cross-http-downgrade.downgrade.https.html new file mode 100644 index 0000000..d4c5259 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/xhr/cross-http-downgrade.downgrade.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "cross-http-downgrade", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/xhr/cross-http-downgrade.downgrade.https.html.headers b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/xhr/cross-http-downgrade.downgrade.https.html.headers new file mode 100644 index 0000000..602d9dc3 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/xhr/cross-http-downgrade.downgrade.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: upgrade-insecure-requests
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/xhr/cross-http-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/xhr/cross-http-downgrade.no-redirect.https.html new file mode 100644 index 0000000..4378941 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/xhr/cross-http-downgrade.no-redirect.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "cross-http-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/xhr/cross-http-downgrade.no-redirect.https.html.headers b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/xhr/cross-http-downgrade.no-redirect.https.html.headers new file mode 100644 index 0000000..602d9dc3 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/xhr/cross-http-downgrade.no-redirect.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: upgrade-insecure-requests
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/xhr/cross-https.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/xhr/cross-https.downgrade.https.html new file mode 100644 index 0000000..b278d26a --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/xhr/cross-https.downgrade.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for xhr to cross-https origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "cross-https", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/xhr/cross-https.downgrade.https.html.headers b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/xhr/cross-https.downgrade.https.html.headers new file mode 100644 index 0000000..602d9dc3 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/xhr/cross-https.downgrade.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: upgrade-insecure-requests
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/xhr/same-http-downgrade.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/xhr/same-http-downgrade.downgrade.https.html new file mode 100644 index 0000000..3220dbc --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/xhr/same-http-downgrade.downgrade.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-http-downgrade", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/xhr/same-http-downgrade.downgrade.https.html.headers b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/xhr/same-http-downgrade.downgrade.https.html.headers new file mode 100644 index 0000000..602d9dc3 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/xhr/same-http-downgrade.downgrade.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: upgrade-insecure-requests
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/xhr/same-http-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/xhr/same-http-downgrade.no-redirect.https.html new file mode 100644 index 0000000..5b345af --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/xhr/same-http-downgrade.no-redirect.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-http-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/xhr/same-http-downgrade.no-redirect.https.html.headers b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/xhr/same-http-downgrade.no-redirect.https.html.headers new file mode 100644 index 0000000..602d9dc3 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/xhr/same-http-downgrade.no-redirect.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: upgrade-insecure-requests
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/xhr/same-https.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/xhr/same-https.downgrade.https.html new file mode 100644 index 0000000..0b0ed68 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/xhr/same-https.downgrade.https.html
@@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for xhr to same-https origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/xhr/same-https.downgrade.https.html.headers b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/xhr/same-https.downgrade.https.html.headers new file mode 100644 index 0000000..602d9dc3 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/xhr/same-https.downgrade.https.html.headers
@@ -0,0 +1 @@ +Content-Security-Policy: upgrade-insecure-requests
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/fetch/cross-http-downgrade.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/fetch/cross-http-downgrade.downgrade.https.html new file mode 100644 index 0000000..112fae8 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/fetch/cross-http-downgrade.downgrade.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="No upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects blocked for fetch to cross-http-downgrade origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-http-downgrade", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/fetch/cross-http-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/fetch/cross-http-downgrade.no-redirect.https.html new file mode 100644 index 0000000..b3995f3 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/fetch/cross-http-downgrade.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="No upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects blocked for fetch to cross-http-downgrade origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-http-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/fetch/cross-https.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/fetch/cross-https.downgrade.https.html new file mode 100644 index 0000000..643d7d2 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/fetch/cross-https.downgrade.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="No upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects blocked for fetch to cross-https origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-https", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/fetch/same-http-downgrade.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/fetch/same-http-downgrade.downgrade.https.html new file mode 100644 index 0000000..5c7db8f --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/fetch/same-http-downgrade.downgrade.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="No upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects blocked for fetch to same-http-downgrade origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http-downgrade", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/fetch/same-http-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/fetch/same-http-downgrade.no-redirect.https.html new file mode 100644 index 0000000..fc1f4c4 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/fetch/same-http-downgrade.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="No upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects blocked for fetch to same-http-downgrade origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/fetch/same-https.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/fetch/same-https.downgrade.https.html new file mode 100644 index 0000000..bfad8ce --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/fetch/same-https.downgrade.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="No upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects blocked for fetch to same-https origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-https", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/websocket/cross-ws-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/websocket/cross-ws-downgrade.no-redirect.https.html new file mode 100644 index 0000000..5b286c2 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/websocket/cross-ws-downgrade.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="No upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects blocked for websocket to cross-ws-downgrade origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-ws-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "websocket", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/websocket/same-ws-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/websocket/same-ws-downgrade.no-redirect.https.html new file mode 100644 index 0000000..b257b62 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/websocket/same-ws-downgrade.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="No upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects blocked for websocket to same-ws-downgrade origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-ws-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "websocket", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/worker-classic/same-http-downgrade.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/worker-classic/same-http-downgrade.downgrade.https.html new file mode 100644 index 0000000..41edcee --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/worker-classic/same-http-downgrade.downgrade.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="No upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects blocked for worker-classic to same-http-downgrade origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http-downgrade", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "worker-classic", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/worker-classic/same-http-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/worker-classic/same-http-downgrade.no-redirect.https.html new file mode 100644 index 0000000..c8f80ea5 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/worker-classic/same-http-downgrade.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="No upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects blocked for worker-classic to same-http-downgrade origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "worker-classic", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/worker-classic/same-https.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/worker-classic/same-https.downgrade.https.html new file mode 100644 index 0000000..e62b99c --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/worker-classic/same-https.downgrade.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="No upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects blocked for worker-classic to same-https origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-https", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "worker-classic", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/worker-module/same-http-downgrade.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/worker-module/same-http-downgrade.downgrade.https.html new file mode 100644 index 0000000..9ae603af9 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/worker-module/same-http-downgrade.downgrade.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="No upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects blocked for worker-module to same-http-downgrade origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http-downgrade", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "worker-module", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/worker-module/same-http-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/worker-module/same-http-downgrade.no-redirect.https.html new file mode 100644 index 0000000..fa6db23 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/worker-module/same-http-downgrade.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="No upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects blocked for worker-module to same-http-downgrade origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "worker-module", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/worker-module/same-https.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/worker-module/same-https.downgrade.https.html new file mode 100644 index 0000000..67db42f --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/worker-module/same-https.downgrade.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="No upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects blocked for worker-module to same-https origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-https", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "worker-module", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/xhr/cross-http-downgrade.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/xhr/cross-http-downgrade.downgrade.https.html new file mode 100644 index 0000000..fd8f1d4 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/xhr/cross-http-downgrade.downgrade.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="No upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects blocked for xhr to cross-http-downgrade origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-http-downgrade", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/xhr/cross-http-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/xhr/cross-http-downgrade.no-redirect.https.html new file mode 100644 index 0000000..79a1cc7 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/xhr/cross-http-downgrade.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="No upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects blocked for xhr to cross-http-downgrade origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-http-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/xhr/cross-https.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/xhr/cross-https.downgrade.https.html new file mode 100644 index 0000000..9d851b1 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/xhr/cross-https.downgrade.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="No upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects blocked for xhr to cross-https origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "cross-https", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/xhr/same-http-downgrade.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/xhr/same-http-downgrade.downgrade.https.html new file mode 100644 index 0000000..c5fd012 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/xhr/same-http-downgrade.downgrade.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="No upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects blocked for xhr to same-http-downgrade origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http-downgrade", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/xhr/same-http-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/xhr/same-http-downgrade.no-redirect.https.html new file mode 100644 index 0000000..f3d4243 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/xhr/same-http-downgrade.no-redirect.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="No upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects blocked for xhr to same-http-downgrade origin and no-redirect redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-http-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/xhr/same-https.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/xhr/same-https.downgrade.https.html new file mode 100644 index 0000000..d220e18 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/xhr/same-https.downgrade.https.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="No upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects blocked for xhr to same-https origin and downgrade redirection from https context."> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "blocked", + "origin": "same-https", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [ + { + "deliveryType": "http-rp", + "key": "upgradeInsecureRequests", + "value": "upgrade" + } + ], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/fetch/cross-http-downgrade.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/fetch/cross-http-downgrade.downgrade.https.html new file mode 100644 index 0000000..fe3315e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/fetch/cross-http-downgrade.downgrade.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and downgrade redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "cross-http-downgrade", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/fetch/cross-http-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/fetch/cross-http-downgrade.no-redirect.https.html new file mode 100644 index 0000000..2b11613 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/fetch/cross-http-downgrade.no-redirect.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and no-redirect redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "cross-http-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/fetch/cross-https.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/fetch/cross-https.downgrade.https.html new file mode 100644 index 0000000..218fe6e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/fetch/cross-https.downgrade.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for fetch to cross-https origin and downgrade redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "cross-https", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/fetch/same-http-downgrade.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/fetch/same-http-downgrade.downgrade.https.html new file mode 100644 index 0000000..940801d --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/fetch/same-http-downgrade.downgrade.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and downgrade redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-http-downgrade", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/fetch/same-http-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/fetch/same-http-downgrade.no-redirect.https.html new file mode 100644 index 0000000..7cf5065 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/fetch/same-http-downgrade.no-redirect.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and no-redirect redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-http-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/fetch/same-https.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/fetch/same-https.downgrade.https.html new file mode 100644 index 0000000..4074faa --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/fetch/same-https.downgrade.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for fetch to same-https origin and downgrade redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "fetch", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/websocket/cross-ws-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/websocket/cross-ws-downgrade.no-redirect.https.html new file mode 100644 index 0000000..10244a3 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/websocket/cross-ws-downgrade.no-redirect.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for websocket to cross-ws-downgrade origin and no-redirect redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "cross-ws-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "websocket", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/websocket/same-ws-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/websocket/same-ws-downgrade.no-redirect.https.html new file mode 100644 index 0000000..87fc5f47d --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/websocket/same-ws-downgrade.no-redirect.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for websocket to same-ws-downgrade origin and no-redirect redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-ws-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "websocket", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/worker-classic/same-http-downgrade.downgrade.https-expected.txt b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/worker-classic/same-http-downgrade.downgrade.https-expected.txt new file mode 100644 index 0000000..87009a4 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/worker-classic/same-http-downgrade.downgrade.https-expected.txt
@@ -0,0 +1,4 @@ +This is a testharness.js-based test. +FAIL Upgrade-Insecure-Requests: Expects allowed for worker-classic to same-http-downgrade origin and downgrade redirection from https context. assert_equals: The resource request should be 'allowed'. expected "allowed" but got "blocked" +Harness: the test ran to completion. +
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/worker-classic/same-http-downgrade.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/worker-classic/same-http-downgrade.downgrade.https.html new file mode 100644 index 0000000..4753094 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/worker-classic/same-http-downgrade.downgrade.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for worker-classic to same-http-downgrade origin and downgrade redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-http-downgrade", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "worker-classic", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/worker-classic/same-http-downgrade.no-redirect.https-expected.txt b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/worker-classic/same-http-downgrade.no-redirect.https-expected.txt new file mode 100644 index 0000000..643d31a --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/worker-classic/same-http-downgrade.no-redirect.https-expected.txt
@@ -0,0 +1,4 @@ +This is a testharness.js-based test. +FAIL Upgrade-Insecure-Requests: Expects allowed for worker-classic to same-http-downgrade origin and no-redirect redirection from https context. assert_equals: The resource request should be 'allowed'. expected "allowed" but got "blocked" +Harness: the test ran to completion. +
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/worker-classic/same-http-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/worker-classic/same-http-downgrade.no-redirect.https.html new file mode 100644 index 0000000..b663ecb --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/worker-classic/same-http-downgrade.no-redirect.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for worker-classic to same-http-downgrade origin and no-redirect redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-http-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "worker-classic", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/worker-classic/same-https.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/worker-classic/same-https.downgrade.https.html new file mode 100644 index 0000000..c9a3b86 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/worker-classic/same-https.downgrade.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for worker-classic to same-https origin and downgrade redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "worker-classic", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/worker-module/same-http-downgrade.downgrade.https-expected.txt b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/worker-module/same-http-downgrade.downgrade.https-expected.txt new file mode 100644 index 0000000..182f777 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/worker-module/same-http-downgrade.downgrade.https-expected.txt
@@ -0,0 +1,4 @@ +This is a testharness.js-based test. +FAIL Upgrade-Insecure-Requests: Expects allowed for worker-module to same-http-downgrade origin and downgrade redirection from https context. assert_equals: The resource request should be 'allowed'. expected "allowed" but got "blocked" +Harness: the test ran to completion. +
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/worker-module/same-http-downgrade.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/worker-module/same-http-downgrade.downgrade.https.html new file mode 100644 index 0000000..f6845c7 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/worker-module/same-http-downgrade.downgrade.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for worker-module to same-http-downgrade origin and downgrade redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-http-downgrade", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "worker-module", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/worker-module/same-http-downgrade.no-redirect.https-expected.txt b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/worker-module/same-http-downgrade.no-redirect.https-expected.txt new file mode 100644 index 0000000..e7c151b --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/worker-module/same-http-downgrade.no-redirect.https-expected.txt
@@ -0,0 +1,4 @@ +This is a testharness.js-based test. +FAIL Upgrade-Insecure-Requests: Expects allowed for worker-module to same-http-downgrade origin and no-redirect redirection from https context. assert_equals: The resource request should be 'allowed'. expected "allowed" but got "blocked" +Harness: the test ran to completion. +
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/worker-module/same-http-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/worker-module/same-http-downgrade.no-redirect.https.html new file mode 100644 index 0000000..15b88d5 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/worker-module/same-http-downgrade.no-redirect.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for worker-module to same-http-downgrade origin and no-redirect redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-http-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "worker-module", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/worker-module/same-https.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/worker-module/same-https.downgrade.https.html new file mode 100644 index 0000000..ee73df98 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/worker-module/same-https.downgrade.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for worker-module to same-https origin and downgrade redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "worker-module", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/xhr/cross-http-downgrade.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/xhr/cross-http-downgrade.downgrade.https.html new file mode 100644 index 0000000..496e6612 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/xhr/cross-http-downgrade.downgrade.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and downgrade redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "cross-http-downgrade", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/xhr/cross-http-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/xhr/cross-http-downgrade.no-redirect.https.html new file mode 100644 index 0000000..97f7130 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/xhr/cross-http-downgrade.no-redirect.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and no-redirect redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "cross-http-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/xhr/cross-https.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/xhr/cross-https.downgrade.https.html new file mode 100644 index 0000000..3b9fa3d --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/xhr/cross-https.downgrade.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for xhr to cross-https origin and downgrade redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "cross-https", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/xhr/same-http-downgrade.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/xhr/same-http-downgrade.downgrade.https.html new file mode 100644 index 0000000..3e1d82a --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/xhr/same-http-downgrade.downgrade.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and downgrade redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-http-downgrade", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/xhr/same-http-downgrade.no-redirect.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/xhr/same-http-downgrade.no-redirect.https.html new file mode 100644 index 0000000..8990d9e9 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/xhr/same-http-downgrade.no-redirect.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and no-redirect redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-http-downgrade", + "redirection": "no-redirect", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/xhr/same-https.downgrade.https.html b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/xhr/same-https.downgrade.https.html new file mode 100644 index 0000000..cb7f651d --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/xhr/same-https.downgrade.https.html
@@ -0,0 +1,40 @@ +<!DOCTYPE html> +<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` --> +<html> + <head> + <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title> + <meta charset='utf-8'> + <meta name="description" content="With upgrade-insecure-request"> + <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org"> + <link rel="help" href="https://w3c.github.io/webappsec-upgrade-insecure-requests/"> + <meta name="assert" content="Upgrade-Insecure-Requests: Expects allowed for xhr to same-https origin and downgrade redirection from https context."> + <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests"> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> + <script src="/common/security-features/resources/common.sub.js"></script> + <script src="../../../../generic/test-case.sub.js"></script> + </head> + <body> + <script> + TestCase( + { + "expectation": "allowed", + "origin": "same-https", + "redirection": "downgrade", + "source_context_list": [ + { + "policyDeliveries": [], + "sourceContextType": "worker-module" + } + ], + "source_scheme": "https", + "subresource": "xhr", + "subresource_policy_deliveries": [] + }, + document.querySelector("meta[name=assert]").content, + new SanityChecker() + ).start(); + </script> + <div id="log"></div> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/generic/spec_json.js b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/generic/spec_json.js index c0ef97148..fa9ace4 100644 --- a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/generic/spec_json.js +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/generic/spec_json.js
@@ -1 +1 @@ -var SPEC_JSON = {"selection_pattern": "%(source_context_list)s.%(delivery_type)s/%(delivery_value)s/%(subresource)s/%(origin)s.%(redirection)s.%(source_scheme)s", "test_file_path_pattern": "gen/%(source_context_list)s.%(delivery_type)s/%(delivery_value)s/%(subresource)s/%(origin)s.%(redirection)s.%(source_scheme)s.html", "excluded_tests": [{"name": "Workers are same-origin only", "expansion": "*", "source_scheme": "*", "source_context_list": "*", "delivery_type": "*", "delivery_value": "*", "redirection": "*", "subresource": ["worker-classic", "worker-module", "sharedworker-classic", "sharedworker-module"], "origin": ["cross-https", "cross-http", "cross-http-downgrade", "cross-wss", "cross-ws", "cross-ws-downgrade"], "expectation": "*"}, {"name": "Workers are same-origin only (redirects)", "expansion": "*", "source_scheme": "*", "source_context_list": "*", "delivery_type": "*", "delivery_value": "*", "redirection": ["swap-origin", "swap-scheme"], "subresource": ["worker-classic", "worker-module", "sharedworker-classic", "sharedworker-module"], "origin": "*", "expectation": "*"}, {"name": "Websockets are ws/wss-only", "expansion": "*", "source_scheme": "*", "source_context_list": "*", "delivery_type": "*", "delivery_value": "*", "redirection": "*", "subresource": "websocket", "origin": ["same-https", "same-http", "same-http-downgrade", "cross-https", "cross-http", "cross-http-downgrade"], "expectation": "*"}, {"name": "Websockets are no-redirect only", "expansion": "*", "source_scheme": "*", "source_context_list": "*", "delivery_type": "*", "delivery_value": "*", "redirection": ["keep-origin", "swap-origin", "keep-scheme", "swap-scheme", "downgrade"], "subresource": "websocket", "origin": "*", "expectation": "*"}, {"name": "ws/wss are websocket-only", "expansion": "*", "source_scheme": "*", "source_context_list": "*", "delivery_type": "*", "delivery_value": "*", "redirection": "*", "subresource": ["area-tag", "a-tag", "fetch", "iframe-tag", "img-tag", "script-tag", "sharedworker-classic", "sharedworker-import-data", "sharedworker-module", "worker-classic", "worker-import-data", "worker-module", "worklet-animation", "worklet-animation-import-data", "worklet-audio", "worklet-audio-import-data", "worklet-layout", "worklet-layout-import-data", "worklet-paint", "worklet-paint-import-data", "xhr"], "origin": ["same-wss", "same-ws", "same-ws-downgrade", "cross-wss", "cross-ws", "cross-ws-downgrade"], "expectation": "*"}, {"name": "Omit secure requests", "expansion": "*", "source_scheme": "*", "source_context_list": "*", "delivery_type": "*", "delivery_value": "*", "redirection": "no-redirect", "subresource": "*", "origin": ["same-https", "cross-https", "same-wss", "cross-wss"], "expectation": "allowed"}, {"name": "For inheriting tests skip http-rp because we already have <meta> tests", "expansion": "*", "source_scheme": "*", "source_context_list": ["srcdoc-inherit", "iframe-blank-inherit", "worker-classic-data"], "delivery_type": "http-rp", "delivery_value": "*", "redirection": "*", "subresource": "*", "origin": "*", "expectation": "*"}, {"name": "source_context_list values not yet tested", "expansion": "*", "source_scheme": "*", "source_context_list": ["req", "srcdoc", "iframe", "worker-classic", "worker-module", "worker-module-data", "sharedworker-classic-data", "sharedworker-module-data"], "delivery_type": "*", "delivery_value": "*", "redirection": "*", "subresource": "*", "origin": "*", "expectation": "*"}, {"name": "subresource values not yet tested", "expansion": "*", "source_scheme": "*", "source_context_list": "*", "delivery_type": "*", "delivery_value": "*", "redirection": "*", "subresource": ["a-tag", "area-tag", "audio-tag", "beacon", "link-css-tag", "link-prefetch-tag", "object-tag", "picture-tag", "script-tag", "video-tag"], "origin": "*", "expectation": "*"}, {"name": "origins that upgrade-insecure-requests tests don't care", "expansion": "*", "source_scheme": "*", "source_context_list": "*", "delivery_type": "*", "delivery_value": "*", "redirection": "*", "origin": ["same-http", "cross-http", "same-ws", "cross-ws"], "subresource": "*", "expectation": "*"}, {"name": "redirections that upgrade-insecure-requests tests don't care", "expansion": "*", "source_scheme": "*", "source_context_list": "*", "delivery_type": "*", "delivery_value": "*", "redirection": ["keep-origin", "swap-origin", "keep-scheme", "swap-scheme"], "origin": "*", "subresource": "*", "expectation": "*"}], "source_context_schema": {"supported_subresource": {"top": "*", "iframe": "*", "iframe-blank": "*", "srcdoc": "*", "worker-classic": ["xhr", "fetch", "websocket", "worker-classic", "worker-module"], "worker-module": ["xhr", "fetch", "websocket", "worker-classic", "worker-module"], "worker-classic-data": ["xhr", "fetch", "websocket"], "worker-module-data": ["xhr", "fetch", "websocket"], "sharedworker-classic": ["xhr", "fetch", "websocket"], "sharedworker-module": ["xhr", "fetch", "websocket"], "sharedworker-classic-data": ["xhr", "fetch", "websocket"], "sharedworker-module-data": ["xhr", "fetch", "websocket"]}, "supported_delivery_type": {"top": ["http-rp", "meta"], "iframe": ["http-rp", "meta"], "iframe-blank": ["meta"], "srcdoc": ["meta"], "worker-classic": ["http-rp"], "worker-module": ["http-rp"], "worker-classic-data": [], "worker-module-data": [], "sharedworker-classic": ["http-rp"], "sharedworker-module": ["http-rp"], "sharedworker-classic-data": [], "sharedworker-module-data": []}}, "source_context_list_schema": {"top": {"description": "Policy set by the top-level Document", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["policy"]}], "subresourcePolicyDeliveries": []}, "req": {"description": "Subresource request's policy should override Document's policy", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["anotherPolicy"]}], "subresourcePolicyDeliveries": ["nonNullPolicy"]}, "srcdoc-inherit": {"description": "srcdoc iframe without its own policy should inherit parent Document's policy", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["policy"]}, {"sourceContextType": "srcdoc"}], "subresourcePolicyDeliveries": []}, "srcdoc": {"description": "srcdoc iframe's policy should override parent Document's policy", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["anotherPolicy"]}, {"sourceContextType": "srcdoc", "policyDeliveries": ["nonNullPolicy"]}], "subresourcePolicyDeliveries": []}, "iframe": {"description": "external iframe's policy should override parent Document's policy", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["anotherPolicy"]}, {"sourceContextType": "iframe", "policyDeliveries": ["policy"]}], "subresourcePolicyDeliveries": []}, "iframe-blank-inherit": {"description": "blank iframe should inherit parent Document's policy", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["policy"]}, {"sourceContextType": "iframe-blank"}], "subresourcePolicyDeliveries": []}, "worker-classic": {"description": "dedicated workers shouldn't inherit its parent's policy.", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["anotherPolicy"]}, {"sourceContextType": "worker-classic", "policyDeliveries": ["policy"]}], "subresourcePolicyDeliveries": []}, "worker-classic-data": {"description": "data: dedicated workers should inherit its parent's policy.", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["policy"]}, {"sourceContextType": "worker-classic-data", "policyDeliveries": []}], "subresourcePolicyDeliveries": []}, "worker-module": {"description": "dedicated workers shouldn't inherit its parent's policy.", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["anotherPolicy"]}, {"sourceContextType": "worker-module", "policyDeliveries": ["policy"]}], "subresourcePolicyDeliveries": []}, "worker-module-data": {"description": "data: dedicated workers should inherit its parent's policy.", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["policy"]}, {"sourceContextType": "worker-module-data", "policyDeliveries": []}], "subresourcePolicyDeliveries": []}, "sharedworker-classic-data": {"description": "data: shared workers should inherit its parent's policy.", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["policy"]}, {"sourceContextType": "sharedworker-classic-data", "policyDeliveries": []}], "subresourcePolicyDeliveries": []}, "sharedworker-module-data": {"description": "data: shared workers should inherit its parent's policy.", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["policy"]}, {"sourceContextType": "sharedworker-module-data", "policyDeliveries": []}], "subresourcePolicyDeliveries": []}}, "test_expansion_schema": {"expansion": ["default", "override"], "source_scheme": ["http", "https"], "source_context_list": ["top", "req", "srcdoc-inherit", "srcdoc", "iframe", "iframe-blank-inherit", "worker-classic", "worker-classic-data", "worker-module", "worker-module-data", "sharedworker-classic-data", "sharedworker-module-data"], "redirection": ["no-redirect", "keep-origin", "swap-origin", "keep-scheme", "swap-scheme", "downgrade"], "origin": ["same-https", "same-http", "same-http-downgrade", "cross-https", "cross-http", "cross-http-downgrade", "same-wss", "same-ws", "same-ws-downgrade", "cross-wss", "cross-ws", "cross-ws-downgrade"], "subresource": ["a-tag", "area-tag", "audio-tag", "beacon", "fetch", "iframe-tag", "img-tag", "link-css-tag", "link-prefetch-tag", "object-tag", "picture-tag", "script-tag", "sharedworker-classic", "sharedworker-import-data", "sharedworker-module", "video-tag", "websocket", "worker-classic", "worker-import-data", "worker-module", "worklet-animation", "worklet-animation-import-data", "worklet-audio", "worklet-audio-import-data", "worklet-layout", "worklet-layout-import-data", "worklet-paint", "worklet-paint-import-data", "xhr"], "delivery_type": ["http-rp", "meta"], "delivery_value": [null, "upgrade"], "expectation": ["allowed", "blocked"]}, "test_description_template": "Upgrade-Insecure-Requests: Expects %(expectation)s for %(subresource)s to %(origin)s origin and %(redirection)s redirection from %(source_scheme)s context.", "test_page_title_template": "Upgrade-Insecure-Requests: %(title)s", "specification": [{"name": "No upgrade-insecure-request", "title": "No upgrade-insecure-request", "description": "No upgrade-insecure-request", "specification_url": "https://w3c.github.io/webappsec-upgrade-insecure-requests/", "test_expansion": [{"name": "Without upgrade-insecure-request, all requests are blocked ...", "expansion": "default", "source_scheme": "https", "source_context_list": "*", "delivery_type": "meta", "delivery_value": null, "redirection": "*", "subresource": "*", "origin": "*", "expectation": "blocked"}, {"name": "... except for the secure requests listed here", "expansion": "override", "source_scheme": "https", "source_context_list": "*", "delivery_type": "meta", "delivery_value": null, "redirection": "no-redirect", "subresource": "*", "origin": ["same-https", "cross-https", "same-wss", "cross-wss"], "expectation": "allowed"}]}, {"name": "With upgrade-insecure-request", "title": "With upgrade-insecure-request", "description": "With upgrade-insecure-request", "specification_url": "https://w3c.github.io/webappsec-upgrade-insecure-requests/", "test_expansion": [{"name": "With upgrade-insecure-request, all insecure requests are upgraded and allowed.", "expansion": "default", "source_scheme": "https", "source_context_list": "*", "delivery_type": "*", "delivery_value": "upgrade", "redirection": "*", "subresource": "*", "origin": "*", "expectation": "allowed"}]}], "delivery_key": "upgradeInsecureRequests", "subresource_schema": {"supported_delivery_type": {"a-tag": [], "area-tag": [], "audio-tag": [], "beacon": [], "fetch": [], "iframe-tag": [], "img-tag": [], "link-css-tag": [], "link-prefetch-tag": [], "object-tag": [], "picture-tag": [], "script-tag": [], "sharedworker-classic": [], "sharedworker-import-data": [], "sharedworker-module": [], "video-tag": [], "websocket": [], "worker-classic": [], "worker-import-data": [], "worker-module": [], "worklet-animation": [], "worklet-animation-import-data": [], "worklet-audio": [], "worklet-audio-import-data": [], "worklet-layout": [], "worklet-layout-import-data": [], "worklet-paint": [], "worklet-paint-import-data": [], "xhr": []}}}; +var SPEC_JSON = {"selection_pattern": "%(source_context_list)s.%(delivery_type)s/%(delivery_value)s/%(subresource)s/%(origin)s.%(redirection)s.%(source_scheme)s", "test_file_path_pattern": "gen/%(source_context_list)s.%(delivery_type)s/%(delivery_value)s/%(subresource)s/%(origin)s.%(redirection)s.%(source_scheme)s.html", "excluded_tests": [{"name": "Workers are same-origin only", "expansion": "*", "source_scheme": "*", "source_context_list": "*", "delivery_type": "*", "delivery_value": "*", "redirection": "*", "subresource": ["worker-classic", "worker-module", "sharedworker-classic", "sharedworker-module"], "origin": ["cross-https", "cross-http", "cross-http-downgrade", "cross-wss", "cross-ws", "cross-ws-downgrade"], "expectation": "*"}, {"name": "Workers are same-origin only (redirects)", "expansion": "*", "source_scheme": "*", "source_context_list": "*", "delivery_type": "*", "delivery_value": "*", "redirection": ["swap-origin", "swap-scheme"], "subresource": ["worker-classic", "worker-module", "sharedworker-classic", "sharedworker-module"], "origin": "*", "expectation": "*"}, {"name": "Websockets are ws/wss-only", "expansion": "*", "source_scheme": "*", "source_context_list": "*", "delivery_type": "*", "delivery_value": "*", "redirection": "*", "subresource": "websocket", "origin": ["same-https", "same-http", "same-http-downgrade", "cross-https", "cross-http", "cross-http-downgrade"], "expectation": "*"}, {"name": "Websockets are no-redirect only", "expansion": "*", "source_scheme": "*", "source_context_list": "*", "delivery_type": "*", "delivery_value": "*", "redirection": ["keep-origin", "swap-origin", "keep-scheme", "swap-scheme", "downgrade"], "subresource": "websocket", "origin": "*", "expectation": "*"}, {"name": "ws/wss are websocket-only", "expansion": "*", "source_scheme": "*", "source_context_list": "*", "delivery_type": "*", "delivery_value": "*", "redirection": "*", "subresource": ["area-tag", "a-tag", "fetch", "iframe-tag", "img-tag", "script-tag", "sharedworker-classic", "sharedworker-import-data", "sharedworker-module", "worker-classic", "worker-import-data", "worker-module", "worklet-animation", "worklet-animation-import-data", "worklet-audio", "worklet-audio-import-data", "worklet-layout", "worklet-layout-import-data", "worklet-paint", "worklet-paint-import-data", "xhr"], "origin": ["same-wss", "same-ws", "same-ws-downgrade", "cross-wss", "cross-ws", "cross-ws-downgrade"], "expectation": "*"}, {"name": "Omit secure requests", "expansion": "*", "source_scheme": "*", "source_context_list": "*", "delivery_type": "*", "delivery_value": "*", "redirection": "no-redirect", "subresource": "*", "origin": ["same-https", "cross-https", "same-wss", "cross-wss"], "expectation": "allowed"}, {"name": "For inheriting tests skip http-rp because we already have <meta> tests", "expansion": "*", "source_scheme": "*", "source_context_list": ["srcdoc-inherit", "iframe-blank-inherit", "worker-classic-data"], "delivery_type": "http-rp", "delivery_value": "*", "redirection": "*", "subresource": "*", "origin": "*", "expectation": "*"}, {"name": "source_context_list values not yet tested", "expansion": "*", "source_scheme": "*", "source_context_list": ["req", "srcdoc", "iframe", "worker-module-data", "sharedworker-classic-data", "sharedworker-module-data"], "delivery_type": "*", "delivery_value": "*", "redirection": "*", "subresource": "*", "origin": "*", "expectation": "*"}, {"name": "source_context_list values not for CSP tests", "expansion": "*", "source_scheme": "*", "source_context_list": ["worker-classic", "worker-module"], "delivery_type": "*", "delivery_value": "*", "redirection": "*", "subresource": "*", "origin": "*", "expectation": "*"}, {"name": "subresource values not yet tested", "expansion": "*", "source_scheme": "*", "source_context_list": "*", "delivery_type": "*", "delivery_value": "*", "redirection": "*", "subresource": ["a-tag", "area-tag", "audio-tag", "beacon", "link-css-tag", "link-prefetch-tag", "object-tag", "picture-tag", "script-tag", "video-tag"], "origin": "*", "expectation": "*"}, {"name": "origins that upgrade-insecure-requests tests don't care", "expansion": "*", "source_scheme": "*", "source_context_list": "*", "delivery_type": "*", "delivery_value": "*", "redirection": "*", "origin": ["same-http", "cross-http", "same-ws", "cross-ws"], "subresource": "*", "expectation": "*"}, {"name": "redirections that upgrade-insecure-requests tests don't care", "expansion": "*", "source_scheme": "*", "source_context_list": "*", "delivery_type": "*", "delivery_value": "*", "redirection": ["keep-origin", "swap-origin", "keep-scheme", "swap-scheme"], "origin": "*", "subresource": "*", "expectation": "*"}], "source_context_schema": {"supported_subresource": {"top": "*", "iframe": "*", "iframe-blank": "*", "srcdoc": "*", "worker-classic": ["xhr", "fetch", "websocket", "worker-classic", "worker-module"], "worker-module": ["xhr", "fetch", "websocket", "worker-classic", "worker-module"], "worker-classic-data": ["xhr", "fetch", "websocket"], "worker-module-data": ["xhr", "fetch", "websocket"], "sharedworker-classic": ["xhr", "fetch", "websocket"], "sharedworker-module": ["xhr", "fetch", "websocket"], "sharedworker-classic-data": ["xhr", "fetch", "websocket"], "sharedworker-module-data": ["xhr", "fetch", "websocket"]}, "supported_delivery_type": {"top": ["http-rp", "meta"], "iframe": ["http-rp", "meta"], "iframe-blank": ["meta"], "srcdoc": ["meta"], "worker-classic": ["http-rp"], "worker-module": ["http-rp"], "worker-classic-data": [], "worker-module-data": [], "sharedworker-classic": ["http-rp"], "sharedworker-module": ["http-rp"], "sharedworker-classic-data": [], "sharedworker-module-data": []}}, "source_context_list_schema": {"top": {"description": "Policy set by the top-level Document", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["policy"]}], "subresourcePolicyDeliveries": []}, "req": {"description": "Subresource request's policy should override Document's policy", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["anotherPolicy"]}], "subresourcePolicyDeliveries": ["nonNullPolicy"]}, "srcdoc-inherit": {"description": "srcdoc iframe without its own policy should inherit parent Document's policy", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["policy"]}, {"sourceContextType": "srcdoc"}], "subresourcePolicyDeliveries": []}, "srcdoc": {"description": "srcdoc iframe's policy should override parent Document's policy", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["anotherPolicy"]}, {"sourceContextType": "srcdoc", "policyDeliveries": ["nonNullPolicy"]}], "subresourcePolicyDeliveries": []}, "iframe": {"description": "external iframe's policy should override parent Document's policy", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["anotherPolicy"]}, {"sourceContextType": "iframe", "policyDeliveries": ["policy"]}], "subresourcePolicyDeliveries": []}, "iframe-blank-inherit": {"description": "blank iframe should inherit parent Document's policy", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["policy"]}, {"sourceContextType": "iframe-blank"}], "subresourcePolicyDeliveries": []}, "worker-classic": {"description": "dedicated workers shouldn't inherit its parent's policy.", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["anotherPolicy"]}, {"sourceContextType": "worker-classic", "policyDeliveries": ["policy"]}], "subresourcePolicyDeliveries": []}, "worker-classic-inherit": {"description": "dedicated workers should inherit its parent's policy.", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["policy"]}, {"sourceContextType": "worker-classic", "policyDeliveries": ["anotherPolicy"]}], "subresourcePolicyDeliveries": []}, "worker-classic-data": {"description": "data: dedicated workers should inherit its parent's policy.", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["policy"]}, {"sourceContextType": "worker-classic-data", "policyDeliveries": []}], "subresourcePolicyDeliveries": []}, "worker-module": {"description": "dedicated workers shouldn't inherit its parent's policy.", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["anotherPolicy"]}, {"sourceContextType": "worker-module", "policyDeliveries": ["policy"]}], "subresourcePolicyDeliveries": []}, "worker-module-inherit": {"description": "dedicated workers should inherit its parent's policy.", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["policy"]}, {"sourceContextType": "worker-module", "policyDeliveries": ["anotherPolicy"]}], "subresourcePolicyDeliveries": []}, "worker-module-data": {"description": "data: dedicated workers should inherit its parent's policy.", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["policy"]}, {"sourceContextType": "worker-module-data", "policyDeliveries": []}], "subresourcePolicyDeliveries": []}, "sharedworker-classic": {"description": "shared workers shouldn't inherit its parent's policy.", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["anotherPolicy"]}, {"sourceContextType": "sharedworker-classic", "policyDeliveries": ["policy"]}], "subresourcePolicyDeliveries": []}, "sharedworker-classic-data": {"description": "data: shared workers should inherit its parent's policy.", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["policy"]}, {"sourceContextType": "sharedworker-classic-data", "policyDeliveries": []}], "subresourcePolicyDeliveries": []}, "sharedworker-module": {"description": "shared workers shouldn't inherit its parent's policy.", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["anotherPolicy"]}, {"sourceContextType": "sharedworker-module", "policyDeliveries": ["policy"]}], "subresourcePolicyDeliveries": []}, "sharedworker-module-data": {"description": "data: shared workers should inherit its parent's policy.", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["policy"]}, {"sourceContextType": "sharedworker-module-data", "policyDeliveries": []}], "subresourcePolicyDeliveries": []}}, "test_expansion_schema": {"expansion": ["default", "override"], "source_scheme": ["http", "https"], "source_context_list": ["top", "req", "srcdoc-inherit", "srcdoc", "iframe", "iframe-blank-inherit", "worker-classic", "worker-classic-inherit", "worker-classic-data", "worker-module", "worker-module-inherit", "worker-module-data", "sharedworker-classic", "sharedworker-classic-data", "sharedworker-module", "sharedworker-module-data"], "redirection": ["no-redirect", "keep-origin", "swap-origin", "keep-scheme", "swap-scheme", "downgrade"], "origin": ["same-https", "same-http", "same-http-downgrade", "cross-https", "cross-http", "cross-http-downgrade", "same-wss", "same-ws", "same-ws-downgrade", "cross-wss", "cross-ws", "cross-ws-downgrade"], "subresource": ["a-tag", "area-tag", "audio-tag", "beacon", "fetch", "iframe-tag", "img-tag", "link-css-tag", "link-prefetch-tag", "object-tag", "picture-tag", "script-tag", "sharedworker-classic", "sharedworker-import-data", "sharedworker-module", "video-tag", "websocket", "worker-classic", "worker-import-data", "worker-module", "worklet-animation", "worklet-animation-import-data", "worklet-audio", "worklet-audio-import-data", "worklet-layout", "worklet-layout-import-data", "worklet-paint", "worklet-paint-import-data", "xhr"], "delivery_type": ["http-rp", "meta"], "delivery_value": [null, "upgrade"], "expectation": ["allowed", "blocked"]}, "test_description_template": "Upgrade-Insecure-Requests: Expects %(expectation)s for %(subresource)s to %(origin)s origin and %(redirection)s redirection from %(source_scheme)s context.", "test_page_title_template": "Upgrade-Insecure-Requests: %(title)s", "specification": [{"name": "No upgrade-insecure-request", "title": "No upgrade-insecure-request", "description": "No upgrade-insecure-request", "specification_url": "https://w3c.github.io/webappsec-upgrade-insecure-requests/", "test_expansion": [{"name": "Without upgrade-insecure-request, all requests are blocked ...", "expansion": "default", "source_scheme": "https", "source_context_list": "*", "delivery_type": "meta", "delivery_value": null, "redirection": "*", "subresource": "*", "origin": "*", "expectation": "blocked"}, {"name": "... except for the secure requests listed here", "expansion": "override", "source_scheme": "https", "source_context_list": "*", "delivery_type": "meta", "delivery_value": null, "redirection": "no-redirect", "subresource": "*", "origin": ["same-https", "cross-https", "same-wss", "cross-wss"], "expectation": "allowed"}]}, {"name": "With upgrade-insecure-request", "title": "With upgrade-insecure-request", "description": "With upgrade-insecure-request", "specification_url": "https://w3c.github.io/webappsec-upgrade-insecure-requests/", "test_expansion": [{"name": "With upgrade-insecure-request, all insecure requests are upgraded and allowed.", "expansion": "default", "source_scheme": "https", "source_context_list": "*", "delivery_type": "*", "delivery_value": "upgrade", "redirection": "*", "subresource": "*", "origin": "*", "expectation": "allowed"}]}], "delivery_key": "upgradeInsecureRequests", "subresource_schema": {"supported_delivery_type": {"a-tag": [], "area-tag": [], "audio-tag": [], "beacon": [], "fetch": [], "iframe-tag": [], "img-tag": [], "link-css-tag": [], "link-prefetch-tag": [], "object-tag": [], "picture-tag": [], "script-tag": [], "sharedworker-classic": [], "sharedworker-import-data": [], "sharedworker-module": [], "video-tag": [], "websocket": [], "worker-classic": [], "worker-import-data": [], "worker-module": [], "worklet-animation": [], "worklet-animation-import-data": [], "worklet-audio": [], "worklet-audio-import-data": [], "worklet-layout": [], "worklet-layout-import-data": [], "worklet-paint": [], "worklet-paint-import-data": [], "xhr": []}}};
diff --git a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/spec.src.json b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/spec.src.json index d6431590..f5198c318 100644 --- a/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/spec.src.json +++ b/third_party/blink/web_tests/external/wpt/upgrade-insecure-requests/spec.src.json
@@ -103,8 +103,6 @@ "req", "srcdoc", "iframe", - "worker-classic", - "worker-module", "worker-module-data", "sharedworker-classic-data", "sharedworker-module-data" @@ -117,6 +115,21 @@ "expectation": "*" }, { + "name": "source_context_list values not for CSP tests", + "expansion": "*", + "source_scheme": "*", + "source_context_list": [ + "worker-classic", + "worker-module" + ], + "delivery_type": "*", + "delivery_value": "*", + "redirection": "*", + "subresource": "*", + "origin": "*", + "expectation": "*" + }, + { "name": "subresource values not yet tested", "expansion": "*", "source_scheme": "*",
diff --git a/third_party/blink/web_tests/fast/sub-pixel/repaint-subpixel-layer-in-subpixel-composited-layer-expected.txt b/third_party/blink/web_tests/fast/sub-pixel/repaint-subpixel-layer-in-subpixel-composited-layer-expected.txt index aa8c4f8..1d53bec0 100644 --- a/third_party/blink/web_tests/fast/sub-pixel/repaint-subpixel-layer-in-subpixel-composited-layer-expected.txt +++ b/third_party/blink/web_tests/fast/sub-pixel/repaint-subpixel-layer-in-subpixel-composited-layer-expected.txt
@@ -10,17 +10,9 @@ { "name": "LayoutNGBlockFlow (relative positioned) DIV id='container'", "bounds": [100, 50], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='test'", - "rect": [11, 0, 14, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='test'", - "rect": [9, 0, 14, 12], - "reason": "geometry" - } + "invalidations": [ + [11, 0, 14, 12], + [9, 0, 14, 12] ], "transform": 1 } @@ -49,17 +41,9 @@ { "name": "LayoutNGBlockFlow (relative positioned) DIV id='container'", "bounds": [100, 50], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='test'", - "rect": [11, 0, 14, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='test'", - "rect": [9, 0, 14, 12], - "reason": "geometry" - } + "invalidations": [ + [11, 0, 14, 12], + [9, 0, 14, 12] ], "transform": 1 } @@ -88,17 +72,9 @@ { "name": "LayoutNGBlockFlow (relative positioned) DIV id='container'", "bounds": [100, 50], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='test'", - "rect": [12, 0, 14, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='test'", - "rect": [10, 0, 14, 12], - "reason": "geometry" - } + "invalidations": [ + [12, 0, 14, 12], + [10, 0, 14, 12] ], "transform": 1 } @@ -127,17 +103,9 @@ { "name": "LayoutNGBlockFlow (relative positioned) DIV id='container'", "bounds": [100, 50], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='test'", - "rect": [11, 0, 14, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='test'", - "rect": [9, 0, 14, 12], - "reason": "geometry" - } + "invalidations": [ + [11, 0, 14, 12], + [9, 0, 14, 12] ], "transform": 1 } @@ -166,17 +134,9 @@ { "name": "LayoutNGBlockFlow (relative positioned) DIV id='container'", "bounds": [100, 50], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='test'", - "rect": [12, 0, 14, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='test'", - "rect": [10, 0, 14, 12], - "reason": "geometry" - } + "invalidations": [ + [12, 0, 14, 12], + [10, 0, 14, 12] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/fast/sub-pixel/repaint-subpixel-layer-in-subpixel-composited-layer.html b/third_party/blink/web_tests/fast/sub-pixel/repaint-subpixel-layer-in-subpixel-composited-layer.html index af2ea18..ef48437 100644 --- a/third_party/blink/web_tests/fast/sub-pixel/repaint-subpixel-layer-in-subpixel-composited-layer.html +++ b/third_party/blink/web_tests/fast/sub-pixel/repaint-subpixel-layer-in-subpixel-composited-layer.html
@@ -50,7 +50,7 @@ document.getElementById('test').style.left = testData[testIndex][2]; if (window.internals) { document.getElementById('console').textContent += testData[testIndex] + ':\n' - + internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS); + + internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_INVALIDATIONS); internals.stopTrackingRepaints(document); }
diff --git a/third_party/blink/web_tests/fast/sub-pixel/should-not-repaint-subpixel-composited-layer.html b/third_party/blink/web_tests/fast/sub-pixel/should-not-repaint-subpixel-composited-layer.html index 7c0c865..fddec51 100644 --- a/third_party/blink/web_tests/fast/sub-pixel/should-not-repaint-subpixel-composited-layer.html +++ b/third_party/blink/web_tests/fast/sub-pixel/should-not-repaint-subpixel-composited-layer.html
@@ -33,7 +33,7 @@ document.getElementById('layer').style.left = left + 'px'; if (window.internals) { document.getElementById('console').textContent += left + ':\n' - + internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS); + + internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_INVALIDATIONS); internals.stopTrackingRepaints(document); }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/compositing/squashing/add-remove-squashed-layers-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/compositing/squashing/add-remove-squashed-layers-expected.txt index d1d5edf..4d8c58a 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/compositing/squashing/add-remove-squashed-layers-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/compositing/squashing/add-remove-squashed-layers-expected.txt
@@ -57,12 +57,8 @@ "position": [140, 140], "bounds": [260, 260], "backgroundColor": "#0000FF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='C' class='overlap3'", - "rect": [160, 160, 100, 100], - "reason": "chunk appeared" - } + "invalidations": [ + [160, 160, 100, 100] ] } ], @@ -100,12 +96,8 @@ "position": [140, 140], "bounds": [260, 260], "backgroundColor": "#0000FF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='B' class='overlap2'", - "rect": [80, 80, 100, 100], - "reason": "chunk disappeared" - } + "invalidations": [ + [80, 80, 100, 100] ] } ], @@ -144,12 +136,8 @@ "bounds": [100, 100], "contentsOpaque": true, "backgroundColor": "#FF00FF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='C' class='overlap3'", - "rect": [0, 0, 100, 100], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 100, 100] ] } ], @@ -187,12 +175,8 @@ "position": [220, 220], "bounds": [180, 180], "backgroundColor": "#00FF00", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='B' class='overlap2'", - "rect": [0, 0, 180, 180], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 180, 180] ] } ], @@ -230,12 +214,8 @@ "position": [140, 140], "bounds": [180, 180], "backgroundColor": "#0000FF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='A' class='overlap1'", - "rect": [0, 0, 180, 180], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 180, 180] ] } ],
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/compositing/squashing/invalidations-with-large-negative-margin-inline-content-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/compositing/squashing/invalidations-with-large-negative-margin-inline-content-expected.txt index f540e38..2bed0e7d 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/compositing/squashing/invalidations-with-large-negative-margin-inline-content-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/compositing/squashing/invalidations-with-large-negative-margin-inline-content-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='chip'", - "rect": [408, 108, 20, 20], - "reason": "background" - } + "invalidations": [ + [408, 108, 20, 20] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/compositing/squashing/repaint-child-of-squashed-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/compositing/squashing/repaint-child-of-squashed-expected.txt index b7ac9ba..e3392e51 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/compositing/squashing/repaint-child-of-squashed-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/compositing/squashing/repaint-child-of-squashed-expected.txt
@@ -57,12 +57,8 @@ "bounds": [100, 100], "contentsOpaque": true, "backgroundColor": "#00FFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='inner'", - "rect": [10, 10, 50, 50], - "reason": "background" - } + "invalidations": [ + [10, 10, 50, 50] ] } ],
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/compositing/squashing/selection-repaint-with-gaps-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/compositing/squashing/selection-repaint-with-gaps-expected.txt index eca60c9..414a828 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/compositing/squashing/selection-repaint-with-gaps-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/compositing/squashing/selection-repaint-with-gaps-expected.txt
@@ -17,17 +17,8 @@ "position": [15, 35], "bounds": [100, 210], "backgroundColor": "#D3D3D3", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'ipsum'", - "rect": [0, 80, 40, 40], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'lorem'", - "rect": [0, 80, 40, 40], - "reason": "geometry" - } + "invalidations": [ + [0, 80, 40, 40] ] } ], @@ -62,27 +53,9 @@ "position": [15, 35], "bounds": [100, 210], "backgroundColor": "#D3D3D3", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'ipsum'", - "rect": [0, 160, 40, 40], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'lorem'", - "rect": [0, 160, 40, 40], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'ipsum'", - "rect": [0, 80, 40, 40], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'lorem'", - "rect": [0, 80, 40, 40], - "reason": "geometry" - } + "invalidations": [ + [0, 160, 40, 40], + [0, 80, 40, 40] ] } ],
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/compositing/squashing/squash-above-fixed-1-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/compositing/squashing/squash-above-fixed-1-expected.txt index 87bd0256..d9b0c61 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/compositing/squashing/squash-above-fixed-1-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/compositing/squashing/squash-above-fixed-1-expected.txt
@@ -52,12 +52,8 @@ "bounds": [785, 1400], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='paragraph-b' class='overlapping lime'", - "rect": [0, 100, 200, 100], - "reason": "chunk appeared" - } + "invalidations": [ + [0, 100, 200, 100] ], "transform": 1 }, @@ -79,12 +75,8 @@ "bounds": [200, 1200], "contentsOpaque": true, "backgroundColor": "#00FFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='paragraph-c' class='overlapping cyan'", - "rect": [0, 0, 200, 1200], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 200, 1200] ], "transform": 1 } @@ -172,12 +164,8 @@ "bounds": [785, 1400], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='paragraph-c' class='overlapping cyan'", - "rect": [0, 200, 200, 100], - "reason": "chunk appeared" - } + "invalidations": [ + [0, 200, 200, 100] ], "transform": 1 }, @@ -199,12 +187,8 @@ "bounds": [200, 1100], "contentsOpaque": true, "backgroundColor": "#00FF00", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='paragraph-d' class='overlapping lime'", - "rect": [0, 0, 200, 1100], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 200, 1100] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/compositing/squashing/squash-above-fixed-3-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/compositing/squashing/squash-above-fixed-3-expected.txt index 8e2ee99f..f64c6571 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/compositing/squashing/squash-above-fixed-3-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/compositing/squashing/squash-above-fixed-3-expected.txt
@@ -150,12 +150,8 @@ "position": [100, 100], "bounds": [200, 4000], "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='innerScrolling'", - "rect": [100, 0, 100, 100], - "reason": "chunk appeared" - } + "invalidations": [ + [100, 0, 100, 100] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/compositing/squashing/squash-paint-invalidation-fixed-position-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/compositing/squashing/squash-paint-invalidation-fixed-position-expected.txt index fef9f216..2f2fee6 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/compositing/squashing/squash-paint-invalidation-fixed-position-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/compositing/squashing/squash-paint-invalidation-fixed-position-expected.txt
@@ -19,12 +19,8 @@ "bounds": [100, 125], "contentsOpaque": true, "backgroundColor": "#D3D3D3", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='foo'", - "rect": [0, 25, 100, 100], - "reason": "background" - } + "invalidations": [ + [0, 25, 100, 100] ] } ], @@ -61,12 +57,8 @@ "bounds": [100, 125], "contentsOpaque": true, "backgroundColor": "#D3D3D3", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='foo'", - "rect": [0, 25, 100, 100], - "reason": "background" - } + "invalidations": [ + [0, 25, 100, 100] ] } ],
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/compositing/squashing/squash-transform-repainting-child-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/compositing/squashing/squash-transform-repainting-child-expected.txt index a697200..254675f 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/compositing/squashing/squash-transform-repainting-child-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/compositing/squashing/squash-transform-repainting-child-expected.txt
@@ -53,12 +53,8 @@ "name": "LayoutNGBlockFlow (positioned) DIV class='box middle'", "bounds": [280, 280], "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='box middle'", - "rect": [0, 0, 141, 141], - "reason": "background" - } + "invalidations": [ + [0, 0, 141, 141] ] } ], @@ -95,17 +91,8 @@ "name": "LayoutNGBlockFlow (positioned) DIV class='box middle'", "bounds": [280, 280], "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='box middle'", - "rect": [0, 0, 141, 141], - "reason": "background" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV class='smallbox'", - "rect": [31, 31, 71, 71], - "reason": "background" - } + "invalidations": [ + [0, 0, 141, 141] ] } ],
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/compositing/squashing/squash-transform-repainting-transformed-child-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/compositing/squashing/squash-transform-repainting-transformed-child-expected.txt index 00acfdf..3bf57fa 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/compositing/squashing/squash-transform-repainting-transformed-child-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/compositing/squashing/squash-transform-repainting-transformed-child-expected.txt
@@ -55,12 +55,8 @@ "position": [4, 4], "bounds": [276, 276], "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='box middle'", - "rect": [0, 0, 132, 132], - "reason": "background" - } + "invalidations": [ + [0, 0, 132, 132] ] } ], @@ -98,17 +94,8 @@ "position": [4, 4], "bounds": [276, 276], "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='box middle'", - "rect": [0, 0, 132, 132], - "reason": "background" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV class='smallbox'", - "rect": [26, 28, 71, 72], - "reason": "background" - } + "invalidations": [ + [0, 0, 132, 132] ] } ],
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/compositing/squashing/squashed-layer-loses-graphicslayer-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/compositing/squashing/squashed-layer-loses-graphicslayer-expected.txt index 34cf523..96b12ae 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/compositing/squashing/squashed-layer-loses-graphicslayer-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/compositing/squashing/squashed-layer-loses-graphicslayer-expected.txt
@@ -44,27 +44,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='C' class='overlap3'", - "rect": [300, 300, 100, 100], - "reason": "chunk appeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='B' class='overlap2'", - "rect": [220, 220, 100, 100], - "reason": "chunk appeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='A' class='overlap1'", - "rect": [140, 140, 100, 100], - "reason": "chunk appeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='forceComposited' class='underneath'", - "rect": [60, 60, 100, 100], - "reason": "chunk appeared" - } + "invalidations": [ + [300, 300, 100, 100], + [220, 220, 100, 100], + [140, 140, 100, 100], + [60, 60, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/compositing/squashing/squashed-repaints-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/compositing/squashing/squashed-repaints-expected.txt index c4e120a..d4ccf95 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/compositing/squashing/squashed-repaints-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/compositing/squashing/squashed-repaints-expected.txt
@@ -57,12 +57,8 @@ "position": [140, 140], "bounds": [260, 260], "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='A' class='overlap1'", - "rect": [0, 0, 100, 100], - "reason": "background" - } + "invalidations": [ + [0, 0, 100, 100] ] } ], @@ -100,17 +96,9 @@ "position": [140, 140], "bounds": [260, 260], "backgroundColor": "#0000FF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='B' class='overlap2'", - "rect": [80, 80, 100, 100], - "reason": "background" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='A' class='overlap1'", - "rect": [0, 0, 100, 100], - "reason": "background" - } + "invalidations": [ + [80, 80, 100, 100], + [0, 0, 100, 100] ] } ], @@ -148,17 +136,9 @@ "position": [140, 140], "bounds": [260, 260], "backgroundColor": "#0000FF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='C' class='overlap3'", - "rect": [160, 160, 100, 100], - "reason": "background" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='B' class='overlap2'", - "rect": [80, 80, 100, 100], - "reason": "background" - } + "invalidations": [ + [160, 160, 100, 100], + [80, 80, 100, 100] ] } ], @@ -196,17 +176,9 @@ "position": [140, 140], "bounds": [260, 260], "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='C' class='overlap3'", - "rect": [160, 160, 100, 100], - "reason": "background" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='A' class='overlap1'", - "rect": [0, 0, 100, 100], - "reason": "background" - } + "invalidations": [ + [160, 160, 100, 100], + [0, 0, 100, 100] ] } ],
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/fast/sub-pixel/repaint-subpixel-layer-in-subpixel-composited-layer-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/fast/sub-pixel/repaint-subpixel-layer-in-subpixel-composited-layer-expected.txt index 361c8f3d..912ce92 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/fast/sub-pixel/repaint-subpixel-layer-in-subpixel-composited-layer-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/fast/sub-pixel/repaint-subpixel-layer-in-subpixel-composited-layer-expected.txt
@@ -10,17 +10,9 @@ { "name": "LayoutNGBlockFlow (relative positioned) DIV id='container'", "bounds": [100, 50], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='test'", - "rect": [12, 0, 12, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='test'", - "rect": [10, 0, 12, 12], - "reason": "geometry" - } + "invalidations": [ + [12, 0, 12, 12], + [10, 0, 12, 12] ], "transform": 1 } @@ -49,17 +41,9 @@ { "name": "LayoutNGBlockFlow (relative positioned) DIV id='container'", "bounds": [100, 50], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='test'", - "rect": [11, 0, 13, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='test'", - "rect": [9, 0, 13, 12], - "reason": "geometry" - } + "invalidations": [ + [11, 0, 13, 12], + [9, 0, 13, 12] ], "transform": 1 } @@ -88,17 +72,9 @@ { "name": "LayoutNGBlockFlow (relative positioned) DIV id='container'", "bounds": [100, 50], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='test'", - "rect": [12, 0, 13, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='test'", - "rect": [10, 0, 13, 12], - "reason": "geometry" - } + "invalidations": [ + [12, 0, 13, 12], + [10, 0, 13, 12] ], "transform": 1 } @@ -127,17 +103,9 @@ { "name": "LayoutNGBlockFlow (relative positioned) DIV id='container'", "bounds": [100, 50], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='test'", - "rect": [12, 0, 13, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='test'", - "rect": [10, 0, 13, 12], - "reason": "geometry" - } + "invalidations": [ + [12, 0, 13, 12], + [10, 0, 13, 12] ], "transform": 1 } @@ -166,17 +134,9 @@ { "name": "LayoutNGBlockFlow (relative positioned) DIV id='container'", "bounds": [100, 50], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='test'", - "rect": [12, 0, 13, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='test'", - "rect": [10, 0, 13, 12], - "reason": "geometry" - } + "invalidations": [ + [12, 0, 13, 12], + [10, 0, 13, 12] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/float/float-under-inline-self-painting-change-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/float/float-under-inline-self-painting-change-expected.txt index 4e2ff41..1b5f831 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/float/float-under-inline-self-painting-change-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/float/float-under-inline-self-painting-change-expected.txt
@@ -5,42 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTextControl (floating) TEXTAREA id='target'", - "rect": [8, 8, 306, 306], - "reason": "appeared" - }, - { - "object": "LayoutTextControl (floating) TEXTAREA id='target'", - "rect": [8, 8, 306, 306], - "reason": "chunk disappeared" - }, - { - "object": "LayoutTextControl (floating) TEXTAREA id='target'", - "rect": [9, 9, 289, 304], - "reason": "chunk disappeared" - }, - { - "object": "LayoutTextControl (floating) TEXTAREA id='target'", - "rect": [11, 11, 285, 302], - "reason": "chunk disappeared" - }, - { - "object": "VerticalScrollbar", - "rect": [298, 9, 15, 289], - "reason": "chunk disappeared" - }, - { - "object": "LayoutTextControl (floating) TEXTAREA id='target'", - "rect": [298, 298, 15, 15], - "reason": "chunk appeared" - }, - { - "object": "Scroll corner of LayoutTextControl (floating) TEXTAREA id='target'", - "rect": [298, 298, 15, 15], - "reason": "chunk disappeared" - } + "invalidations": [ + [8, 8, 306, 306] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/4776765-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/4776765-expected.txt index ec45a8f0..86ec310 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/4776765-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/4776765-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV", - "rect": [6, 42, 788, 64], - "reason": "geometry" - }, - { - "object": "Caret", - "rect": [8, 84, 1, 19], - "reason": "caret" - }, - { - "object": "Caret", - "rect": [8, 64, 1, 19], - "reason": "caret" - } + "invalidations": [ + [6, 42, 788, 64] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/background-currentColor-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/background-currentColor-repaint-expected.txt index 3b08cbc56..ebd833de 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/background-currentColor-repaint-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/background-currentColor-repaint-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='div2'", - "rect": [8, 108, 100, 100], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='div1'", - "rect": [8, 8, 100, 100], - "reason": "disappeared" - } + "invalidations": [ + [8, 108, 100, 100], + [8, 8, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/background-generated-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/background-generated-expected.txt index 9322951..decd9f51d 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/background-generated-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/background-generated-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [8, 8, 100, 300], - "reason": "background" - } + "invalidations": [ + [8, 8, 100, 300] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/background-image-paint-invalidation-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/background-image-paint-invalidation-expected.txt index c6d549c..ac9eb1f7 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/background-image-paint-invalidation-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/background-image-paint-invalidation-expected.txt
@@ -5,12 +5,8 @@ "bounds": [808, 2016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 808, 2016], - "reason": "background" - } + "invalidations": [ + [0, 0, 808, 2016] ] }, {
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/background-misaligned-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/background-misaligned-expected.txt index 82cbdd5..ffd7c0c 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/background-misaligned-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/background-misaligned-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV", - "rect": [8, 8, 273, 276], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV", - "rect": [8, 8, 273, 276], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target'", - "rect": [238, 241, 40, 40], - "reason": "disappeared" - } + "invalidations": [ + [8, 8, 273, 276] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/background-resize-height-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/background-resize-height-expected.txt index 897ad42..1cac3199 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/background-resize-height-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/background-resize-height-expected.txt
@@ -12,17 +12,9 @@ "bounds": [110, 44], "contentsOpaque": true, "backgroundColor": "#000000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='test image size-cover'", - "rect": [50, 0, 60, 44], - "reason": "background" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV class='test image'", - "rect": [0, 40, 60, 4], - "reason": "incremental" - } + "invalidations": [ + [50, 0, 60, 44], + [0, 40, 60, 4] ] }, { @@ -31,17 +23,9 @@ "bounds": [110, 44], "contentsOpaque": true, "backgroundColor": "#000000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='test image size-contain'", - "rect": [0, 0, 60, 44], - "reason": "background" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV class='test image fixed-height'", - "rect": [50, 40, 60, 4], - "reason": "incremental" - } + "invalidations": [ + [0, 0, 60, 44], + [50, 40, 60, 4] ] }, { @@ -50,17 +34,9 @@ "bounds": [110, 44], "contentsOpaque": true, "backgroundColor": "#000000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='test image percent-height'", - "rect": [0, 0, 60, 44], - "reason": "background" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV class='test image top'", - "rect": [50, 40, 60, 4], - "reason": "incremental" - } + "invalidations": [ + [0, 0, 60, 44], + [50, 40, 60, 4] ] }, { @@ -69,34 +45,18 @@ "bounds": [110, 44], "contentsOpaque": true, "backgroundColor": "#000000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='test image center'", - "rect": [50, 0, 60, 44], - "reason": "background" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV class='test image bottom'", - "rect": [0, 0, 60, 44], - "reason": "background" - } + "invalidations": [ + [50, 0, 60, 44], + [0, 0, 60, 44] ] }, { "name": "LayoutNGBlockFlow (positioned) DIV class='test image no-repeat'", "position": [408, 8], "bounds": [110, 44], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='test image repeat-space'", - "rect": [50, 0, 60, 44], - "reason": "background" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV class='test image no-repeat'", - "rect": [0, 40, 60, 4], - "reason": "incremental" - } + "invalidations": [ + [50, 0, 60, 44], + [0, 40, 60, 4] ] }, { @@ -105,12 +65,8 @@ "bounds": [60, 44], "contentsOpaque": true, "backfaceVisibility": "hidden", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='test image repeat-round'", - "rect": [0, 0, 60, 44], - "reason": "background" - } + "invalidations": [ + [0, 0, 60, 44] ] }, { @@ -119,17 +75,9 @@ "bounds": [110, 44], "contentsOpaque": true, "backgroundColor": "#000000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='test generated size-cover'", - "rect": [50, 0, 60, 44], - "reason": "background" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV class='test generated'", - "rect": [0, 0, 60, 44], - "reason": "background" - } + "invalidations": [ + [50, 0, 60, 44], + [0, 0, 60, 44] ] }, { @@ -137,17 +85,9 @@ "position": [108, 108], "bounds": [160, 44], "backgroundColor": "#000000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='test generated percent-height'", - "rect": [100, 0, 60, 44], - "reason": "background" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV class='test generated size-contain'", - "rect": [0, 0, 60, 44], - "reason": "background" - } + "invalidations": [ + [100, 0, 60, 44], + [0, 0, 60, 44] ] }, { @@ -156,17 +96,9 @@ "bounds": [110, 44], "contentsOpaque": true, "backgroundColor": "#000000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='test generated bottom'", - "rect": [50, 0, 60, 44], - "reason": "background" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV class='test generated top'", - "rect": [0, 0, 60, 44], - "reason": "background" - } + "invalidations": [ + [50, 0, 60, 44], + [0, 0, 60, 44] ] }, { @@ -174,17 +106,9 @@ "position": [358, 108], "bounds": [110, 44], "backgroundColor": "#000000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='test generated no-repeat'", - "rect": [50, 0, 60, 44], - "reason": "background" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV class='test generated center'", - "rect": [0, 0, 60, 44], - "reason": "background" - } + "invalidations": [ + [50, 0, 60, 44], + [0, 0, 60, 44] ] }, { @@ -192,17 +116,9 @@ "position": [458, 108], "bounds": [110, 44], "backgroundColor": "#000000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='test generated repeat-round'", - "rect": [50, 0, 60, 44], - "reason": "background" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV class='test generated repeat-space'", - "rect": [0, 0, 60, 44], - "reason": "background" - } + "invalidations": [ + [50, 0, 60, 44], + [0, 0, 60, 44] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/background-shorthand-with-gradient-and-height-changes-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/background-shorthand-with-gradient-and-height-changes-expected.txt index f0407d6..2406bec 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/background-shorthand-with-gradient-and-height-changes-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/background-shorthand-with-gradient-and-height-changes-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='outer'", - "rect": [8, 8, 784, 500], - "reason": "background" - } + "invalidations": [ + [8, 8, 784, 500] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/background-size-auto-with-gradient-and-height-changes-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/background-size-auto-with-gradient-and-height-changes-expected.txt index f0407d6..2406bec 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/background-size-auto-with-gradient-and-height-changes-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/background-size-auto-with-gradient-and-height-changes-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='outer'", - "rect": [8, 8, 784, 500], - "reason": "background" - } + "invalidations": [ + [8, 8, 784, 500] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/backgroundSizeRepaint-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/backgroundSizeRepaint-expected.txt index 9016833..d90f87d 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/backgroundSizeRepaint-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/backgroundSizeRepaint-expected.txt
@@ -5,27 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [19, 339, 200, 60], - "reason": "background" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [19, 177, 200, 60], - "reason": "background" - }, - { - "object": "LayoutNGBlockFlow DIV id='b'", - "rect": [29, 379, 180, 20], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow DIV id='a'", - "rect": [29, 217, 180, 20], - "reason": "incremental" - } + "invalidations": [ + [19, 339, 200, 60], + [19, 177, 200, 60] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/body-background-image-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/body-background-image-expected.txt index 430e090..41b2cf8b 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/body-background-image-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/body-background-image-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow BODY", - "rect": [8, 240, 784, 288], - "reason": "background" - } + "invalidations": [ + [8, 240, 784, 288] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/change-text-content-and-background-color-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/change-text-content-and-background-color-expected.txt index 01de216..c7a710a 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/change-text-content-and-background-color-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/change-text-content-and-background-color-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTextControl (positioned) INPUT id='input'", - "rect": [8, 8, 244, 68], - "reason": "background" - }, - { - "object": "InlineTextBox 'NEW'", - "rect": [30, 30, 46, 23], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'OLD'", - "rect": [30, 30, 41, 23], - "reason": "disappeared" - } + "invalidations": [ + [8, 8, 244, 68] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/composited-background-on-both-layers-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/composited-background-on-both-layers-expected.txt index cf71333..75a1cf1 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/composited-background-on-both-layers-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/composited-background-on-both-layers-expected.txt
@@ -11,12 +11,8 @@ "bounds": [240, 240], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [0, 0, 240, 240], - "reason": "background" - } + "invalidations": [ + [0, 0, 240, 240] ], "transform": 1 }, @@ -32,12 +28,8 @@ "position": [20, 20], "bounds": [185, 3000], "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutNGBlockFlow DIV id='target'", - "rect": [0, 0, 185, 3000], - "reason": "background" - } + "invalidations": [ + [0, 0, 185, 3000] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/full-viewport-repaint-for-background-attachment-fixed-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/full-viewport-repaint-for-background-attachment-fixed-expected.txt index b525efd..763ed5f 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/full-viewport-repaint-for-background-attachment-fixed-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/full-viewport-repaint-for-background-attachment-fixed-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 5016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 800, 5016], - "reason": "background" - } + "invalidations": [ + [0, 0, 800, 5016] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/viewport-gradient-background-html-move-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/viewport-gradient-background-html-move-overflow-expected.txt index 4dd8287f..51f97ecd 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/viewport-gradient-background-html-move-overflow-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/viewport-gradient-background-html-move-overflow-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 800, 600], - "reason": "background" - }, - { - "object": "LayoutNGBlockFlow HTML", - "rect": [0, 0, 800, 170], - "reason": "style change" - } + "invalidations": [ + [0, 0, 800, 600] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/viewport-gradient-background-html-resize-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/viewport-gradient-background-html-resize-expected.txt index df5a20d8..51f97ecd 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/viewport-gradient-background-html-resize-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/viewport-gradient-background-html-resize-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 800, 600], - "reason": "background" - } + "invalidations": [ + [0, 0, 800, 600] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/viewport-gradient-background-html-resize-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/viewport-gradient-background-html-resize-overflow-expected.txt index 739fb5a2..51f97ecd 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/viewport-gradient-background-html-resize-overflow-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/background/viewport-gradient-background-html-resize-overflow-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 800, 600], - "reason": "background" - }, - { - "object": "LayoutNGBlockFlow HTML", - "rect": [0, 0, 800, 200], - "reason": "disappeared" - } + "invalidations": [ + [0, 0, 800, 600] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/block-layout-inline-children-replaced-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/block-layout-inline-children-replaced-expected.txt index 0800f2c..9c0468b 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/block-layout-inline-children-replaced-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/block-layout-inline-children-replaced-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target' class='target'", - "rect": [0, 116, 402, 152], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='target' class='target'", - "rect": [0, 116, 402, 152], - "reason": "disappeared" - }, - { - "object": "LayoutImage IMG", - "rect": [151, 117, 100, 100], - "reason": "appeared" - } + "invalidations": [ + [0, 116, 402, 152] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/block-no-inflow-children-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/block-no-inflow-children-expected.txt index 5a088f7..b03a0421 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/block-no-inflow-children-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/block-no-inflow-children-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'La la la la'", - "rect": [0, 0, 62, 19], - "reason": "full" - } + "invalidations": [ + [0, 0, 62, 19] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/block-shift-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/block-shift-repaint-expected.txt index dd8114e..9aeadae 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/block-shift-repaint-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/block-shift-repaint-expected.txt
@@ -5,87 +5,18 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='half'", - "rect": [8, 353, 60, 38], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='half'", - "rect": [8, 338, 60, 38], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='red half'", - "rect": [8, 248, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='green half'", - "rect": [8, 218, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='red half'", - "rect": [8, 218, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='green half'", - "rect": [8, 188, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='green half'", - "rect": [8, 158, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='green half'", - "rect": [8, 128, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='red half'", - "rect": [8, 128, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='red half'", - "rect": [8, 98, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV id='top' class='blue half'", - "rect": [8, 98, 60, 30], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV class='green half'", - "rect": [8, 68, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='green half'", - "rect": [8, 38, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='red half'", - "rect": [8, 38, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='red half'", - "rect": [8, 8, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV id='div1' class='blue half'", - "rect": [8, 8, 60, 30], - "reason": "disappeared" - } + "invalidations": [ + [8, 353, 60, 38], + [8, 338, 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/composite-after-paint/paint/invalidation/box/border-current-color-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/border-current-color-expected.txt index 60754a8..ebeacef 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/border-current-color-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/border-current-color-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='currentColor'", - "rect": [58, 220, 120, 120], - "reason": "style change" - } + "invalidations": [ + [58, 220, 120, 120] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/border-image-outset-add-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/border-image-outset-add-repaint-expected.txt index 3fdf6ad..52202fd 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/border-image-outset-add-repaint-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/border-image-outset-add-repaint-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='test'", - "rect": [8, 8, 75, 75], - "reason": "style change" - } + "invalidations": [ + [8, 8, 75, 75] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/border-image-outset-change-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/border-image-outset-change-repaint-expected.txt index 3fdf6ad..52202fd 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/border-image-outset-change-repaint-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/border-image-outset-change-repaint-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='test'", - "rect": [8, 8, 75, 75], - "reason": "style change" - } + "invalidations": [ + [8, 8, 75, 75] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/border-radius-repaint-2-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/border-radius-repaint-2-expected.txt index 5fbff94..ef84319 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/border-radius-repaint-2-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/border-radius-repaint-2-expected.txt
@@ -5,17 +5,8 @@ "bounds": [874, 600], "contentsOpaque": true, "backgroundColor": "#3F3F3F", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [8, 8, 866, 592], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [137, 88, 607, 512], - "reason": "geometry" - } + "invalidations": [ + [8, 8, 866, 592] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/border-radius-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/border-radius-repaint-expected.txt index 87b2f92..3d80e88 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/border-radius-repaint-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/border-radius-repaint-expected.txt
@@ -5,27 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [19, 245, 200, 88], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [19, 83, 200, 88], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV id='b'", - "rect": [33, 299, 172, 20], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow DIV id='a'", - "rect": [33, 137, 172, 20], - "reason": "incremental" - } + "invalidations": [ + [19, 245, 200, 88], + [19, 83, 200, 88] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/border-radius-without-border-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/border-radius-without-border-expected.txt index 8f866b9..fa98e81f 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/border-radius-without-border-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/border-radius-without-border-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target1'", - "rect": [0, 0, 200, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target2'", - "rect": [0, 200, 100, 200], - "reason": "geometry" - } + "invalidations": [ + [0, 0, 200, 100], + [0, 200, 100, 200] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/border-repaint-glitch-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/border-repaint-glitch-expected.txt index 9fccf918..404b12cd 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/border-repaint-glitch-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/border-repaint-glitch-expected.txt
@@ -5,27 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [19, 349, 200, 88], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [19, 187, 200, 88], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV id='b'", - "rect": [33, 403, 172, 20], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow DIV id='a'", - "rect": [33, 241, 172, 20], - "reason": "incremental" - } + "invalidations": [ + [19, 349, 200, 88], + [19, 187, 200, 88] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/box-inline-resize-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/box-inline-resize-expected.txt index e51e2943..840a5351 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/box-inline-resize-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/box-inline-resize-expected.txt
@@ -5,22 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Chromium'", - "rect": [40, 107, 113, 27], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'Chromium'", - "rect": [8, 107, 113, 27], - "reason": "geometry" - }, - { - "object": "LayoutImage IMG id='foo'", - "rect": [8, 88, 32, 32], - "reason": "appeared" - } + "invalidations": [ + [40, 107, 113, 27], + [8, 107, 113, 27], + [8, 88, 32, 32] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/box-shadow-add-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/box-shadow-add-repaint-expected.txt index 8550365..3570c820 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/box-shadow-add-repaint-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/box-shadow-add-repaint-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='test'", - "rect": [5, 5, 116, 116], - "reason": "style change" - } + "invalidations": [ + [5, 5, 116, 116] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/box-shadow-change-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/box-shadow-change-repaint-expected.txt index 1311c31..ebf0c9d 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/box-shadow-change-repaint-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/box-shadow-change-repaint-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='test'", - "rect": [3, 3, 130, 130], - "reason": "style change" - } + "invalidations": [ + [3, 3, 130, 130] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/box-shadow-dynamic-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/box-shadow-dynamic-expected.txt index f3ee6d1..57bb3f7 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/box-shadow-dynamic-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/box-shadow-dynamic-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [18, 72, 55, 75], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [18, 192, 55, 55], - "reason": "geometry" - } + "invalidations": [ + [18, 72, 55, 75], + [18, 192, 55, 55] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/box-shadow-inset-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/box-shadow-inset-repaint-expected.txt index 2626c53..98ab3d5 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/box-shadow-inset-repaint-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/box-shadow-inset-repaint-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='container'", - "rect": [8, 8, 230, 130], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [23, 23, 100, 100], - "reason": "appeared" - } + "invalidations": [ + [8, 8, 230, 130] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/box-sizing-border-keeping-size-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/box-sizing-border-keeping-size-expected.txt index 034adc7..4398b52 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/box-sizing-border-keeping-size-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/box-sizing-border-keeping-size-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target2' class='border-box'", - "rect": [0, 200, 100, 100], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target1' class='content-box'", - "rect": [0, 0, 100, 100], - "reason": "style change" - } + "invalidations": [ + [0, 200, 100, 100], + [0, 0, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/box-sizing-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/box-sizing-expected.txt index 0c0bddd0..e559087 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/box-sizing-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/box-sizing-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target2' class='border-box'", - "rect": [0, 200, 440, 140], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target1' class='content-box'", - "rect": [0, 0, 440, 140], - "reason": "geometry" - } + "invalidations": [ + [0, 200, 440, 140], + [0, 0, 440, 140] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/box-sizing-padding-keeping-size-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/box-sizing-padding-keeping-size-expected.txt index 034adc7..4398b52 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/box-sizing-padding-keeping-size-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/box-sizing-padding-keeping-size-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target2' class='border-box'", - "rect": [0, 200, 100, 100], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target1' class='content-box'", - "rect": [0, 0, 100, 100], - "reason": "style change" - } + "invalidations": [ + [0, 200, 100, 100], + [0, 0, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/hover-pseudo-borders-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/hover-pseudo-borders-expected.txt index c78ba29..7b15195 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/hover-pseudo-borders-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/hover-pseudo-borders-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) ::after", - "rect": [138, 8, 100, 100], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow DIV class='hitregion'", - "rect": [8, 8, 100, 100], - "reason": "background" - } + "invalidations": [ + [138, 8, 100, 100], + [8, 8, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/hover-pseudo-borders-whitespace-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/hover-pseudo-borders-whitespace-expected.txt index f5d37f2..42b2264 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/hover-pseudo-borders-whitespace-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/hover-pseudo-borders-whitespace-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='div_outline'", - "rect": [8, 138, 120, 120], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow DIV id='div_border'", - "rect": [8, 8, 120, 120], - "reason": "style change" - } + "invalidations": [ + [8, 138, 120, 120], + [8, 8, 120, 120] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/invalidate-box-shadow-currentColor-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/invalidate-box-shadow-currentColor-expected.txt index ca6d5886..8bf1037 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/invalidate-box-shadow-currentColor-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/invalidate-box-shadow-currentColor-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Text'", - "rect": [8, 8, 29, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalBoxFragment LayoutInline SPAN id='target'", - "rect": [8, 8, 28, 24], - "reason": "style change" - } + "invalidations": [ + [8, 8, 29, 19], + [8, 8, 28, 24] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/margin-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/margin-expected.txt index febdb3b4..48fc75a 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/margin-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/margin-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target'", - "rect": [20, 20, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target'", - "rect": [0, 0, 100, 100], - "reason": "geometry" - } + "invalidations": [ + [20, 20, 100, 100], + [0, 0, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/negative-shadow-box-expand-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/negative-shadow-box-expand-expected.txt index 1a4abcf..0125d65 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/negative-shadow-box-expand-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/negative-shadow-box-expand-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='outer'", - "rect": [100, 60, 640, 240], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV id='inner2'", - "rect": [100, 200, 600, 100], - "reason": "appeared" - } + "invalidations": [ + [100, 60, 640, 240] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/negative-shadow-box-shrink-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/negative-shadow-box-shrink-expected.txt index 82fe1efd..0125d65 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/negative-shadow-box-shrink-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/negative-shadow-box-shrink-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='outer'", - "rect": [100, 60, 640, 240], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV id='inner2'", - "rect": [100, 200, 600, 100], - "reason": "disappeared" - } + "invalidations": [ + [100, 60, 640, 240] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/padding-border-keeping-border-box-and-content-box-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/padding-border-keeping-border-box-and-content-box-expected.txt index 0ac367c..db1b04c 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/padding-border-keeping-border-box-and-content-box-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/padding-border-keeping-border-box-and-content-box-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target'", - "rect": [0, 0, 180, 180], - "reason": "style change" - } + "invalidations": [ + [0, 0, 180, 180] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/padding-keeping-content-size-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/padding-keeping-content-size-expected.txt index 77c48c4..13e7b1b 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/padding-keeping-content-size-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/padding-keeping-content-size-expected.txt
@@ -5,27 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target2' class='outer'", - "rect": [0, 200, 140, 140], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target1' class='outer'", - "rect": [0, 0, 140, 140], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow DIV class='inner'", - "rect": [20, 220, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='inner'", - "rect": [0, 200, 100, 100], - "reason": "geometry" - } + "invalidations": [ + [0, 200, 140, 140], + [0, 0, 140, 140] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/padding-keeping-visual-size-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/padding-keeping-visual-size-expected.txt index 54830083..4398b52 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/padding-keeping-visual-size-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/padding-keeping-visual-size-expected.txt
@@ -5,22 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target2' class='outer'", - "rect": [0, 200, 100, 100], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow DIV class='inner'", - "rect": [0, 200, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target1' class='outer'", - "rect": [0, 0, 100, 100], - "reason": "style change" - } + "invalidations": [ + [0, 200, 100, 100], + [0, 0, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/resize-with-border-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/resize-with-border-expected.txt index 4c4a5961f..c084f4d 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/resize-with-border-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/resize-with-border-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='div'", - "rect": [100, 100, 420, 220], - "reason": "geometry" - } + "invalidations": [ + [100, 100, 420, 220] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/shadow-box-resize-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/shadow-box-resize-expected.txt index 5feefc73..43f2b6c 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/shadow-box-resize-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/shadow-box-resize-expected.txt
@@ -5,27 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target1'", - "rect": [100, 100, 190, 120], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target3'", - "rect": [100, 300, 140, 170], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target4'", - "rect": [300, 300, 140, 120], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target2'", - "rect": [300, 100, 140, 120], - "reason": "geometry" - } + "invalidations": [ + [100, 100, 190, 120], + [100, 300, 140, 170], + [300, 300, 140, 120], + [300, 100, 140, 120] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/shadow-box-resize-writing-mode-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/shadow-box-resize-writing-mode-expected.txt index 5feefc73..43f2b6c 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/shadow-box-resize-writing-mode-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/box/shadow-box-resize-writing-mode-expected.txt
@@ -5,27 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target1'", - "rect": [100, 100, 190, 120], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target3'", - "rect": [100, 300, 140, 170], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target4'", - "rect": [300, 300, 140, 120], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target2'", - "rect": [300, 100, 140, 120], - "reason": "geometry" - } + "invalidations": [ + [100, 100, 190, 120], + [100, 300, 140, 170], + [300, 300, 140, 120], + [300, 100, 140, 120] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/bugzilla-3509-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/bugzilla-3509-expected.txt index f8b0f2b..3606ae1 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/bugzilla-3509-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/bugzilla-3509-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='im'", - "rect": [61, 131, 50, 100], - "reason": "incremental" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [11, 131, 4, 19], - "reason": "geometry" - } + "invalidations": [ + [61, 131, 50, 100], + [11, 131, 4, 19] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/bugzilla-5699-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/bugzilla-5699-expected.txt index fe90b4c..7c63c170 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/bugzilla-5699-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/bugzilla-5699-expected.txt
@@ -5,27 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Hello'", - "rect": [8, 184, 35, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Hello'", - "rect": [8, 156, 35, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [8, 150, 4, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [8, 136, 4, 19], - "reason": "style change" - } + "invalidations": [ + [8, 184, 35, 19], + [8, 156, 35, 19], + [8, 150, 4, 19], + [8, 136, 4, 19] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/bugzilla-6278-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/bugzilla-6278-expected.txt index 76fac86..a750108 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/bugzilla-6278-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/bugzilla-6278-expected.txt
@@ -5,127 +5,13 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [10, 303, 292, 50], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Curabitur pretium, quam quis semper'", - "rect": [10, 138, 291, 159], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Phasellus vehicula, sem at posuere'", - "rect": [10, 138, 291, 159], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Quisque eu nulla non nisi molestie'", - "rect": [10, 138, 291, 159], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'ac, laoreet non, suscipit sed, sapien.'", - "rect": [10, 138, 291, 159], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'accumsan. Etiam tellus urna, laoreet'", - "rect": [10, 138, 291, 159], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'malesuada, est libero feugiat libero,'", - "rect": [10, 138, 291, 159], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'vehicula, augue nibh molestie nisl,'", - "rect": [10, 138, 291, 159], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'vel fringilla orci nibh sed neque.'", - "rect": [10, 138, 291, 159], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [10, 343, 242, 50], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD id='col1'", - "rect": [10, 353, 242, 40], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [10, 298, 242, 40], - "reason": "incremental" - }, - { - "object": "NGPhysicalTextFragment 'Curabitur pretium, quam quis semper'", - "rect": [10, 138, 235, 199], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Phasellus vehicula, sem at posuere'", - "rect": [10, 138, 235, 199], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Quisque eu nulla non nisi molestie'", - "rect": [10, 138, 235, 199], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'ac, laoreet non, suscipit sed, sapien.'", - "rect": [10, 138, 235, 199], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'accumsan. Etiam tellus urna, laoreet'", - "rect": [10, 138, 235, 199], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'malesuada, est libero feugiat libero,'", - "rect": [10, 138, 235, 199], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'nec ullamcorper lacus ante vulputate'", - "rect": [10, 138, 235, 199], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'pede.'", - "rect": [10, 138, 235, 199], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'vehicula, augue nibh molestie nisl,'", - "rect": [10, 138, 235, 199], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'vel fringilla orci nibh sed neque.'", - "rect": [10, 138, 235, 199], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD id='col1'", - "rect": [252, 138, 50, 215], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [252, 138, 50, 160], - "reason": "incremental" - } + "invalidations": [ + [10, 303, 292, 50], + [10, 138, 291, 159], + [10, 343, 242, 50], + [10, 298, 242, 40], + [10, 138, 235, 199], + [252, 138, 50, 215] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/bugzilla-6388-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/bugzilla-6388-expected.txt index b2fd2e35..3a1c4af 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/bugzilla-6388-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/bugzilla-6388-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [8, 136, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [8, 136, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [8, 136, 100, 100], - "reason": "disappeared" - } + "invalidations": [ + [8, 136, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/bugzilla-6473-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/bugzilla-6473-expected.txt index 80b24c4..537ff88 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/bugzilla-6473-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/bugzilla-6473-expected.txt
@@ -5,22 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) P", - "rect": [8, 152, 784, 20], - "reason": "chunk disappeared" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) P", - "rect": [8, 136, 784, 20], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'SUCCESS'", - "rect": [8, 136, 71, 19], - "reason": "appeared" - } + "invalidations": [ + [8, 152, 784, 20], + [8, 136, 784, 20] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/bugzilla-7235-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/bugzilla-7235-expected.txt index 1aaa126..5d3792c 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/bugzilla-7235-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/bugzilla-7235-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='t'", - "rect": [8, 176, 100, 100], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [8, 156, 4, 19], - "reason": "geometry" - } + "invalidations": [ + [8, 176, 100, 100], + [8, 156, 4, 19] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/button-spurious-layout-hint-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/button-spurious-layout-hint-expected.txt index cb41a07..ae2e746 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/button-spurious-layout-hint-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/button-spurious-layout-hint-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutButton BUTTON id='target'", - "rect": [8, 8, 100, 100], - "reason": "background" - } + "invalidations": [ + [8, 8, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/canvas-putImageData-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/canvas-putImageData-expected.txt index ec8a11cd..729c46ba 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/canvas-putImageData-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/canvas-putImageData-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutHTMLCanvas CANVAS id='canvas'", - "rect": [8, 8, 90, 90], - "reason": "invalidate paint rectangle" - } + "invalidations": [ + [8, 8, 90, 90] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/canvas-resize-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/canvas-resize-expected.txt index edb57ac..68b109d 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/canvas-resize-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/canvas-resize-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutHTMLCanvas (positioned) CANVAS id='canvas'", - "rect": [50, 50, 500, 500], - "reason": "geometry" - }, - { - "object": "LayoutHTMLCanvas (positioned) CANVAS id='canvas'", - "rect": [550, 50, 100, 500], - "reason": "incremental" - } + "invalidations": [ + [50, 50, 500, 500], + [550, 50, 100, 500] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/canvas-resize-no-full-invalidation-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/canvas-resize-no-full-invalidation-expected.txt index 2f524b9..20c7fe02 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/canvas-resize-no-full-invalidation-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/canvas-resize-no-full-invalidation-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutHTMLCanvas (positioned) CANVAS id='canvas'", - "rect": [550, 50, 100, 500], - "reason": "incremental" - }, - { - "object": "LayoutHTMLCanvas (positioned) CANVAS id='canvas'", - "rect": [550, 50, 100, 500], - "reason": "incremental" - } + "invalidations": [ + [550, 50, 100, 500] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/caret-outside-block-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/caret-outside-block-expected.txt index a246667..d96f017c2 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/caret-outside-block-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/caret-outside-block-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Caret", - "rect": [791, 8, 1, 19], - "reason": "appeared" - } + "invalidations": [ + [791, 8, 1, 19] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/caret-subpixel-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/caret-subpixel-expected.txt index 339fb07..5bfc2809 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/caret-subpixel-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/caret-subpixel-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTextControl INPUT id='target'", - "rect": [8, 8, 226, 22], - "reason": "subtree" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [211, 11, 2, 16], - "reason": "chunk appeared" - } + "invalidations": [ + [8, 8, 226, 22] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/change-clip-composited-layer-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/change-clip-composited-layer-expected.txt index d09b7b7..696f0e0d 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/change-clip-composited-layer-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/change-clip-composited-layer-expected.txt
@@ -10,12 +10,8 @@ "name": "LayoutNGBlockFlow DIV id='target'", "bounds": [100, 10], "drawsContent": false, - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [0, 0, 50, 10], - "reason": "chunk disappeared" - } + "invalidations": [ + [0, 0, 50, 10] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/caret-ancestor-clip-change-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/caret-ancestor-clip-change-expected.txt index 6d1f455..3c0c670 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/caret-ancestor-clip-change-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/caret-ancestor-clip-change-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [8, 58, 110, 63], - "reason": "incremental" - }, - { - "object": "LayoutTextControl INPUT id='target'", - "rect": [8, 58, 110, 63], - "reason": "incremental" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [12, 58, 1, 57], - "reason": "incremental" - } + "invalidations": [ + [8, 58, 110, 63] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/clip-path-in-mask-layer-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/clip-path-in-mask-layer-expected.txt index d22e5c0..2351f8d 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/clip-path-in-mask-layer-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/clip-path-in-mask-layer-expected.txt
@@ -10,12 +10,8 @@ "name": "LayoutNGBlockFlow DIV", "bounds": [200, 200], "backgroundColor": "#0000FF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [0, 0, 200, 200], - "reason": "full" - } + "invalidations": [ + [0, 0, 200, 200] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/clip-path-resize-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/clip-path-resize-expected.txt index 10e41db..f30b1e4 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/clip-path-resize-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/clip-path-resize-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [8, 8, 200, 100], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [8, 8, 100, 100], - "reason": "paint property change" - } + "invalidations": [ + [8, 8, 200, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/clip-unclip-and-change-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/clip-unclip-and-change-expected.txt index a942da1..1bebea3 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/clip-unclip-and-change-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/clip-unclip-and-change-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='content'", - "rect": [8, 120, 100, 300], - "reason": "background" - } + "invalidations": [ + [8, 120, 100, 300] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/clip-with-layout-delta-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/clip-with-layout-delta-expected.txt index 9776466..e47d1e17 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/clip-with-layout-delta-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/clip-with-layout-delta-expected.txt
@@ -5,32 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV", - "rect": [108, 8, 100, 100], - "reason": "chunk appeared" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV", - "rect": [108, 8, 100, 100], - "reason": "chunk disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [8, 8, 100, 100], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [8, 8, 100, 100], - "reason": "chunk disappeared" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [8, 8, 4, 19], - "reason": "appeared" - } + "invalidations": [ + [108, 8, 100, 100], + [8, 8, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/clipped-relative-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/clipped-relative-expected.txt index ee10a96d..e1f2968 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/clipped-relative-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/clipped-relative-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutImage IMG", - "rect": [8, 74, 204, 232], - "reason": "geometry" - }, - { - "object": "LayoutImage IMG", - "rect": [8, 74, 94, 232], - "reason": "geometry" - } + "invalidations": [ + [8, 74, 204, 232] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/control-clip-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/control-clip-expected.txt index 19e6b8d4..fbe3f23 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/control-clip-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/control-clip-expected.txt
@@ -5,27 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (anonymous)", - "rect": [76, 117, 64, 16], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox 'SUCCESS'", - "rect": [9, 87, 63, 16], - "reason": "appeared" - }, - { - "object": "LayoutBlockFlow (anonymous)", - "rect": [81, 117, 54, 16], - "reason": "chunk disappeared" - }, - { - "object": "InlineTextBox 'FAILURE'", - "rect": [9, 87, 54, 16], - "reason": "disappeared" - } + "invalidations": [ + [76, 117, 64, 16], + [9, 87, 63, 16] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/css-clip-change-stacking-child-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/css-clip-change-stacking-child-expected.txt index 571aaede..b462f034 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/css-clip-change-stacking-child-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/css-clip-change-stacking-child-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [8, 8, 300, 200], - "reason": "subtree" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [8, 208, 300, 100], - "reason": "incremental" - } + "invalidations": [ + [8, 8, 300, 200], + [8, 208, 300, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/intermediate-layout-position-clip-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/intermediate-layout-position-clip-expected.txt index f5ab17f..f022af0 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/intermediate-layout-position-clip-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/intermediate-layout-position-clip-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [8, 8, 40, 20], - "reason": "incremental" - } + "invalidations": [ + [8, 8, 40, 20] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/mask-clip-change-stacking-child-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/mask-clip-change-stacking-child-expected.txt index 4401bee..9561a0fe 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/mask-clip-change-stacking-child-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/mask-clip-change-stacking-child-expected.txt
@@ -5,27 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target'", - "rect": [8, 8, 300, 300], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [8, 8, 300, 300], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target'", - "rect": [8, 8, 300, 200], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [8, 8, 300, 200], - "reason": "paint property change" - } + "invalidations": [ + [8, 8, 300, 300] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/outline-clip-change-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/outline-clip-change-expected.txt index fa012414..4d70b5d 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/outline-clip-change-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/outline-clip-change-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) A id='link' class='updated'", - "rect": [48, 88, 90, 25], - "reason": "chunk appeared" - }, - { - "object": "NGPhysicalTextFragment 'Lorem Ipsum'", - "rect": [48, 88, 86, 19], - "reason": "disappeared" - } + "invalidations": [ + [48, 88, 90, 25] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/replaced-clipped-positioned-not-wrong-incremental-repainting-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/replaced-clipped-positioned-not-wrong-incremental-repainting-expected.txt index 25cce6b..35a8777 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/replaced-clipped-positioned-not-wrong-incremental-repainting-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/replaced-clipped-positioned-not-wrong-incremental-repainting-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutImage IMG", - "rect": [8, 8, 194, 232], - "reason": "geometry" - }, - { - "object": "LayoutImage IMG", - "rect": [8, 8, 114, 232], - "reason": "geometry" - } + "invalidations": [ + [8, 8, 194, 232] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/resize-with-border-clipped-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/resize-with-border-clipped-expected.txt index 996e2a8..0dda3c0 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/resize-with-border-clipped-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/resize-with-border-clipped-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='container'", - "rect": [100, 100, 200, 200], - "reason": "chunk appeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [100, 100, 120, 120], - "reason": "disappeared" - } + "invalidations": [ + [100, 100, 200, 200] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/subtree-root-clip-2-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/subtree-root-clip-2-expected.txt index 7350a656..ae2e746 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/subtree-root-clip-2-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/subtree-root-clip-2-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [8, 8, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [8, 8, 100, 100], - "reason": "appeared" - } + "invalidations": [ + [8, 8, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/subtree-root-clip-3-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/subtree-root-clip-3-expected.txt index 656300c..bfb9654 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/subtree-root-clip-3-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/subtree-root-clip-3-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [15, 60, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [15, 60, 100, 100], - "reason": "appeared" - } + "invalidations": [ + [15, 60, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/subtree-root-clip-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/subtree-root-clip-expected.txt index c015543..ae2e746 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/subtree-root-clip-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/clip/subtree-root-clip-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [8, 8, 100, 100], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='inner'", - "rect": [8, 8, 100, 100], - "reason": "disappeared" - } + "invalidations": [ + [8, 8, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/background-attachment-local-composited-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/background-attachment-local-composited-expected.txt index 03df4fe..2933025 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/background-attachment-local-composited-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/background-attachment-local-composited-expected.txt
@@ -22,12 +22,8 @@ "name": "LayoutNGBlockFlow DIV id='container'", "bounds": [400, 2000], "backgroundColor": "#0000FF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutNGBlockFlow DIV id='container'", - "rect": [0, 500, 400, 1500], - "reason": "incremental" - } + "invalidations": [ + [0, 500, 400, 1500] ], "transform": 2 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/background-attachment-local-equivalent-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/background-attachment-local-equivalent-expected.txt index e924932..21aea2f 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/background-attachment-local-equivalent-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/background-attachment-local-equivalent-expected.txt
@@ -16,12 +16,8 @@ "name": "LayoutNGBlockFlow DIV id='container'", "bounds": [400, 2000], "backgroundColor": "#0000FF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutNGBlockFlow DIV id='container'", - "rect": [0, 500, 400, 1500], - "reason": "incremental" - } + "invalidations": [ + [0, 500, 400, 1500] ], "transform": 2 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/child-of-sub-pixel-offset-composited-layer-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/child-of-sub-pixel-offset-composited-layer-expected.txt index d32dd88c..b6dce72 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/child-of-sub-pixel-offset-composited-layer-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/child-of-sub-pixel-offset-composited-layer-expected.txt
@@ -10,12 +10,8 @@ "name": "LayoutNGBlockFlow (positioned) DIV id='target' class='green'", "position": [-1, 0], "bounds": [15, 14], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target' class='green'", - "rect": [0, 0, 15, 14], - "reason": "style change" - } + "invalidations": [ + [0, 0, 15, 14] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/chunk-reorder-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/chunk-reorder-expected.txt index 4fae2fb..44f004e 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/chunk-reorder-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/chunk-reorder-expected.txt
@@ -10,12 +10,8 @@ "name": "LayoutNGBlockFlow DIV", "bounds": [784, 1], "backgroundColor": "#FF0000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='chunk2'", - "rect": [0, 0, 1, 1], - "reason": "chunk reordered" - } + "invalidations": [ + [0, 0, 1, 1] ], "transform": 1 }, @@ -24,12 +20,8 @@ "position": [400, 400], "bounds": [150, 150], "backgroundColor": "#0000FF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='chunk5'", - "rect": [0, 0, 150, 150], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 150, 150] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/column-span-under-composited-column-child-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/column-span-under-composited-column-child-expected.txt index c496ac6..ae2e746 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/column-span-under-composited-column-child-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/column-span-under-composited-column-child-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (column spanner) DIV id='target'", - "rect": [8, 8, 100, 100], - "reason": "background" - } + "invalidations": [ + [8, 8, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/composited-float-under-composited-inline-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/composited-float-under-composited-inline-expected.txt index 8a819f26..839267e 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/composited-float-under-composited-inline-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/composited-float-under-composited-inline-expected.txt
@@ -11,12 +11,8 @@ "bounds": [100, 100], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) (floating) DIV id='float'", - "rect": [0, 0, 100, 100], - "reason": "background" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/composited-float-under-composited-inline-individual-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/composited-float-under-composited-inline-individual-expected.txt index 8a819f26..839267e 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/composited-float-under-composited-inline-individual-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/composited-float-under-composited-inline-individual-expected.txt
@@ -11,12 +11,8 @@ "bounds": [100, 100], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) (floating) DIV id='float'", - "rect": [0, 0, 100, 100], - "reason": "background" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/compositing-reason-removed-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/compositing-reason-removed-expected.txt index ed10ca2..0a66457 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/compositing-reason-removed-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/compositing-reason-removed-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='square'", - "rect": [8, 8, 30, 30], - "reason": "appeared" - } + "invalidations": [ + [8, 8, 30, 30] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/containing-block-added-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/containing-block-added-expected.txt index 1010c59..c106af1 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/containing-block-added-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/containing-block-added-expected.txt
@@ -10,12 +10,8 @@ "name": "LayoutNGBlockFlow (positioned) DIV id='container'", "bounds": [125, 125], "backgroundColor": "#0000FF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='fixed'", - "rect": [50, 50, 75, 75], - "reason": "chunk appeared" - } + "invalidations": [ + [50, 50, 75, 75] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/containing-block-added-individual-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/containing-block-added-individual-expected.txt index 1010c59..c106af1 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/containing-block-added-individual-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/containing-block-added-individual-expected.txt
@@ -10,12 +10,8 @@ "name": "LayoutNGBlockFlow (positioned) DIV id='container'", "bounds": [125, 125], "backgroundColor": "#0000FF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='fixed'", - "rect": [50, 50, 75, 75], - "reason": "chunk appeared" - } + "invalidations": [ + [50, 50, 75, 75] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/containing-block-removed-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/containing-block-removed-expected.txt index a65e897..0c5fa48f 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/containing-block-removed-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/containing-block-removed-expected.txt
@@ -11,12 +11,8 @@ "bounds": [100, 100], "contentsOpaque": true, "backgroundColor": "#0000FF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='fixed'", - "rect": [50, 50, 75, 75], - "reason": "chunk disappeared" - } + "invalidations": [ + [50, 50, 75, 75] ], "transform": 1 }, @@ -26,12 +22,8 @@ "bounds": [75, 75], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='fixed'", - "rect": [0, 0, 75, 75], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 75, 75] ] } ],
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/containing-block-removed-individual-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/containing-block-removed-individual-expected.txt index dd82b47..7e338f73 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/containing-block-removed-individual-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/containing-block-removed-individual-expected.txt
@@ -12,12 +12,8 @@ "bounds": [100, 100], "contentsOpaque": true, "backgroundColor": "#0000FF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='fixed'", - "rect": [50, 50, 75, 75], - "reason": "chunk disappeared" - } + "invalidations": [ + [50, 50, 75, 75] ], "transform": 1 }, @@ -27,12 +23,8 @@ "bounds": [75, 75], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='fixed'", - "rect": [0, 0, 75, 75], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 75, 75] ] } ],
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/float-under-composited-inline-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/float-under-composited-inline-expected.txt index b7bebf2..8989c2c 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/float-under-composited-inline-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/float-under-composited-inline-expected.txt
@@ -12,12 +12,8 @@ "bounds": [100, 100], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (floating) DIV id='float'", - "rect": [0, 0, 100, 100], - "reason": "background" - } + "invalidations": [ + [0, 0, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/iframe-inside-squashed-layer-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/iframe-inside-squashed-layer-expected.txt index 9350cc32..4eb35d7 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/iframe-inside-squashed-layer-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/iframe-inside-squashed-layer-expected.txt
@@ -22,17 +22,9 @@ "name": "LayoutNGBlockFlow (positioned) DIV", "position": [8, 0], "bounds": [300, 655], - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'test1'", - "rect": [8, 508, 29, 19], - "reason": "geometry" - }, - { - "object": "VerticalScrollbar", - "rect": [285, 500, 15, 150], - "reason": "chunk appeared" - } + "invalidations": [ + [8, 508, 29, 19], + [285, 500, 15, 150] ] } ],
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/invalidate-paint-in-iframe-in-composited-layer-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/invalidate-paint-in-iframe-in-composited-layer-expected.txt index 4ce9bd4e..83ae0ac 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/invalidate-paint-in-iframe-in-composited-layer-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/invalidate-paint-in-iframe-in-composited-layer-expected.txt
@@ -15,12 +15,8 @@ "name": "LayoutNGBlockFlow DIV", "bounds": [304, 200], "backgroundColor": "#9A9A9A", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [10, 10, 50, 50], - "reason": "background" - } + "invalidations": [ + [10, 10, 50, 50] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/invalidate-when-leaving-squashed-layer-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/invalidate-when-leaving-squashed-layer-expected.txt index 61bc62d..4bca9727 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/invalidate-when-leaving-squashed-layer-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/invalidate-when-leaving-squashed-layer-expected.txt
@@ -19,12 +19,8 @@ "bounds": [200, 200], "contentsOpaque": true, "backgroundColor": "#ADD8E6", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target'", - "rect": [0, 0, 200, 200], - "reason": "disappeared" - } + "invalidations": [ + [0, 0, 200, 200] ] }, { @@ -32,12 +28,8 @@ "bounds": [200, 200], "contentsOpaque": true, "backgroundColor": "#ADD8E6", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target'", - "rect": [0, 0, 200, 200], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 200, 200] ], "transform": 2 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/invalidation-for-subpixel-offset-of-squashed-layer-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/invalidation-for-subpixel-offset-of-squashed-layer-expected.txt index 26c16b2..2f3cbf9 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/invalidation-for-subpixel-offset-of-squashed-layer-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/invalidation-for-subpixel-offset-of-squashed-layer-expected.txt
@@ -18,12 +18,8 @@ "position": [50, 50], "bounds": [251, 251], "backgroundColor": "#ADD8E6", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target'", - "rect": [50, 50, 201, 201], - "reason": "background" - } + "invalidations": [ + [50, 50, 201, 201] ] } ],
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/invalidations-on-composited-layers-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/invalidations-on-composited-layers-expected.txt index 874f4f1..9649ac6 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/invalidations-on-composited-layers-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/invalidations-on-composited-layers-expected.txt
@@ -11,12 +11,8 @@ "bounds": [400, 400], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='parent'", - "rect": [0, 0, 400, 400], - "reason": "background" - } + "invalidations": [ + [0, 0, 400, 400] ], "transform": 1 }, @@ -25,12 +21,8 @@ "bounds": [75, 75], "contentsOpaque": true, "backgroundColor": "#0000FF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='child'", - "rect": [0, 0, 75, 75], - "reason": "background" - } + "invalidations": [ + [0, 0, 75, 75] ], "transform": 2 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/invalidations-with-large-negative-margin-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/invalidations-with-large-negative-margin-expected.txt index c36196d..2b7eab7 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/invalidations-with-large-negative-margin-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/invalidations-with-large-negative-margin-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='chip'", - "rect": [408, 8, 50, 50], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='chip'", - "rect": [8, 8, 50, 50], - "reason": "geometry" - } + "invalidations": [ + [408, 8, 50, 50], + [8, 8, 50, 50] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/new-stacking-context-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/new-stacking-context-expected.txt index 72d0c10..31a1082 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/new-stacking-context-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/new-stacking-context-expected.txt
@@ -16,12 +16,8 @@ "name": "LayoutNGBlockFlow DIV id='target'", "bounds": [200, 200], "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [0, 0, 200, 200], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 200, 200] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/remove-squashed-layer-plus-move-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/remove-squashed-layer-plus-move-expected.txt index ec5ac5e..5b0b8e4 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/remove-squashed-layer-plus-move-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/remove-squashed-layer-plus-move-expected.txt
@@ -32,12 +32,8 @@ "position": [8, 8], "bounds": [1000, 105], "backgroundColor": "#ADD8E6", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV class='mv-tile'", - "rect": [0, 0, 1000, 105], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 1000, 105] ] } ],
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/repaint-overflow-scrolled-squashed-content-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/repaint-overflow-scrolled-squashed-content-expected.txt index 73c22cd..19a68a7 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/repaint-overflow-scrolled-squashed-content-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/repaint-overflow-scrolled-squashed-content-expected.txt
@@ -18,12 +18,8 @@ "bounds": [100, 1000], "contentsOpaque": true, "backgroundColor": "#FF0000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='foo'", - "rect": [0, 0, 100, 1000], - "reason": "background" - } + "invalidations": [ + [0, 0, 100, 1000] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/repaint-squashed-layer-in-rect-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/repaint-squashed-layer-in-rect-expected.txt index f0bf691..f9baaf0 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/repaint-squashed-layer-in-rect-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/repaint-squashed-layer-in-rect-expected.txt
@@ -33,12 +33,8 @@ "position": [8, 0], "bounds": [592, 600], "backgroundColor": "#ADD8E6", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='imgElement'", - "rect": [392, 400, 200, 200], - "reason": "background" - } + "invalidations": [ + [392, 400, 200, 200] ] } ],
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/repaint-via-layout-offset-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/repaint-via-layout-offset-expected.txt index 641d48e6..e106bf4 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/repaint-via-layout-offset-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/repaint-via-layout-offset-expected.txt
@@ -19,17 +19,8 @@ "bounds": [50, 50], "contentsOpaque": true, "backgroundColor": "#FF0000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) SPAN class='child embiggen'", - "rect": [0, 0, 50, 50], - "reason": "chunk appeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) SPAN class='child'", - "rect": [0, 0, 40, 40], - "reason": "disappeared" - } + "invalidations": [ + [0, 0, 50, 50] ] } ],
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/resize-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/resize-repaint-expected.txt index eac40e31..9adc6dd 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/resize-repaint-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/resize-repaint-expected.txt
@@ -9,22 +9,8 @@ { "name": "LayoutNGBlockFlow DIV id='resizing'", "bounds": [402, 207], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='resizing'", - "rect": [0, 0, 402, 207], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [2, 155, 398, 50], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [2, 104, 398, 50], - "reason": "appeared" - } + "invalidations": [ + [0, 0, 402, 207] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/resize-squashing-layer-that-needs-full-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/resize-squashing-layer-that-needs-full-repaint-expected.txt index 79a9c56..663a3d63 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/resize-squashing-layer-that-needs-full-repaint-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/resize-squashing-layer-that-needs-full-repaint-expected.txt
@@ -18,22 +18,8 @@ "bounds": [500, 500], "contentsOpaque": true, "backgroundColor": "#ADD8E6", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [0, 0, 500, 500], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [55, 55, 445, 445], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='to-be-removed'", - "rect": [0, 0, 50, 50], - "reason": "chunk disappeared" - } + "invalidations": [ + [0, 0, 500, 500] ] } ],
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/should-not-clip-composited-overflow-scrolling-layer-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/should-not-clip-composited-overflow-scrolling-layer-expected.txt index aa7305c..e8bd8101 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/should-not-clip-composited-overflow-scrolling-layer-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/should-not-clip-composited-overflow-scrolling-layer-expected.txt
@@ -35,12 +35,8 @@ "bounds": [1000, 1000], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='content'", - "rect": [0, 0, 1000, 1000], - "reason": "background" - } + "invalidations": [ + [0, 0, 1000, 1000] ], "transform": 2 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/should-not-clip-composited-viewport-scrolling-layer-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/should-not-clip-composited-viewport-scrolling-layer-expected.txt index 069c079..9b7b8c6 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/should-not-clip-composited-viewport-scrolling-layer-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/should-not-clip-composited-viewport-scrolling-layer-expected.txt
@@ -5,12 +5,8 @@ "bounds": [2008, 1516], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='content'", - "rect": [8, 8, 2000, 1500], - "reason": "background" - } + "invalidations": [ + [8, 8, 2000, 1500] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/should-not-repaint-scrolling-contents-outline-change-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/should-not-repaint-scrolling-contents-outline-change-expected.txt index 487f6e2..e7e0950e 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/should-not-repaint-scrolling-contents-outline-change-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/should-not-repaint-scrolling-contents-outline-change-expected.txt
@@ -40,12 +40,8 @@ "name": "LayoutNGBlockFlow DIV id='target'", "position": [-10, -10], "bounds": [220, 220], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [0, 0, 220, 220], - "reason": "style change" - } + "invalidations": [ + [0, 0, 220, 220] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/squash-partial-repaint-inside-squashed-layer-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/squash-partial-repaint-inside-squashed-layer-expected.txt index f44f248..beae226 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/squash-partial-repaint-inside-squashed-layer-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/squash-partial-repaint-inside-squashed-layer-expected.txt
@@ -18,12 +18,8 @@ "position": [180, 180], "bounds": [262, 200], "backgroundColor": "#00FF00", - "paintInvalidations": [ - { - "object": "LayoutImage (positioned) IMG id='repaintdiv' class='repaintdiv'", - "rect": [80, 80, 182, 29], - "reason": "background" - } + "invalidations": [ + [80, 80, 182, 29] ] } ],
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/squashing-inside-preserve-3d-element-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/squashing-inside-preserve-3d-element-expected.txt index 62078659..31ab0b9 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/squashing-inside-preserve-3d-element-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/squashing-inside-preserve-3d-element-expected.txt
@@ -19,12 +19,8 @@ "bounds": [100, 100], "contentsOpaque": true, "backgroundColor": "#FF0000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target'", - "rect": [0, 0, 100, 100], - "reason": "background" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/stacked-float-under-composited-inline-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/stacked-float-under-composited-inline-expected.txt index 900ecd99..479221e 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/stacked-float-under-composited-inline-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/stacked-float-under-composited-inline-expected.txt
@@ -12,12 +12,8 @@ "bounds": [100, 100], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) (floating) DIV id='float'", - "rect": [0, 0, 100, 100], - "reason": "background" - } + "invalidations": [ + [0, 0, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/text-color-change-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/text-color-change-expected.txt index 7a6e5a5..8f56042 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/text-color-change-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/text-color-change-expected.txt
@@ -5,67 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment ' Text'", - "rect": [8, 61, 48, 185], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment ' Text'", - "rect": [8, 61, 48, 185], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment ' Text'", - "rect": [8, 61, 48, 185], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment ' Text'", - "rect": [8, 61, 48, 185], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment ' Text'", - "rect": [8, 61, 48, 185], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment ' Text'", - "rect": [8, 61, 48, 185], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment ' Text'", - "rect": [8, 61, 48, 185], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment ' Text'", - "rect": [8, 61, 48, 185], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment ' Text'", - "rect": [8, 61, 48, 185], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment ' Text'", - "rect": [8, 61, 48, 185], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment ' Text'", - "rect": [8, 61, 48, 185], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment ' Text'", - "rect": [8, 61, 48, 185], - "reason": "style change" - } + "invalidations": [ + [8, 61, 48, 185] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/text-match-highlight-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/text-match-highlight-expected.txt index 197eb49..98dff50 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/text-match-highlight-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/text-match-highlight-expected.txt
@@ -5,47 +5,15 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Can you findme in this boring text?'", - "rect": [10, 135, 223, 19], - "reason": "DocumentMarker change" - }, - { - "object": "InlineTextBox 'Findme on a path! Did you findme?'", - "rect": [20, 224, 182, 72], - "reason": "DocumentMarker change" - }, - { - "object": "InlineTextBox 'Findme in a typewriter!'", - "rect": [10, 191, 138, 12], - "reason": "DocumentMarker change" - }, - { - "object": "NGPhysicalTextFragment 'findme'", - "rect": [278, 40, 44, 19], - "reason": "DocumentMarker change" - }, - { - "object": "NGPhysicalTextFragment 'findme'", - "rect": [264, 60, 44, 19], - "reason": "DocumentMarker change" - }, - { - "object": "NGPhysicalTextFragment 'findme'", - "rect": [220, 60, 44, 19], - "reason": "DocumentMarker change" - }, - { - "object": "NGPhysicalTextFragment 'findme'", - "rect": [89, 60, 44, 19], - "reason": "DocumentMarker change" - }, - { - "object": "NGPhysicalTextFragment 'findme'", - "rect": [51, 80, 44, 19], - "reason": "DocumentMarker change" - } + "invalidations": [ + [10, 135, 223, 19], + [20, 224, 182, 72], + [10, 191, 138, 12], + [278, 40, 44, 19], + [264, 60, 44, 19], + [220, 60, 44, 19], + [89, 60, 44, 19], + [51, 80, 44, 19] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/updating-scrolling-container-and-content-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/updating-scrolling-container-and-content-expected.txt index 4225a9a..0fbbd44 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/updating-scrolling-container-and-content-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/updating-scrolling-container-and-content-expected.txt
@@ -5,57 +5,17 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'CONTENT'", - "rect": [8, 258, 77, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'CONTENT'", - "rect": [8, 238, 77, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'CONTENT'", - "rect": [8, 218, 77, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'CONTENT'", - "rect": [8, 198, 77, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'CONTENT'", - "rect": [8, 178, 77, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'CONTENT'", - "rect": [8, 158, 77, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'CONTENT'", - "rect": [8, 138, 77, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'CONTENT'", - "rect": [8, 118, 77, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'CONTENT'", - "rect": [8, 278, 77, 15], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'CONTENT'", - "rect": [8, 108, 77, 9], - "reason": "style change" - } + "invalidations": [ + [8, 258, 77, 19], + [8, 238, 77, 19], + [8, 218, 77, 19], + [8, 198, 77, 19], + [8, 178, 77, 19], + [8, 158, 77, 19], + [8, 138, 77, 19], + [8, 118, 77, 19], + [8, 278, 77, 15], + [8, 108, 77, 9] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/updating-scrolling-container-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/updating-scrolling-container-expected.txt index 3bd979b5..aeb8fc61 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/updating-scrolling-container-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/updating-scrolling-container-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='container'", - "rect": [8, 108, 210, 210], - "reason": "style change" - } + "invalidations": [ + [8, 108, 210, 210] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/updating-scrolling-content-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/updating-scrolling-content-expected.txt index 9651f3b..b48ae68 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/updating-scrolling-content-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/compositing/updating-scrolling-content-expected.txt
@@ -28,12 +28,8 @@ "name": "LayoutNGBlockFlow DIV id='scroller'", "bounds": [185, 1200], "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='indicator'", - "rect": [0, 0, 185, 200], - "reason": "background" - } + "invalidations": [ + [0, 0, 185, 200] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/crbug-371640-2-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/crbug-371640-2-expected.txt index c7c06eec..87e657f 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/crbug-371640-2-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/crbug-371640-2-expected.txt
@@ -5,22 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='keep' class='item'", - "rect": [348, 88, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV id='to_remove' class='item'", - "rect": [348, 88, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='keep' class='item'", - "rect": [88, 88, 100, 100], - "reason": "geometry" - } + "invalidations": [ + [348, 88, 100, 100], + [88, 88, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/crbug-371640-3-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/crbug-371640-3-expected.txt index d745330..57c50c4 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/crbug-371640-3-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/crbug-371640-3-expected.txt
@@ -5,22 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='keep_child'", - "rect": [508, 208, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='remove_child'", - "rect": [508, 88, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='keep_child'", - "rect": [408, 208, 100, 100], - "reason": "geometry" - } + "invalidations": [ + [508, 208, 100, 100], + [508, 88, 100, 100], + [408, 208, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/crbug-371640-4-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/crbug-371640-4-expected.txt index 33de551..66ceb95 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/crbug-371640-4-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/crbug-371640-4-expected.txt
@@ -5,37 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='keep' class='item'", - "rect": [408, 88, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV id='to_remove' class='item'", - "rect": [408, 88, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='keep' class='item'", - "rect": [208, 88, 100, 100], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [408, 88, 4, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [408, 88, 4, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [208, 88, 4, 19], - "reason": "geometry" - } + "invalidations": [ + [408, 88, 100, 100], + [208, 88, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/crbug-371640-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/crbug-371640-expected.txt index b1695b5..87e657f 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/crbug-371640-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/crbug-371640-expected.txt
@@ -5,37 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='keep' class='item'", - "rect": [348, 88, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV id='to_remove' class='item'", - "rect": [348, 88, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='keep' class='item'", - "rect": [88, 88, 100, 100], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [348, 88, 4, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [348, 88, 4, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [88, 88, 4, 19], - "reason": "geometry" - } + "invalidations": [ + [348, 88, 100, 100], + [88, 88, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/create-layer-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/create-layer-repaint-expected.txt index ecfd1bd5..35f344c 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/create-layer-repaint-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/create-layer-repaint-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='test' class='big stretchy'", - "rect": [28, 56, 500, 50], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='test' class='stretchy'", - "rect": [28, 56, 250, 50], - "reason": "chunk appeared" - } + "invalidations": [ + [28, 56, 500, 50] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/css-grid-layout/align-items-change-from-baseline-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/css-grid-layout/align-items-change-from-baseline-expected.txt index 8be4b0b8..682be5a 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/css-grid-layout/align-items-change-from-baseline-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/css-grid-layout/align-items-change-from-baseline-expected.txt
@@ -5,27 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='item2'", - "rect": [50, 77, 50, 50], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item2'", - "rect": [50, 52, 50, 50], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item1'", - "rect": [0, 77, 50, 25], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item1'", - "rect": [0, 52, 50, 25], - "reason": "geometry" - } + "invalidations": [ + [50, 77, 50, 50], + [50, 52, 50, 50], + [0, 77, 50, 25], + [0, 52, 50, 25] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/css-grid-layout/align-items-change-to-baseline-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/css-grid-layout/align-items-change-to-baseline-expected.txt index 8be4b0b8..682be5a 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/css-grid-layout/align-items-change-to-baseline-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/css-grid-layout/align-items-change-to-baseline-expected.txt
@@ -5,27 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='item2'", - "rect": [50, 77, 50, 50], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item2'", - "rect": [50, 52, 50, 50], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item1'", - "rect": [0, 77, 50, 25], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item1'", - "rect": [0, 52, 50, 25], - "reason": "geometry" - } + "invalidations": [ + [50, 77, 50, 50], + [50, 52, 50, 50], + [0, 77, 50, 25], + [0, 52, 50, 25] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/css-grid-layout/align-self-change-from-baseline-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/css-grid-layout/align-self-change-from-baseline-expected.txt index e1af9b1e..e58730b7 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/css-grid-layout/align-self-change-from-baseline-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/css-grid-layout/align-self-change-from-baseline-expected.txt
@@ -5,27 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='item2'", - "rect": [50, 77, 50, 50], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item2'", - "rect": [50, 52, 50, 50], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item1'", - "rect": [0, 127, 50, 25], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item1'", - "rect": [0, 77, 50, 25], - "reason": "geometry" - } + "invalidations": [ + [50, 77, 50, 50], + [50, 52, 50, 50], + [0, 127, 50, 25], + [0, 77, 50, 25] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/css-grid-layout/align-self-change-to-baseline-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/css-grid-layout/align-self-change-to-baseline-expected.txt index e1af9b1e..e58730b7 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/css-grid-layout/align-self-change-to-baseline-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/css-grid-layout/align-self-change-to-baseline-expected.txt
@@ -5,27 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='item2'", - "rect": [50, 77, 50, 50], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item2'", - "rect": [50, 52, 50, 50], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item1'", - "rect": [0, 127, 50, 25], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item1'", - "rect": [0, 77, 50, 25], - "reason": "geometry" - } + "invalidations": [ + [50, 77, 50, 50], + [50, 52, 50, 50], + [0, 127, 50, 25], + [0, 77, 50, 25] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/css-grid-layout/grid-element-change-columns-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/css-grid-layout/grid-element-change-columns-repaint-expected.txt index 2848245..17659298 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/css-grid-layout/grid-element-change-columns-repaint-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/css-grid-layout/grid-element-change-columns-repaint-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutGrid DIV class='grid min-content'", - "rect": [8, 48, 250, 50], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow DIV class='sizedToGridArea'", - "rect": [58, 48, 50, 50], - "reason": "incremental" - } + "invalidations": [ + [8, 48, 250, 50] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/css-grid-layout/grid-element-change-rows-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/css-grid-layout/grid-element-change-rows-repaint-expected.txt index 1f7f76a..0c392cd1 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/css-grid-layout/grid-element-change-rows-repaint-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/css-grid-layout/grid-element-change-rows-repaint-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutGrid DIV class='grid fit-content'", - "rect": [8, 48, 100, 150], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow DIV class='sizedToGridArea'", - "rect": [8, 98, 100, 50], - "reason": "incremental" - } + "invalidations": [ + [8, 48, 100, 150] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/css-grid-layout/grid-item-change-column-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/css-grid-layout/grid-item-change-column-repaint-expected.txt index 1d05c06f..5d3167b 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/css-grid-layout/grid-item-change-column-repaint-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/css-grid-layout/grid-item-change-column-repaint-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='sizedToGridArea'", - "rect": [8, 38, 100, 50], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow DIV class='sizedToGridArea'", - "rect": [208, 38, 50, 50], - "reason": "style change" - } + "invalidations": [ + [8, 38, 100, 50], + [208, 38, 50, 50] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/css-grid-layout/grid-item-change-row-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/css-grid-layout/grid-item-change-row-repaint-expected.txt index ec70064..fa8cc20c 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/css-grid-layout/grid-item-change-row-repaint-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/css-grid-layout/grid-item-change-row-repaint-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='sizedToGridArea'", - "rect": [8, 88, 100, 100], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow DIV class='sizedToGridArea'", - "rect": [8, 38, 100, 50], - "reason": "style change" - } + "invalidations": [ + [8, 88, 100, 100], + [8, 38, 100, 50] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/css-grid-layout/grid-item-z-index-change-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/css-grid-layout/grid-item-z-index-change-repaint-expected.txt index b7462a7..a558bdf 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/css-grid-layout/grid-item-z-index-change-repaint-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/css-grid-layout/grid-item-z-index-change-repaint-expected.txt
@@ -5,47 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow HTML", - "rect": [8, 16, 454, 320], - "reason": "chunk disappeared" - }, - { - "object": "NGPhysicalTextFragment 'This test checks that grid items correctly repaint when 'z-index' changes.'", - "rect": [8, 16, 454, 19], - "reason": "appeared" - }, - { - "object": "LayoutGrid DIV class='grid fit-content'", - "rect": [8, 236, 400, 100], - "reason": "appeared" - }, - { - "object": "LayoutGrid DIV class='grid fit-content'", - "rect": [8, 126, 400, 100], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'For this test to pass, there should be no red below.'", - "rect": [8, 52, 314, 19], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow DIV class='sizedToGridArea red'", - "rect": [208, 236, 200, 100], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow DIV class='sizedToGridArea red'", - "rect": [208, 126, 200, 100], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='item2' class='sizedToGridArea green'", - "rect": [8, 236, 200, 100], - "reason": "chunk appeared" - } + "invalidations": [ + [8, 16, 454, 320] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/cull-rect-change-crash-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/cull-rect-change-crash-expected.txt index 76a9925..34e9341 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/cull-rect-change-crash-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/cull-rect-change-crash-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGForeignObject foreignObject", - "rect": [0, 8, 1, 1], - "reason": "paint property change" - } + "invalidations": [ + [0, 8, 1, 1] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/delete-into-nested-block-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/delete-into-nested-block-expected.txt index 8990a28..16931c6 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/delete-into-nested-block-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/delete-into-nested-block-expected.txt
@@ -5,32 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'three'", - "rect": [8, 167, 31, 20], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'three'", - "rect": [8, 127, 31, 20], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'one'", - "rect": [8, 127, 27, 20], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'two'", - "rect": [8, 147, 24, 20], - "reason": "disappeared" - }, - { - "object": "Caret", - "rect": [8, 127, 1, 20], - "reason": "appeared" - } + "invalidations": [ + [8, 167, 31, 20], + [8, 127, 31, 20], + [8, 147, 24, 20] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/details-open-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/details-open-repaint-expected.txt index 1c5b15c..59cda0d 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/details-open-repaint-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/details-open-repaint-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTextControl INPUT", - "rect": [8, 72, 185, 22], - "reason": "appeared" - }, - { - "object": "LayoutDetailsMarker DIV id='details-marker'", - "rect": [8, 56, 11, 11], - "reason": "full" - } + "invalidations": [ + [8, 72, 185, 22], + [8, 56, 11, 11] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-composite-1-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-composite-1-expected.txt index 3c5d9be..d961693f 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-composite-1-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-composite-1-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='box'", - "rect": [128, 120, 100, 100], - "reason": "background" - } + "invalidations": [ + [128, 120, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-composite-2-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-composite-2-expected.txt index 3caaba8..d887a10 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-composite-2-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-composite-2-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='box'", - "rect": [128, 120, 200, 200], - "reason": "background" - } + "invalidations": [ + [128, 120, 200, 200] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-composite-3-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-composite-3-expected.txt index bd3fcff..44dcc4b 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-composite-3-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-composite-3-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='box'", - "rect": [0, 0, 328, 320], - "reason": "background" - } + "invalidations": [ + [0, 0, 328, 320] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-composite-4-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-composite-4-expected.txt index 3caaba8..d887a10 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-composite-4-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-composite-4-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='box'", - "rect": [128, 120, 200, 200], - "reason": "background" - } + "invalidations": [ + [128, 120, 200, 200] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-composite-5-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-composite-5-expected.txt index 3c5d9be..d961693f 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-composite-5-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-composite-5-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='box'", - "rect": [128, 120, 100, 100], - "reason": "background" - } + "invalidations": [ + [128, 120, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-composite-6-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-composite-6-expected.txt index fecf09b..fc02ff0c 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-composite-6-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-composite-6-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='box'", - "rect": [28, 20, 300, 300], - "reason": "background" - } + "invalidations": [ + [28, 20, 300, 300] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-displacement-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-displacement-expected.txt index 1ecfc8e3..fb0a62e2 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-displacement-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-displacement-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='box'", - "rect": [8, 0, 240, 240], - "reason": "background" - } + "invalidations": [ + [8, 0, 240, 240] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-gaussianblur-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-gaussianblur-expected.txt index 29a46b78..27cdc9f 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-gaussianblur-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-gaussianblur-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='box'", - "rect": [0, 0, 318, 310], - "reason": "background" - } + "invalidations": [ + [0, 0, 318, 310] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-gaussianblur-xonly-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-gaussianblur-xonly-expected.txt index 6ef862b..3496922 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-gaussianblur-xonly-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-gaussianblur-xonly-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='box'", - "rect": [0, 50, 318, 200], - "reason": "background" - } + "invalidations": [ + [0, 50, 318, 200] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-gaussianblur-yonly-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-gaussianblur-yonly-expected.txt index 03b4bae..3e6bd57 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-gaussianblur-yonly-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-gaussianblur-yonly-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='box'", - "rect": [58, 0, 200, 310], - "reason": "background" - } + "invalidations": [ + [58, 0, 200, 310] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-lighting-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-lighting-expected.txt index 99effb5c..50d58ee 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-lighting-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-lighting-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='box'", - "rect": [78, 70, 100, 100], - "reason": "appeared" - } + "invalidations": [ + [78, 70, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-merge-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-merge-expected.txt index fecf09b..fc02ff0c 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-merge-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-merge-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='box'", - "rect": [28, 20, 300, 300], - "reason": "background" - } + "invalidations": [ + [28, 20, 300, 300] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-morphology-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-morphology-expected.txt index de4b0ea..2450bc1 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-morphology-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-morphology-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='box'", - "rect": [33, 25, 250, 250], - "reason": "background" - } + "invalidations": [ + [33, 25, 250, 250] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-morphology-xonly-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-morphology-xonly-expected.txt index 6992c0e..92a3660 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-morphology-xonly-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-morphology-xonly-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='box'", - "rect": [33, 50, 250, 200], - "reason": "background" - } + "invalidations": [ + [33, 50, 250, 200] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-morphology-yonly-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-morphology-yonly-expected.txt index 6637fe1..3d5a5b0 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-morphology-yonly-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-morphology-yonly-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='box'", - "rect": [58, 25, 200, 250], - "reason": "background" - } + "invalidations": [ + [58, 25, 200, 250] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-offset-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-offset-expected.txt index a5be060..eb335ef 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-offset-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-offset-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='box'", - "rect": [198, 198, 110, 110], - "reason": "background" - } + "invalidations": [ + [198, 198, 110, 110] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-primitive-attr-mutation-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-primitive-attr-mutation-expected.txt index 7d208ad..ae2e746 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-primitive-attr-mutation-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-primitive-attr-mutation-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='target'", - "rect": [8, 8, 100, 100], - "reason": "paint property change" - } + "invalidations": [ + [8, 8, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-primitive-attr-removal-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-primitive-attr-removal-expected.txt index 7d208ad..ae2e746 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-primitive-attr-removal-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-primitive-attr-removal-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='target'", - "rect": [8, 8, 100, 100], - "reason": "paint property change" - } + "invalidations": [ + [8, 8, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-primitive-removed-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-primitive-removed-expected.txt index 7d208ad..ae2e746 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-primitive-removed-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/effect-reference-repaint-primitive-removed-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='target'", - "rect": [8, 8, 100, 100], - "reason": "paint property change" - } + "invalidations": [ + [8, 8, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/filter-invalidation-after-display-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/filter-invalidation-after-display-expected.txt index abf59b6..2c75d8f 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/filter-invalidation-after-display-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/filter-invalidation-after-display-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='box' class='green drop-shadowed box'", - "rect": [300, 8, 330, 330], - "reason": "chunk disappeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='box' class='green box'", - "rect": [300, 8, 200, 200], - "reason": "appeared" - } + "invalidations": [ + [300, 8, 330, 330] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/filter-invalidation-positioned-child-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/filter-invalidation-positioned-child-expected.txt index f70ff08..04febac8 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/filter-invalidation-positioned-child-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/filter-invalidation-positioned-child-expected.txt
@@ -5,27 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='box'", - "rect": [8, 8, 430, 230], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='positioned'", - "rect": [408, 408, 380, 180], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow DIV id='box'", - "rect": [8, 8, 380, 180], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='positioned'", - "rect": [408, 408, 330, 130], - "reason": "paint property change" - } + "invalidations": [ + [8, 8, 430, 230], + [408, 408, 380, 180] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/filter-invalidation-with-composited-container-change-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/filter-invalidation-with-composited-container-change-expected.txt index 9e2d7f4..4bed6430 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/filter-invalidation-with-composited-container-change-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/filter-invalidation-with-composited-container-change-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='box' class='green drop-shadowed box'", - "rect": [8, 8, 330, 330], - "reason": "chunk disappeared" - } + "invalidations": [ + [8, 8, 330, 330] ] }, { @@ -18,12 +14,8 @@ "position": [-30, -30], "bounds": [260, 260], "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='box' class='green box blurry'", - "rect": [0, 0, 260, 260], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 260, 260] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/filter-repaint-accelerated-child-with-filter-child-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/filter-repaint-accelerated-child-with-filter-child-expected.txt index 3682f231..d6a1ad5c 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/filter-repaint-accelerated-child-with-filter-child-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/filter-repaint-accelerated-child-with-filter-child-expected.txt
@@ -17,17 +17,8 @@ "position": [-14, -14], "bounds": [214, 260], "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='resize' class='drop-shadow'", - "rect": [0, 0, 214, 260], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow DIV id='resize' class='drop-shadow'", - "rect": [0, 0, 160, 260], - "reason": "paint property change" - } + "invalidations": [ + [0, 0, 214, 260] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/filter-repaint-accelerated-on-accelerated-filter-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/filter-repaint-accelerated-on-accelerated-filter-expected.txt index 1aea33c..3359954 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/filter-repaint-accelerated-on-accelerated-filter-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/filters/filter-repaint-accelerated-on-accelerated-filter-expected.txt
@@ -17,12 +17,8 @@ "position": [-14, -14], "bounds": [160, 260], "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='resize' class='drop-shadow accelerated'", - "rect": [0, 0, 160, 260], - "reason": "paint property change" - } + "invalidations": [ + [0, 0, 160, 260] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/align-content-change-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/align-content-change-expected.txt index cddfb21..70287433 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/align-content-change-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/align-content-change-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [0, 202, 200, 150], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [0, 52, 200, 150], - "reason": "geometry" - } + "invalidations": [ + [0, 202, 200, 150], + [0, 52, 200, 150] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/align-content-distribution-change-grid-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/align-content-distribution-change-grid-expected.txt index 803ae87..fc0fbf64 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/align-content-distribution-change-grid-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/align-content-distribution-change-grid-expected.txt
@@ -5,22 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [0, 252, 200, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [0, 152, 200, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [0, 52, 200, 100], - "reason": "geometry" - } + "invalidations": [ + [0, 252, 200, 100], + [0, 152, 200, 100], + [0, 52, 200, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/align-items-change-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/align-items-change-expected.txt index 4e52169..9b8bd2d 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/align-items-change-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/align-items-change-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [100, 52, 100, 300], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [0, 52, 100, 300], - "reason": "geometry" - } + "invalidations": [ + [100, 52, 100, 300], + [0, 52, 100, 300] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/align-self-change-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/align-self-change-expected.txt index 4e52169..9b8bd2d 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/align-self-change-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/align-self-change-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [100, 52, 100, 300], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [0, 52, 100, 300], - "reason": "geometry" - } + "invalidations": [ + [100, 52, 100, 300], + [0, 52, 100, 300] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/align-self-change-grid-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/align-self-change-grid-expected.txt index 131749c..8fe789e 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/align-self-change-grid-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/align-self-change-grid-expected.txt
@@ -5,32 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='item1'", - "rect": [0, 52, 100, 300], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item3'", - "rect": [100, 202, 100, 150], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item2'", - "rect": [100, 127, 100, 150], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item3'", - "rect": [100, 127, 100, 150], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item2'", - "rect": [100, 52, 100, 150], - "reason": "geometry" - } + "invalidations": [ + [0, 52, 100, 300], + [100, 202, 100, 150], + [100, 127, 100, 150], + [100, 52, 100, 150] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/justify-content-change-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/justify-content-change-expected.txt index 49157bb..b4700f8 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/justify-content-change-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/justify-content-change-expected.txt
@@ -5,27 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [148, 52, 52, 300], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [124, 52, 52, 300], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [24, 52, 52, 300], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [0, 52, 52, 300], - "reason": "geometry" - } + "invalidations": [ + [148, 52, 52, 300], + [124, 52, 52, 300], + [24, 52, 52, 300], + [0, 52, 52, 300] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/justify-content-distribution-change-grid-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/justify-content-distribution-change-grid-expected.txt index 70de8572..28e28e33 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/justify-content-distribution-change-grid-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/justify-content-distribution-change-grid-expected.txt
@@ -5,22 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [200, 52, 100, 200], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [100, 52, 100, 200], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [0, 52, 100, 200], - "reason": "geometry" - } + "invalidations": [ + [200, 52, 100, 200], + [100, 52, 100, 200], + [0, 52, 100, 200] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/justify-items-change-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/justify-items-change-expected.txt index 727554e..74d55b1 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/justify-items-change-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/justify-items-change-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [150, 52, 50, 300], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [0, 52, 50, 300], - "reason": "geometry" - } + "invalidations": [ + [150, 52, 50, 300], + [0, 52, 50, 300] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/justify-items-legacy-change-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/justify-items-legacy-change-expected.txt index 6850b6d8..dc14798 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/justify-items-legacy-change-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/justify-items-legacy-change-expected.txt
@@ -5,27 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='item2'", - "rect": [124, 52, 52, 150], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item2'", - "rect": [100, 52, 52, 150], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item1'", - "rect": [24, 52, 52, 150], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item1'", - "rect": [0, 52, 52, 150], - "reason": "geometry" - } + "invalidations": [ + [124, 52, 52, 150], + [100, 52, 52, 150], + [24, 52, 52, 150], + [0, 52, 52, 150] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/justify-self-change-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/justify-self-change-expected.txt index 187f00c3..bed16a3 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/justify-self-change-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/justify-self-change-expected.txt
@@ -5,32 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='item1'", - "rect": [0, 52, 100, 300], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item3'", - "rect": [150, 52, 50, 300], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item2'", - "rect": [125, 52, 50, 300], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item3'", - "rect": [125, 52, 50, 300], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item2'", - "rect": [100, 52, 50, 300], - "reason": "geometry" - } + "invalidations": [ + [0, 52, 100, 300], + [150, 52, 50, 300], + [125, 52, 50, 300], + [100, 52, 50, 300] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/remove-inline-block-descendant-of-flex-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/remove-inline-block-descendant-of-flex-expected.txt index 9289da44..ae93da1c 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/remove-inline-block-descendant-of-flex-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/remove-inline-block-descendant-of-flex-expected.txt
@@ -5,22 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='inline-block-2' class='item'", - "rect": [0, 200, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV id='inline-block-1' class='item'", - "rect": [0, 100, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='inline-block-2' class='item'", - "rect": [0, 100, 100, 100], - "reason": "geometry" - } + "invalidations": [ + [0, 200, 100, 100], + [0, 100, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/repaint-column-reverse-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/repaint-column-reverse-expected.txt index 67a2e10..086530f1 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/repaint-column-reverse-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/repaint-column-reverse-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='blue' class='flex-item'", - "rect": [8, 68, 200, 30], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV id='blue' class='flex-item'", - "rect": [9, 69, 198, 30], - "reason": "geometry" - } + "invalidations": [ + [8, 68, 200, 30], + [9, 69, 198, 30] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/repaint-during-resize-no-flex-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/repaint-during-resize-no-flex-expected.txt index 1c29a1b..b3732da 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/repaint-during-resize-no-flex-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/repaint-during-resize-no-flex-expected.txt
@@ -5,32 +5,12 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='flex-item-1' class='flex-item width'", - "rect": [30, 20, 40, 50], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow DIV class='flex-item'", - "rect": [160, 20, 10, 50], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='flex-item'", - "rect": [120, 20, 10, 50], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='flex-item'", - "rect": [110, 20, 10, 50], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='flex-item'", - "rect": [70, 20, 10, 50], - "reason": "geometry" - } + "invalidations": [ + [30, 20, 40, 50], + [160, 20, 10, 50], + [120, 20, 10, 50], + [110, 20, 10, 50], + [70, 20, 10, 50] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/repaint-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/repaint-expected.txt index 93e67000..698c8f9 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/repaint-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/repaint-expected.txt
@@ -5,157 +5,12 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='content'", - "rect": [138, 128, 654, 100], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow DIV id='content'", - "rect": [148, 128, 644, 100], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean laoreet dolor id urna eleifend aliquet.'", - "rect": [138, 128, 636, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Nulla vel dolor ipsum. Aliquam ut turpis nisl, in vulputate sapien. Cum sociis natoque penatibus et'", - "rect": [138, 128, 636, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Sed volutpat, tellus vel varius vestibulum, purus quam mollis sapien, in condimentum leo neque sed'", - "rect": [138, 128, 636, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'magnis dis parturient montes, nascetur ridiculus mus. Sed congue magna vitae dolor feugiat vehicula.'", - "rect": [138, 128, 636, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'nulla. Nunc quis porta elit. Pellentesque erat lectus, ultricies a lobortis id, faucibus id quam.'", - "rect": [138, 128, 636, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean laoreet dolor id urna eleifend aliquet.'", - "rect": [148, 128, 635, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean laoreet dolor id urna eleifend aliquet.'", - "rect": [148, 128, 635, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Nulla vel dolor ipsum. Aliquam ut turpis nisl, in vulputate sapien. Cum sociis natoque penatibus et'", - "rect": [148, 128, 635, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Nulla vel dolor ipsum. Aliquam ut turpis nisl, in vulputate sapien. Cum sociis natoque penatibus et'", - "rect": [148, 128, 635, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Sed volutpat, tellus vel varius vestibulum, purus quam mollis sapien, in condimentum leo neque sed'", - "rect": [148, 128, 635, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Sed volutpat, tellus vel varius vestibulum, purus quam mollis sapien, in condimentum leo neque sed'", - "rect": [148, 128, 635, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'magnis dis parturient montes, nascetur ridiculus mus. Sed congue magna vitae dolor feugiat vehicula.'", - "rect": [148, 128, 635, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'magnis dis parturient montes, nascetur ridiculus mus. Sed congue magna vitae dolor feugiat vehicula.'", - "rect": [148, 128, 635, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'nulla. Nunc quis porta elit. Pellentesque erat lectus, ultricies a lobortis id, faucibus id quam.'", - "rect": [148, 128, 635, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'nulla. Nunc quis porta elit. Pellentesque erat lectus, ultricies a lobortis id, faucibus id quam.'", - "rect": [148, 128, 635, 99], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV id='content'", - "rect": [400, 128, 392, 180], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow DIV id='left'", - "rect": [8, 228, 392, 80], - "reason": "incremental" - }, - { - "object": "NGPhysicalTextFragment 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean laoreet dolor id urna eleifend aliquet.'", - "rect": [400, 128, 391, 179], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Nulla vel dolor ipsum. Aliquam ut turpis nisl, in vulputate sapien. Cum sociis natoque penatibus et'", - "rect": [400, 128, 391, 179], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Sed volutpat, tellus vel varius vestibulum, purus quam mollis sapien, in condimentum leo neque sed'", - "rect": [400, 128, 391, 179], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Sed volutpat, tellus vel varius vestibulum, purus quam mollis'", - "rect": [400, 128, 391, 179], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'elit. Pellentesque erat lectus, ultricies a lobortis id, faucibus id'", - "rect": [400, 128, 391, 179], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'magnis dis parturient montes, nascetur ridiculus mus. Sed congue magna vitae dolor feugiat vehicula.'", - "rect": [400, 128, 391, 179], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'nulla. Nunc quis porta elit. Pellentesque erat lectus, ultricies a lobortis id, faucibus id quam.'", - "rect": [400, 128, 391, 179], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'quam.'", - "rect": [400, 128, 391, 179], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'sapien, in condimentum leo neque sed nulla. Nunc quis porta'", - "rect": [400, 128, 391, 179], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='left'", - "rect": [148, 128, 252, 180], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow DIV id='left'", - "rect": [8, 128, 140, 100], - "reason": "geometry" - } + "invalidations": [ + [138, 128, 654, 100], + [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/composite-after-paint/paint/invalidation/flexbox/repaint-on-layout-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/repaint-on-layout-expected.txt index 4d13c00..aa4bba7 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/repaint-on-layout-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/repaint-on-layout-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='badge'", - "rect": [712, 8, 80, 20], - "reason": "disappeared" - } + "invalidations": [ + [712, 8, 80, 20] ] }, {
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/repaint-on-margin-change-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/repaint-on-margin-change-expected.txt index f1408fff..870962d 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/repaint-on-margin-change-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/repaint-on-margin-change-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='child-to-grow' class='child'", - "rect": [48, 28, 20, 20], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV id='child-to-grow' class='child'", - "rect": [8, 28, 20, 20], - "reason": "geometry" - } + "invalidations": [ + [48, 28, 20, 20], + [8, 28, 20, 20] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/repaint-opacity-change-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/repaint-opacity-change-expected.txt index 7c79be319..773f2a7 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/repaint-opacity-change-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/repaint-opacity-change-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target' class='item'", - "rect": [18, 18, 764, 20], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='target' class='item'", - "rect": [18, 18, 764, 20], - "reason": "chunk disappeared" - } + "invalidations": [ + [18, 18, 764, 20] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/repaint-rtl-column-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/repaint-rtl-column-expected.txt index 9b931d9..4738c15 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/repaint-rtl-column-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/repaint-rtl-column-expected.txt
@@ -5,47 +5,12 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='content'", - "rect": [8, 116, 200, 252], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow DIV id='content'", - "rect": [8, 119, 200, 249], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow DIV id='left'", - "rect": [8, 68, 200, 145], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV id='left'", - "rect": [8, 68, 200, 52], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [13, 124, 190, 351], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [13, 124, 190, 351], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [13, 121, 190, 351], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [13, 218, 190, 350], - "reason": "geometry" - } + "invalidations": [ + [8, 116, 200, 252], + [8, 68, 200, 145], + [13, 124, 190, 351], + [13, 121, 190, 351], + [13, 218, 190, 350] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/scrollbars-changed-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/scrollbars-changed-expected.txt index b6fad37c1..b674497 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/scrollbars-changed-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/flexbox/scrollbars-changed-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'a'", - "rect": [0, 5, 15, 15], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'z'", - "rect": [0, 5, 15, 15], - "reason": "appeared" - } + "invalidations": [ + [0, 5, 15, 15] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/float-in-new-block-with-layout-delta-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/float-in-new-block-with-layout-delta-expected.txt index 8ae44fb1..a3d86505 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/float-in-new-block-with-layout-delta-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/float-in-new-block-with-layout-delta-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [8, 108, 100, 100], - "reason": "appeared" - } + "invalidations": [ + [8, 108, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/float-move-during-layout-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/float-move-during-layout-expected.txt index d2c22175..cdcd45b 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/float-move-during-layout-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/float-move-during-layout-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [8, 210, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [8, 110, 100, 100], - "reason": "geometry" - } + "invalidations": [ + [8, 210, 100, 100], + [8, 110, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/float-new-in-block-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/float-new-in-block-expected.txt index e556bbb..34ccfd1 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/float-new-in-block-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/float-new-in-block-expected.txt
@@ -5,22 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [8, 8, 784, 20], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [8, 8, 784, 20], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV id='target'", - "rect": [8, 8, 100, 100], - "reason": "appeared" - } + "invalidations": [ + [8, 8, 784, 20], + [8, 8, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/float-offscreen-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/float-offscreen-expected.txt index 1deab3c..8a5a401e 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/float-offscreen-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/float-offscreen-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [11, 11, 89, 22], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [11, 11, 89, 22], - "reason": "paint property change" - } + "invalidations": [ + [11, 11, 89, 22] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/forms/button-checkbox-click-method-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/forms/button-checkbox-click-method-repaint-expected.txt index cab2f3c..115201a 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/forms/button-checkbox-click-method-repaint-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/forms/button-checkbox-click-method-repaint-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow INPUT id='checkbox'", - "rect": [12, 61, 30, 30], - "reason": "subtree" - } + "invalidations": [ + [12, 61, 30, 30] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/forms/button-reset-focus-by-mouse-then-keydown-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/forms/button-reset-focus-by-mouse-then-keydown-expected.txt index e6e44fef..635a6aa 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/forms/button-reset-focus-by-mouse-then-keydown-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/forms/button-reset-focus-by-mouse-then-keydown-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutButton BUTTON", - "rect": [6, 6, 54, 26], - "reason": "subtree" - }, - { - "object": "InlineTextBox 'Reset'", - "rect": [16, 11, 34, 16], - "reason": "subtree" - } + "invalidations": [ + [6, 6, 54, 26] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/forms/checkbox-focus-by-mouse-then-keydown-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/forms/checkbox-focus-by-mouse-then-keydown-expected.txt index 8be630f..4cebb7b 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/forms/checkbox-focus-by-mouse-then-keydown-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/forms/checkbox-focus-by-mouse-then-keydown-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow INPUT", - "rect": [8, 7, 21, 21], - "reason": "subtree" - } + "invalidations": [ + [8, 7, 21, 21] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/forms/details-marker-color-change-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/forms/details-marker-color-change-expected.txt index 899d29b..1d87646 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/forms/details-marker-color-change-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/forms/details-marker-color-change-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Details'", - "rect": [24, 8, 45, 19], - "reason": "style change" - }, - { - "object": "LayoutDetailsMarker DIV id='details-marker'", - "rect": [8, 12, 11, 11], - "reason": "style change" - } + "invalidations": [ + [24, 8, 45, 19], + [8, 12, 11, 11] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/forms/radio-focus-by-mouse-then-keydown-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/forms/radio-focus-by-mouse-then-keydown-expected.txt index c216643..36812da 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/forms/radio-focus-by-mouse-then-keydown-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/forms/radio-focus-by-mouse-then-keydown-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow INPUT", - "rect": [9, 7, 21, 21], - "reason": "subtree" - } + "invalidations": [ + [9, 7, 21, 21] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/forms/range-focus-by-mouse-then-keydown-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/forms/range-focus-by-mouse-then-keydown-expected.txt index 5022cf1f..c0239f7 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/forms/range-focus-by-mouse-then-keydown-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/forms/range-focus-by-mouse-then-keydown-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSlider INPUT", - "rect": [8, 8, 133, 20], - "reason": "subtree" - }, - { - "object": "LayoutBlockFlow DIV id='thumb'", - "rect": [66, 10, 17, 16], - "reason": "subtree" - } + "invalidations": [ + [8, 8, 133, 20] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/forms/select-option-background-color-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/forms/select-option-background-color-expected.txt index a977e51..a7edb07 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/forms/select-option-background-color-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/forms/select-option-background-color-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow OPTION id='option'", - "rect": [1, 37, 13, 17], - "reason": "appeared" - } + "invalidations": [ + [1, 37, 13, 17] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.txt index e80f9de..299401f 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutButton INPUT", - "rect": [6, 6, 61, 26], - "reason": "subtree" - }, - { - "object": "LayoutButton INPUT", - "rect": [6, 6, 61, 26], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox 'Submit'", - "rect": [16, 11, 41, 16], - "reason": "subtree" - } + "invalidations": [ + [6, 6, 61, 26] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/forms/textarea-appearance-none-resize-handle-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/forms/textarea-appearance-none-resize-handle-expected.txt index d19d129..776fea8 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/forms/textarea-appearance-none-resize-handle-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/forms/textarea-appearance-none-resize-handle-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTextControl (positioned) TEXTAREA id='textarea'", - "rect": [0, 50, 106, 206], - "reason": "geometry" - }, - { - "object": "Scroll corner of LayoutTextControl (positioned) TEXTAREA id='textarea'", - "rect": [90, 240, 15, 15], - "reason": "geometry" - }, - { - "object": "Scroll corner of LayoutTextControl (positioned) TEXTAREA id='textarea'", - "rect": [90, 140, 15, 15], - "reason": "geometry" - } + "invalidations": [ + [0, 50, 106, 206] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/forms/textarea-caret-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/forms/textarea-caret-expected.txt index 7d2bbe3..d1546eb 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/forms/textarea-caret-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/forms/textarea-caret-expected.txt
@@ -5,47 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTextControl TEXTAREA id='editor'", - "rect": [6, 6, 185, 42], - "reason": "chunk appeared" - }, - { - "object": "LayoutTextControl TEXTAREA id='editor'", - "rect": [6, 6, 185, 42], - "reason": "chunk appeared" - }, - { - "object": "LayoutTextControl TEXTAREA id='editor'", - "rect": [8, 8, 181, 38], - "reason": "disappeared" - }, - { - "object": "LayoutTextControl TEXTAREA id='editor'", - "rect": [9, 9, 179, 21], - "reason": "chunk appeared" - }, - { - "object": "LayoutTextControl TEXTAREA id='editor'", - "rect": [9, 11, 179, 16], - "reason": "chunk appeared" - }, - { - "object": "HorizontalScrollbar", - "rect": [9, 30, 164, 15], - "reason": "chunk appeared" - }, - { - "object": "LayoutTextControl TEXTAREA id='editor'", - "rect": [173, 30, 15, 15], - "reason": "chunk disappeared" - }, - { - "object": "Scroll corner of LayoutTextControl TEXTAREA id='editor'", - "rect": [173, 30, 15, 15], - "reason": "chunk appeared" - } + "invalidations": [ + [6, 6, 185, 42] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/forms/textarea-resize-property-change-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/forms/textarea-resize-property-change-expected.txt index 4d57101..f8c202b 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/forms/textarea-resize-property-change-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/forms/textarea-resize-property-change-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTextControl (positioned) TEXTAREA id='textarea'", - "rect": [0, 50, 106, 106], - "reason": "style change" - }, - { - "object": "LayoutTextControl (positioned) TEXTAREA id='textarea'", - "rect": [90, 140, 15, 15], - "reason": "chunk appeared" - } + "invalidations": [ + [0, 50, 106, 106] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/forms/textarea-set-disabled-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/forms/textarea-set-disabled-expected.txt index 3b514b6f0..aa6c08da 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/forms/textarea-set-disabled-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/forms/textarea-set-disabled-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTextControl TEXTAREA", - "rect": [8, 8, 106, 106], - "reason": "subtree" - } + "invalidations": [ + [8, 8, 106, 106] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/gradients-em-stops-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/gradients-em-stops-repaint-expected.txt index 145da90..8cfb52a 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/gradients-em-stops-repaint-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/gradients-em-stops-repaint-expected.txt
@@ -5,22 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='box4' class='box'", - "rect": [344, 18, 302, 122], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow DIV class='indicator'", - "rect": [345, 19, 240, 20], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment ' '", - "rect": [330, 135, 4, 19], - "reason": "geometry" - } + "invalidations": [ + [344, 18, 302, 122], + [330, 135, 4, 19] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/iframe-display-block-to-display-none-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/iframe-display-block-to-display-none-expected.txt index 82a4051..41e4384 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/iframe-display-block-to-display-none-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/iframe-display-block-to-display-none-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutIFrame IFRAME id='iframe'", - "rect": [8, 72, 732, 94], - "reason": "disappeared" - } + "invalidations": [ + [8, 72, 732, 94] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/iframe-display-none-to-display-block-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/iframe-display-none-to-display-block-expected.txt index f6230653..41e4384 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/iframe-display-none-to-display-block-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/iframe-display-none-to-display-block-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutIFrame IFRAME id='iframe'", - "rect": [8, 72, 732, 94], - "reason": "appeared" - } + "invalidations": [ + [8, 72, 732, 94] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/iframe-rounding-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/iframe-rounding-expected.txt index 5861a6e..7c92f08e 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/iframe-rounding-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/iframe-rounding-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='target'", - "rect": [19, 18, 101, 100], - "reason": "background" - } + "invalidations": [ + [19, 18, 101, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/image/canvas-composite-repaint-by-all-imagesource-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/image/canvas-composite-repaint-by-all-imagesource-expected.txt index 7671dfe..e23d57fc 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/image/canvas-composite-repaint-by-all-imagesource-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/image/canvas-composite-repaint-by-all-imagesource-expected.txt
@@ -5,447 +5,51 @@ "bounds": [785, 933], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutHTMLCanvas CANVAS id='copyvideo'", - "rect": [571, 515, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='copyvideo'", - "rect": [571, 515, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-atopvideo'", - "rect": [571, 415, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-atopvideo'", - "rect": [571, 415, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-invideo'", - "rect": [571, 315, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-invideo'", - "rect": [571, 315, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-outvideo'", - "rect": [571, 165, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-outvideo'", - "rect": [571, 165, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-invideo'", - "rect": [571, 115, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-invideo'", - "rect": [571, 115, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='copycanvas'", - "rect": [429, 515, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='copycanvas'", - "rect": [429, 515, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-atopcanvas'", - "rect": [429, 415, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-atopcanvas'", - "rect": [429, 415, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-incanvas'", - "rect": [429, 315, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-incanvas'", - "rect": [429, 315, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-outcanvas'", - "rect": [429, 165, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-outcanvas'", - "rect": [429, 165, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-incanvas'", - "rect": [429, 115, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-incanvas'", - "rect": [429, 115, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='copyimage'", - "rect": [287, 515, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='copyimage'", - "rect": [287, 515, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-atopimage'", - "rect": [287, 415, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-atopimage'", - "rect": [287, 415, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-inimage'", - "rect": [287, 315, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-inimage'", - "rect": [287, 315, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-outimage'", - "rect": [287, 165, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-outimage'", - "rect": [287, 165, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-inimage'", - "rect": [287, 115, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-inimage'", - "rect": [287, 115, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='copysolid color'", - "rect": [145, 515, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='copysolid color'", - "rect": [145, 515, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-atopsolid color'", - "rect": [145, 415, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-atopsolid color'", - "rect": [145, 415, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-insolid color'", - "rect": [145, 315, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-insolid color'", - "rect": [145, 315, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-outsolid color'", - "rect": [145, 165, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-outsolid color'", - "rect": [145, 165, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-insolid color'", - "rect": [145, 115, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-insolid color'", - "rect": [145, 115, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='xorvideo'", - "rect": [601, 565, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='xorvideo'", - "rect": [601, 565, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='lightervideo'", - "rect": [601, 465, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='lightervideo'", - "rect": [601, 465, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-outvideo'", - "rect": [601, 365, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-outvideo'", - "rect": [601, 365, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-overvideo'", - "rect": [601, 265, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-overvideo'", - "rect": [601, 265, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-atopvideo'", - "rect": [601, 215, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-atopvideo'", - "rect": [601, 215, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-overvideo'", - "rect": [601, 65, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-overvideo'", - "rect": [601, 65, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='xorcanvas'", - "rect": [459, 565, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='xorcanvas'", - "rect": [459, 565, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='lightercanvas'", - "rect": [459, 465, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='lightercanvas'", - "rect": [459, 465, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-outcanvas'", - "rect": [459, 365, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-outcanvas'", - "rect": [459, 365, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-overcanvas'", - "rect": [459, 265, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-overcanvas'", - "rect": [459, 265, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-atopcanvas'", - "rect": [459, 215, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-atopcanvas'", - "rect": [459, 215, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-overcanvas'", - "rect": [459, 65, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-overcanvas'", - "rect": [459, 65, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='xorimage'", - "rect": [317, 565, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='xorimage'", - "rect": [317, 565, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='lighterimage'", - "rect": [317, 465, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='lighterimage'", - "rect": [317, 465, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-outimage'", - "rect": [317, 365, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-outimage'", - "rect": [317, 365, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-overimage'", - "rect": [317, 265, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-overimage'", - "rect": [317, 265, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-atopimage'", - "rect": [317, 215, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-atopimage'", - "rect": [317, 215, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-overimage'", - "rect": [317, 65, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-overimage'", - "rect": [317, 65, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='xorsolid color'", - "rect": [175, 565, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='xorsolid color'", - "rect": [175, 565, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='lightersolid color'", - "rect": [175, 465, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='lightersolid color'", - "rect": [175, 465, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-outsolid color'", - "rect": [175, 365, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-outsolid color'", - "rect": [175, 365, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-oversolid color'", - "rect": [175, 265, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-oversolid color'", - "rect": [175, 265, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-atopsolid color'", - "rect": [175, 215, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-atopsolid color'", - "rect": [175, 215, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-oversolid color'", - "rect": [175, 65, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-oversolid color'", - "rect": [175, 65, 50, 40], - "reason": "invalidate paint rectangle" - } + "invalidations": [ + [571, 515, 80, 40], + [571, 415, 80, 40], + [571, 315, 80, 40], + [571, 165, 80, 40], + [571, 115, 80, 40], + [429, 515, 80, 40], + [429, 415, 80, 40], + [429, 315, 80, 40], + [429, 165, 80, 40], + [429, 115, 80, 40], + [287, 515, 80, 40], + [287, 415, 80, 40], + [287, 315, 80, 40], + [287, 165, 80, 40], + [287, 115, 80, 40], + [145, 515, 80, 40], + [145, 415, 80, 40], + [145, 315, 80, 40], + [145, 165, 80, 40], + [145, 115, 80, 40], + [601, 565, 50, 40], + [601, 465, 50, 40], + [601, 365, 50, 40], + [601, 265, 50, 40], + [601, 215, 50, 40], + [601, 65, 50, 40], + [459, 565, 50, 40], + [459, 465, 50, 40], + [459, 365, 50, 40], + [459, 265, 50, 40], + [459, 215, 50, 40], + [459, 65, 50, 40], + [317, 565, 50, 40], + [317, 465, 50, 40], + [317, 365, 50, 40], + [317, 265, 50, 40], + [317, 215, 50, 40], + [317, 65, 50, 40], + [175, 565, 50, 40], + [175, 465, 50, 40], + [175, 365, 50, 40], + [175, 265, 50, 40], + [175, 215, 50, 40], + [175, 65, 50, 40] ] }, {
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/image/do-not-paint-below-image-baseline-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/image/do-not-paint-below-image-baseline-expected.txt index 594316b6..ac1b6c0f 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/image/do-not-paint-below-image-baseline-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/image/do-not-paint-below-image-baseline-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutImage IMG", - "rect": [50, 50, 259, 194], - "reason": "background" - } + "invalidations": [ + [50, 50, 259, 194] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/image/image-resize-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/image/image-resize-expected.txt index 96554d72..ff9ad0a 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/image/image-resize-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/image/image-resize-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutImage (positioned) IMG", - "rect": [0, 50, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutImage (positioned) IMG", - "rect": [0, 50, 100, 200], - "reason": "geometry" - } + "invalidations": [ + [0, 50, 150, 150], + [0, 50, 100, 200] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/image/percent-size-image-resize-container-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/image/percent-size-image-resize-container-expected.txt index 96554d72..ff9ad0a 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/image/percent-size-image-resize-container-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/image/percent-size-image-resize-container-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutImage (positioned) IMG", - "rect": [0, 50, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutImage (positioned) IMG", - "rect": [0, 50, 100, 200], - "reason": "geometry" - } + "invalidations": [ + [0, 50, 150, 150], + [0, 50, 100, 200] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/in-scaled-iframe-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/in-scaled-iframe-expected.txt index 893b4b4..97a6b6bb 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/in-scaled-iframe-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/in-scaled-iframe-expected.txt
@@ -5,12 +5,8 @@ "bounds": [785, 825], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='div'", - "rect": [209, 209, 100, 100], - "reason": "background" - } + "invalidations": [ + [209, 209, 100, 100] ] }, {
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/inline-block-resize-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/inline-block-resize-expected.txt index bf0de57..ae2e746 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/inline-block-resize-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/inline-block-resize-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [8, 8, 100, 100], - "reason": "appeared" - } + "invalidations": [ + [8, 8, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/inline-color-change-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/inline-color-change-expected.txt index 17d92bb..8f65db5 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/inline-color-change-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/inline-color-change-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalBoxFragment LayoutInline SPAN id='target'", - "rect": [8, 72, 38, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'PASS'", - "rect": [8, 72, 38, 19], - "reason": "style change" - } + "invalidations": [ + [8, 72, 38, 19] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/inline-reflow-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/inline-reflow-expected.txt index b073860..d9abf5c 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/inline-reflow-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/inline-reflow-expected.txt
@@ -5,137 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'A A A A A AA AA'", - "rect": [0, 0, 300, 200], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'A A'", - "rect": [0, 0, 300, 200], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'AA AA AA A A A'", - "rect": [0, 0, 300, 200], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'AA AA AAA AAA'", - "rect": [0, 0, 300, 200], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'AAA AAA AAA AA'", - "rect": [0, 0, 300, 200], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'AAA AAAA AAAA'", - "rect": [0, 0, 300, 200], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'AAAAA AAAA AAAA'", - "rect": [0, 0, 300, 200], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'AAAAA AAAAA'", - "rect": [0, 0, 300, 200], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'AAAAAA AAAAA'", - "rect": [0, 0, 300, 200], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'AAAAAA AAAAAAA'", - "rect": [0, 0, 300, 200], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'A A A A A AA AA'", - "rect": [0, 0, 200, 300], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'A A A A'", - "rect": [0, 0, 200, 300], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'A A'", - "rect": [0, 0, 200, 300], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'AA AA AA A A A'", - "rect": [0, 0, 200, 300], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'AA AA AA A'", - "rect": [0, 0, 200, 300], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'AA AA AAA AAA'", - "rect": [0, 0, 200, 300], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'AAA AAA AA'", - "rect": [0, 0, 200, 300], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'AAA AAA AAA AA'", - "rect": [0, 0, 200, 300], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'AAA AAAA AAAA'", - "rect": [0, 0, 200, 300], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'AAAA AAA'", - "rect": [0, 0, 200, 300], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'AAAAA AAAA AAAA'", - "rect": [0, 0, 200, 300], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'AAAAA AAAA'", - "rect": [0, 0, 200, 300], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'AAAAA AAAAA'", - "rect": [0, 0, 200, 300], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'AAAAAA AAAAA'", - "rect": [0, 0, 200, 300], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'AAAAAA AAAAAAA'", - "rect": [0, 0, 200, 300], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'A A A A A'", - "rect": [0, 300, 180, 20], - "reason": "geometry" - } + "invalidations": [ + [0, 0, 300, 200], + [0, 0, 200, 300], + [0, 300, 180, 20] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/insert-frame-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/insert-frame-expected.txt index f697b98c..c873c2c 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/insert-frame-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/insert-frame-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutIFrame IFRAME", - "rect": [0, 0, 104, 104], - "reason": "appeared" - } + "invalidations": [ + [0, 0, 104, 104] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/invalidate-caret-before-text-node-update-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/invalidate-caret-before-text-node-update-expected.txt index 8781b782..35ee8ea 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/invalidate-caret-before-text-node-update-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/invalidate-caret-before-text-node-update-expected.txt
@@ -5,27 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='root' class='editing'", - "rect": [6, 6, 788, 22], - "reason": "style change" - }, - { - "object": "InlineTextBox '1'", - "rect": [8, 8, 10, 18], - "reason": "disappeared" - }, - { - "object": "Caret", - "rect": [18, 8, 1, 18], - "reason": "caret" - }, - { - "object": "Caret", - "rect": [8, 8, 1, 18], - "reason": "caret" - } + "invalidations": [ + [6, 6, 788, 22] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/invalidate-descendants-when-receiving-paint-layer-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/invalidate-descendants-when-receiving-paint-layer-expected.txt index 8da9c1f5..6e4e626 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/invalidate-descendants-when-receiving-paint-layer-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/invalidate-descendants-when-receiving-paint-layer-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='child'", - "rect": [9, 9, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [9, 9, 100, 100], - "reason": "chunk appeared" - } + "invalidations": [ + [9, 9, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/invalidate-invisible-element-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/invalidate-invisible-element-expected.txt index 2ee6c9d..b37eaec 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/invalidate-invisible-element-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/invalidate-invisible-element-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target'", - "rect": [200, 300, 200, 200], - "reason": "appeared" - } + "invalidations": [ + [200, 300, 200, 200] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/invalidation-after-opacity-change-subtree-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/invalidation-after-opacity-change-subtree-expected.txt index 2cefe2cc..118a1b84 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/invalidation-after-opacity-change-subtree-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/invalidation-after-opacity-change-subtree-expected.txt
@@ -5,12 +5,8 @@ "bounds": [785, 2350], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='absolute'", - "rect": [8, 2046, 774, 257], - "reason": "chunk appeared" - } + "invalidations": [ + [8, 2046, 774, 257] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/invalidation-on-foreground-graphics-layer-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/invalidation-on-foreground-graphics-layer-expected.txt index 48e92207..56325d2 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/invalidation-on-foreground-graphics-layer-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/invalidation-on-foreground-graphics-layer-expected.txt
@@ -55,12 +55,8 @@ "bounds": [200, 200], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [0, 0, 200, 200], - "reason": "background" - } + "invalidations": [ + [0, 0, 200, 200] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/invalidation-with-zero-size-object-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/invalidation-with-zero-size-object-expected.txt index 20d271f..20201d4 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/invalidation-with-zero-size-object-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/invalidation-with-zero-size-object-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='element'", - "rect": [8, 8, 200, 200], - "reason": "disappeared" - } + "invalidations": [ + [8, 8, 200, 200] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/layer-full-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/layer-full-repaint-expected.txt index 82f3bcf..ae2e746 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/layer-full-repaint-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/layer-full-repaint-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='test' class='selected'", - "rect": [8, 8, 100, 100], - "reason": "background" - } + "invalidations": [ + [8, 8, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/layer-hide-when-needs-layout-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/layer-hide-when-needs-layout-expected.txt index 66ce575f..ae2e746 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/layer-hide-when-needs-layout-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/layer-hide-when-needs-layout-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target'", - "rect": [8, 8, 100, 100], - "reason": "disappeared" - } + "invalidations": [ + [8, 8, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/layer-visibility-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/layer-visibility-expected.txt index 643da97..7f85c3c 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/layer-visibility-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/layer-visibility-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target'", - "rect": [100, 0, 100, 100], - "reason": "background" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target'", - "rect": [0, 0, 100, 100], - "reason": "background" - } + "invalidations": [ + [100, 0, 100, 100], + [0, 0, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/line-flow-with-floats-1-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/line-flow-with-floats-1-expected.txt index 72013ca7..2245152 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/line-flow-with-floats-1-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/line-flow-with-floats-1-expected.txt
@@ -5,167 +5,16 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'become of me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'a ridge or furrow in the way wherever she wanted to send the'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'getting up and walking off to other parts of the ground, Alice'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog to, and, as the doubled-up soldiers were always'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'in the act of crawling away: besides all this, there was generally'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'provoking to find that the hedgehog had unrolled itself, and was'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'soon came to the conclusion that it was a very '", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'could not help bursting out laughing: and when she had got its'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'head down, and was going to '", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'look up in her face, with such a puzzled expression that she'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in managing'", - "rect": [14, 80, 406, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'away, comfortably enough, under her arm, with its legs'", - "rect": [14, 80, 406, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hanging down, but generally, just as she had got its'", - "rect": [14, 80, 406, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog a blow with its head, it '", - "rect": [14, 80, 406, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'her flamingo: she succeeded in getting its body tucked'", - "rect": [14, 80, 406, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'neck nicely straightened out, and was going to give the'", - "rect": [14, 80, 406, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'difficult'", - "rect": [65, 360, 356, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'game indeed.'", - "rect": [65, 360, 356, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'about once in a minute.'", - "rect": [14, 460, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'shouting \u2018Off with his head!\u2019 or \u2018Off with her head!\u2019'", - "rect": [14, 460, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'was in a furious passion, and went stamping about, and'", - "rect": [14, 460, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for the hedgehogs; and in a very short time '", - "rect": [14, 420, 355, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for turns, quarrelling all the while, and fighting'", - "rect": [14, 420, 355, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting'", - "rect": [65, 400, 304, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV id='pinkFloat'", - "rect": [378, 138, 70, 30], - "reason": "incremental" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [302, 440, 67, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [238, 180, 41, 19], - "reason": "geometry" - } + "invalidations": [ + [14, 520, 408, 80], + [14, 240, 407, 139], + [14, 180, 407, 79], + [14, 80, 406, 119], + [65, 360, 356, 39], + [14, 460, 355, 59], + [14, 420, 355, 39], + [65, 400, 304, 19], + [378, 138, 70, 30] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/line-flow-with-floats-10-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/line-flow-with-floats-10-expected.txt index 5a411af..a26d74e 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/line-flow-with-floats-10-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/line-flow-with-floats-10-expected.txt
@@ -5,182 +5,18 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'become of me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'a ridge or furrow in the way wherever she wanted to send the'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'getting up and walking off to other parts of the ground, Alice'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog to, and, as the doubled-up soldiers were always'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'in the act of crawling away: besides all this, there was generally'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'provoking to find that the hedgehog had unrolled itself, and was'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'soon came to the conclusion that it was a very '", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'could not help bursting out laughing: and when she had got its'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'head down, and was going to '", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'look up in her face, with such a puzzled expression that she'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'difficult'", - "rect": [65, 360, 356, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'game indeed.'", - "rect": [65, 360, 356, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in managing'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'away, comfortably enough, under her arm, with its legs'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hanging down, but generally, just as she had got its'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog a blow with its head, it '", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'her flamingo: she succeeded in getting its body tucked'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'neck nicely straightened out, and was going to give the'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' was in a furious passion, and went stamping'", - "rect": [14, 460, 355, 59], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'about, and shouting \u2018Off with his head!\u2019 or \u2018Off with'", - "rect": [14, 460, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'her head!\u2019 about once in a minute.'", - "rect": [14, 460, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'was in a furious passion, and went stamping about, and'", - "rect": [14, 460, 355, 59], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'Queen'", - "rect": [14, 440, 355, 39], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'the'", - "rect": [14, 440, 355, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for the hedgehogs; and in a very short time '", - "rect": [14, 420, 355, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for turns, quarrelling all the while, and fighting'", - "rect": [14, 420, 355, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting'", - "rect": [65, 400, 304, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 363, 48, 65], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 374, 48, 64], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [238, 180, 41, 19], - "reason": "geometry" - } + "invalidations": [ + [14, 520, 408, 80], + [14, 240, 407, 139], + [14, 180, 407, 79], + [65, 360, 356, 39], + [14, 80, 355, 119], + [14, 460, 355, 59], + [14, 440, 355, 39], + [14, 420, 355, 39], + [65, 400, 304, 19], + [14, 363, 48, 65], + [14, 374, 48, 64] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/line-flow-with-floats-2-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/line-flow-with-floats-2-expected.txt index 0f275e0e..80edd8e 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/line-flow-with-floats-2-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/line-flow-with-floats-2-expected.txt
@@ -5,312 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow P", - "rect": [8, 74, 418, 526], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'become of me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet'", - "rect": [14, 521, 408, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'become of me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 521, 408, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 521, 408, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 521, 408, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'a ridge or furrow in the way wherever she wanted to send the'", - "rect": [14, 241, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very'", - "rect": [14, 241, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'getting up and walking off to other parts of the ground, Alice'", - "rect": [14, 241, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog to, and, as the doubled-up soldiers were always'", - "rect": [14, 241, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'in the act of crawling away: besides all this, there was generally'", - "rect": [14, 241, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'provoking to find that the hedgehog had unrolled itself, and was'", - "rect": [14, 241, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'soon came to the conclusion that it was a very '", - "rect": [14, 241, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'a ridge or furrow in the way wherever she wanted to send the'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'getting up and walking off to other parts of the ground, Alice'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog to, and, as the doubled-up soldiers were always'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'in the act of crawling away: besides all this, there was generally'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'provoking to find that the hedgehog had unrolled itself, and was'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'soon came to the conclusion that it was a very '", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and'", - "rect": [14, 181, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'could not help bursting out laughing: and when she had got its'", - "rect": [14, 181, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'head down, and was going to '", - "rect": [14, 181, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'look up in her face, with such a puzzled expression that she'", - "rect": [14, 181, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'could not help bursting out laughing: and when she had got its'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'head down, and was going to '", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'look up in her face, with such a puzzled expression that she'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'difficult'", - "rect": [65, 361, 356, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'game indeed.'", - "rect": [65, 361, 356, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'difficult'", - "rect": [65, 360, 356, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'game indeed.'", - "rect": [65, 360, 356, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in managing'", - "rect": [14, 80, 355, 120], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'away, comfortably enough, under her arm, with its legs'", - "rect": [14, 80, 355, 120], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hanging down, but generally, just as she had got its'", - "rect": [14, 80, 355, 120], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog a blow with its head, it '", - "rect": [14, 80, 355, 120], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'her flamingo: she succeeded in getting its body tucked'", - "rect": [14, 80, 355, 120], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'neck nicely straightened out, and was going to give the'", - "rect": [14, 80, 355, 120], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'about once in a minute.'", - "rect": [14, 461, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'shouting \u2018Off with his head!\u2019 or \u2018Off with her head!\u2019'", - "rect": [14, 461, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'was in a furious passion, and went stamping about, and'", - "rect": [14, 461, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'about once in a minute.'", - "rect": [14, 460, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'shouting \u2018Off with his head!\u2019 or \u2018Off with her head!\u2019'", - "rect": [14, 460, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'was in a furious passion, and went stamping about, and'", - "rect": [14, 460, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for the hedgehogs; and in a very short time '", - "rect": [14, 421, 355, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for turns, quarrelling all the while, and fighting'", - "rect": [14, 421, 355, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for the hedgehogs; and in a very short time '", - "rect": [14, 420, 355, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for turns, quarrelling all the while, and fighting'", - "rect": [14, 420, 355, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting'", - "rect": [65, 401, 304, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting'", - "rect": [65, 400, 304, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [302, 441, 67, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [302, 440, 67, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='greenFloat'", - "rect": [372, 404, 48, 81], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='greenFloat'", - "rect": [372, 403, 48, 81], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 364, 48, 65], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 363, 48, 65], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [235, 180, 46, 20], - "reason": "style change" - }, - { - "object": "VerticalScrollbar", - "rect": [485, 0, 15, 600], - "reason": "scroll control" - } + "invalidations": [ + [8, 74, 418, 526], + [485, 0, 15, 600] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/line-flow-with-floats-3-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/line-flow-with-floats-3-expected.txt index 59d3299..b1bf737 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/line-flow-with-floats-3-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/line-flow-with-floats-3-expected.txt
@@ -5,202 +5,17 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'become of me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'a ridge or furrow in the way wherever she wanted to send the'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'getting up and walking off to other parts of the ground, Alice'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog to, and, as the doubled-up soldiers were always'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'in the act of crawling away: besides all this, there was generally'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'provoking to find that the hedgehog had unrolled itself, and was'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'soon came to the conclusion that it was a very '", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'could not help bursting out laughing: and when she had got its'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'head down, and was going to '", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'look up in her face, with such a puzzled expression that she'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for turns,'", - "rect": [14, 400, 406, 59], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'hedgehogs; and in a very short time '", - "rect": [14, 400, 406, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'quarrelling all the while, and fighting for the'", - "rect": [14, 400, 406, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'difficult'", - "rect": [65, 360, 356, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'game indeed.'", - "rect": [65, 360, 356, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in managing'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'away, comfortably enough, under her arm, with its legs'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hanging down, but generally, just as she had got its'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog a blow with its head, it '", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'her flamingo: she succeeded in getting its body tucked'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'neck nicely straightened out, and was going to give the'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'a furious passion, and went stamping about, and'", - "rect": [14, 460, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'about once in a minute.'", - "rect": [14, 460, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'shouting \u2018Off with his head!\u2019 or \u2018Off with her head!\u2019'", - "rect": [14, 460, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' was in'", - "rect": [14, 440, 339, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'a furious passion, and went stamping about, and'", - "rect": [14, 440, 339, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'about once in a minute.'", - "rect": [14, 440, 339, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'shouting \u2018Off with his head!\u2019 or \u2018Off with her head!\u2019'", - "rect": [14, 440, 339, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting '", - "rect": [65, 400, 304, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [302, 440, 67, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [242, 440, 66, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='greenFloat'", - "rect": [356, 423, 64, 81], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='greenFloat'", - "rect": [372, 403, 48, 81], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [238, 180, 41, 19], - "reason": "geometry" - } + "invalidations": [ + [14, 520, 408, 80], + [14, 240, 407, 139], + [14, 180, 407, 79], + [14, 400, 406, 59], + [65, 360, 356, 39], + [14, 80, 355, 119], + [14, 460, 355, 59], + [14, 440, 339, 79], + [356, 423, 64, 81], + [372, 403, 48, 81] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/line-flow-with-floats-4-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/line-flow-with-floats-4-expected.txt index 6a0f312..4ee46a3 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/line-flow-with-floats-4-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/line-flow-with-floats-4-expected.txt
@@ -5,167 +5,16 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'become of me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'a ridge or furrow in the way wherever she wanted to send the'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'getting up and walking off to other parts of the ground, Alice'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog to, and, as the doubled-up soldiers were always'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'in the act of crawling away: besides all this, there was generally'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'provoking to find that the hedgehog had unrolled itself, and was'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'soon came to the conclusion that it was a very '", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'could not help bursting out laughing: and when she had got its'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'head down, and was going to '", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'look up in her face, with such a puzzled expression that she'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'in a minute.'", - "rect": [14, 460, 407, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'shouting \u2018Off with his head!\u2019 or \u2018Off with her head!\u2019 about once'", - "rect": [14, 460, 407, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'was in a furious passion, and went stamping about, and'", - "rect": [14, 460, 407, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'difficult'", - "rect": [65, 360, 356, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'game indeed.'", - "rect": [65, 360, 356, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in managing'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'away, comfortably enough, under her arm, with its legs'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hanging down, but generally, just as she had got its'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog a blow with its head, it '", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'her flamingo: she succeeded in getting its body tucked'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'neck nicely straightened out, and was going to give the'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for the hedgehogs; and in a very short time '", - "rect": [14, 420, 355, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for turns, quarrelling all the while, and fighting'", - "rect": [14, 420, 355, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting'", - "rect": [65, 400, 304, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [302, 440, 67, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='greenFloat'", - "rect": [372, 403, 48, 81], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [238, 180, 41, 19], - "reason": "geometry" - } + "invalidations": [ + [14, 520, 408, 80], + [14, 240, 407, 139], + [14, 180, 407, 79], + [14, 460, 407, 59], + [65, 360, 356, 39], + [14, 80, 355, 119], + [14, 420, 355, 39], + [65, 400, 304, 19], + [372, 403, 48, 81] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/line-flow-with-floats-5-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/line-flow-with-floats-5-expected.txt index 5dcdadb..b62bd15 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/line-flow-with-floats-5-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/line-flow-with-floats-5-expected.txt
@@ -5,187 +5,15 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'become of me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'a ridge or furrow in the way wherever she wanted to send the'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'getting up and walking off to other parts of the ground, Alice'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog to, and, as the doubled-up soldiers were always'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'in the act of crawling away: besides all this, there was generally'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'provoking to find that the hedgehog had unrolled itself, and was'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'soon came to the conclusion that it was a very '", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'could not help bursting out laughing: and when she had got its'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'head down, and was going to '", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'look up in her face, with such a puzzled expression that she'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'difficult'", - "rect": [49, 360, 372, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'game indeed.'", - "rect": [49, 360, 372, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for'", - "rect": [14, 400, 356, 59], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'hedgehogs; and in a very short time '", - "rect": [14, 400, 356, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'turns, quarrelling all the while, and fighting for the'", - "rect": [14, 400, 356, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in managing'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'away, comfortably enough, under her arm, with its legs'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hanging down, but generally, just as she had got its'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog a blow with its head, it '", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'her flamingo: she succeeded in getting its body tucked'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'neck nicely straightened out, and was going to give the'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' was in a'", - "rect": [14, 440, 355, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'furious passion, and went stamping about, and shouting'", - "rect": [14, 440, 355, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'in a minute.'", - "rect": [14, 440, 355, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u2018Off with his head!\u2019 or \u2018Off with her head!\u2019 about once'", - "rect": [14, 440, 355, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting '", - "rect": [65, 400, 304, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting '", - "rect": [49, 400, 302, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [302, 440, 67, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [245, 440, 67, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 363, 48, 65], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [238, 180, 41, 19], - "reason": "geometry" - } + "invalidations": [ + [14, 520, 408, 80], + [14, 240, 407, 139], + [14, 180, 407, 79], + [49, 360, 372, 39], + [14, 400, 356, 59], + [14, 80, 355, 119], + [14, 440, 355, 79], + [14, 363, 48, 65] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/line-flow-with-floats-6-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/line-flow-with-floats-6-expected.txt index afaab58..8b881fe7 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/line-flow-with-floats-6-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/line-flow-with-floats-6-expected.txt
@@ -5,177 +5,16 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'become of me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'a ridge or furrow in the way wherever she wanted to send the'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'getting up and walking off to other parts of the ground, Alice'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog to, and, as the doubled-up soldiers were always'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'in the act of crawling away: besides all this, there was generally'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'provoking to find that the hedgehog had unrolled itself, and was'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'soon came to the conclusion that it was a very '", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'could not help bursting out laughing: and when she had got its'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'head down, and was going to '", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'look up in her face, with such a puzzled expression that she'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'difficult'", - "rect": [65, 360, 356, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'game indeed.'", - "rect": [65, 360, 356, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in managing'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'away, comfortably enough, under her arm, with its legs'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hanging down, but generally, just as she had got its'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog a blow with its head, it '", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'her flamingo: she succeeded in getting its body tucked'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'neck nicely straightened out, and was going to give the'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'about once in a minute.'", - "rect": [14, 460, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'shouting \u2018Off with his head!\u2019 or \u2018Off with her head!\u2019'", - "rect": [14, 460, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'was in a furious passion, and went stamping about, and'", - "rect": [14, 460, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for the hedgehogs; and in a very short time '", - "rect": [14, 420, 355, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for turns, quarrelling all the while, and fighting'", - "rect": [14, 420, 355, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting'", - "rect": [65, 400, 304, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [302, 440, 67, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 363, 48, 65], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 363, 48, 65], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [238, 180, 41, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'foo'", - "rect": [27, 363, 22, 20], - "reason": "appeared" - } + "invalidations": [ + [14, 520, 408, 80], + [14, 240, 407, 139], + [14, 180, 407, 79], + [65, 360, 356, 39], + [14, 80, 355, 119], + [14, 460, 355, 59], + [14, 420, 355, 39], + [65, 400, 304, 19], + [14, 363, 48, 65] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/line-flow-with-floats-7-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/line-flow-with-floats-7-expected.txt index a6165c9..1cfe917 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/line-flow-with-floats-7-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/line-flow-with-floats-7-expected.txt
@@ -5,162 +5,15 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'become of me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'a ridge or furrow in the way wherever she wanted to send the'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'getting up and walking off to other parts of the ground, Alice'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog to, and, as the doubled-up soldiers were always'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'in the act of crawling away: besides all this, there was generally'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'provoking to find that the hedgehog had unrolled itself, and was'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'soon came to the conclusion that it was a very '", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'could not help bursting out laughing: and when she had got its'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'head down, and was going to '", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'look up in her face, with such a puzzled expression that she'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'difficult'", - "rect": [65, 360, 356, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'game indeed.'", - "rect": [65, 360, 356, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in managing'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'away, comfortably enough, under her arm, with its legs'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hanging down, but generally, just as she had got its'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog a blow with its head, it '", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'her flamingo: she succeeded in getting its body tucked'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'neck nicely straightened out, and was going to give the'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'about once in a minute.'", - "rect": [14, 460, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'shouting \u2018Off with his head!\u2019 or \u2018Off with her head!\u2019'", - "rect": [14, 460, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'was in a furious passion, and went stamping about, and'", - "rect": [14, 460, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for the hedgehogs; and in a very short time '", - "rect": [14, 420, 355, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for turns, quarrelling all the while, and fighting'", - "rect": [14, 420, 355, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting'", - "rect": [65, 400, 304, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [298, 440, 71, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [238, 180, 41, 19], - "reason": "geometry" - } + "invalidations": [ + [14, 520, 408, 80], + [14, 240, 407, 139], + [14, 180, 407, 79], + [65, 360, 356, 39], + [14, 80, 355, 119], + [14, 460, 355, 59], + [14, 420, 355, 39], + [65, 400, 304, 19] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/line-flow-with-floats-8-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/line-flow-with-floats-8-expected.txt index 5b936fa..ed13ab1 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/line-flow-with-floats-8-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/line-flow-with-floats-8-expected.txt
@@ -5,192 +5,15 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'become of me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'a ridge or furrow in the way wherever she wanted to send the'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'getting up and walking off to other parts of the ground, Alice'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog to, and, as the doubled-up soldiers were always'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'in the act of crawling away: besides all this, there was generally'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'provoking to find that the hedgehog had unrolled itself, and was'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'soon came to the conclusion that it was a very '", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'could not help bursting out laughing: and when she had got its'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'head down, and was going to '", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'look up in her face, with such a puzzled expression that she'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'difficult game'", - "rect": [14, 360, 407, 39], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'indeed.'", - "rect": [14, 360, 407, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' was in a furious'", - "rect": [14, 440, 356, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'minute.'", - "rect": [14, 440, 356, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'passion, and went stamping about, and shouting \u2018Off'", - "rect": [14, 440, 356, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'with his head!\u2019 or \u2018Off with her head!\u2019 about once in a'", - "rect": [14, 440, 356, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'difficult'", - "rect": [65, 360, 356, 39], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in managing'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'away, comfortably enough, under her arm, with its legs'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hanging down, but generally, just as she had got its'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog a blow with its head, it '", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'her flamingo: she succeeded in getting its body tucked'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'neck nicely straightened out, and was going to give the'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'and in a very short time '", - "rect": [14, 400, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for turns,'", - "rect": [14, 400, 355, 59], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'quarrelling all the while, and fighting for the hedgehogs;'", - "rect": [14, 400, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting '", - "rect": [65, 400, 304, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting '", - "rect": [14, 400, 298, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [184, 440, 69, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [302, 440, 67, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 363, 48, 65], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [238, 180, 41, 19], - "reason": "geometry" - } + "invalidations": [ + [14, 520, 408, 80], + [14, 240, 407, 139], + [14, 180, 407, 79], + [14, 360, 407, 39], + [14, 440, 356, 79], + [14, 80, 355, 119], + [14, 400, 355, 59], + [14, 363, 48, 65] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/line-flow-with-floats-9-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/line-flow-with-floats-9-expected.txt index 0152008..8797145 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/line-flow-with-floats-9-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/line-flow-with-floats-9-expected.txt
@@ -5,192 +5,18 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'become of me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'and was in the act of crawling away: besides all this,'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'ground, Alice soon came to the conclusion that it was a very'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'provoking to find that the hedgehog had unrolled itself,'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'there was generally a ridge or furrow in the way wherever she'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'wanted to send the hedgehog to, and, as the doubled-up soldiers'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'were always getting up and walking off to other parts of the'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'could not help bursting out laughing: and when she had got its'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'head down, and was going to '", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'look up in her face, with such a puzzled expression that she'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'difficult game indeed.'", - "rect": [65, 360, 356, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'difficult'", - "rect": [65, 360, 356, 39], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in managing'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'away, comfortably enough, under her arm, with its legs'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hanging down, but generally, just as she had got its'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog a blow with its head, it '", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'her flamingo: she succeeded in getting its body tucked'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'neck nicely straightened out, and was going to give the'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' was in a furious passion, and went stamping'", - "rect": [14, 460, 355, 59], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'about, and shouting \u2018Off with his head!\u2019 or \u2018Off with'", - "rect": [14, 460, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'her head!\u2019 about once in a minute.'", - "rect": [14, 460, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'was in a furious passion, and went stamping about, and'", - "rect": [14, 460, 355, 59], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'Queen'", - "rect": [14, 440, 355, 39], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'the'", - "rect": [14, 440, 355, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for the hedgehogs; and in a very short time '", - "rect": [14, 420, 355, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for turns, quarrelling all the while, and fighting'", - "rect": [14, 420, 355, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting'", - "rect": [65, 400, 304, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 383, 48, 65], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 363, 48, 65], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='yellowFloat'", - "rect": [372, 243, 48, 49], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [238, 180, 41, 19], - "reason": "geometry" - } + "invalidations": [ + [14, 520, 408, 80], + [14, 240, 407, 139], + [14, 180, 407, 79], + [65, 360, 356, 39], + [14, 80, 355, 119], + [14, 460, 355, 59], + [14, 440, 355, 39], + [14, 420, 355, 39], + [65, 400, 304, 19], + [14, 383, 48, 65], + [14, 363, 48, 65] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/lines-with-layout-delta-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/lines-with-layout-delta-expected.txt index bec0000..7ea6479 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/lines-with-layout-delta-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/lines-with-layout-delta-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'PASS'", - "rect": [8, 58, 38, 19], - "reason": "full" - } + "invalidations": [ + [8, 58, 38, 19] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/list-marker-2-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/list-marker-2-expected.txt index a078ee8..a27007da 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/list-marker-2-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/list-marker-2-expected.txt
@@ -5,22 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutImage IMG id='target'", - "rect": [48, 100, 100, 100], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u2022 '", - "rect": [30, 185, 7, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u2022 '", - "rect": [30, 135, 7, 19], - "reason": "geometry" - } + "invalidations": [ + [48, 100, 100, 100], + [30, 185, 7, 19], + [30, 135, 7, 19] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/make-children-non-inline-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/make-children-non-inline-expected.txt index 7643851..449cf1e 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/make-children-non-inline-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/make-children-non-inline-expected.txt
@@ -5,102 +5,21 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'about all the stuff'", - "rect": [8, 264, 110, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'about all the stuff'", - "rect": [8, 164, 110, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'write a book'", - "rect": [8, 144, 79, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'write a book'", - "rect": [8, 144, 79, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'more words.'", - "rect": [8, 104, 79, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'more words.'", - "rect": [8, 104, 79, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'that comes'", - "rect": [8, 284, 67, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'that comes'", - "rect": [8, 184, 67, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'the break.'", - "rect": [8, 324, 62, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'the break.'", - "rect": [8, 224, 62, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'I could'", - "rect": [8, 124, 44, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'I could'", - "rect": [8, 124, 44, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'words,'", - "rect": [8, 84, 43, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'words,'", - "rect": [8, 84, 43, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'Word,'", - "rect": [8, 64, 39, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'Word,'", - "rect": [8, 64, 39, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'after'", - "rect": [8, 304, 29, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'after'", - "rect": [8, 204, 29, 19], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [8, 164, 10, 100], - "reason": "appeared" - } + "invalidations": [ + [8, 264, 110, 19], + [8, 164, 110, 19], + [8, 144, 79, 19], + [8, 104, 79, 19], + [8, 284, 67, 19], + [8, 184, 67, 19], + [8, 324, 62, 19], + [8, 224, 62, 19], + [8, 124, 44, 19], + [8, 84, 43, 19], + [8, 64, 39, 19], + [8, 304, 29, 19], + [8, 204, 29, 19], + [8, 164, 10, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/mix-blend-mode-separate-stacking-context-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/mix-blend-mode-separate-stacking-context-expected.txt index 477ed75..51f97ecd 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/mix-blend-mode-separate-stacking-context-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/mix-blend-mode-separate-stacking-context-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 800, 600], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 800, 600] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/multi-layout-one-frame-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/multi-layout-one-frame-expected.txt index b3b7ed91..a724f9f 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/multi-layout-one-frame-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/multi-layout-one-frame-expected.txt
@@ -5,32 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'PASSED'", - "rect": [201, 11, 53, 16], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'PASSED'", - "rect": [12, 11, 53, 16], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'FAILED'", - "rect": [201, 11, 45, 16], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'FAILED'", - "rect": [12, 11, 45, 16], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment ' '", - "rect": [193, 9, 4, 19], - "reason": "geometry" - } + "invalidations": [ + [201, 11, 53, 16], + [12, 11, 53, 16], + [193, 9, 4, 19] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/multicol/column-rules-fixed-height-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/multicol/column-rules-fixed-height-expected.txt index 7a1c9b2..8a45e85 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/multicol/column-rules-fixed-height-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/multicol/column-rules-fixed-height-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutMultiColumnSet (anonymous)", - "rect": [8, 52, 525, 315], - "reason": "style change" - } + "invalidations": [ + [8, 52, 525, 315] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/multicol/multicol-as-paint-container-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/multicol/multicol-as-paint-container-expected.txt index 6359f122..f3f1125 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/multicol/multicol-as-paint-container-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/multicol/multicol-as-paint-container-expected.txt
@@ -11,92 +11,9 @@ "position": [8, -172], "bounds": [630, 520], "backfaceVisibility": "hidden", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Lorem ipsum'", - "rect": [0, 0, 625, 360], - "reason": "style change" - }, - { - "object": "InlineTextBox 'adipiscing'", - "rect": [0, 0, 625, 360], - "reason": "style change" - }, - { - "object": "InlineTextBox 'consectetur'", - "rect": [0, 0, 625, 360], - "reason": "style change" - }, - { - "object": "InlineTextBox 'dolor sit amet,'", - "rect": [0, 0, 625, 360], - "reason": "style change" - }, - { - "object": "InlineTextBox 'elit. Fusce'", - "rect": [0, 0, 625, 360], - "reason": "style change" - }, - { - "object": "InlineTextBox 'eu fringilla'", - "rect": [0, 0, 625, 360], - "reason": "style change" - }, - { - "object": "InlineTextBox 'pulvinar, ipsum'", - "rect": [0, 0, 625, 360], - "reason": "style change" - }, - { - "object": "InlineTextBox 'sapien'", - "rect": [0, 0, 625, 360], - "reason": "style change" - }, - { - "object": "InlineTextBox 'varius, metus'", - "rect": [0, 0, 625, 360], - "reason": "style change" - }, - { - "object": "InlineTextBox 'eget, dapibus'", - "rect": [0, 180, 625, 340], - "reason": "style change" - }, - { - "object": "InlineTextBox 'libero,'", - "rect": [0, 180, 625, 340], - "reason": "style change" - }, - { - "object": "InlineTextBox 'non condimentum'", - "rect": [0, 180, 625, 340], - "reason": "style change" - }, - { - "object": "InlineTextBox 'purus. Ut nisl'", - "rect": [0, 180, 625, 340], - "reason": "style change" - }, - { - "object": "InlineTextBox 'quam est eu'", - "rect": [0, 180, 625, 340], - "reason": "style change" - }, - { - "object": "InlineTextBox 'suscipit ut leo'", - "rect": [0, 180, 625, 340], - "reason": "style change" - }, - { - "object": "InlineTextBox 'ultrices dolor.'", - "rect": [0, 180, 625, 340], - "reason": "style change" - }, - { - "object": "InlineTextBox 'ultricies arcu,'", - "rect": [0, 180, 625, 340], - "reason": "style change" - } + "invalidations": [ + [0, 0, 625, 360], + [0, 180, 625, 340] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/multicol/multicol-relpos-with-abspos-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/multicol/multicol-relpos-with-abspos-expected.txt index cee71087..f89c0dd0 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/multicol/multicol-relpos-with-abspos-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/multicol/multicol-relpos-with-abspos-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='target'", - "rect": [618, 28, 20, 20], - "reason": "appeared" - } + "invalidations": [ + [618, 28, 20, 20] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/multicol/multicol-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/multicol/multicol-repaint-expected.txt index 854bb401..042384d 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/multicol/multicol-repaint-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/multicol/multicol-repaint-expected.txt
@@ -5,27 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'XXXXXX'", - "rect": [234, 15, 300, 50], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'x'", - "rect": [234, 15, 50, 50], - "reason": "disappeared" - }, - { - "object": "InlineTextBox '\u00A0'", - "rect": [9, 10, 13, 57], - "reason": "appeared" - }, - { - "object": "InlineTextBox '\u00A0'", - "rect": [9, 10, 13, 57], - "reason": "disappeared" - } + "invalidations": [ + [234, 15, 300, 50], + [9, 10, 13, 57] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/multicol/multicol-resize-with-rule-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/multicol/multicol-resize-with-rule-expected.txt index f75762a..4fc182d 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/multicol/multicol-resize-with-rule-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/multicol/multicol-resize-with-rule-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutMultiColumnSet (anonymous)", - "rect": [8, 8, 600, 200], - "reason": "geometry" - } + "invalidations": [ + [8, 8, 600, 200] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/multicol/multicol-with-abspos-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/multicol/multicol-with-abspos-expected.txt index 1cab3c4..ced55e4 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/multicol/multicol-with-abspos-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/multicol/multicol-with-abspos-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='target'", - "rect": [0, 580, 80, 20], - "reason": "chunk appeared" - } + "invalidations": [ + [0, 580, 80, 20] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/multicol/multicol-with-abspos-in-relpos-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/multicol/multicol-with-abspos-in-relpos-expected.txt index 838d38a..a1ae278 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/multicol/multicol-with-abspos-in-relpos-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/multicol/multicol-with-abspos-in-relpos-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'PASS'", - "rect": [508, 28, 80, 20], - "reason": "appeared" - } + "invalidations": [ + [508, 28, 80, 20] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/multicol/multicol-with-block-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/multicol/multicol-with-block-expected.txt index d69347a..f4bbcd01 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/multicol/multicol-with-block-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/multicol/multicol-with-block-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutMultiColumnFlowThread (anonymous)", - "rect": [488, 8, 80, 20], - "reason": "chunk appeared" - } + "invalidations": [ + [488, 8, 80, 20] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/multicol/multicol-with-inline-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/multicol/multicol-with-inline-expected.txt index d341073..f4bbcd01 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/multicol/multicol-with-inline-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/multicol/multicol-with-inline-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'PASS'", - "rect": [488, 8, 80, 20], - "reason": "appeared" - } + "invalidations": [ + [488, 8, 80, 20] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/multicol/multicol-with-overflowing-block-rl-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/multicol/multicol-with-overflowing-block-rl-expected.txt index 39eee09..2d274298 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/multicol/multicol-with-overflowing-block-rl-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/multicol/multicol-with-overflowing-block-rl-expected.txt
@@ -5,22 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='elm'", - "rect": [8, 8, 792, 500], - "reason": "background" - }, - { - "object": "LayoutBlockFlow DIV id='elm'", - "rect": [0, 8, 508, 500], - "reason": "background" - }, - { - "object": "LayoutBlockFlow DIV id='elm'", - "rect": [8, 8, 500, 500], - "reason": "background" - } + "invalidations": [ + [8, 8, 792, 500], + [0, 8, 508, 500] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/multicol/multicol-with-relpos-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/multicol/multicol-with-relpos-expected.txt index bf8b52a..23b779d 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/multicol/multicol-with-relpos-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/multicol/multicol-with-relpos-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (relative positioned) DIV id='target'", - "rect": [508, 28, 150, 20], - "reason": "chunk appeared" - } + "invalidations": [ + [508, 28, 150, 20] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/multicol/multicol-with-text-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/multicol/multicol-with-text-expected.txt index d69347a..f4bbcd01 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/multicol/multicol-with-text-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/multicol/multicol-with-text-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutMultiColumnFlowThread (anonymous)", - "rect": [488, 8, 80, 20], - "reason": "chunk appeared" - } + "invalidations": [ + [488, 8, 80, 20] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/non-text-link-invalidation-optimization-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/non-text-link-invalidation-optimization-expected.txt index beacf1e8..029d29c 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/non-text-link-invalidation-optimization-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/non-text-link-invalidation-optimization-expected.txt
@@ -5,37 +5,13 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment ' text is invalidated and '", - "rect": [164, 8, 145, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment ' passes if '", - "rect": [75, 8, 61, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'This test '", - "rect": [8, 8, 57, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment ' images.'", - "rect": [353, 8, 52, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'only'", - "rect": [136, 8, 28, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment ' no '", - "rect": [319, 8, 24, 19], - "reason": "style change" - } + "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] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/offset-change-wrong-invalidation-with-float-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/offset-change-wrong-invalidation-with-float-expected.txt index eb08148..faa97e3 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/offset-change-wrong-invalidation-with-float-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/offset-change-wrong-invalidation-with-float-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) UL id='submenu'", - "rect": [48, 94, 40, 20], - "reason": "chunk disappeared" - } + "invalidations": [ + [48, 94, 40, 20] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/opacity-from-zero-to-non-zero-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/opacity-from-zero-to-non-zero-expected.txt index 955e378..ae2e746 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/opacity-from-zero-to-non-zero-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/opacity-from-zero-to-non-zero-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [8, 8, 100, 100], - "reason": "chunk appeared" - } + "invalidations": [ + [8, 8, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/border-outline-0-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/border-outline-0-expected.txt index a7a9b6a..fad2bf4 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/border-outline-0-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/border-outline-0-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='border-image'", - "rect": [10, 10, 200, 200], - "reason": "disappeared" - } + "invalidations": [ + [10, 10, 200, 200] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/border-radius-with-outline-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/border-radius-with-outline-expected.txt index 980c6b3e..ab6ea6ad 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/border-radius-with-outline-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/border-radius-with-outline-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target'", - "rect": [45, 45, 310, 310], - "reason": "geometry" - } + "invalidations": [ + [45, 45, 310, 310] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/focus-continuations-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/focus-continuations-expected.txt index 872ff9d..81f7c2e1 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/focus-continuations-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/focus-continuations-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalBoxFragment LayoutInline SPAN id='outer'", - "rect": [6, 86, 90, 24], - "reason": "disappeared" - } + "invalidations": [ + [6, 86, 90, 24] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/focus-enable-continuations-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/focus-enable-continuations-expected.txt index 20d476d2..81f7c2e1 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/focus-enable-continuations-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/focus-enable-continuations-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalBoxFragment LayoutInline SPAN id='outer'", - "rect": [6, 86, 90, 24], - "reason": "appeared" - } + "invalidations": [ + [6, 86, 90, 24] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/focus-ring-on-child-move-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/focus-ring-on-child-move-expected.txt index 35713fc..6baf048 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/focus-ring-on-child-move-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/focus-ring-on-child-move-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='child'", - "rect": [300, 50, 20, 300], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='child'", - "rect": [150, 50, 20, 300], - "reason": "geometry" - } + "invalidations": [ + [300, 50, 20, 300], + [150, 50, 20, 300] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/focus-ring-on-continuation-move-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/focus-ring-on-continuation-move-expected.txt index 863723af..fe523cb 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/focus-ring-on-continuation-move-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/focus-ring-on-continuation-move-expected.txt
@@ -5,27 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalBoxFragment LayoutInline SPAN", - "rect": [206, 230, 104, 104], - "reason": "outline" - }, - { - "object": "NGPhysicalBoxFragment LayoutInline SPAN", - "rect": [6, 230, 104, 104], - "reason": "outline" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='block'", - "rect": [208, 232, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='block'", - "rect": [8, 232, 100, 100], - "reason": "geometry" - } + "invalidations": [ + [206, 230, 104, 104], + [6, 230, 104, 104] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/focus-ring-on-inline-continuation-move-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/focus-ring-on-inline-continuation-move-expected.txt index e7961e7..1fe21ce 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/focus-ring-on-inline-continuation-move-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/focus-ring-on-inline-continuation-move-expected.txt
@@ -5,27 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalBoxFragment LayoutInline SPAN", - "rect": [6, 6, 104, 108], - "reason": "outline" - }, - { - "object": "NGPhysicalBoxFragment LayoutInline SPAN", - "rect": [6, 86, 104, 104], - "reason": "outline" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='block'", - "rect": [8, 88, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='block'", - "rect": [8, 8, 100, 100], - "reason": "geometry" - } + "invalidations": [ + [6, 6, 104, 108], + [6, 86, 104, 104] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/inline-outline-repaint-2-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/inline-outline-repaint-2-expected.txt index 92fa2ad..8658594 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/inline-outline-repaint-2-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/inline-outline-repaint-2-expected.txt
@@ -4,17 +4,8 @@ "name": "Scrolling background of LayoutView #document", "bounds": [800, 600], "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalBoxFragment LayoutInline SPAN", - "rect": [210, 0, 50, 15], - "reason": "outline" - }, - { - "object": "NGPhysicalTextFragment 'Test'", - "rect": [215, 0, 40, 10], - "reason": "style change" - } + "invalidations": [ + [210, 0, 50, 15] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/inline-outline-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/inline-outline-repaint-expected.txt index 1285af3..d7009b2 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/inline-outline-repaint-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/inline-outline-repaint-expected.txt
@@ -5,47 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutInline SPAN id='test'", - "rect": [5, 173, 95, 45], - "reason": "geometry" - }, - { - "object": "InlineTextBox ' '", - "rect": [8, 176, 89, 39], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'Lorem ipsum'", - "rect": [8, 176, 89, 39], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'dolor sit amet\u00A0'", - "rect": [8, 176, 89, 39], - "reason": "disappeared" - }, - { - "object": "InlineTextBox ' '", - "rect": [8, 176, 88, 39], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'Lorem ipsum'", - "rect": [8, 176, 88, 39], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'dolor\u00A0'", - "rect": [8, 176, 88, 39], - "reason": "appeared" - }, - { - "object": "Caret", - "rect": [45, 196, 1, 19], - "reason": "appeared" - } + "invalidations": [ + [5, 173, 95, 45] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-add-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-add-repaint-expected.txt index 3979e7c..8f461a1b9 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-add-repaint-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-add-repaint-expected.txt
@@ -4,12 +4,8 @@ "name": "Scrolling background of LayoutView #document", "bounds": [800, 600], "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='test'", - "rect": [0, 0, 110, 110], - "reason": "style change" - } + "invalidations": [ + [0, 0, 110, 110] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-become-affected-by-descendant-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-become-affected-by-descendant-expected.txt index af146aa..23d72e3c6 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-become-affected-by-descendant-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-become-affected-by-descendant-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='outline'", - "rect": [6, 6, 154, 104], - "reason": "outline" - }, - { - "object": "LayoutNGBlockFlow DIV id='child'", - "rect": [58, 8, 100, 50], - "reason": "incremental" - } + "invalidations": [ + [6, 6, 154, 104] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-become-not-affected-by-descendant-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-become-not-affected-by-descendant-expected.txt index befb0d52..23d72e3c6 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-become-not-affected-by-descendant-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-become-not-affected-by-descendant-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='outline'", - "rect": [6, 6, 154, 104], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV id='child'", - "rect": [58, 8, 100, 50], - "reason": "incremental" - } + "invalidations": [ + [6, 6, 154, 104] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-change-invalidation-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-change-invalidation-expected.txt index 54ef726f..9fb73b2 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-change-invalidation-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-change-invalidation-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow A id='link'", - "rect": [43, 83, 754, 30], - "reason": "appeared" - } + "invalidations": [ + [43, 83, 754, 30] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-change-offset-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-change-offset-expected.txt index 8c3899a..e73df63e 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-change-offset-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-change-offset-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target'", - "rect": [35, 35, 130, 130], - "reason": "style change" - } + "invalidations": [ + [35, 35, 130, 130] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-change-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-change-repaint-expected.txt index 3979e7c..8f461a1b9 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-change-repaint-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-change-repaint-expected.txt
@@ -4,12 +4,8 @@ "name": "Scrolling background of LayoutView #document", "bounds": [800, 600], "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='test'", - "rect": [0, 0, 110, 110], - "reason": "style change" - } + "invalidations": [ + [0, 0, 110, 110] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-change-vertical-rl-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-change-vertical-rl-expected.txt index f9bf20a..8d716d20 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-change-vertical-rl-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-change-vertical-rl-expected.txt
@@ -5,12 +5,8 @@ "bounds": [1016, 585], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [0, 0, 1016, 128], - "reason": "style change" - } + "invalidations": [ + [0, 0, 1016, 128] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-child-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-child-repaint-expected.txt index c20e8bb5..6a4615da 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-child-repaint-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-child-repaint-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='outlined'", - "rect": [0, 240, 220, 50], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outlined'", - "rect": [0, 140, 220, 50], - "reason": "geometry" - } + "invalidations": [ + [0, 240, 220, 50], + [0, 140, 220, 50] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-containing-image-in-non-standard-mode-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-containing-image-in-non-standard-mode-expected.txt index db65b4b..231c0df 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-containing-image-in-non-standard-mode-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-containing-image-in-non-standard-mode-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalBoxFragment LayoutInline SPAN id='target'", - "rect": [6, 6, 204, 58], - "reason": "style change" - } + "invalidations": [ + [6, 6, 204, 58] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-continuations-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-continuations-expected.txt index 306d74a..45c5275 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-continuations-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-continuations-expected.txt
@@ -5,32 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalBoxFragment LayoutInline SPAN id='outer'", - "rect": [16, 108, 90, 63], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'CONTENTS'", - "rect": [18, 150, 86, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'CONTENTS'", - "rect": [18, 150, 86, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'CONTENTS'", - "rect": [18, 110, 86, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'CONTENTS'", - "rect": [18, 110, 86, 19], - "reason": "disappeared" - } + "invalidations": [ + [16, 108, 90, 63] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-current-color-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-current-color-expected.txt index 56ab85f..72ffbf52c 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-current-color-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-current-color-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='currentColor'", - "rect": [48, 190, 120, 120], - "reason": "style change" - } + "invalidations": [ + [48, 190, 120, 120] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-inset-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-inset-expected.txt index 3b9c72c5..74d05df 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-inset-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-inset-expected.txt
@@ -5,27 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [19, 191, 200, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [19, 29, 200, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV id='b'", - "rect": [29, 231, 180, 20], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow DIV id='a'", - "rect": [29, 69, 180, 20], - "reason": "incremental" - } + "invalidations": [ + [19, 191, 200, 60], + [19, 29, 200, 60] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-not-affected-by-descendant-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-not-affected-by-descendant-expected.txt index 3cc3349..fa32ac6 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-not-affected-by-descendant-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-not-affected-by-descendant-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='child'", - "rect": [8, 8, 50, 50], - "reason": "background" - } + "invalidations": [ + [8, 8, 50, 50] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-repaint-glitch-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-repaint-glitch-expected.txt index 2b15fa3..fddc7ae 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-repaint-glitch-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-repaint-glitch-expected.txt
@@ -5,27 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [15, 391, 208, 68], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [15, 229, 208, 68], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV id='b'", - "rect": [29, 435, 180, 20], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow DIV id='a'", - "rect": [29, 273, 180, 20], - "reason": "incremental" - } + "invalidations": [ + [15, 391, 208, 68], + [15, 229, 208, 68] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-shrinking-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-shrinking-expected.txt index e708795..2202ded2 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-shrinking-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/outline/outline-shrinking-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='t'", - "rect": [4, 114, 108, 108], - "reason": "style change" - } + "invalidations": [ + [4, 114, 108, 108] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/align-items-overflow-change-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/align-items-overflow-change-expected.txt index 0d1eeee..2636f4bf 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/align-items-overflow-change-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/align-items-overflow-change-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='item1'", - "rect": [0, 52, 200, 200], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item1'", - "rect": [0, 2, 200, 200], - "reason": "geometry" - } + "invalidations": [ + [0, 52, 200, 200], + [0, 2, 200, 200] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/align-self-overflow-change-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/align-self-overflow-change-expected.txt index 0d1eeee..2636f4bf 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/align-self-overflow-change-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/align-self-overflow-change-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='item1'", - "rect": [0, 52, 200, 200], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item1'", - "rect": [0, 2, 200, 200], - "reason": "geometry" - } + "invalidations": [ + [0, 52, 200, 200], + [0, 2, 200, 200] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/clipped-overflow-visible-subtree-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/clipped-overflow-visible-subtree-expected.txt index 351b5e6d..fa9b2f7a 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/clipped-overflow-visible-subtree-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/clipped-overflow-visible-subtree-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [308, 8, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [8, 8, 100, 100], - "reason": "geometry" - } + "invalidations": [ + [308, 8, 100, 100], + [8, 8, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/composited-overflow-local-background-removed-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/composited-overflow-local-background-removed-expected.txt index 414dff2..3f75083 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/composited-overflow-local-background-removed-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/composited-overflow-local-background-removed-expected.txt
@@ -22,12 +22,8 @@ "name": "HorizontalScrollbar", "position": [0, 185], "bounds": [200, 15], - "paintInvalidations": [ - { - "object": "HorizontalScrollbar", - "rect": [0, 0, 185, 15], - "reason": "scroll control" - } + "invalidations": [ + [0, 0, 185, 15] ], "transform": 1 }, @@ -41,12 +37,8 @@ "name": "LayoutNGBlockFlow DIV id='scroller'", "position": [0, 16], "bounds": [185, 336], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='scroller'", - "rect": [0, 0, 185, 336], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 185, 336] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/composited-overflow-with-borderbox-background-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/composited-overflow-with-borderbox-background-expected.txt index c23245c..b1d676f 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/composited-overflow-with-borderbox-background-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/composited-overflow-with-borderbox-background-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='scroller'", - "rect": [8, 8, 220, 220], - "reason": "background" - } + "invalidations": [ + [8, 8, 220, 220] ] }, { @@ -25,12 +21,8 @@ "position": [10, 10], "bounds": [185, 300], "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutNGBlockFlow DIV id='scroller'", - "rect": [0, 0, 185, 300], - "reason": "background" - } + "invalidations": [ + [0, 0, 185, 300] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/composited-overflow-with-local-background-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/composited-overflow-with-local-background-expected.txt index 44fca6f9..71c070d 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/composited-overflow-with-local-background-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/composited-overflow-with-local-background-expected.txt
@@ -22,12 +22,8 @@ "name": "LayoutNGBlockFlow DIV id='scroller'", "bounds": [185, 300], "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutNGBlockFlow DIV id='scroller'", - "rect": [0, 0, 185, 300], - "reason": "background" - } + "invalidations": [ + [0, 0, 185, 300] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/composited-overflow-with-negative-offset-outline-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/composited-overflow-with-negative-offset-outline-expected.txt index 33b5478..1a09a8e 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/composited-overflow-with-negative-offset-outline-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/composited-overflow-with-negative-offset-outline-expected.txt
@@ -39,12 +39,8 @@ { "name": "LayoutNGBlockFlow DIV id='scroller'", "bounds": [200, 200], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='scroller'", - "rect": [0, 0, 200, 200], - "reason": "style change" - } + "invalidations": [ + [0, 0, 200, 200] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/composited-vertical-rl-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/composited-vertical-rl-overflow-expected.txt index b51e8f50..e943e2a4 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/composited-vertical-rl-overflow-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/composited-vertical-rl-overflow-expected.txt
@@ -11,12 +11,8 @@ "position": [-50, 0], "bounds": [150, 100], "backgroundColor": "#0000FF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='div'", - "rect": [0, 0, 150, 100], - "reason": "style change" - } + "invalidations": [ + [0, 0, 150, 100] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/content-into-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/content-into-overflow-expected.txt index 77d8532..870f1a1e 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/content-into-overflow-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/content-into-overflow-expected.txt
@@ -5,27 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [8, 158, 106, 106], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [8, 8, 106, 106], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [8, 308, 100, 100], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='target3'", - "rect": [8, 388, 100, 20], - "reason": "appeared" - } + "invalidations": [ + [8, 158, 106, 106], + [8, 8, 106, 106], + [8, 308, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/erase-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/erase-overflow-expected.txt index f1fe802..ebd833de 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/erase-overflow-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/erase-overflow-expected.txt
@@ -5,22 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='square'", - "rect": [8, 108, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV class='square'", - "rect": [8, 8, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='target' class='square'", - "rect": [8, 8, 100, 100], - "reason": "chunk appeared" - } + "invalidations": [ + [8, 108, 100, 100], + [8, 8, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/fixed-position-transparency-with-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/fixed-position-transparency-with-overflow-expected.txt index 05bd05ea..2628bcf 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/fixed-position-transparency-with-overflow-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/fixed-position-transparency-with-overflow-expected.txt
@@ -5,27 +5,9 @@ "bounds": [785, 2016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='absolute green'", - "rect": [108, 308, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV class='absolute green'", - "rect": [108, 308, 100, 100], - "reason": "chunk appeared" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='container' class='relative blue'", - "rect": [8, 208, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='container' class='relative blue'", - "rect": [8, 208, 100, 100], - "reason": "chunk appeared" - } + "invalidations": [ + [108, 308, 100, 100], + [8, 208, 100, 100] ] }, {
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/float-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/float-overflow-expected.txt index 9db084e2..0bdd6922 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/float-overflow-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/float-overflow-expected.txt
@@ -5,557 +5,76 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 537, 62, 37], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 531, 62, 37], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 498, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 492, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 459, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 453, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 420, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow 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": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 171, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 165, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 132, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 126, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 93, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 87, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 54, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 48, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 15, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow 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": "LayoutNGBlockFlow DIV", - "rect": [67, 504, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 498, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 465, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 459, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 426, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow 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": "LayoutNGBlockFlow DIV", - "rect": [67, 177, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 171, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 138, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 132, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 99, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 93, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 60, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 54, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 21, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 15, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [69, 374, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [69, 368, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [69, 335, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [69, 329, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [69, 296, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [69, 290, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [70, 375, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [70, 369, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [70, 336, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [70, 330, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [70, 297, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [70, 291, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [67, 138, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [67, 132, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [65, 60, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [65, 54, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [65, 21, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [65, 15, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [59, 543, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [59, 537, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [59, 504, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [59, 498, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [59, 465, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [59, 459, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [59, 426, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (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": "LayoutNGBlockFlow (floating) DIV", - "rect": [59, 177, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [59, 171, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [59, 99, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [59, 93, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 543, 32, 20], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 537, 32, 20], - "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": "NGPhysicalTextFragment 'x'", - "rect": [66, 299, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [66, 293, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [63, 23, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [63, 17, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [59, 545, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [59, 539, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [59, 506, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [59, 500, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [59, 467, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [59, 461, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [59, 428, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [59, 422, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [59, 179, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [59, 173, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [59, 140, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [59, 134, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [58, 377, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [58, 371, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [58, 338, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [58, 332, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [57, 101, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [57, 95, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [57, 62, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [57, 56, 16, 16], - "reason": "geometry" - } + "invalidations": [ + [61, 537, 62, 37], + [61, 531, 62, 37], + [61, 498, 62, 22], + [61, 492, 62, 22], + [61, 459, 62, 22], + [61, 453, 62, 22], + [61, 420, 62, 22], + [61, 414, 62, 22], + [61, 249, 62, 22], + [61, 243, 62, 22], + [61, 210, 62, 22], + [61, 204, 62, 22], + [61, 171, 62, 22], + [61, 165, 62, 22], + [61, 132, 62, 22], + [61, 126, 62, 22], + [61, 93, 62, 22], + [61, 87, 62, 22], + [61, 54, 62, 22], + [61, 48, 62, 22], + [61, 15, 62, 22], + [61, 9, 62, 22], + [61, 366, 58, 28], + [61, 360, 58, 28], + [61, 327, 58, 28], + [61, 321, 58, 28], + [61, 288, 58, 28], + [61, 282, 58, 28], + [59, 543, 40, 10], + [59, 537, 40, 10], + [59, 504, 40, 10], + [59, 498, 40, 10], + [59, 465, 40, 10], + [59, 459, 40, 10], + [59, 426, 40, 10], + [59, 420, 40, 10], + [59, 255, 40, 10], + [59, 249, 40, 10], + [59, 216, 40, 10], + [59, 210, 40, 10], + [59, 177, 40, 10], + [59, 171, 40, 10], + [59, 99, 40, 10], + [59, 93, 40, 10], + [59, 257, 16, 17], + [59, 251, 16, 17], + [59, 218, 16, 17], + [59, 212, 16, 17], + [63, 23, 16, 16], + [59, 545, 16, 16], + [59, 539, 16, 16], + [59, 506, 16, 16], + [59, 500, 16, 16], + [59, 467, 16, 16], + [59, 461, 16, 16], + [59, 428, 16, 16], + [59, 422, 16, 16], + [59, 179, 16, 16], + [59, 173, 16, 16], + [59, 140, 16, 16], + [59, 134, 16, 16], + [58, 377, 16, 16], + [58, 371, 16, 16], + [58, 338, 16, 16], + [58, 332, 16, 16], + [57, 101, 16, 16], + [57, 95, 16, 16], + [57, 62, 16, 16], + [57, 56, 16, 16] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/float-overflow-right-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/float-overflow-right-expected.txt index 963a6b1..c3c9841 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/float-overflow-right-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/float-overflow-right-expected.txt
@@ -5,557 +5,76 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 537, 62, 37], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 531, 62, 37], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 498, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 492, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 459, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 453, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 420, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow 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": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 171, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 165, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 132, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 126, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 93, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 87, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 54, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 48, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 15, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow 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": "LayoutNGBlockFlow DIV", - "rect": [683, 504, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 498, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 465, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 459, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 426, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow 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": "LayoutNGBlockFlow DIV", - "rect": [683, 177, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 171, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 138, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 132, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 99, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 93, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 60, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 54, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 21, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 15, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [689, 374, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [689, 368, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [689, 335, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [689, 329, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [689, 296, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [689, 290, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [701, 543, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [701, 537, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [701, 504, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [701, 498, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [701, 465, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [701, 459, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [701, 426, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (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": "LayoutNGBlockFlow (floating) DIV", - "rect": [701, 177, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [701, 171, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [701, 99, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [701, 93, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [695, 60, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [695, 54, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [695, 21, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [695, 15, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [693, 138, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [693, 132, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [690, 375, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [690, 369, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [690, 336, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [690, 330, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [690, 297, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [690, 291, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [701, 543, 32, 20], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [701, 537, 32, 20], - "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": "NGPhysicalTextFragment 'x'", - "rect": [727, 101, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [727, 95, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [727, 62, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [727, 56, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [726, 377, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [726, 371, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [726, 338, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [726, 332, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 545, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 539, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 506, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 500, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 467, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 461, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 428, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 422, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 179, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 173, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 140, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 134, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [721, 23, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [721, 17, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [718, 299, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [718, 293, 16, 16], - "reason": "geometry" - } + "invalidations": [ + [677, 537, 62, 37], + [677, 531, 62, 37], + [677, 498, 62, 22], + [677, 492, 62, 22], + [677, 459, 62, 22], + [677, 453, 62, 22], + [677, 420, 62, 22], + [677, 414, 62, 22], + [677, 249, 62, 22], + [677, 243, 62, 22], + [677, 210, 62, 22], + [677, 204, 62, 22], + [677, 171, 62, 22], + [677, 165, 62, 22], + [677, 132, 62, 22], + [677, 126, 62, 22], + [677, 93, 62, 22], + [677, 87, 62, 22], + [677, 54, 62, 22], + [677, 48, 62, 22], + [677, 15, 62, 22], + [677, 9, 62, 22], + [681, 366, 58, 28], + [681, 360, 58, 28], + [681, 327, 58, 28], + [681, 321, 58, 28], + [681, 288, 58, 28], + [681, 282, 58, 28], + [701, 543, 40, 10], + [701, 537, 40, 10], + [701, 504, 40, 10], + [701, 498, 40, 10], + [701, 465, 40, 10], + [701, 459, 40, 10], + [701, 426, 40, 10], + [701, 420, 40, 10], + [701, 255, 40, 10], + [701, 249, 40, 10], + [701, 216, 40, 10], + [701, 210, 40, 10], + [701, 177, 40, 10], + [701, 171, 40, 10], + [701, 99, 40, 10], + [701, 93, 40, 10], + [725, 257, 16, 17], + [725, 251, 16, 17], + [725, 218, 16, 17], + [725, 212, 16, 17], + [727, 101, 16, 16], + [727, 95, 16, 16], + [727, 62, 16, 16], + [727, 56, 16, 16], + [726, 377, 16, 16], + [726, 371, 16, 16], + [726, 338, 16, 16], + [726, 332, 16, 16], + [725, 545, 16, 16], + [725, 539, 16, 16], + [725, 506, 16, 16], + [725, 500, 16, 16], + [725, 467, 16, 16], + [725, 461, 16, 16], + [725, 428, 16, 16], + [725, 422, 16, 16], + [725, 179, 16, 16], + [725, 173, 16, 16], + [725, 140, 16, 16], + [725, 134, 16, 16], + [721, 23, 16, 16] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/inline-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/inline-overflow-expected.txt index 5475dd3..ef3cda5 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/inline-overflow-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/inline-overflow-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'A\u00A0\u00A0B'", - "rect": [33, 33, 250, 100], - "reason": "style change" - } + "invalidations": [ + [33, 33, 250, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/inline-vertical-lr-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/inline-vertical-lr-overflow-expected.txt index 6699f55..fb16954d 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/inline-vertical-lr-overflow-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/inline-vertical-lr-overflow-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'A\u00A0\u00A0B'", - "rect": [33, 33, 100, 250], - "reason": "style change" - } + "invalidations": [ + [33, 33, 100, 250] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/inline-vertical-rl-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/inline-vertical-rl-overflow-expected.txt index b8c55508..c16dc12 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/inline-vertical-rl-overflow-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/inline-vertical-rl-overflow-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'A\u00A0\u00A0B'", - "rect": [667, 33, 100, 250], - "reason": "style change" - } + "invalidations": [ + [667, 33, 100, 250] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/justify-items-overflow-change-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/justify-items-overflow-change-expected.txt index d9ae206..e361767 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/justify-items-overflow-change-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/justify-items-overflow-change-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='item1'", - "rect": [0, 52, 160, 300], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item1'", - "rect": [0, 52, 100, 300], - "reason": "geometry" - } + "invalidations": [ + [0, 52, 160, 300] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/justify-self-overflow-change-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/justify-self-overflow-change-expected.txt index fad4a48..2af73b0 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/justify-self-overflow-change-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/justify-self-overflow-change-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='item1'", - "rect": [0, 52, 150, 300], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item1'", - "rect": [0, 52, 100, 300], - "reason": "geometry" - } + "invalidations": [ + [0, 52, 150, 300] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/line-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/line-overflow-expected.txt index 7ccd4ae..16de1a5 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/line-overflow-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/line-overflow-expected.txt
@@ -5,67 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment ' eleifend'", - "rect": [8, 122, 195, 99], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'convallis.'", - "rect": [8, 122, 195, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'lacus, at sagittis eros leo'", - "rect": [8, 122, 195, 99], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'pulvinar velit. Integer'", - "rect": [8, 122, 195, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'sollicitudin nisi ut urna blandit'", - "rect": [8, 122, 195, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' eleifend lacus,'", - "rect": [8, 142, 195, 79], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'Cras faucibus. Nunc'", - "rect": [8, 82, 192, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'adipiscing, enim in scelerisque'", - "rect": [8, 82, 192, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'convallis, augue '", - "rect": [8, 82, 192, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalBoxFragment LayoutInline SPAN id='t'", - "rect": [114, 92, 35, 49], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'purus'", - "rect": [114, 122, 35, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'purus'", - "rect": [38, 142, 35, 19], - "reason": "disappeared" - } + "invalidations": [ + [8, 122, 195, 99], + [8, 82, 192, 59] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/negative-text-indent-with-overflow-hidden-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/negative-text-indent-with-overflow-hidden-expected.txt index 22cb796..388614c 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/negative-text-indent-with-overflow-hidden-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/negative-text-indent-with-overflow-hidden-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target' class='changed'", - "rect": [550, 8, 200, 50], - "reason": "background" - } + "invalidations": [ + [550, 8, 200, 50] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/opacity-change-on-overflow-float-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/opacity-change-on-overflow-float-expected.txt index e0ade37..b83684a 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/opacity-change-on-overflow-float-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/opacity-change-on-overflow-float-expected.txt
@@ -5,47 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow HTML", - "rect": [8, 8, 784, 59], - "reason": "chunk appeared" - }, - { - "object": "NGPhysicalTextFragment 'REGRESSION (r41203): Facebook friend suggestions disappear on update. Make sure when a layer'", - "rect": [8, 8, 784, 59], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'a 100x100 green square below. If you see any red, the test has failed.'", - "rect": [8, 8, 784, 59], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'switches from being self-painting to non-self-painting that a layout happens to fix up the floating objects lists. You should see'", - "rect": [8, 8, 784, 59], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV class='green'", - "rect": [8, 84, 100, 100], - "reason": "chunk disappeared" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV class='red'", - "rect": [8, 84, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV class='red'", - "rect": [8, 84, 100, 100], - "reason": "chunk appeared" - }, - { - "object": "NGPhysicalTextFragment 'Repaint test for '", - "rect": [8, 8, 100, 19], - "reason": "disappeared" - } + "invalidations": [ + [8, 8, 784, 59], + [8, 84, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/overflow-changed-on-child-of-composited-layer-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/overflow-changed-on-child-of-composited-layer-expected.txt index 035f2b29..47fa534 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/overflow-changed-on-child-of-composited-layer-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/overflow-changed-on-child-of-composited-layer-expected.txt
@@ -10,12 +10,8 @@ "name": "LayoutNGBlockFlow DIV id='parent'", "position": [-1, -1], "bounds": [745, 102], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='parent'", - "rect": [0, 0, 102, 102], - "reason": "paint property change" - } + "invalidations": [ + [0, 0, 102, 102] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/overflow-delete-line-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/overflow-delete-line-expected.txt index cc7e03fe..47e9905 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/overflow-delete-line-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/overflow-delete-line-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Lorem ipsu'", - "rect": [8, 74, 72, 19], - "reason": "appeared" - }, - { - "object": "LayoutBlockFlow DIV id='dv'", - "rect": [8, 74, 46, 36], - "reason": "chunk disappeared" - } + "invalidations": [ + [8, 74, 72, 19], + [8, 74, 46, 36] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/overflow-hide-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/overflow-hide-expected.txt index bf4a173..62d6a7b6 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/overflow-hide-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/overflow-hide-expected.txt
@@ -5,17 +5,9 @@ "bounds": [785, 2016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV class='relative red'", - "rect": [108, 108, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='overflowParent' class='absolute green'", - "rect": [8, 8, 100, 100], - "reason": "style change" - } + "invalidations": [ + [108, 108, 100, 100], + [8, 8, 100, 100] ] }, {
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/overflow-into-content-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/overflow-into-content-expected.txt index a7c4456..870f1a1e 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/overflow-into-content-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/overflow-into-content-expected.txt
@@ -5,27 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [8, 158, 106, 106], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [8, 8, 106, 106], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [8, 308, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='target3'", - "rect": [8, 388, 100, 20], - "reason": "disappeared" - } + "invalidations": [ + [8, 158, 106, 106], + [8, 8, 106, 106], + [8, 308, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/overflow-show-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/overflow-show-expected.txt index 6e1ceaf..62d6a7b6 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/overflow-show-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/overflow-show-expected.txt
@@ -5,17 +5,9 @@ "bounds": [785, 2016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV class='relative green'", - "rect": [108, 108, 100, 100], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='overflowParent' class='absolute green'", - "rect": [8, 8, 100, 100], - "reason": "style change" - } + "invalidations": [ + [108, 108, 100, 100], + [8, 8, 100, 100] ] }, {
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/rel-positioned-inline-with-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/rel-positioned-inline-with-overflow-expected.txt index 12b8b152..2d9186a 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/rel-positioned-inline-with-overflow-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/rel-positioned-inline-with-overflow-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [8, 94, 100, 50], - "reason": "background" - } + "invalidations": [ + [8, 94, 100, 50] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/repaint-resized-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/repaint-resized-overflow-expected.txt index 882087a..f156e68 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/repaint-resized-overflow-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/repaint-resized-overflow-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='s'", - "rect": [8, 156, 108, 108], - "reason": "geometry" - } + "invalidations": [ + [8, 156, 108, 108] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/resize-child-within-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/resize-child-within-overflow-expected.txt index 94dece7f..89505a6c 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/resize-child-within-overflow-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/resize-child-within-overflow-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 1000], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='container'", - "rect": [400, 0, 200, 1000], - "reason": "incremental" - } + "invalidations": [ + [400, 0, 200, 1000] ] }, {
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/trailing-floats-root-line-box-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/trailing-floats-root-line-box-overflow-expected.txt index 87e9251a..06d5491 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/trailing-floats-root-line-box-overflow-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/trailing-floats-root-line-box-overflow-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target'", - "rect": [8, 58, 100, 100], - "reason": "disappeared" - } + "invalidations": [ + [8, 58, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/vertical-overflow-child-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/vertical-overflow-child-expected.txt index 49550b34..298d639 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/vertical-overflow-child-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/vertical-overflow-child-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='target'", - "rect": [214, 21, 100, 100], - "reason": "appeared" - } + "invalidations": [ + [214, 21, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/vertical-overflow-parent-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/vertical-overflow-parent-expected.txt index f39c79f..b424e87 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/vertical-overflow-parent-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/vertical-overflow-parent-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='target'", - "rect": [29, 29, 100, 100], - "reason": "appeared" - } + "invalidations": [ + [29, 29, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/vertical-overflow-same-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/vertical-overflow-same-expected.txt index 27c4351f..dc463f7b 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/vertical-overflow-same-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/vertical-overflow-same-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='target'", - "rect": [29, 21, 100, 100], - "reason": "appeared" - } + "invalidations": [ + [29, 21, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/vertical-rl-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/vertical-rl-overflow-expected.txt index d776822..2ee87fd 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/vertical-rl-overflow-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overflow/vertical-rl-overflow-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='div'", - "rect": [50, 100, 150, 100], - "reason": "style change" - } + "invalidations": [ + [50, 100, 150, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overhanging-float-detach-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overhanging-float-detach-repaint-expected.txt index d5747aeb..bed4e4a 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overhanging-float-detach-repaint-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/overhanging-float-detach-repaint-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (floating) DIV class='float'", - "rect": [8, 68, 100, 100], - "reason": "disappeared" - } + "invalidations": [ + [8, 68, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/paint-caret-in-div-with-negative-indent-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/paint-caret-in-div-with-negative-indent-expected.txt index d655b6cd4..8b0dd1d 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/paint-caret-in-div-with-negative-indent-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/paint-caret-in-div-with-negative-indent-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Caret", - "rect": [358, 200, 1, 20], - "reason": "appeared" - } + "invalidations": [ + [358, 200, 1, 20] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/paint-invalidation-with-opacity-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/paint-invalidation-with-opacity-expected.txt index 97bb495..ae2e746 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/paint-invalidation-with-opacity-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/paint-invalidation-with-opacity-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [8, 8, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [8, 8, 100, 100], - "reason": "chunk appeared" - } + "invalidations": [ + [8, 8, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/paint-invalidation-with-reparent-across-frame-boundaries-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/paint-invalidation-with-reparent-across-frame-boundaries-expected.txt index 32a0283..9c6764ea 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/paint-invalidation-with-reparent-across-frame-boundaries-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/paint-invalidation-with-reparent-across-frame-boundaries-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'abc'", - "rect": [18, 18, 22, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'abc'", - "rect": [8, 187, 22, 19], - "reason": "appeared" - } + "invalidations": [ + [18, 18, 22, 19], + [8, 187, 22, 19] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/absolute-display-block-to-none-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/absolute-display-block-to-none-expected.txt index 0f86038..4e36c2ad 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/absolute-display-block-to-none-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/absolute-display-block-to-none-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'When an absolute positioned element is set display:none, we should not invalidate the whole body.'", - "rect": [8, 8, 621, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='absolute'", - "rect": [100, 100, 100, 100], - "reason": "disappeared" - } + "invalidations": [ + [8, 8, 621, 19], + [100, 100, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/absolute-margin-change-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/absolute-margin-change-repaint-expected.txt index 9a5ac8dd..847158c 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/absolute-margin-change-repaint-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/absolute-margin-change-repaint-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='test'", - "rect": [0, 60, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='test'", - "rect": [0, 40, 100, 100], - "reason": "geometry" - } + "invalidations": [ + [0, 60, 100, 100], + [0, 40, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/absolute-position-change-containing-block-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/absolute-position-change-containing-block-expected.txt index ede89fd..e315d3f 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/absolute-position-change-containing-block-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/absolute-position-change-containing-block-expected.txt
@@ -5,17 +5,9 @@ "bounds": [785, 2016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='absolute green'", - "rect": [100, 100, 100, 100], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='container' class='fixed blue'", - "rect": [8, 8, 100, 100], - "reason": "appeared" - } + "invalidations": [ + [100, 100, 100, 100], + [8, 8, 100, 100] ] }, {
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/absolute-position-changed-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/absolute-position-changed-expected.txt index 27c1b68..a4bdaf7ff 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/absolute-position-changed-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/absolute-position-changed-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 2016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='absoluteDiv' class='absolute green'", - "rect": [100, 500, 100, 100], - "reason": "chunk disappeared" - } + "invalidations": [ + [100, 500, 100, 100] ], "transform": 1 }, @@ -26,12 +22,8 @@ "bounds": [100, 100], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='absoluteDiv' class='absolute green'", - "rect": [0, 0, 100, 100], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/absolute-position-moved-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/absolute-position-moved-expected.txt index 6f9cb4e..e5a0665 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/absolute-position-moved-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/absolute-position-moved-expected.txt
@@ -5,12 +5,8 @@ "bounds": [785, 2016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='absoluteDiv' class='absolute green'", - "rect": [100, 100, 100, 100], - "reason": "chunk appeared" - } + "invalidations": [ + [100, 100, 100, 100] ] }, { @@ -23,22 +19,9 @@ "bounds": [100, 100], "contentsOpaque": true, "backgroundColor": "#FF0000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='absoluteDiv' class='absolute green'", - "rect": [100, 100, 100, 100], - "reason": "chunk disappeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV class='fixed red'", - "rect": [0, 0, 100, 100], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV class='fixed red'", - "rect": [0, 0, 100, 100], - "reason": "disappeared" - } + "invalidations": [ + [100, 100, 100, 100], + [0, 0, 100, 100] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/abspos-shift-image-incorrect-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/abspos-shift-image-incorrect-repaint-expected.txt index 5e70ae7..39ee6e6 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/abspos-shift-image-incorrect-repaint-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/abspos-shift-image-incorrect-repaint-expected.txt
@@ -5,32 +5,12 @@ "bounds": [1250, 585], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutImage IMG", - "rect": [704, 0, 214, 232], - "reason": "geometry" - }, - { - "object": "LayoutImage IMG", - "rect": [454, 0, 214, 232], - "reason": "geometry" - }, - { - "object": "LayoutImage IMG", - "rect": [0, 0, 214, 232], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' '", - "rect": [700, 217, 4, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' '", - "rect": [450, 217, 4, 19], - "reason": "geometry" - } + "invalidations": [ + [704, 0, 214, 232], + [454, 0, 214, 232], + [0, 0, 214, 232], + [700, 217, 4, 19], + [450, 217, 4, 19] ] }, {
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/align-content-position-change-grid-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/align-content-position-change-grid-expected.txt index 88beace..409af81 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/align-content-position-change-grid-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/align-content-position-change-grid-expected.txt
@@ -5,37 +5,13 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [0, 302, 200, 50], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [0, 252, 200, 50], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [0, 202, 200, 50], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [0, 152, 200, 50], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [0, 102, 200, 50], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [0, 52, 200, 50], - "reason": "geometry" - } + "invalidations": [ + [0, 302, 200, 50], + [0, 252, 200, 50], + [0, 202, 200, 50], + [0, 152, 200, 50], + [0, 102, 200, 50], + [0, 52, 200, 50] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/block-layout-inline-children-float-positioned-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/block-layout-inline-children-float-positioned-expected.txt index 1f6682b..40492bd 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/block-layout-inline-children-float-positioned-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/block-layout-inline-children-float-positioned-expected.txt
@@ -5,27 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [0, 36, 602, 102], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [0, 36, 602, 102], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'the quick brown fox jumped over the lazy dog'", - "rect": [309, 37, 292, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'the quick brown fox jumped over the lazy dog'", - "rect": [155, 37, 292, 19], - "reason": "appeared" - } + "invalidations": [ + [0, 36, 602, 102] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/containing-block-position-change-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/containing-block-position-change-expected.txt index 6bfa8da..42fba02 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/containing-block-position-change-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/containing-block-position-change-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [158, 74, 50, 50], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [100, 74, 50, 50], - "reason": "geometry" - } + "invalidations": [ + [158, 74, 50, 50], + [100, 74, 50, 50] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/fixed-element-repaint-after-compositing-update-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/fixed-element-repaint-after-compositing-update-expected.txt index 05a91ae9..8f23e75 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/fixed-element-repaint-after-compositing-update-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/fixed-element-repaint-after-compositing-update-expected.txt
@@ -11,17 +11,9 @@ "position": [8, 88], "bounds": [792, 512], "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='moveMe'", - "rect": [142, 62, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='moveMe'", - "rect": [0, 0, 100, 100], - "reason": "geometry" - } + "invalidations": [ + [142, 62, 100, 100], + [0, 0, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/fixed-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/fixed-expected.txt index efe30cd8..c04f038 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/fixed-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/fixed-expected.txt
@@ -16,12 +16,8 @@ "name": "LayoutNGBlockFlow (positioned) DIV id='t'", "bounds": [100, 100], "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='t'", - "rect": [0, 0, 100, 100], - "reason": "background" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 2 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/fixed-margin-change-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/fixed-margin-change-repaint-expected.txt index 7fb918d8..828851a 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/fixed-margin-change-repaint-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/fixed-margin-change-repaint-expected.txt
@@ -12,12 +12,8 @@ "bounds": [100, 100], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='test'", - "rect": [0, 0, 100, 100], - "reason": "paint property change" - } + "invalidations": [ + [0, 0, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/fixed-to-relative-position-with-absolute-child-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/fixed-to-relative-position-with-absolute-child-expected.txt index 55b88a4..2628bcf 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/fixed-to-relative-position-with-absolute-child-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/fixed-to-relative-position-with-absolute-child-expected.txt
@@ -5,17 +5,9 @@ "bounds": [785, 2016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='absolute green'", - "rect": [108, 308, 100, 100], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='container' class='fixed blue'", - "rect": [8, 208, 100, 100], - "reason": "appeared" - } + "invalidations": [ + [108, 308, 100, 100], + [8, 208, 100, 100] ] }, {
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/fixed-tranformed-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/fixed-tranformed-expected.txt index 2ac3266..71378ce 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/fixed-tranformed-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/fixed-tranformed-expected.txt
@@ -18,12 +18,8 @@ "bounds": [100, 100], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='test'", - "rect": [0, 0, 100, 100], - "reason": "background" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 2 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/inline-relative-positioned-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/inline-relative-positioned-expected.txt index b9e0e46..65130aa 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/inline-relative-positioned-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/inline-relative-positioned-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'a'", - "rect": [8, 88, 100, 100], - "reason": "full" - } + "invalidations": [ + [8, 88, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/intermediate-layout-position-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/intermediate-layout-position-expected.txt index 43093cfe..074f86d 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/intermediate-layout-position-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/intermediate-layout-position-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTable TABLE", - "rect": [8, 172, 46, 20], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [8, 74, 46, 20], - "reason": "incremental" - } + "invalidations": [ + [8, 172, 46, 20], + [8, 74, 46, 20] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/invalidate-paint-for-fixed-pos-inside-iframe-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/invalidate-paint-for-fixed-pos-inside-iframe-expected.txt index 3c9ced7..ffb5c30 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/invalidate-paint-for-fixed-pos-inside-iframe-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/invalidate-paint-for-fixed-pos-inside-iframe-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [18, 418, 50, 50], - "reason": "background" - } + "invalidations": [ + [18, 418, 50, 50] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/justify-content-position-change-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/justify-content-position-change-expected.txt index ebf0bcbd..8ce509d 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/justify-content-position-change-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/justify-content-position-change-expected.txt
@@ -5,27 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [100, 52, 52, 300], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [52, 52, 52, 300], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [48, 52, 52, 300], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [0, 52, 52, 300], - "reason": "geometry" - } + "invalidations": [ + [100, 52, 52, 300], + [52, 52, 52, 300], + [48, 52, 52, 300], + [0, 52, 52, 300] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/justify-content-position-change-grid-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/justify-content-position-change-grid-expected.txt index 8845eacb..feedc97 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/justify-content-position-change-grid-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/justify-content-position-change-grid-expected.txt
@@ -5,37 +5,13 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [250, 52, 50, 200], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [200, 52, 50, 200], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [150, 52, 50, 200], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [100, 52, 50, 200], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [50, 52, 50, 200], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [0, 52, 50, 200], - "reason": "geometry" - } + "invalidations": [ + [250, 52, 50, 200], + [200, 52, 50, 200], + [150, 52, 50, 200], + [100, 52, 50, 200], + [50, 52, 50, 200], + [0, 52, 50, 200] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/layout-state-only-positioned-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/layout-state-only-positioned-expected.txt index 805dca4..f8c202b 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/layout-state-only-positioned-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/layout-state-only-positioned-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [0, 50, 106, 106], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [0, 50, 106, 106], - "reason": "chunk appeared" - }, - { - "object": "VerticalScrollbar", - "rect": [88, 53, 15, 100], - "reason": "chunk appeared" - } + "invalidations": [ + [0, 50, 106, 106] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/layout-state-relative-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/layout-state-relative-expected.txt index b04a530..33de19a 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/layout-state-relative-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/layout-state-relative-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'PASS'", - "rect": [8, 152, 38, 19], - "reason": "full" - } + "invalidations": [ + [8, 152, 38, 19] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/layoutstate-invalid-invalidation-inline-relative-positioned-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/layoutstate-invalid-invalidation-inline-relative-positioned-expected.txt index c1b8f03..f376c7a 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/layoutstate-invalid-invalidation-inline-relative-positioned-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/layoutstate-invalid-invalidation-inline-relative-positioned-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [8, 220, 100, 100], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [8, 200, 100, 100], - "reason": "geometry" - } + "invalidations": [ + [8, 220, 100, 100], + [8, 200, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/position-change-keeping-geometry-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/position-change-keeping-geometry-expected.txt index ba11428..62af46b 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/position-change-keeping-geometry-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/position-change-keeping-geometry-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target3'", - "rect": [420, 20, 100, 100], - "reason": "chunk disappeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target2'", - "rect": [220, 20, 100, 100], - "reason": "chunk appeared" - } + "invalidations": [ + [420, 20, 100, 100], + [220, 20, 100, 100] ] }, { @@ -24,12 +16,8 @@ "bounds": [100, 100], "contentsOpaque": true, "backgroundColor": "#0000FF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target3'", - "rect": [0, 0, 100, 100], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/positioned-document-element-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/positioned-document-element-expected.txt index 32d9a579..8bb19685 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/positioned-document-element-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/positioned-document-element-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 800, 600], - "reason": "background" - }, - { - "object": "NGPhysicalTextFragment 'Tests that the entire viewport is painted with a floated html element.'", - "rect": [108, 116, 424, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Tests that the entire viewport is painted with a floated html element.'", - "rect": [8, 16, 424, 19], - "reason": "geometry" - } + "invalidations": [ + [0, 0, 800, 600] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/positioned-great-grandparent-change-location-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/positioned-great-grandparent-change-location-expected.txt index 192300ed..8c48312 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/positioned-great-grandparent-change-location-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/positioned-great-grandparent-change-location-expected.txt
@@ -5,27 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [100, 200, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [100, 100, 100, 100], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Target'", - "rect": [100, 200, 41, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Target'", - "rect": [100, 100, 41, 19], - "reason": "geometry" - } + "invalidations": [ + [100, 200, 100, 100], + [100, 100, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/positioned-list-offset-change-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/positioned-list-offset-change-repaint-expected.txt index c7454607..f948829 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/positioned-list-offset-change-repaint-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/positioned-list-offset-change-repaint-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutImage IMG", - "rect": [8, 64, 214, 232], - "reason": "geometry" - }, - { - "object": "LayoutImage IMG", - "rect": [8, 64, 114, 232], - "reason": "geometry" - } + "invalidations": [ + [8, 64, 214, 232] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/relative-inline-positioned-movement-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/relative-inline-positioned-movement-repaint-expected.txt index b263180..d3bd508 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/relative-inline-positioned-movement-repaint-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/relative-inline-positioned-movement-repaint-expected.txt
@@ -11,12 +11,8 @@ "position": [68, 7], "bounds": [365, 21], "backfaceVisibility": "hidden", - "paintInvalidations": [ - { - "object": "LayoutInline (relative positioned) DIV id='block'", - "rect": [0, 0, 365, 21], - "reason": "paint property change" - } + "invalidations": [ + [0, 0, 365, 21] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/relative-margin-change-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/relative-margin-change-repaint-expected.txt index bb9a42e..847158c 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/relative-margin-change-repaint-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/relative-margin-change-repaint-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='test'", - "rect": [0, 60, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='test'", - "rect": [0, 40, 100, 100], - "reason": "geometry" - } + "invalidations": [ + [0, 60, 100, 100], + [0, 40, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/shift-relative-positioned-container-with-image-addition-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/shift-relative-positioned-container-with-image-addition-expected.txt index 8d94d8f80..a61513e5 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/shift-relative-positioned-container-with-image-addition-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/shift-relative-positioned-container-with-image-addition-expected.txt
@@ -5,27 +5,11 @@ "bounds": [785, 836], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 742, 785, 94], - "reason": "incremental" - }, - { - "object": "LayoutIFrame IFRAME id='iframe'", - "rect": [8, 92, 732, 94], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow HTML", - "rect": [58, 236, 489, 537], - "reason": "chunk appeared" - }, - { - "object": "LayoutImage IMG", - "rect": [58, 142, 489, 537], - "reason": "disappeared" - } + "invalidations": [ + [0, 742, 785, 94], + [8, 92, 732, 94], + [58, 236, 489, 537], + [58, 142, 489, 537] ] }, {
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/shift-relative-positioned-container-with-image-removal-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/shift-relative-positioned-container-with-image-removal-expected.txt index 13fa0e1b..569cc7b 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/shift-relative-positioned-container-with-image-removal-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/shift-relative-positioned-container-with-image-removal-expected.txt
@@ -5,22 +5,10 @@ "bounds": [785, 742], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutIFrame IFRAME id='iframe'", - "rect": [8, 92, 732, 94], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow HTML", - "rect": [58, 241, 489, 537], - "reason": "chunk disappeared" - }, - { - "object": "LayoutImage IMG", - "rect": [58, 142, 489, 537], - "reason": "appeared" - } + "invalidations": [ + [8, 92, 732, 94], + [58, 241, 489, 537], + [58, 142, 489, 537] ] }, {
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/static-to-positioned-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/static-to-positioned-expected.txt index 2ed50783..b739053 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/static-to-positioned-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/static-to-positioned-expected.txt
@@ -5,27 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='t'", - "rect": [8, 332, 100, 100], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='t'", - "rect": [8, 282, 100, 100], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='a'", - "rect": [8, 132, 100, 100], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='a'", - "rect": [8, 82, 100, 100], - "reason": "style change" - } + "invalidations": [ + [8, 332, 100, 100], + [8, 282, 100, 100], + [8, 132, 100, 100], + [8, 82, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/text-in-relative-positioned-inline-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/text-in-relative-positioned-inline-expected.txt index 291d1d93..f30b1e4 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/text-in-relative-positioned-inline-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/text-in-relative-positioned-inline-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'ab'", - "rect": [8, 8, 200, 100], - "reason": "disappeared" - } + "invalidations": [ + [8, 8, 200, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/transform-absolute-child-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/transform-absolute-child-expected.txt index 8908af8f..8c539cd 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/transform-absolute-child-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/transform-absolute-child-expected.txt
@@ -5,27 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='child'", - "rect": [135, 127, 400, 50], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='child'", - "rect": [124, 116, 340, 297], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='box' class='rotated'", - "rect": [16, 8, 288, 288], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='box' class='rotated'", - "rect": [58, 50, 204, 204], - "reason": "paint property change" - } + "invalidations": [ + [135, 127, 400, 50], + [124, 116, 340, 297], + [16, 8, 288, 288] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/transform-absolute-in-positioned-container-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/transform-absolute-in-positioned-container-expected.txt index 2ec9816..b7e5231 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/transform-absolute-in-positioned-container-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/transform-absolute-in-positioned-container-expected.txt
@@ -5,17 +5,8 @@ "bounds": [802, 585], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='box' class='rotated'", - "rect": [76, 190, 286, 286], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='box' class='rotated'", - "rect": [118, 232, 202, 202], - "reason": "paint property change" - } + "invalidations": [ + [76, 190, 286, 286] ] }, {
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/transform-relative-position-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/transform-relative-position-expected.txt index 7c0a0cb..f46dc9a 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/transform-relative-position-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/position/transform-relative-position-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='box' class='rotated'", - "rect": [66, 110, 286, 286], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='box' class='rotated'", - "rect": [108, 152, 202, 202], - "reason": "paint property change" - } + "invalidations": [ + [66, 110, 286, 286] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/push-block-with-first-line-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/push-block-with-first-line-expected.txt index 2e18264..98e9ad73 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/push-block-with-first-line-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/push-block-with-first-line-expected.txt
@@ -5,27 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalLineBoxFragment", - "rect": [8, 68, 784, 20], - "reason": "geometry" - }, - { - "object": "NGPhysicalLineBoxFragment", - "rect": [8, 8, 784, 20], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'JOCULAR'", - "rect": [8, 68, 140, 20], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'JOCULAR'", - "rect": [8, 8, 140, 20], - "reason": "geometry" - } + "invalidations": [ + [8, 68, 784, 20], + [8, 8, 784, 20] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/quotes-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/quotes-expected.txt index c04b58d..f4a31c0 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/quotes-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/quotes-expected.txt
@@ -5,32 +5,12 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'quote 2'", - "rect": [17, 28, 47, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'quote 2'", - "rect": [16, 28, 47, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment '}'", - "rect": [64, 28, 9, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment '{'", - "rect": [8, 28, 9, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment '}'", - "rect": [63, 28, 8, 19], - "reason": "style change" - } + "invalidations": [ + [17, 28, 47, 19], + [16, 28, 47, 19], + [64, 28, 9, 19], + [8, 28, 9, 19], + [63, 28, 8, 19] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/reflection/reflection-invalidation-after-display-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/reflection/reflection-invalidation-after-display-expected.txt index dc14186c..3de4d7e 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/reflection/reflection-invalidation-after-display-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/reflection/reflection-invalidation-after-display-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='box' class='green reflected box'", - "rect": [300, 8, 450, 200], - "reason": "chunk disappeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='box' class='green box'", - "rect": [300, 8, 200, 200], - "reason": "appeared" - } + "invalidations": [ + [300, 8, 450, 200] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/reflection/reflection-invalidation-positioned-child-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/reflection/reflection-invalidation-positioned-child-expected.txt index fe889abb..6a04cf56 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/reflection/reflection-invalidation-positioned-child-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/reflection/reflection-invalidation-positioned-child-expected.txt
@@ -5,27 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='box'", - "rect": [0, 0, 100, 220], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow DIV id='box'", - "rect": [0, 0, 100, 200], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='positioned'", - "rect": [400, 10, 50, 200], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='positioned'", - "rect": [400, 10, 50, 180], - "reason": "paint property change" - } + "invalidations": [ + [0, 0, 100, 220], + [400, 10, 50, 200] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/reflection/reflection-redraw-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/reflection/reflection-redraw-expected.txt index 25615108..cd460f6 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/reflection/reflection-redraw-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/reflection/reflection-redraw-expected.txt
@@ -5,67 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'The color of this'", - "rect": [380, 267, 286, 59], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'should be green'", - "rect": [380, 267, 286, 59], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'text in the reflection'", - "rect": [380, 267, 286, 59], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'The color of this'", - "rect": [70, 267, 286, 59], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'should be green'", - "rect": [70, 267, 286, 59], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'text in the reflection'", - "rect": [70, 267, 286, 59], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'The color of this'", - "rect": [305, 34, 126, 182], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'should be green'", - "rect": [305, 34, 126, 182], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'text in the reflection'", - "rect": [305, 34, 126, 182], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'The color of this'", - "rect": [305, 377, 126, 156], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'should be green'", - "rect": [305, 377, 126, 156], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'text in the reflection'", - "rect": [305, 377, 126, 156], - "reason": "style change" - } + "invalidations": [ + [380, 267, 286, 59], + [70, 267, 286, 59], + [305, 34, 126, 182], + [305, 377, 126, 156] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/reflection/reflection-with-rotation-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/reflection/reflection-with-rotation-expected.txt index 6670092..118224f 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/reflection/reflection-with-rotation-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/reflection/reflection-with-rotation-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'PASS'", - "rect": [23, 51, 72, 110], - "reason": "full" - } + "invalidations": [ + [23, 51, 72, 110] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/reflection/scroll-absolute-layer-with-reflection-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/reflection/scroll-absolute-layer-with-reflection-expected.txt index cdb568d..cb322e0 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/reflection/scroll-absolute-layer-with-reflection-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/reflection/scroll-absolute-layer-with-reflection-expected.txt
@@ -5,17 +5,8 @@ "bounds": [785, 2016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='absolute red'", - "rect": [250, 230, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV class='relative reflected'", - "rect": [250, 230, 100, 100], - "reason": "paint property change" - } + "invalidations": [ + [250, 230, 100, 100] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/reflection/scroll-fixed-layer-with-reflection-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/reflection/scroll-fixed-layer-with-reflection-expected.txt index 9f7d19b..1ca3e97 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/reflection/scroll-fixed-layer-with-reflection-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/reflection/scroll-fixed-layer-with-reflection-expected.txt
@@ -16,17 +16,8 @@ "name": "LayoutNGBlockFlow (positioned) DIV id='moveMe' class='fixed clipped'", "bounds": [100, 100], "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='absolute green reflected'", - "rect": [0, 0, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV class='absolute red'", - "rect": [0, 0, 100, 100], - "reason": "paint property change" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 2 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/reflection/scroll-fixed-reflected-layer-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/reflection/scroll-fixed-reflected-layer-expected.txt index 238b965c..1c1b1804 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/reflection/scroll-fixed-reflected-layer-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/reflection/scroll-fixed-reflected-layer-expected.txt
@@ -16,12 +16,8 @@ "name": "LayoutNGBlockFlow (positioned) DIV class='reflected fixed'", "bounds": [100, 100], "backgroundColor": "#FF0000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='absolute green reflected'", - "rect": [0, 0, 100, 100], - "reason": "chunk reordered" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 2 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/remove-block-after-layout-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/remove-block-after-layout-expected.txt index 1583da8..a3d86505 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/remove-block-after-layout-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/remove-block-after-layout-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target'", - "rect": [8, 108, 100, 100], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'This div should'", - "rect": [8, 108, 98, 39], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'disappear.'", - "rect": [8, 108, 98, 39], - "reason": "disappeared" - } + "invalidations": [ + [8, 108, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/remove-inline-after-layout-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/remove-inline-after-layout-expected.txt index bef69aa2..1602cb0 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/remove-inline-after-layout-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/remove-inline-after-layout-expected.txt
@@ -5,27 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'This span should disappear. '", - "rect": [112, 193, 178, 19], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [290, 108, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [112, 108, 100, 100], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' '", - "rect": [108, 193, 4, 19], - "reason": "geometry" - } + "invalidations": [ + [112, 193, 178, 19], + [290, 108, 100, 100], + [112, 108, 100, 100], + [108, 193, 4, 19] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/remove-inline-layer-after-layout-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/remove-inline-layer-after-layout-expected.txt index d27294f..1602cb0 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/remove-inline-layer-after-layout-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/remove-inline-layer-after-layout-expected.txt
@@ -5,27 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutInline SPAN id='target'", - "rect": [112, 193, 178, 19], - "reason": "chunk disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [290, 108, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [112, 108, 100, 100], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' '", - "rect": [108, 193, 4, 19], - "reason": "geometry" - } + "invalidations": [ + [112, 193, 178, 19], + [290, 108, 100, 100], + [112, 108, 100, 100], + [108, 193, 4, 19] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/repaint-across-writing-mode-boundary-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/repaint-across-writing-mode-boundary-expected.txt index 42d8268..af05c730 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/repaint-across-writing-mode-boundary-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/repaint-across-writing-mode-boundary-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment '\u7B2C\u4E00\u6BB5\u843D paragraph 1'", - "rect": [548, 191, 23, 36], - "reason": "selection" - } + "invalidations": [ + [548, 191, 23, 36] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/repaint-descandant-on-ancestor-layer-move-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/repaint-descandant-on-ancestor-layer-move-expected.txt index 37ee3579..a8e7f0e 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/repaint-descandant-on-ancestor-layer-move-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/repaint-descandant-on-ancestor-layer-move-expected.txt
@@ -5,27 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV", - "rect": [428, 38, 300, 20], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV", - "rect": [28, 38, 300, 20], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'There should only be one copy of this text.'", - "rect": [428, 38, 270, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'There should only be one copy of this text.'", - "rect": [28, 38, 270, 19], - "reason": "geometry" - } + "invalidations": [ + [428, 38, 300, 20], + [28, 38, 300, 20] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/repaint-in-iframe-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/repaint-in-iframe-expected.txt index 391635b..ffb5c30 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/repaint-in-iframe-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/repaint-in-iframe-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [18, 418, 50, 50], - "reason": "background" - } + "invalidations": [ + [18, 418, 50, 50] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/repaint-on-style-change-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/repaint-on-style-change-expected.txt index 8cd48c2..0863edc 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/repaint-on-style-change-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/repaint-on-style-change-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='box'", - "rect": [260, 260, 100, 100], - "reason": "background" - } + "invalidations": [ + [260, 260, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/repaint-overlay/layers-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/repaint-overlay/layers-expected.txt index f1bb7e3..208e273 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/repaint-overlay/layers-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/repaint-overlay/layers-expected.txt
@@ -11,12 +11,8 @@ "name": "LayoutNGBlockFlow (positioned) DIV id='container'", "bounds": [100, 100], "backgroundColor": "#0000FF80", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='child1'", - "rect": [20, 20, 10, 10], - "reason": "background" - } + "invalidations": [ + [20, 20, 10, 10] ], "transform": 2 }, @@ -37,12 +33,8 @@ "bounds": [200, 200], "contentsOpaque": true, "backgroundColor": "#FFFF00", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='child2'", - "rect": [20, 20, 10, 10], - "reason": "background" - } + "invalidations": [ + [20, 20, 10, 10] ], "transform": 6 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/repaint-subrect-grid-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/repaint-subrect-grid-expected.txt index 7ab157c..4c3c896 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/repaint-subrect-grid-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/repaint-subrect-grid-expected.txt
@@ -5,107 +5,17 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='mask'", - "rect": [45, 18, 20, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='mask'", - "rect": [45, 18, 20, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='mask'", - "rect": [36, 36, 19, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='mask'", - "rect": [36, 36, 19, 19], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='mask'", - "rect": [36, 0, 19, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='mask'", - "rect": [36, 0, 19, 19], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='mask'", - "rect": [27, 18, 19, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='mask'", - "rect": [27, 18, 19, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='mask'", - "rect": [18, 36, 19, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='mask'", - "rect": [18, 36, 19, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='mask'", - "rect": [18, 0, 19, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='mask'", - "rect": [18, 0, 19, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='mask'", - "rect": [9, 18, 19, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='mask'", - "rect": [9, 18, 19, 19], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='mask'", - "rect": [0, 36, 19, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='mask'", - "rect": [0, 36, 19, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='mask'", - "rect": [0, 0, 19, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='mask'", - "rect": [0, 0, 19, 19], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='mask'", - "rect": [0, 18, 10, 19], - "reason": "chunk appeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='mask'", - "rect": [0, 18, 10, 19], - "reason": "chunk disappeared" - } + "invalidations": [ + [45, 18, 20, 19], + [36, 36, 19, 19], + [36, 0, 19, 19], + [27, 18, 19, 19], + [18, 36, 19, 19], + [18, 0, 19, 19], + [9, 18, 19, 19], + [0, 36, 19, 19], + [0, 0, 19, 19], + [0, 18, 10, 19] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/requestAnimation-translation-leave-traces-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/requestAnimation-translation-leave-traces-expected.txt index 365c6fe..d7702c4 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/requestAnimation-translation-leave-traces-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/requestAnimation-translation-leave-traces-expected.txt
@@ -8,37 +8,10 @@ "bounds": [1600, 585], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [1300, 0, 300, 585], - "reason": "incremental" - }, - { - "object": "Scrolling background of LayoutView #document", - "rect": [1000, 0, 300, 585], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow DIV id='box'", - "rect": [1500, 0, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow DIV id='box'", - "rect": [1200, 0, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow DIV id='box'", - "rect": [1200, 0, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow DIV id='box'", - "rect": [900, 0, 100, 100], - "reason": "paint property change" - } + "invalidations": [ + [1300, 0, 300, 585], + [1000, 0, 300, 585], + [900, 0, 100, 100] ] }, {
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/resize-iframe-text-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/resize-iframe-text-expected.txt index 5f8c90c..61ec6c7 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/resize-iframe-text-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/resize-iframe-text-expected.txt
@@ -5,27 +5,9 @@ "bounds": [500, 400], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 200, 500, 200], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow HTML", - "rect": [8, 300, 60, 22], - "reason": "incremental" - }, - { - "object": "NGPhysicalTextFragment 'Success'", - "rect": [8, 300, 60, 22], - "reason": "appeared" - }, - { - "object": "VerticalScrollbar", - "rect": [485, 0, 15, 200], - "reason": "chunk disappeared" - } + "invalidations": [ + [0, 200, 500, 200], + [485, 0, 15, 200] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/ruby-flipped-blocks-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/ruby-flipped-blocks-expected.txt index 3e8a807..308e3508 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/ruby-flipped-blocks-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/ruby-flipped-blocks-expected.txt
@@ -5,32 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'b'", - "rect": [8, 28, 20, 20], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'b'", - "rect": [8, 28, 20, 20], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'a'", - "rect": [8, 8, 20, 20], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'a'", - "rect": [8, 8, 20, 20], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'c'", - "rect": [28, 33, 10, 10], - "reason": "style change" - } + "invalidations": [ + [8, 28, 20, 20], + [8, 8, 20, 20], + [28, 33, 10, 10] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/caret-invalidation-in-overflow-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/caret-invalidation-in-overflow-scroll-expected.txt index 92a8d4a..7d15f580 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/caret-invalidation-in-overflow-scroll-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/caret-invalidation-in-overflow-scroll-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Caret", - "rect": [401, 11, 1, 16], - "reason": "caret" - }, - { - "object": "Caret", - "rect": [398, 11, 1, 16], - "reason": "caret" - } + "invalidations": [ + [401, 11, 1, 16], + [398, 11, 1, 16] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/caret-with-composited-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/caret-with-composited-scroll-expected.txt index c361d6f..fc96184 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/caret-with-composited-scroll-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/caret-with-composited-scroll-expected.txt
@@ -22,22 +22,8 @@ "name": "LayoutNGBlockFlow DIV id='scroller'", "bounds": [205, 1022], "backgroundColor": "#D3D3D3", - "paintInvalidations": [ - { - "object": "LayoutTextControl INPUT id='text'", - "rect": [0, 998, 205, 24], - "reason": "subtree" - }, - { - "object": "LayoutTextControl INPUT id='text'", - "rect": [0, 998, 205, 24], - "reason": "chunk appeared" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [3, 1003, 1, 16], - "reason": "chunk appeared" - } + "invalidations": [ + [0, 998, 205, 24] ], "transform": 2 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/composited-add-resizer-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/composited-add-resizer-expected.txt index 309b019..189cc24 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/composited-add-resizer-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/composited-add-resizer-expected.txt
@@ -9,12 +9,8 @@ { "name": "LayoutNGBlockFlow DIV id='target'", "bounds": [100, 100], - "paintInvalidations": [ - { - "object": "Scroll corner of LayoutNGBlockFlow DIV id='target'", - "rect": [85, 85, 15, 15], - "reason": "appeared" - } + "invalidations": [ + [85, 85, 15, 15] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/destroy-composited-scrollbar-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/destroy-composited-scrollbar-expected.txt index 3244ab0..52ec71f 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/destroy-composited-scrollbar-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/destroy-composited-scrollbar-expected.txt
@@ -11,12 +11,8 @@ "bounds": [200, 200], "contentsOpaque": true, "backgroundColor": "#0000FF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [0, 0, 200, 200], - "reason": "appeared" - } + "invalidations": [ + [0, 0, 200, 200] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/destroy-overlay-scrollbar-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/destroy-overlay-scrollbar-expected.txt index ecd1bf3..487c482 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/destroy-overlay-scrollbar-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/destroy-overlay-scrollbar-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "VerticalScrollbar", - "rect": [193, 100, 7, 200], - "reason": "chunk disappeared" - } + "invalidations": [ + [193, 100, 7, 200] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/destroy-scrollbar-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/destroy-scrollbar-expected.txt index 668c1a2d..c339b48 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/destroy-scrollbar-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/destroy-scrollbar-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "VerticalScrollbar", - "rect": [185, 100, 15, 200], - "reason": "chunk disappeared" - } + "invalidations": [ + [185, 100, 15, 200] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/fixed-after-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/fixed-after-scroll-expected.txt index dc26976..c77a95c 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/fixed-after-scroll-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/fixed-after-scroll-expected.txt
@@ -5,12 +5,8 @@ "bounds": [785, 2016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='t' class='green absolute'", - "rect": [8, 200, 100, 100], - "reason": "chunk disappeared" - } + "invalidations": [ + [8, 200, 100, 100] ], "transform": 1 }, @@ -31,12 +27,8 @@ "bounds": [100, 100], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='t' class='green absolute'", - "rect": [0, 0, 100, 100], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 3 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/fixed-and-absolute-position-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/fixed-and-absolute-position-scrolled-expected.txt index 82b871ca..2342a299 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/fixed-and-absolute-position-scrolled-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/fixed-and-absolute-position-scrolled-expected.txt
@@ -25,12 +25,8 @@ "bounds": [100, 100], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='absoluteDiv' class='absolute green'", - "rect": [0, 0, 100, 100], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/fixed-child-move-after-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/fixed-child-move-after-scroll-expected.txt index 93daffd..32addf2 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/fixed-child-move-after-scroll-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/fixed-child-move-after-scroll-expected.txt
@@ -16,12 +16,8 @@ "name": "LayoutNGBlockFlow (positioned) DIV id='toMove'", "bounds": [100, 100], "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='toMove'", - "rect": [0, 0, 100, 100], - "reason": "background" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 2 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/fixed-child-of-fixed-move-after-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/fixed-child-of-fixed-move-after-scroll-expected.txt index 93daffd..32addf2 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/fixed-child-of-fixed-move-after-scroll-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/fixed-child-of-fixed-move-after-scroll-expected.txt
@@ -16,12 +16,8 @@ "name": "LayoutNGBlockFlow (positioned) DIV id='toMove'", "bounds": [100, 100], "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='toMove'", - "rect": [0, 0, 100, 100], - "reason": "background" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 2 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/fixed-child-of-transformed-move-after-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/fixed-child-of-transformed-move-after-scroll-expected.txt index a52228ff..d9d4695 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/fixed-child-of-transformed-move-after-scroll-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/fixed-child-of-transformed-move-after-scroll-expected.txt
@@ -5,17 +5,9 @@ "bounds": [785, 3016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='toMove'", - "rect": [158, 278, 100, 100], - "reason": "background" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='toMove'", - "rect": [18, 278, 100, 100], - "reason": "background" - } + "invalidations": [ + [158, 278, 100, 100], + [18, 278, 100, 100] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/fixed-child-of-transformed-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/fixed-child-of-transformed-scrolled-expected.txt index 53480c9..cd215d7 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/fixed-child-of-transformed-scrolled-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/fixed-child-of-transformed-scrolled-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='fixed'", - "rect": [200, 150, 100, 100], - "reason": "background" - } + "invalidations": [ + [200, 150, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/fixed-descendant-of-transformed-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/fixed-descendant-of-transformed-scrolled-expected.txt index 53480c9..cd215d7 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/fixed-descendant-of-transformed-scrolled-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/fixed-descendant-of-transformed-scrolled-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='fixed'", - "rect": [200, 150, 100, 100], - "reason": "background" - } + "invalidations": [ + [200, 150, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/fixed-move-after-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/fixed-move-after-scroll-expected.txt index 93daffd..32addf2 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/fixed-move-after-scroll-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/fixed-move-after-scroll-expected.txt
@@ -16,12 +16,8 @@ "name": "LayoutNGBlockFlow (positioned) DIV id='toMove'", "bounds": [100, 100], "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='toMove'", - "rect": [0, 0, 100, 100], - "reason": "background" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 2 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/fixed-under-composited-absolute-scrolled-expected.png b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/fixed-under-composited-absolute-scrolled-expected.png deleted file mode 100644 index fd8a7ac..0000000 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/fixed-under-composited-absolute-scrolled-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/fixed-under-composited-absolute-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/fixed-under-composited-absolute-scrolled-expected.txt index 90da974..d2a6a3a 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/fixed-under-composited-absolute-scrolled-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/fixed-under-composited-absolute-scrolled-expected.txt
@@ -25,12 +25,8 @@ "name": "LayoutNGBlockFlow (positioned) DIV id='fixed'", "bounds": [100, 200], "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='fixed'", - "rect": [0, 100, 100, 100], - "reason": "incremental" - } + "invalidations": [ + [0, 100, 100, 100] ] } ],
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/fixed-with-border-under-composited-absolute-scrolled-expected.png b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/fixed-with-border-under-composited-absolute-scrolled-expected.png deleted file mode 100644 index d74a761..0000000 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/fixed-with-border-under-composited-absolute-scrolled-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/fixed-with-border-under-composited-absolute-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/fixed-with-border-under-composited-absolute-scrolled-expected.txt index 129a003..462914a 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/fixed-with-border-under-composited-absolute-scrolled-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/fixed-with-border-under-composited-absolute-scrolled-expected.txt
@@ -25,12 +25,8 @@ "name": "LayoutNGBlockFlow (positioned) DIV id='fixed'", "bounds": [120, 220], "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='fixed'", - "rect": [0, 0, 120, 220], - "reason": "geometry" - } + "invalidations": [ + [0, 0, 120, 220] ] } ],
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/flipped-blocks-writing-mode-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/flipped-blocks-writing-mode-scroll-expected.txt index 0871f38..15ae91c 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/flipped-blocks-writing-mode-scroll-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/flipped-blocks-writing-mode-scroll-expected.txt
@@ -29,12 +29,8 @@ "bounds": [10000, 200], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [0, 0, 10000, 200], - "reason": "background" - } + "invalidations": [ + [0, 0, 10000, 200] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/iframe-gradient-background-scroll-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/iframe-gradient-background-scroll-repaint-expected.txt index 6a2dd2ebe..fb37dd4 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/iframe-gradient-background-scroll-repaint-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/iframe-gradient-background-scroll-repaint-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [10, 10, 300, 150], - "reason": "paint property change" - } + "invalidations": [ + [10, 10, 300, 150] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/iframe-scrollbar-hover-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/iframe-scrollbar-hover-expected.txt index dec8d13..413fb72 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/iframe-scrollbar-hover-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/iframe-scrollbar-hover-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "VerticalScrollbar", - "rect": [187, 102, 15, 200], - "reason": "scroll control" - } + "invalidations": [ + [187, 102, 15, 200] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/inline-style-change-in-scrolled-view-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/inline-style-change-in-scrolled-view-expected.txt index b6c0ef22..b88c90e 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/inline-style-change-in-scrolled-view-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/inline-style-change-in-scrolled-view-expected.txt
@@ -5,12 +5,8 @@ "bounds": [2000, 2000], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Text Text Text Text Text Text Text Text Text Text Text Text Text'", - "rect": [0, 320, 413, 19], - "reason": "style change" - } + "invalidations": [ + [0, 320, 413, 19] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/invalidate-after-composited-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/invalidate-after-composited-scroll-expected.txt index 27738cb0..5b426be 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/invalidate-after-composited-scroll-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/invalidate-after-composited-scroll-expected.txt
@@ -28,12 +28,8 @@ "name": "LayoutNGBlockFlow (positioned) DIV id='scroller'", "bounds": [185, 4900], "backgroundColor": "#FFEFD5", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [0, 2400, 100, 100], - "reason": "background" - } + "invalidations": [ + [0, 2400, 100, 100] ], "transform": 2 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/invalidate-after-composited-scroll-of-window-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/invalidate-after-composited-scroll-of-window-expected.txt index bf0f48c1..a92430c 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/invalidate-after-composited-scroll-of-window-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/invalidate-after-composited-scroll-of-window-expected.txt
@@ -5,17 +5,9 @@ "bounds": [785, 4936], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Tests that invalidation of a div after scrolling invalidates just the div and no other area.'", - "rect": [8, 4908, 540, 19], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [8, 2408, 100, 100], - "reason": "background" - } + "invalidations": [ + [8, 4908, 540, 19], + [8, 2408, 100, 100] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/invalidate-caret-in-composited-scrolling-container-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/invalidate-caret-in-composited-scrolling-container-expected.txt index aae992d4..e8dc920 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/invalidate-caret-in-composited-scrolling-container-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/invalidate-caret-in-composited-scrolling-container-expected.txt
@@ -11,32 +11,8 @@ "position": [-2, -2], "bounds": [69, 26], "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTextControl INPUT id='root'", - "rect": [0, 0, 69, 26], - "reason": "paint property change" - }, - { - "object": "LayoutTextControl INPUT id='root'", - "rect": [0, 0, 65, 22], - "reason": "paint property change" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [4, 3, 57, 16], - "reason": "paint property change" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [6, 5, 56, 16], - "reason": "paint property change" - }, - { - "object": "Caret", - "rect": [61, 5, 1, 16], - "reason": "caret" - } + "invalidations": [ + [0, 0, 69, 26] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/invalidate-caret-in-non-composited-scrolling-container-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/invalidate-caret-in-non-composited-scrolling-container-expected.txt index aae992d4..e8dc920 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/invalidate-caret-in-non-composited-scrolling-container-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/invalidate-caret-in-non-composited-scrolling-container-expected.txt
@@ -11,32 +11,8 @@ "position": [-2, -2], "bounds": [69, 26], "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTextControl INPUT id='root'", - "rect": [0, 0, 69, 26], - "reason": "paint property change" - }, - { - "object": "LayoutTextControl INPUT id='root'", - "rect": [0, 0, 65, 22], - "reason": "paint property change" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [4, 3, 57, 16], - "reason": "paint property change" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [6, 5, 56, 16], - "reason": "paint property change" - }, - { - "object": "Caret", - "rect": [61, 5, 1, 16], - "reason": "caret" - } + "invalidations": [ + [0, 0, 69, 26] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/layout-state-scrolloffset-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/layout-state-scrolloffset-expected.txt index 5944b07..bc50365 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/layout-state-scrolloffset-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/layout-state-scrolloffset-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'after'", - "rect": [100, 120, 40, 19], - "reason": "full" - } + "invalidations": [ + [100, 120, 40, 19] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/layout-state-scrolloffset2-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/layout-state-scrolloffset2-expected.txt index 788d8fb..8354f31 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/layout-state-scrolloffset2-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/layout-state-scrolloffset2-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'after'", - "rect": [102, 122, 40, 19], - "reason": "full" - } + "invalidations": [ + [102, 122, 40, 19] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/layout-state-scrolloffset3-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/layout-state-scrolloffset3-expected.txt index ca1b3fa..3c9a4f8 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/layout-state-scrolloffset3-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/layout-state-scrolloffset3-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'after'", - "rect": [100, 120, 34, 19], - "reason": "full" - } + "invalidations": [ + [100, 120, 34, 19] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/line-in-scrolled-clipped-block-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/line-in-scrolled-clipped-block-expected.txt index b1de7092..89d438c 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/line-in-scrolled-clipped-block-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/line-in-scrolled-clipped-block-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment ' PASS .'", - "rect": [8, 8, 100, 19], - "reason": "full" - } + "invalidations": [ + [8, 8, 100, 19] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/nested-fixed-iframe-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/nested-fixed-iframe-scrolled-expected.txt index 4bdb966..a7ba47c 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/nested-fixed-iframe-scrolled-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/nested-fixed-iframe-scrolled-expected.txt
@@ -5,12 +5,8 @@ "bounds": [785, 2016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='div'", - "rect": [22, 522, 100, 100], - "reason": "background" - } + "invalidations": [ + [22, 522, 100, 100] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/outline-change-in-scrollers-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/outline-change-in-scrollers-expected.txt index 04cfef39..ab3c8aa 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/outline-change-in-scrollers-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/outline-change-in-scrollers-expected.txt
@@ -5,37 +5,13 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='target'", - "rect": [286, 173, 75, 75], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow DIV class='target'", - "rect": [286, 18, 75, 75], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow DIV class='target'", - "rect": [172, 173, 75, 75], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow DIV class='target'", - "rect": [172, 18, 75, 75], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow DIV class='target'", - "rect": [53, 153, 75, 75], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow DIV class='target'", - "rect": [18, 18, 75, 75], - "reason": "style change" - } + "invalidations": [ + [286, 173, 75, 75], + [286, 18, 75, 75], + [172, 173, 75, 75], + [172, 18, 75, 75], + [53, 153, 75, 75], + [18, 18, 75, 75] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/outline-change-scrollable-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/outline-change-scrollable-expected.txt index 9c49741..4738816 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/outline-change-scrollable-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/outline-change-scrollable-expected.txt
@@ -5,12 +5,8 @@ "bounds": [1008, 585], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [0, 0, 1008, 128], - "reason": "style change" - } + "invalidations": [ + [0, 0, 1008, 128] ] }, {
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/overflow-auto-in-overflow-auto-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/overflow-auto-in-overflow-auto-scrolled-expected.txt index 20e2c61..6d235ad 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/overflow-auto-in-overflow-auto-scrolled-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/overflow-auto-in-overflow-auto-scrolled-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='innerDiv'", - "rect": [8, 8, 300, 300], - "reason": "paint property change" - }, - { - "object": "VerticalScrollbar", - "rect": [762, 8, 15, 300], - "reason": "scroll control" - } + "invalidations": [ + [8, 8, 300, 300], + [762, 8, 15, 300] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/overflow-hidden-in-overflow-hidden-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/overflow-hidden-in-overflow-hidden-scrolled-expected.txt index f313b35..74fed8c 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/overflow-hidden-in-overflow-hidden-scrolled-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/overflow-hidden-in-overflow-hidden-scrolled-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='innerWrapper'", - "rect": [8, 18, 100, 190], - "reason": "paint property change" - } + "invalidations": [ + [8, 18, 100, 190] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/overflow-move-after-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/overflow-move-after-scroll-expected.txt index a7aab94..e235fd18 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/overflow-move-after-scroll-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/overflow-move-after-scroll-expected.txt
@@ -34,17 +34,9 @@ "name": "LayoutNGBlockFlow (positioned) DIV id='scroller' class='scroller'", "bounds": [685, 600], "backgroundColor": "#CCEEFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='block'", - "rect": [300, 200, 120, 50], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='block'", - "rect": [50, 200, 120, 50], - "reason": "geometry" - } + "invalidations": [ + [300, 200, 120, 50], + [50, 200, 120, 50] ], "transform": 2 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/overflow-scroll-after-move-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/overflow-scroll-after-move-expected.txt index 77e1f2c8..360e821c 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/overflow-scroll-after-move-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/overflow-scroll-after-move-expected.txt
@@ -34,17 +34,9 @@ "name": "LayoutNGBlockFlow (positioned) DIV id='scroller'", "bounds": [285, 900], "backgroundColor": "#CCEEFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='block'", - "rect": [50, 310, 200, 50], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='block'", - "rect": [50, 200, 200, 50], - "reason": "geometry" - } + "invalidations": [ + [50, 310, 200, 50], + [50, 200, 200, 50] ], "transform": 2 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/overflow-scroll-body-appear-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/overflow-scroll-body-appear-expected.txt index c776ee0..52701ed4 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/overflow-scroll-body-appear-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/overflow-scroll-body-appear-expected.txt
@@ -5,37 +5,8 @@ "bounds": [2008, 2096], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 2008, 2096], - "reason": "background" - }, - { - "object": "LayoutNGBlockFlow HTML", - "rect": [8, 16, 503, 55], - "reason": "chunk appeared" - }, - { - "object": "NGPhysicalTextFragment 'Bug 36461 - No vertical scrollbar after the CSS class change'", - "rect": [124, 52, 383, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'You should see both vertical and horizontal scrollbars.'", - "rect": [8, 16, 340, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'This is the test for '", - "rect": [8, 52, 116, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment '.'", - "rect": [507, 52, 4, 19], - "reason": "disappeared" - } + "invalidations": [ + [0, 0, 2008, 2096] ] }, { @@ -52,12 +23,8 @@ "name": "Scroll corner of LayoutView #document", "position": [785, 585], "bounds": [15, 15], - "paintInvalidations": [ - { - "object": "Scroll corner of LayoutView #document", - "rect": [0, 0, 15, 15], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 15, 15] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/overflow-scroll-composited-non-stacking-child-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/overflow-scroll-composited-non-stacking-child-expected.txt index 805dd1f5..1886ff4 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/overflow-scroll-composited-non-stacking-child-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/overflow-scroll-composited-non-stacking-child-expected.txt
@@ -5,22 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='back'", - "rect": [93, 125, 180, 100], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV class='back'", - "rect": [93, 75, 180, 100], - "reason": "paint property change" - }, - { - "object": "VerticalScrollbar", - "rect": [308, 65, 15, 175], - "reason": "scroll control" - } + "invalidations": [ + [93, 125, 180, 100], + [93, 75, 180, 100], + [308, 65, 15, 175] ] }, {
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/overflow-scroll-delete-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/overflow-scroll-delete-expected.txt index f201b29a..4f10343 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/overflow-scroll-delete-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/overflow-scroll-delete-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Passed'", - "rect": [8, 136, 43, 17], - "reason": "full" - } + "invalidations": [ + [8, 136, 43, 17] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/overflow-scroll-in-overflow-scroll-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/overflow-scroll-in-overflow-scroll-scrolled-expected.txt index 20e2c61..6d235ad 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/overflow-scroll-in-overflow-scroll-scrolled-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/overflow-scroll-in-overflow-scroll-scrolled-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='innerDiv'", - "rect": [8, 8, 300, 300], - "reason": "paint property change" - }, - { - "object": "VerticalScrollbar", - "rect": [762, 8, 15, 300], - "reason": "scroll control" - } + "invalidations": [ + [8, 8, 300, 300], + [762, 8, 15, 300] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/overflow-scroll-local-background-text-color-change-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/overflow-scroll-local-background-text-color-change-expected.txt index ba4f1c6e..6c3c5e3 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/overflow-scroll-local-background-text-color-change-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/overflow-scroll-local-background-text-color-change-expected.txt
@@ -22,12 +22,8 @@ "name": "LayoutNGBlockFlow DIV id='scroller'", "bounds": [185, 552], "backgroundColor": "#0000FF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutNGBlockFlow DIV id='scroller'", - "rect": [0, 0, 185, 552], - "reason": "background" - } + "invalidations": [ + [0, 0, 185, 552] ], "transform": 2 }, @@ -35,12 +31,8 @@ "name": "HorizontalScrollbar", "position": [0, 185], "bounds": [200, 15], - "paintInvalidations": [ - { - "object": "HorizontalScrollbar", - "rect": [0, 0, 185, 15], - "reason": "scroll control" - } + "invalidations": [ + [0, 0, 185, 15] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/repaint-composited-child-in-scrolled-container-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/repaint-composited-child-in-scrolled-container-expected.txt index d29aeea..4b768f2 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/repaint-composited-child-in-scrolled-container-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/repaint-composited-child-in-scrolled-container-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='outer'", - "rect": [8, 8, 285, 285], - "reason": "paint property change" - }, - { - "object": "HorizontalScrollbar", - "rect": [8, 293, 285, 15], - "reason": "scroll control" - } + "invalidations": [ + [8, 8, 285, 285], + [8, 293, 285, 15] ] }, { @@ -23,12 +15,8 @@ "bounds": [600, 600], "contentsOpaque": true, "backgroundColor": "#FF0000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='inner'", - "rect": [0, 0, 600, 600], - "reason": "appeared" - } + "invalidations": [ + [0, 0, 600, 600] ], "transform": 3 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/repaint-during-scroll-with-zoom-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/repaint-during-scroll-with-zoom-expected.txt index 6ecc482..96df02e 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/repaint-during-scroll-with-zoom-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/repaint-during-scroll-with-zoom-expected.txt
@@ -5,27 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#C0C0C0", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [3, 65, 235, 235], - "reason": "paint property change" - }, - { - "object": "HorizontalScrollbar", - "rect": [3, 300, 235, 15], - "reason": "scroll control" - }, - { - "object": "LayoutNGBlockFlow HTML", - "rect": [3, 65, 55, 17], - "reason": "paint property change" - }, - { - "object": "VerticalScrollbar", - "rect": [238, 65, 15, 235], - "reason": "scroll control" - } + "invalidations": [ + [3, 65, 235, 235], + [3, 300, 235, 15], + [238, 65, 15, 235] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/resize-scrollable-div-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/resize-scrollable-div-expected.txt index 3fb1f38..e9c3fb6 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/resize-scrollable-div-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/resize-scrollable-div-expected.txt
@@ -5,37 +5,13 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "HorizontalScrollbar", - "rect": [8, 393, 285, 15], - "reason": "scroll control" - }, - { - "object": "HorizontalScrollbar", - "rect": [8, 193, 85, 15], - "reason": "scroll control" - }, - { - "object": "VerticalScrollbar", - "rect": [293, 108, 15, 285], - "reason": "scroll control" - }, - { - "object": "VerticalScrollbar", - "rect": [93, 108, 15, 85], - "reason": "scroll control" - }, - { - "object": "Scroll corner of LayoutNGBlockFlow DIV id='div'", - "rect": [293, 393, 15, 15], - "reason": "geometry" - }, - { - "object": "Scroll corner of LayoutNGBlockFlow DIV id='div'", - "rect": [93, 193, 15, 15], - "reason": "geometry" - } + "invalidations": [ + [8, 393, 285, 15], + [8, 193, 85, 15], + [293, 108, 15, 285], + [93, 108, 15, 85], + [293, 393, 15, 15], + [93, 193, 15, 15] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/resize-scrollable-iframe-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/resize-scrollable-iframe-expected.txt index d6d90c8..e9c3fb6 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/resize-scrollable-iframe-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/resize-scrollable-iframe-expected.txt
@@ -5,37 +5,13 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "HorizontalScrollbar", - "rect": [8, 393, 285, 15], - "reason": "scroll control" - }, - { - "object": "HorizontalScrollbar", - "rect": [8, 193, 85, 15], - "reason": "scroll control" - }, - { - "object": "VerticalScrollbar", - "rect": [293, 108, 15, 285], - "reason": "scroll control" - }, - { - "object": "VerticalScrollbar", - "rect": [93, 108, 15, 85], - "reason": "scroll control" - }, - { - "object": "Scroll corner of LayoutView #document", - "rect": [293, 393, 15, 15], - "reason": "geometry" - }, - { - "object": "Scroll corner of LayoutView #document", - "rect": [93, 193, 15, 15], - "reason": "geometry" - } + "invalidations": [ + [8, 393, 285, 15], + [8, 193, 85, 15], + [293, 108, 15, 285], + [93, 108, 15, 85], + [293, 393, 15, 15], + [93, 193, 15, 15] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/scroll-descendant-with-cached-cliprects-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/scroll-descendant-with-cached-cliprects-expected.txt index c3b8bc2..0bc724ae 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/scroll-descendant-with-cached-cliprects-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/scroll-descendant-with-cached-cliprects-expected.txt
@@ -5,12 +5,8 @@ "bounds": [785, 1895], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='ul'", - "rect": [677, 52, 100, 100], - "reason": "chunk disappeared" - } + "invalidations": [ + [677, 52, 100, 100] ], "transform": 1 }, @@ -24,12 +20,8 @@ "bounds": [100, 100], "contentsOpaque": true, "backgroundColor": "#FF0000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='scrollpanel'", - "rect": [0, 0, 100, 100], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 2 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/scroll-fixed-layer-with-no-visible-content-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/scroll-fixed-layer-with-no-visible-content-expected.txt index bc516a7b..69e2eb9 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/scroll-fixed-layer-with-no-visible-content-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/scroll-fixed-layer-with-no-visible-content-expected.txt
@@ -5,17 +5,8 @@ "bounds": [785, 2016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='absolute red'", - "rect": [0, 0, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV class='absolute red'", - "rect": [0, 0, 100, 100], - "reason": "chunk appeared" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 1 }, @@ -29,12 +20,8 @@ "bounds": [100, 100], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='moveMe' class='fixed clipped'", - "rect": [0, 0, 100, 100], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 2 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/scroll-fixed-layer-with-transformed-parent-layer-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/scroll-fixed-layer-with-transformed-parent-layer-expected.txt index b924080a..9971ab0 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/scroll-fixed-layer-with-transformed-parent-layer-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/scroll-fixed-layer-with-transformed-parent-layer-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='absolute green'", - "rect": [93, 234, 142, 143], - "reason": "chunk appeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV class='absolute red'", - "rect": [93, 234, 142, 143], - "reason": "paint property change" - } + "invalidations": [ + [93, 234, 142, 143] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/scroll-in-clipped-layer-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/scroll-in-clipped-layer-expected.txt index dcd79334..8159d72 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/scroll-in-clipped-layer-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/scroll-in-clipped-layer-expected.txt
@@ -5,17 +5,8 @@ "bounds": [785, 2016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='absolute red'", - "rect": [100, 150, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV class='relative green'", - "rect": [100, 150, 100, 100], - "reason": "chunk appeared" - } + "invalidations": [ + [100, 150, 100, 100] ] }, {
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/scroll-in-fixed-layer-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/scroll-in-fixed-layer-expected.txt index 0040bf1..2eaed165 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/scroll-in-fixed-layer-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/scroll-in-fixed-layer-expected.txt
@@ -17,17 +17,8 @@ "bounds": [100, 100], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='absolute green'", - "rect": [0, 0, 100, 100], - "reason": "chunk appeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV class='absolute red'", - "rect": [0, 0, 100, 100], - "reason": "paint property change" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 2 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/scroll-in-transformed-layer-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/scroll-in-transformed-layer-expected.txt index 22ae104..2bb284c 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/scroll-in-transformed-layer-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/scroll-in-transformed-layer-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='absolute green'", - "rect": [79, 129, 142, 142], - "reason": "chunk appeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV class='absolute red'", - "rect": [114, 129, 107, 36], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV class='absolute red'", - "rect": [100, 150, 100, 100], - "reason": "paint property change" - } + "invalidations": [ + [79, 129, 142, 142] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/scroll-with-transformed-parent-layer-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/scroll-with-transformed-parent-layer-expected.txt index d8ac8b3..2bb284c 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/scroll-with-transformed-parent-layer-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/scroll-with-transformed-parent-layer-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='absolute green'", - "rect": [79, 129, 142, 142], - "reason": "chunk appeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV class='absolute red'", - "rect": [79, 129, 142, 142], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV class='absolute red'", - "rect": [114, 129, 107, 36], - "reason": "paint property change" - } + "invalidations": [ + [79, 129, 142, 142] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/scrollbar-ancestor-clip-change-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/scrollbar-ancestor-clip-change-expected.txt index 37a2e8d..e3b2b85 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/scrollbar-ancestor-clip-change-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/scrollbar-ancestor-clip-change-expected.txt
@@ -5,22 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "HorizontalScrollbar", - "rect": [8, 193, 85, 15], - "reason": "paint property change" - }, - { - "object": "VerticalScrollbar", - "rect": [93, 108, 15, 85], - "reason": "incremental" - }, - { - "object": "Scroll corner of LayoutNGBlockFlow DIV id='target'", - "rect": [93, 193, 15, 15], - "reason": "paint property change" - } + "invalidations": [ + [8, 193, 85, 15], + [93, 108, 15, 85], + [93, 193, 15, 15] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/scrollbar-damage-and-full-viewport-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/scrollbar-damage-and-full-viewport-repaint-expected.txt index 40793b3..b4c7686 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/scrollbar-damage-and-full-viewport-repaint-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/scrollbar-damage-and-full-viewport-repaint-expected.txt
@@ -5,12 +5,8 @@ "bounds": [1000, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "HorizontalScrollbar", - "rect": [1, 236, 185, 15], - "reason": "scroll control" - } + "invalidations": [ + [1, 236, 185, 15] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/scrollbar-invalidation-on-resize-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/scrollbar-invalidation-on-resize-expected.txt index e05d38ad..1db2f33 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/scrollbar-invalidation-on-resize-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/scrollbar-invalidation-on-resize-expected.txt
@@ -5,32 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "HorizontalScrollbar", - "rect": [8, 135, 285, 15], - "reason": "scroll control" - }, - { - "object": "VerticalScrollbar", - "rect": [293, 50, 15, 85], - "reason": "scroll control" - }, - { - "object": "VerticalScrollbar", - "rect": [93, 50, 15, 85], - "reason": "scroll control" - }, - { - "object": "Scroll corner of LayoutNGBlockFlow (positioned) DIV id='scrollable'", - "rect": [293, 135, 15, 15], - "reason": "geometry" - }, - { - "object": "Scroll corner of LayoutNGBlockFlow (positioned) DIV id='scrollable'", - "rect": [93, 135, 15, 15], - "reason": "geometry" - } + "invalidations": [ + [8, 135, 285, 15], + [293, 50, 15, 85], + [93, 50, 15, 85], + [293, 135, 15, 15] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/scrollbar-invalidation-on-resize-with-border-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/scrollbar-invalidation-on-resize-with-border-expected.txt index 5f23ba1..9984c082 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/scrollbar-invalidation-on-resize-with-border-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/scrollbar-invalidation-on-resize-with-border-expected.txt
@@ -5,37 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='scrollable'", - "rect": [8, 50, 320, 120], - "reason": "geometry" - }, - { - "object": "HorizontalScrollbar", - "rect": [18, 145, 285, 15], - "reason": "scroll control" - }, - { - "object": "VerticalScrollbar", - "rect": [303, 60, 15, 85], - "reason": "scroll control" - }, - { - "object": "VerticalScrollbar", - "rect": [103, 60, 15, 85], - "reason": "scroll control" - }, - { - "object": "Scroll corner of LayoutNGBlockFlow (positioned) DIV id='scrollable'", - "rect": [303, 145, 15, 15], - "reason": "geometry" - }, - { - "object": "Scroll corner of LayoutNGBlockFlow (positioned) DIV id='scrollable'", - "rect": [103, 145, 15, 15], - "reason": "geometry" - } + "invalidations": [ + [8, 50, 320, 120] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/scrollbar-parts-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/scrollbar-parts-expected.txt index df9c27d1..0d08191d 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/scrollbar-parts-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/scrollbar-parts-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "HorizontalScrollbar", - "rect": [8, 93, 85, 15], - "reason": "scroll control" - }, - { - "object": "VerticalScrollbar", - "rect": [93, 8, 15, 85], - "reason": "scroll control" - } + "invalidations": [ + [8, 93, 85, 15], + [93, 8, 15, 85] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/scrolled-iframe-scrollbar-change-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/scrolled-iframe-scrollbar-change-expected.txt index b31d832..9fdccdb 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/scrolled-iframe-scrollbar-change-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/scrolled-iframe-scrollbar-change-expected.txt
@@ -5,32 +5,8 @@ "bounds": [804, 604], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='overlay'", - "rect": [2, 2, 800, 600], - "reason": "chunk appeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='container'", - "rect": [10, 2, 784, 592], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='container'", - "rect": [10, 2, 769, 592], - "reason": "disappeared" - }, - { - "object": "VerticalScrollbar", - "rect": [787, 2, 15, 600], - "reason": "chunk disappeared" - }, - { - "object": "LayoutNGBlockFlow HTML", - "rect": [779, 2, 15, 592], - "reason": "incremental" - } + "invalidations": [ + [2, 2, 800, 600] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/sticky/invalidate-after-composited-scroll-with-sticky-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/sticky/invalidate-after-composited-scroll-with-sticky-expected.txt index 3e66f47..89b2e87 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/sticky/invalidate-after-composited-scroll-with-sticky-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/scroll/sticky/invalidate-after-composited-scroll-with-sticky-expected.txt
@@ -5,12 +5,8 @@ "bounds": [785, 656], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "VerticalScrollbar", - "rect": [353, 8, 15, 640], - "reason": "scroll control" - } + "invalidations": [ + [353, 8, 15, 640] ] }, {
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/search-field-cancel-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/search-field-cancel-expected.txt index d595413..9474cbb 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/search-field-cancel-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/search-field-cancel-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'some text'", - "rect": [12, 47, 58, 16], - "reason": "appeared" - } + "invalidations": [ + [12, 47, 58, 16] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/invalidation-rect-includes-newline-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/invalidation-rect-includes-newline-expected.txt index 55af056..88aa5ff 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/invalidation-rect-includes-newline-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/invalidation-rect-includes-newline-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'xx'", - "rect": [8, 8, 48, 32], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'y'", - "rect": [8, 8, 48, 32], - "reason": "geometry" - } + "invalidations": [ + [8, 8, 48, 32] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/invalidation-rect-includes-newline-for-rtl-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/invalidation-rect-includes-newline-for-rtl-expected.txt index 7335f250..0b571b4 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/invalidation-rect-includes-newline-for-rtl-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/invalidation-rect-includes-newline-for-rtl-expected.txt
@@ -4,17 +4,8 @@ "name": "Scrolling background of LayoutView #document", "bounds": [800, 600], "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'xx'", - "rect": [0, 8, 40, 32], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'y'", - "rect": [0, 8, 40, 32], - "reason": "geometry" - } + "invalidations": [ + [0, 8, 40, 32] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/invalidation-rect-includes-newline-for-vertical-lr-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/invalidation-rect-includes-newline-for-vertical-lr-expected.txt index 7507e2e..003cb1e 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/invalidation-rect-includes-newline-for-vertical-lr-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/invalidation-rect-includes-newline-for-vertical-lr-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'xx'", - "rect": [8, 8, 32, 48], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'y'", - "rect": [8, 8, 32, 48], - "reason": "geometry" - } + "invalidations": [ + [8, 8, 32, 48] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/invalidation-rect-includes-newline-for-vertical-rl-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/invalidation-rect-includes-newline-for-vertical-rl-expected.txt index 7507e2e..003cb1e 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/invalidation-rect-includes-newline-for-vertical-rl-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/invalidation-rect-includes-newline-for-vertical-rl-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'xx'", - "rect": [8, 8, 32, 48], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'y'", - "rect": [8, 8, 32, 48], - "reason": "geometry" - } + "invalidations": [ + [8, 8, 32, 48] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/invalidation-rect-with-br-includes-newline-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/invalidation-rect-with-br-includes-newline-expected.txt index eb16fda..bed46977 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/invalidation-rect-with-br-includes-newline-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/invalidation-rect-with-br-includes-newline-expected.txt
@@ -5,22 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment '\n'", - "rect": [24, 8, 16, 16], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'b'", - "rect": [8, 24, 16, 16], - "reason": "selection" - }, - { - "object": "NGPhysicalTextFragment 'a'", - "rect": [8, 8, 16, 16], - "reason": "selection" - } + "invalidations": [ + [24, 8, 16, 16], + [8, 24, 16, 16], + [8, 8, 16, 16] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/japanese-rl-selection-clear-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/japanese-rl-selection-clear-expected.txt index 1d1c9e7..0157ccf6 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/japanese-rl-selection-clear-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/japanese-rl-selection-clear-expected.txt
@@ -5,77 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment '\u3042\u3063\u305F\u304B\u5FD8\u308C\u3066\u3057\u307E\u3063\u305F\u7D4C\u9A13\u306F\u3042\u308A\u307E\u3059\u304B'", - "rect": [334, 123, 443, 404], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u3057\u305F\u30A6\u30A7\u30D6\u30DA\u30FC\u30B8\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u304B\u3089\u3082\u691C\u7D22'", - "rect": [334, 123, 443, 404], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u3059\u3002\u8A2A\u554F\u3057\u305F\u30A6\u30A7\u30D6\u30DA\u30FC\u30B8\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u304B'", - "rect": [334, 123, 443, 404], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002\u305B\u3063\u304B\u304F\u898B\u3064\u3051\u305F\u3059'", - "rect": [334, 123, 443, 404], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u305B\u3063\u304B\u304F\u898B\u3064\u3051\u305F\u3059\u3070\u3089\u3057\u3044\u8A18\u4E8B\u304C\u3069\u3053\u306B'", - "rect": [334, 123, 443, 404], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u3063\u305F\u7D4C\u9A13\u306F\u3042\u308A\u307E\u3059\u304B \u306A\u3089\u30BF\u30A4\u30C8\u30EB\u3068\u30A2'", - "rect": [334, 123, 443, 404], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u3064\u3051\u305F\u3059\u3070\u3089\u3057\u3044\u8A18\u4E8B\u304C\u3069\u3053\u306B\u3042\u3063\u305F\u304B\u5FD8'", - "rect": [334, 123, 443, 404], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u306A\u3089\u30BF\u30A4\u30C8\u30EB\u3068\u30A2\u30C9\u30EC\u30B9\u3060\u3051\u3067\u306A\u304F\u3001\u8A2A\u554F'", - "rect": [334, 123, 443, 404], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u304B\u3089\u3082\u691C\u7D22\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E'", - "rect": [334, 123, 443, 404], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u3070\u3089\u3057\u3044\u8A18\u4E8B\u304C\u3069\u3053\u306B\u3042\u3063\u305F\u304B\u5FD8\u308C\u3066\u3057\u307E'", - "rect": [334, 123, 443, 404], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u3089\u3082\u691C\u7D22\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002\u305B\u3063\u304B\u304F\u898B'", - "rect": [334, 123, 443, 404], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u308C\u3066\u3057\u307E\u3063\u305F\u7D4C\u9A13\u306F\u3042\u308A\u307E\u3059\u304B \u306A\u3089\u30BF\u30A4'", - "rect": [334, 123, 443, 404], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u30C8\u30EB\u3068\u30A2\u30C9\u30EC\u30B9\u3060\u3051\u3067\u306A\u304F\u3001\u8A2A\u554F'", - "rect": [334, 123, 443, 404], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u30C9\u30EC\u30B9\u3060\u3051\u3067\u306A\u304F\u3001\u8A2A\u554F\u3057\u305F\u30A6\u30A7\u30D6\u30DA\u30FC\u30B8'", - "rect": [334, 123, 443, 404], - "reason": "geometry" - } + "invalidations": [ + [334, 123, 443, 404] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/repaint-rect-for-vertical-writing-mode-with-positioned-root-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/repaint-rect-for-vertical-writing-mode-with-positioned-root-expected.txt index ae27ce2..5552193 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/repaint-rect-for-vertical-writing-mode-with-positioned-root-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/repaint-rect-for-vertical-writing-mode-with-positioned-root-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Some text in vertical mode'", - "rect": [184, 201, 19, 168], - "reason": "selection" - } + "invalidations": [ + [184, 201, 19, 168] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/selected-replaced-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/selected-replaced-expected.txt index d5e43d5..9613d4d 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/selected-replaced-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/selected-replaced-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutImage (relative positioned) IMG id='test' class='moved'", - "rect": [8, 132, 214, 232], - "reason": "geometry" - }, - { - "object": "LayoutImage (relative positioned) IMG id='test' class='moved'", - "rect": [8, 52, 214, 232], - "reason": "geometry" - } + "invalidations": [ + [8, 132, 214, 232], + [8, 52, 214, 232] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/selection-after-delete-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/selection-after-delete-expected.txt index 30894cd..68f126ef 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/selection-after-delete-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/selection-after-delete-expected.txt
@@ -5,64 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox ' '", - "rect": [39, 79, 154, 99], - "reason": "disappeared" - }, - { - "object": "InlineTextBox ' '", - "rect": [39, 79, 154, 99], - "reason": "disappeared" - }, - { - "object": "InlineTextBox ' '", - "rect": [39, 79, 154, 99], - "reason": "disappeared" - }, - { - "object": "InlineTextBox ' '", - "rect": [39, 79, 154, 99], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'hello world hello world'", - "rect": [39, 79, 154, 99], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'hello world hello world'", - "rect": [39, 79, 154, 99], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'hello world hello world'", - "rect": [39, 79, 154, 99], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'hello world hello world'", - "rect": [39, 79, 154, 99], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'hello'", - "rect": [39, 79, 154, 99], - "reason": "disappeared" - }, - { - "object": "LayoutBlockFlow DIV id='test'", - "rect": [38, 78, 152, 102], - "reason": "geometry" - }, - { - "object": "Caret", - "rect": [39, 79, 1, 19], - "reason": "appeared" - } + "invalidations": [ + [39, 79, 154, 99], + [38, 78, 152, 102] ], - "underPaintInvalidations": [ + "underInvalidations": [ { "x": 194, "y": 79,
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/selection-after-remove-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/selection-after-remove-expected.txt index 99d0ad9..68f126ef 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/selection-after-remove-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/selection-after-remove-expected.txt
@@ -5,79 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox ' '", - "rect": [39, 79, 154, 99], - "reason": "disappeared" - }, - { - "object": "InlineTextBox ' '", - "rect": [39, 79, 154, 99], - "reason": "disappeared" - }, - { - "object": "InlineTextBox ' '", - "rect": [39, 79, 154, 99], - "reason": "disappeared" - }, - { - "object": "InlineTextBox ' '", - "rect": [39, 79, 154, 99], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'hello world hello world'", - "rect": [39, 79, 154, 99], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'hello world hello world'", - "rect": [39, 79, 154, 99], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'hello world hello world'", - "rect": [39, 79, 154, 99], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'hello'", - "rect": [39, 79, 154, 99], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'world hello world'", - "rect": [39, 79, 154, 99], - "reason": "disappeared" - }, - { - "object": "LayoutBlockFlow DIV id='test'", - "rect": [38, 78, 152, 102], - "reason": "geometry" - }, - { - "object": "InlineTextBox ' world'", - "rect": [70, 158, 41, 20], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'world'", - "rect": [74, 79, 37, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'hello '", - "rect": [39, 79, 35, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'hello '", - "rect": [39, 79, 35, 19], - "reason": "disappeared" - } + "invalidations": [ + [39, 79, 154, 99], + [38, 78, 152, 102] ], - "underPaintInvalidations": [ + "underInvalidations": [ { "x": 194, "y": 79,
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/selection-change-in-iframe-with-relative-parent-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/selection-change-in-iframe-with-relative-parent-expected.txt index 724797f2..edcfcc06 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/selection-change-in-iframe-with-relative-parent-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/selection-change-in-iframe-with-relative-parent-expected.txt
@@ -5,47 +5,15 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Bazz'", - "rect": [18, 238, 40, 10], - "reason": "selection" - }, - { - "object": "NGPhysicalTextFragment 'Bar'", - "rect": [18, 218, 30, 10], - "reason": "selection" - }, - { - "object": "NGPhysicalTextFragment 'Foo'", - "rect": [18, 198, 30, 10], - "reason": "selection" - }, - { - "object": "NGPhysicalTextFragment '\n'", - "rect": [58, 238, 10, 10], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment '\n'", - "rect": [48, 218, 10, 10], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment '\n'", - "rect": [48, 198, 10, 10], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment '\n'", - "rect": [18, 228, 10, 10], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment '\n'", - "rect": [18, 208, 10, 10], - "reason": "appeared" - } + "invalidations": [ + [18, 238, 40, 10], + [18, 218, 30, 10], + [18, 198, 30, 10], + [58, 238, 10, 10], + [48, 218, 10, 10], + [48, 198, 10, 10], + [18, 228, 10, 10], + [18, 208, 10, 10] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/selection-clear-after-move-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/selection-clear-after-move-expected.txt index 7170890..22444845 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/selection-clear-after-move-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/selection-clear-after-move-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutImage IMG", - "rect": [100, 300, 50, 51], - "reason": "selection" - } + "invalidations": [ + [100, 300, 50, 51] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/selection-clear-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/selection-clear-expected.txt index c6e5e9c..980a3afb 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/selection-clear-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/selection-clear-expected.txt
@@ -5,32 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='firstLine'", - "rect": [8, 8, 100, 200], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='firstLine'", - "rect": [8, 8, 100, 100], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'FAIL: Test did'", - "rect": [8, 8, 97, 200], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'not run'", - "rect": [8, 8, 97, 200], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [8, 8, 8, 100], - "reason": "appeared" - } + "invalidations": [ + [8, 8, 100, 200] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/selection-in-composited-scrolling-container-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/selection-in-composited-scrolling-container-expected.txt index b084cec7..ae10294 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/selection-in-composited-scrolling-container-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/selection-in-composited-scrolling-container-expected.txt
@@ -5,27 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTextControl INPUT id='target'", - "rect": [6, 6, 69, 26], - "reason": "subtree" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [12, 11, 57, 16], - "reason": "paint property change" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [12, 11, 56, 16], - "reason": "paint property change" - }, - { - "object": "InlineTextBox 'test test test'", - "rect": [20, 11, 26, 16], - "reason": "selection" - } + "invalidations": [ + [6, 6, 69, 26] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/selection-in-non-composited-scrolling-container-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/selection-in-non-composited-scrolling-container-expected.txt index 508b592..ae10294 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/selection-in-non-composited-scrolling-container-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/selection-in-non-composited-scrolling-container-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTextControl INPUT id='target'", - "rect": [6, 6, 69, 26], - "reason": "subtree" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [12, 11, 57, 16], - "reason": "paint property change" - }, - { - "object": "InlineTextBox 'test test test'", - "rect": [33, 11, 26, 16], - "reason": "selection" - } + "invalidations": [ + [6, 6, 69, 26] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/selection-partial-invalidation-between-blocks-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/selection-partial-invalidation-between-blocks-expected.txt index 2b06c43d..a7eb982 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/selection-partial-invalidation-between-blocks-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/selection-partial-invalidation-between-blocks-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Second cell'", - "rect": [11, 35, 74, 20], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'First cell'", - "rect": [11, 11, 58, 20], - "reason": "geometry" - } + "invalidations": [ + [11, 35, 74, 20], + [11, 11, 58, 20] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/selection-rl-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/selection-rl-expected.txt index bd9acd0..5b972ed 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/selection-rl-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/selection-rl-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Testing both hit testing'", - "rect": [772, 8, 20, 143], - "reason": "geometry" - } + "invalidations": [ + [772, 8, 20, 143] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/selection-within-composited-scroller-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/selection-within-composited-scroller-expected.txt index 26eaaea..e89ef25 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/selection-within-composited-scroller-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/selection-within-composited-scroller-expected.txt
@@ -22,12 +22,8 @@ "name": "LayoutNGBlockFlow DIV id='scroller'", "bounds": [200, 1620], "backgroundColor": "#D3D3D3", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'test'", - "rect": [0, 610, 22, 20], - "reason": "geometry" - } + "invalidations": [ + [0, 610, 22, 20] ], "transform": 2 },
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/text-selection-rect-in-overflow-2-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/text-selection-rect-in-overflow-2-expected.txt index 02dd6d6..5aabb19 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/text-selection-rect-in-overflow-2-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/text-selection-rect-in-overflow-2-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Should have blue, not gray, highlight'", - "rect": [18, 18, 233, 20], - "reason": "selection" - } + "invalidations": [ + [18, 18, 233, 20] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/text-selection-rect-in-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/text-selection-rect-in-overflow-expected.txt index 8332d6a9..40c5960 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/text-selection-rect-in-overflow-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/selection/text-selection-rect-in-overflow-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Should have green background'", - "rect": [8, 8, 197, 20], - "reason": "geometry" - } + "invalidations": [ + [8, 8, 197, 20] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/stacked-diacritics-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/stacked-diacritics-expected.txt index 00c82cf..699eb38 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/stacked-diacritics-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/stacked-diacritics-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment '\u1EA6\u1EA4\u1EAA\u1EA8\u1EB0'", - "rect": [19, 166, 130, 43], - "reason": "disappeared" - } + "invalidations": [ + [19, 166, 130, 43] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/stacking-context-lost-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/stacking-context-lost-expected.txt index 7448fe4..96447ca 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/stacking-context-lost-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/stacking-context-lost-expected.txt
@@ -13,17 +13,8 @@ "contentsOpaque": true, "backfaceVisibility": "hidden", "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='inner'", - "rect": [0, 0, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='outer'", - "rect": [0, 0, 100, 100], - "reason": "appeared" - } + "invalidations": [ + [0, 0, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/subtree-root-skipped-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/subtree-root-skipped-expected.txt index 06177d43..29b1e077 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/subtree-root-skipped-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/subtree-root-skipped-expected.txt
@@ -5,22 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'PASS'", - "rect": [12, 11, 35, 16], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'FAIL'", - "rect": [12, 11, 27, 16], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='div'", - "rect": [8, 288, 10, 20], - "reason": "geometry" - } + "invalidations": [ + [12, 11, 35, 16], + [8, 288, 10, 20] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/absolute-sized-content-with-resources-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/absolute-sized-content-with-resources-expected.txt index 0405525..bad6328 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/absolute-sized-content-with-resources-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/absolute-sized-content-with-resources-expected.txt
@@ -5,32 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow div id='contentBox'", - "rect": [8, 52, 402, 402], - "reason": "geometry" - }, - { - "object": "LayoutSVGRect rect", - "rect": [42, 119, 334, 268], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRect rect", - "rect": [42, 119, 334, 268], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRect rect", - "rect": [17, 219, 84, 68], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRect rect", - "rect": [17, 219, 84, 68], - "reason": "paint property change" - } + "invalidations": [ + [8, 52, 402, 402] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/absolute-sized-document-no-scrollbars-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/absolute-sized-document-no-scrollbars-expected.txt index 0402d64..51f97ecd 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/absolute-sized-document-no-scrollbars-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/absolute-sized-document-no-scrollbars-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 800, 600], - "reason": "background" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [0, 0, 577, 433], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [0, 0, 481, 361], - "reason": "paint property change" - } + "invalidations": [ + [0, 0, 800, 600] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/add-background-property-on-root-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/add-background-property-on-root-expected.txt index 9894069..ae2e746 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/add-background-property-on-root-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/add-background-property-on-root-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [8, 8, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [8, 8, 100, 100], - "reason": "chunk appeared" - } + "invalidations": [ + [8, 8, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/add-border-property-on-root-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/add-border-property-on-root-expected.txt index 186daeb..c36ec60 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/add-border-property-on-root-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/add-border-property-on-root-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRoot (positioned) svg", - "rect": [8, 8, 120, 120], - "reason": "chunk appeared" - } + "invalidations": [ + [8, 8, 120, 120] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/add-outline-property-on-root-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/add-outline-property-on-root-expected.txt index 2a928ee..de58512 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/add-outline-property-on-root-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/add-outline-property-on-root-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRoot svg", - "rect": [0, 0, 118, 118], - "reason": "chunk appeared" - } + "invalidations": [ + [0, 0, 118, 118] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/animate-fill-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/animate-fill-expected.txt index 8c21e6a..e9728f4c 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/animate-fill-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/animate-fill-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect id='rect'", - "rect": [0, 0, 110, 110], - "reason": "SVG resource change" - } + "invalidations": [ + [0, 0, 110, 110] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/animate-target-id-changed-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/animate-target-id-changed-expected.txt index 3801e66..d8b2f9a 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/animate-target-id-changed-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/animate-target-id-changed-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect id='newId'", - "rect": [0, 0, 100, 100], - "reason": "style change" - } + "invalidations": [ + [0, 0, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/animate-viewport-overflow-2-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/animate-viewport-overflow-2-expected.txt index 1a2c0d2..5c858d4 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/animate-viewport-overflow-2-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/animate-viewport-overflow-2-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [8, 208, 100, 100], - "reason": "full" - }, - { - "object": "LayoutSVGRect rect", - "rect": [8, 158, 100, 100], - "reason": "full" - } + "invalidations": [ + [8, 208, 100, 100], + [8, 158, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/animate-viewport-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/animate-viewport-overflow-expected.txt index c1d42c5..7432900 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/animate-viewport-overflow-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/animate-viewport-overflow-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [8, 208, 100, 100], - "reason": "style change" - } + "invalidations": [ + [8, 208, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/animated-path-inside-transformed-html-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/animated-path-inside-transformed-html-expected.txt index 2cc83641..d64056a 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/animated-path-inside-transformed-html-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/animated-path-inside-transformed-html-expected.txt
@@ -5,37 +5,13 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'This is some text'", - "rect": [246, 89, 127, 46], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'This is some text'", - "rect": [203, 336, 126, 45], - "reason": "appeared" - }, - { - "object": "LayoutSVGRect rect id='rect'", - "rect": [108, 84, 105, 102], - "reason": "full" - }, - { - "object": "LayoutSVGRect rect id='rect'", - "rect": [355, 125, 104, 104], - "reason": "full" - }, - { - "object": "LayoutSVGImage image id='image'", - "rect": [352, 398, 99, 98], - "reason": "full" - }, - { - "object": "LayoutSVGImage image id='image'", - "rect": [90, 207, 98, 99], - "reason": "full" - } + "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/composite-after-paint/paint/invalidation/svg/append-text-node-to-tspan-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/append-text-node-to-tspan-expected.txt index 9b89683..3acd84d 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/append-text-node-to-tspan-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/append-text-node-to-tspan-expected.txt
@@ -5,62 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox ' '", - "rect": [10, 60, 310, 380], - "reason": "appeared" - }, - { - "object": "InlineTextBox ' '", - "rect": [10, 60, 310, 380], - "reason": "appeared" - }, - { - "object": "InlineTextBox ' '", - "rect": [10, 60, 310, 380], - "reason": "disappeared" - }, - { - "object": "InlineTextBox ' '", - "rect": [10, 60, 310, 380], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'PASS'", - "rect": [10, 300, 280, 140], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'PASS'", - "rect": [10, 300, 280, 140], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'PASS'", - "rect": [10, 180, 280, 140], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'PASS'", - "rect": [10, 180, 280, 140], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'PA'", - "rect": [10, 60, 280, 140], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'SS'", - "rect": [10, 60, 280, 140], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'PA'", - "rect": [10, 60, 150, 140], - "reason": "disappeared" - } + "invalidations": [ + [10, 60, 310, 380] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/change-background-color-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/change-background-color-expected.txt index 3f38c0a..f30b1e4 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/change-background-color-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/change-background-color-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRoot svg", - "rect": [8, 8, 200, 100], - "reason": "background" - } + "invalidations": [ + [8, 8, 200, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/circle-move-invalidation-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/circle-move-invalidation-expected.txt index 952dca9..cd599a3 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/circle-move-invalidation-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/circle-move-invalidation-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGEllipse circle id='c1'", - "rect": [196, 196, 76, 76], - "reason": "full" - }, - { - "object": "LayoutSVGEllipse circle id='c1'", - "rect": [46, 46, 76, 76], - "reason": "full" - } + "invalidations": [ + [196, 196, 76, 76], + [46, 46, 76, 76] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/clip-path-child-changes-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/clip-path-child-changes-expected.txt index af5bb3d..6c3520a8 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/clip-path-child-changes-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/clip-path-child-changes-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGContainer g", - "rect": [0, 0, 200, 200], - "reason": "paint property change" - }, - { - "object": "LayoutSVGContainer g", - "rect": [0, 0, 100, 100], - "reason": "paint property change" - } + "invalidations": [ + [0, 0, 200, 200] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/clip-path-href-changes-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/clip-path-href-changes-expected.txt index f9714ce9..6c3520a8 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/clip-path-href-changes-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/clip-path-href-changes-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRoot svg", - "rect": [0, 0, 200, 200], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGContainer g", - "rect": [0, 0, 100, 100], - "reason": "chunk appeared" - } + "invalidations": [ + [0, 0, 200, 200] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/clip-path-id-changes-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/clip-path-id-changes-expected.txt index f9714ce9..6c3520a8 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/clip-path-id-changes-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/clip-path-id-changes-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRoot svg", - "rect": [0, 0, 200, 200], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGContainer g", - "rect": [0, 0, 100, 100], - "reason": "chunk appeared" - } + "invalidations": [ + [0, 0, 200, 200] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/clip-path-units-changes-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/clip-path-units-changes-expected.txt index af5bb3d..6c3520a8 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/clip-path-units-changes-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/clip-path-units-changes-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGContainer g", - "rect": [0, 0, 200, 200], - "reason": "paint property change" - }, - { - "object": "LayoutSVGContainer g", - "rect": [0, 0, 100, 100], - "reason": "paint property change" - } + "invalidations": [ + [0, 0, 200, 200] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/color-fill-currentColor-and-css-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/color-fill-currentColor-and-css-expected.txt index 4bc6cc9..9c4760c 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/color-fill-currentColor-and-css-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/color-fill-currentColor-and-css-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGEllipse circle", - "rect": [8, 8, 80, 80], - "reason": "style change" - }, - { - "object": "LayoutSVGEllipse circle", - "rect": [8, 8, 80, 80], - "reason": "style change" - } + "invalidations": [ + [8, 8, 80, 80] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/color-stop-properties-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/color-stop-properties-expected.txt index 467a020f..75d7771 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/color-stop-properties-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/color-stop-properties-expected.txt
@@ -5,127 +5,31 @@ "bounds": [808, 621], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect id='r12'", - "rect": [608, 368, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r6'", - "rect": [608, 248, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r12'", - "rect": [608, 128, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r6'", - "rect": [608, 8, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r11'", - "rect": [488, 368, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r5'", - "rect": [488, 248, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r11'", - "rect": [488, 128, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r5'", - "rect": [488, 8, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r10'", - "rect": [368, 368, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r4'", - "rect": [368, 248, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r10'", - "rect": [368, 128, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r4'", - "rect": [368, 8, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r9'", - "rect": [248, 368, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r3'", - "rect": [248, 248, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r9'", - "rect": [248, 128, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r3'", - "rect": [248, 8, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r8'", - "rect": [128, 368, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r2'", - "rect": [128, 248, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r8'", - "rect": [128, 128, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r2'", - "rect": [128, 8, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r7'", - "rect": [8, 368, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r1'", - "rect": [8, 248, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r7'", - "rect": [8, 128, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r1'", - "rect": [8, 8, 100, 100], - "reason": "SVG resource change" - } + "invalidations": [ + [608, 368, 100, 100], + [608, 248, 100, 100], + [608, 128, 100, 100], + [608, 8, 100, 100], + [488, 368, 100, 100], + [488, 248, 100, 100], + [488, 128, 100, 100], + [488, 8, 100, 100], + [368, 368, 100, 100], + [368, 248, 100, 100], + [368, 128, 100, 100], + [368, 8, 100, 100], + [248, 368, 100, 100], + [248, 248, 100, 100], + [248, 128, 100, 100], + [248, 8, 100, 100], + [128, 368, 100, 100], + [128, 248, 100, 100], + [128, 128, 100, 100], + [128, 8, 100, 100], + [8, 368, 100, 100], + [8, 248, 100, 100], + [8, 128, 100, 100], + [8, 8, 100, 100] ] }, {
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/container-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/container-repaint-expected.txt index ba2ef33c..a94abce 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/container-repaint-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/container-repaint-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGViewportContainer svg id='mover'", - "rect": [0, 100, 100, 50], - "reason": "paint property change" - }, - { - "object": "LayoutSVGViewportContainer svg id='mover'", - "rect": [0, 50, 100, 50], - "reason": "paint property change" - } + "invalidations": [ + [0, 100, 100, 50], + [0, 50, 100, 50] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/deep-dynamic-updates-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/deep-dynamic-updates-expected.txt index 66a9d75..51178d2 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/deep-dynamic-updates-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/deep-dynamic-updates-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [24, 24, 402, 402], - "reason": "SVG resource change" - } + "invalidations": [ + [24, 24, 402, 402] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/deep-nested-embedded-svg-size-changes-no-layout-triggers-1-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/deep-nested-embedded-svg-size-changes-no-layout-triggers-1-expected.txt index 7d59cd1..0ab5d23 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/deep-nested-embedded-svg-size-changes-no-layout-triggers-1-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/deep-nested-embedded-svg-size-changes-no-layout-triggers-1-expected.txt
@@ -5,47 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutEmbeddedObject OBJECT", - "rect": [1, 1, 402, 202], - "reason": "appeared" - }, - { - "object": "HorizontalScrollbar", - "rect": [1, 136, 285, 15], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGRect rect", - "rect": [212, 12, 180, 180], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [12, 12, 180, 180], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [11, 11, 180, 125], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRect rect", - "rect": [211, 11, 75, 125], - "reason": "paint property change" - }, - { - "object": "VerticalScrollbar", - "rect": [286, 1, 15, 135], - "reason": "chunk disappeared" - }, - { - "object": "Scroll corner of LayoutView #document", - "rect": [286, 136, 15, 15], - "reason": "chunk disappeared" - } + "invalidations": [ + [1, 1, 402, 202] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/deep-nested-embedded-svg-size-changes-no-layout-triggers-2-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/deep-nested-embedded-svg-size-changes-no-layout-triggers-2-expected.txt index 7d59cd1..0ab5d23 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/deep-nested-embedded-svg-size-changes-no-layout-triggers-2-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/deep-nested-embedded-svg-size-changes-no-layout-triggers-2-expected.txt
@@ -5,47 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutEmbeddedObject OBJECT", - "rect": [1, 1, 402, 202], - "reason": "appeared" - }, - { - "object": "HorizontalScrollbar", - "rect": [1, 136, 285, 15], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGRect rect", - "rect": [212, 12, 180, 180], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [12, 12, 180, 180], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [11, 11, 180, 125], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRect rect", - "rect": [211, 11, 75, 125], - "reason": "paint property change" - }, - { - "object": "VerticalScrollbar", - "rect": [286, 1, 15, 135], - "reason": "chunk disappeared" - }, - { - "object": "Scroll corner of LayoutView #document", - "rect": [286, 136, 15, 15], - "reason": "chunk disappeared" - } + "invalidations": [ + [1, 1, 402, 202] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/embedded-svg-size-changes-no-layout-triggers-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/embedded-svg-size-changes-no-layout-triggers-expected.txt index 87a9653..be35d425 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/embedded-svg-size-changes-no-layout-triggers-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/embedded-svg-size-changes-no-layout-triggers-expected.txt
@@ -5,32 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutEmbeddedObject OBJECT", - "rect": [0, 0, 402, 202], - "reason": "appeared" - }, - { - "object": "LayoutSVGRect rect", - "rect": [211, 11, 180, 180], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRect rect", - "rect": [210, 10, 180, 180], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [11, 11, 180, 180], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [10, 10, 180, 180], - "reason": "paint property change" - } + "invalidations": [ + [0, 0, 402, 202] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/ems-display-none-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/ems-display-none-expected.txt index 809994a..85ee9d3 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/ems-display-none-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/ems-display-none-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRoot svg", - "rect": [50, 54, 571, 86], - "reason": "chunk appeared" - } + "invalidations": [ + [50, 54, 571, 86] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/exs-display-none-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/exs-display-none-expected.txt index 4dc65eb6..ec0df8b 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/exs-display-none-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/exs-display-none-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRoot svg", - "rect": [50, 52, 571, 84], - "reason": "chunk appeared" - } + "invalidations": [ + [50, 52, 571, 84] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-change-target-id-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-change-target-id-expected.txt index a12a8f8d..e9728f4c 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-change-target-id-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-change-target-id-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [0, 0, 110, 110], - "reason": "full" - } + "invalidations": [ + [0, 0, 110, 110] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-multiple-targets-id-change-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-multiple-targets-id-change-expected.txt index 6291f3e..312b0a7d 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-multiple-targets-id-change-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-multiple-targets-id-change-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [45, 0, 60, 110], - "reason": "full" - }, - { - "object": "LayoutSVGRect rect", - "rect": [0, 0, 55, 110], - "reason": "full" - } + "invalidations": [ + [45, 0, 60, 110], + [0, 0, 55, 110] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-reference-invalidation-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-reference-invalidation-expected.txt index a12a8f8d..e9728f4c 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-reference-invalidation-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-reference-invalidation-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [0, 0, 110, 110], - "reason": "full" - } + "invalidations": [ + [0, 0, 110, 110] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-remove-target-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-remove-target-expected.txt index a12a8f8d..e9728f4c 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-remove-target-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-remove-target-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [0, 0, 110, 110], - "reason": "full" - } + "invalidations": [ + [0, 0, 110, 110] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-target-add-to-document-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-target-add-to-document-expected.txt index a12a8f8d..e9728f4c 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-target-add-to-document-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-target-add-to-document-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [0, 0, 110, 110], - "reason": "full" - } + "invalidations": [ + [0, 0, 110, 110] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-target-attribute-change-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-target-attribute-change-expected.txt index a12a8f8d..e9728f4c 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-target-attribute-change-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-target-attribute-change-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [0, 0, 110, 110], - "reason": "full" - } + "invalidations": [ + [0, 0, 110, 110] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-target-attribute-change-with-use-indirection-2-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-target-attribute-change-with-use-indirection-2-expected.txt index a12a8f8d..e9728f4c 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-target-attribute-change-with-use-indirection-2-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-target-attribute-change-with-use-indirection-2-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [0, 0, 110, 110], - "reason": "full" - } + "invalidations": [ + [0, 0, 110, 110] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-target-attribute-change-with-use-indirection-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-target-attribute-change-with-use-indirection-expected.txt index a12a8f8d..e9728f4c 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-target-attribute-change-with-use-indirection-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-target-attribute-change-with-use-indirection-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [0, 0, 110, 110], - "reason": "full" - } + "invalidations": [ + [0, 0, 110, 110] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-target-changes-id-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-target-changes-id-expected.txt index a12a8f8d..e9728f4c 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-target-changes-id-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-target-changes-id-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [0, 0, 110, 110], - "reason": "full" - } + "invalidations": [ + [0, 0, 110, 110] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-target-id-change-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-target-id-change-expected.txt index a12a8f8d..e9728f4c 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-target-id-change-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-target-id-change-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [0, 0, 110, 110], - "reason": "full" - } + "invalidations": [ + [0, 0, 110, 110] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-target-inline-style-change-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-target-inline-style-change-expected.txt index 384b293..e9728f4c 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-target-inline-style-change-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-target-inline-style-change-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [0, 0, 110, 110], - "reason": "style change" - } + "invalidations": [ + [0, 0, 110, 110] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-target-property-change-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-target-property-change-expected.txt index a12a8f8d..e9728f4c 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-target-property-change-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-target-property-change-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [0, 0, 110, 110], - "reason": "full" - } + "invalidations": [ + [0, 0, 110, 110] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-target-reappend-to-document-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-target-reappend-to-document-expected.txt index 0e1ea4fd..e9728f4c 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-target-reappend-to-document-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-target-reappend-to-document-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [0, 0, 110, 110], - "reason": "full" - }, - { - "object": "LayoutSVGRect rect", - "rect": [0, 0, 110, 110], - "reason": "full" - } + "invalidations": [ + [0, 0, 110, 110] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-target-remove-from-document-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-target-remove-from-document-expected.txt index a12a8f8d..e9728f4c 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-target-remove-from-document-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-target-remove-from-document-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [0, 0, 110, 110], - "reason": "full" - } + "invalidations": [ + [0, 0, 110, 110] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-target-style-change-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-target-style-change-expected.txt index 384b293..e9728f4c 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-target-style-change-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-target-style-change-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [0, 0, 110, 110], - "reason": "style change" - } + "invalidations": [ + [0, 0, 110, 110] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/fecomponenttransfer-in1-change-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/fecomponenttransfer-in1-change-expected.txt index 7304e6c6..d8b2f9a 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/fecomponenttransfer-in1-change-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/fecomponenttransfer-in1-change-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [0, 0, 100, 100], - "reason": "full" - } + "invalidations": [ + [0, 0, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/fill-opacity-update-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/fill-opacity-update-expected.txt index 4d3e7463..6c3520a8 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/fill-opacity-update-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/fill-opacity-update-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGEllipse circle", - "rect": [0, 0, 200, 200], - "reason": "style change" - } + "invalidations": [ + [0, 0, 200, 200] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/filter-child-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/filter-child-repaint-expected.txt index 0586f8b6..2468eee 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/filter-child-repaint-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/filter-child-repaint-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGContainer g", - "rect": [0, 0, 106, 106], - "reason": "SVG resource change" - } + "invalidations": [ + [0, 0, 106, 106] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/filter-reference-change-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/filter-reference-change-expected.txt index cd26da0..ec0912f 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/filter-reference-change-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/filter-reference-change-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [8, 8, 110, 110], - "reason": "style change" - } + "invalidations": [ + [8, 8, 110, 110] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/filter-refresh-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/filter-refresh-expected.txt index 8e6c7b8..7bdd985 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/filter-refresh-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/filter-refresh-expected.txt
@@ -5,62 +5,18 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGContainer g", - "rect": [10, 170, 132, 36], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGContainer g", - "rect": [10, 130, 132, 36], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='separate2'", - "rect": [140, 140, 36, 36], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='filtered'", - "rect": [140, 100, 36, 36], - "reason": "appeared" - }, - { - "object": "LayoutSVGContainer g", - "rect": [140, 60, 36, 36], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGContainer g", - "rect": [90, 90, 36, 36], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGContainer g", - "rect": [90, 50, 36, 36], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGContainer g", - "rect": [50, 90, 36, 36], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGContainer g", - "rect": [50, 50, 36, 36], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGContainer g", - "rect": [10, 90, 36, 36], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGContainer g", - "rect": [10, 50, 36, 36], - "reason": "SVG resource change" - } + "invalidations": [ + [10, 170, 132, 36], + [10, 130, 132, 36], + [140, 140, 36, 36], + [140, 100, 36, 36], + [140, 60, 36, 36], + [90, 90, 36, 36], + [90, 50, 36, 36], + [50, 90, 36, 36], + [50, 50, 36, 36], + [10, 90, 36, 36], + [10, 50, 36, 36] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/filter-width-update-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/filter-width-update-expected.txt index 8a73172..03a681f 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/filter-width-update-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/filter-width-update-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [0, 0, 140, 140], - "reason": "full" - } + "invalidations": [ + [0, 0, 140, 140] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/focus-element-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/focus-element-expected.txt index ec0bd26..f131044 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/focus-element-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/focus-element-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect id='rect'", - "rect": [56, 56, 54, 54], - "reason": "style change" - } + "invalidations": [ + [56, 56, 54, 54] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/foreign-object-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/foreign-object-repaint-expected.txt index 96fe151..6c772a95 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/foreign-object-repaint-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/foreign-object-repaint-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow div id='div2'", - "rect": [129, 200, 142, 142], - "reason": "background" - }, - { - "object": "LayoutBlockFlow div id='div1'", - "rect": [50, 50, 100, 100], - "reason": "background" - } + "invalidations": [ + [129, 200, 142, 142], + [50, 50, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/gradient-add-stops-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/gradient-add-stops-expected.txt index f06e7b8..d8b2f9a 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/gradient-add-stops-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/gradient-add-stops-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [0, 0, 100, 100], - "reason": "SVG resource change" - } + "invalidations": [ + [0, 0, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/gradient-stop-style-change-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/gradient-stop-style-change-expected.txt index f06e7b8..d8b2f9a 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/gradient-stop-style-change-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/gradient-stop-style-change-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [0, 0, 100, 100], - "reason": "SVG resource change" - } + "invalidations": [ + [0, 0, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/hairline-stroke-squarecap-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/hairline-stroke-squarecap-expected.txt index b6cff67..77ec741 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/hairline-stroke-squarecap-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/hairline-stroke-squarecap-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGPath path id='path'", - "rect": [197, 197, 107, 107], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [97, 97, 106, 106], - "reason": "chunk disappeared" - } + "invalidations": [ + [197, 197, 107, 107], + [97, 97, 106, 106] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/image-href-change-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/image-href-change-expected.txt index 5aef24a..6c3520a8 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/image-href-change-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/image-href-change-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGImage image id='image'", - "rect": [0, 0, 200, 200], - "reason": "image" - } + "invalidations": [ + [0, 0, 200, 200] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/image-with-clip-path-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/image-with-clip-path-expected.txt index ebf314a..d8f8ea8 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/image-with-clip-path-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/image-with-clip-path-expected.txt
@@ -5,22 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGImage image", - "rect": [20, 20, 60, 60], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGImage image", - "rect": [20, 20, 60, 60], - "reason": "paint property change" - }, - { - "object": "LayoutSVGImage image", - "rect": [175, 25, 50, 50], - "reason": "paint property change" - } + "invalidations": [ + [20, 20, 60, 60], + [175, 25, 50, 50] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/inner-svg-change-viewBox-contract-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/inner-svg-change-viewBox-contract-expected.txt index 465f076..6c3520a8 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/inner-svg-change-viewBox-contract-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/inner-svg-change-viewBox-contract-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGViewportContainer svg id='inner'", - "rect": [0, 0, 200, 200], - "reason": "paint property change" - }, - { - "object": "LayoutSVGViewportContainer svg id='inner'", - "rect": [0, 0, 100, 100], - "reason": "paint property change" - } + "invalidations": [ + [0, 0, 200, 200] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/inner-svg-change-viewBox-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/inner-svg-change-viewBox-expected.txt index 88241c1..d8b2f9a 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/inner-svg-change-viewBox-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/inner-svg-change-viewBox-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGViewportContainer svg id='s'", - "rect": [0, 0, 100, 100], - "reason": "paint property change" - } + "invalidations": [ + [0, 0, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.txt index 1caca771..6c3520a8 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.txt
@@ -5,67 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [0, 0, 200, 200], - "reason": "full" - }, - { - "object": "InlineTextBox 'right-aligned text'", - "rect": [93, 85, 107, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'right-aligned text'", - "rect": [0, 85, 101, 19], - "reason": "disappeared" - }, - { - "object": "LayoutSVGViewportContainer svg id='inner'", - "rect": [100, 0, 100, 200], - "reason": "incremental" - }, - { - "object": "LayoutSVGText text", - "rect": [100, 85, 100, 19], - "reason": "incremental" - }, - { - "object": "LayoutSVGText text", - "rect": [0, 85, 93, 19], - "reason": "incremental" - }, - { - "object": "LayoutSVGContainer use", - "rect": [180, 120, 20, 20], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRect rect", - "rect": [180, 60, 20, 20], - "reason": "incremental" - }, - { - "object": "LayoutSVGRect rect", - "rect": [180, 60, 20, 20], - "reason": "full" - }, - { - "object": "LayoutSVGContainer use", - "rect": [80, 120, 20, 20], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRect rect", - "rect": [80, 60, 20, 20], - "reason": "incremental" - }, - { - "object": "LayoutSVGRect rect", - "rect": [80, 60, 20, 20], - "reason": "full" - } + "invalidations": [ + [0, 0, 200, 200] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/invalidate-on-child-layout-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/invalidate-on-child-layout-expected.txt index 2ccb805..96ed4405 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/invalidate-on-child-layout-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/invalidate-on-child-layout-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGContainer g", - "rect": [40, 40, 120, 120], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGContainer g", - "rect": [0, 0, 110, 110], - "reason": "SVG resource change" - } + "invalidations": [ + [40, 40, 120, 120], + [0, 0, 110, 110] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-late-clipPath-and-object-creation-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-late-clipPath-and-object-creation-expected.txt index c4a7e6c..2c4a13e 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-late-clipPath-and-object-creation-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-late-clipPath-and-object-creation-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Clipped. INVISIBLE.'", - "rect": [16, 40, 784, 173], - "reason": "disappeared" - }, - { - "object": "LayoutSVGContainer g id='content'", - "rect": [16, 40, 784, 173], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGText text", - "rect": [16, 40, 318, 173], - "reason": "chunk appeared" - } + "invalidations": [ + [16, 40, 784, 173] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-late-clipPath-creation-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-late-clipPath-creation-expected.txt index 0f1afd9..2c4a13e 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-late-clipPath-creation-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-late-clipPath-creation-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Clipped. INVISIBLE.'", - "rect": [16, 40, 784, 173], - "reason": "disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [16, 40, 318, 173], - "reason": "chunk appeared" - } + "invalidations": [ + [16, 40, 784, 173] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-late-gradient-and-object-creation-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-late-gradient-and-object-creation-expected.txt index e19c088..26c6410 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-late-gradient-and-object-creation-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-late-gradient-and-object-creation-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRoot svg id='svg-root'", - "rect": [0, 15, 757, 365], - "reason": "chunk appeared" - } + "invalidations": [ + [0, 15, 757, 365] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-late-gradient-creation-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-late-gradient-creation-expected.txt index 96082fb..3c261c14 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-late-gradient-creation-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-late-gradient-creation-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGContainer g id='content'", - "rect": [33, 22, 697, 196], - "reason": "chunk appeared" - } + "invalidations": [ + [33, 22, 697, 196] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-late-marker-and-object-creation-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-late-marker-and-object-creation-expected.txt index cdf879d..659c498 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-late-marker-and-object-creation-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-late-marker-and-object-creation-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGPath path", - "rect": [189, 197, 139, 139], - "reason": "full" - }, - { - "object": "LayoutSVGRoot svg id='svg-root'", - "rect": [189, 197, 139, 139], - "reason": "chunk appeared" - } + "invalidations": [ + [189, 197, 139, 139] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-late-marker-creation-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-late-marker-creation-expected.txt index ea74bd0..659c498 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-late-marker-creation-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-late-marker-creation-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGPath path", - "rect": [189, 197, 139, 139], - "reason": "full" - } + "invalidations": [ + [189, 197, 139, 139] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-late-mask-and-object-creation-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-late-mask-and-object-creation-expected.txt index f1bcc61..50911ea2 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-late-mask-and-object-creation-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-late-mask-and-object-creation-expected.txt
@@ -5,27 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [0, 100, 800, 100], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGRect rect", - "rect": [0, 100, 800, 100], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGRoot svg id='svg-root'", - "rect": [0, 100, 800, 100], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGRoot svg id='svg-root'", - "rect": [0, 100, 800, 100], - "reason": "chunk disappeared" - } + "invalidations": [ + [0, 100, 800, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-late-mask-creation-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-late-mask-creation-expected.txt index 108d037..50911ea2 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-late-mask-creation-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-late-mask-creation-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [0, 100, 800, 100], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGRect rect", - "rect": [0, 100, 800, 100], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGRoot svg id='svg-root'", - "rect": [0, 100, 800, 100], - "reason": "chunk disappeared" - } + "invalidations": [ + [0, 100, 800, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-late-pattern-and-object-creation-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-late-pattern-and-object-creation-expected.txt index 317de8f8..0316b92f 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-late-pattern-and-object-creation-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-late-pattern-and-object-creation-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRoot svg id='svg-root'", - "rect": [0, 15, 682, 365], - "reason": "chunk appeared" - } + "invalidations": [ + [0, 15, 682, 365] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-late-pattern-creation-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-late-pattern-creation-expected.txt index 4a64efed..b584574 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-late-pattern-creation-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-late-pattern-creation-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGContainer g id='content'", - "rect": [33, 22, 622, 196], - "reason": "chunk appeared" - } + "invalidations": [ + [33, 22, 622, 196] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-repaint-rect-on-path-with-stroke-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-repaint-rect-on-path-with-stroke-expected.txt index b779649..545d379 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-repaint-rect-on-path-with-stroke-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-repaint-rect-on-path-with-stroke-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGPath path id='path'", - "rect": [29, 29, 142, 92], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGPath path id='path'", - "rect": [179, 29, 122, 92], - "reason": "disappeared" - } + "invalidations": [ + [29, 29, 142, 92], + [179, 29, 122, 92] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-update-bounce-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-update-bounce-expected.txt index 8792865b..94d1a9a 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-update-bounce-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-update-bounce-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGEllipse circle id='bounce'", - "rect": [101, 101, 68, 68], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [1, 1, 68, 68], - "reason": "chunk disappeared" - } + "invalidations": [ + [101, 101, 68, 68], + [1, 1, 68, 68] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-update-container-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-update-container-expected.txt index 9b08df99..da113fb 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-update-container-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-update-container-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRoot svg", - "rect": [0, 0, 76, 76], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGContainer g id='group'", - "rect": [0, 0, 41, 41], - "reason": "chunk appeared" - } + "invalidations": [ + [0, 0, 76, 76] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-update-gradient-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-update-gradient-expected.txt index 8d265ba..9dc2c6a 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-update-gradient-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-update-gradient-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [10, 100, 430, 80], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect", - "rect": [10, 10, 430, 80], - "reason": "SVG resource change" - } + "invalidations": [ + [10, 100, 430, 80], + [10, 10, 430, 80] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-update-image-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-update-image-expected.txt index 1ba6004..951ce4f1 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-update-image-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-update-image-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRoot svg", - "rect": [0, 0, 75, 75], - "reason": "chunk appeared" - } + "invalidations": [ + [0, 0, 75, 75] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-update-pattern-child-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-update-pattern-child-expected.txt index 8d265ba..9dc2c6a 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-update-pattern-child-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-update-pattern-child-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [10, 100, 430, 80], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect", - "rect": [10, 10, 430, 80], - "reason": "SVG resource change" - } + "invalidations": [ + [10, 100, 430, 80], + [10, 10, 430, 80] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-update-pattern-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-update-pattern-expected.txt index 8d265ba..9dc2c6a 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-update-pattern-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-update-pattern-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [10, 100, 430, 80], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect", - "rect": [10, 10, 430, 80], - "reason": "SVG resource change" - } + "invalidations": [ + [10, 100, 430, 80], + [10, 10, 430, 80] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-update-polygon-changes-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-update-polygon-changes-expected.txt index ec5bcba..969773d 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-update-polygon-changes-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-update-polygon-changes-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGPath polygon id='polygon'", - "rect": [253, 208, 184, 129], - "reason": "full" - }, - { - "object": "LayoutSVGPath polygon id='polygon'", - "rect": [253, 198, 184, 129], - "reason": "full" - } + "invalidations": [ + [253, 208, 184, 129], + [253, 198, 184, 129] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-update-polygon-removal-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-update-polygon-removal-expected.txt index fd94a23..d9aaa1cb 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-update-polygon-removal-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-update-polygon-removal-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGPath polygon id='polygon'", - "rect": [253, 208, 184, 129], - "reason": "full" - } + "invalidations": [ + [253, 208, 184, 129] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-update-stop-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-update-stop-expected.txt index 8d265ba..9dc2c6a 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-update-stop-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-update-stop-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [10, 100, 430, 80], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect", - "rect": [10, 10, 430, 80], - "reason": "SVG resource change" - } + "invalidations": [ + [10, 100, 430, 80], + [10, 10, 430, 80] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-update-stop-linked-gradient-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-update-stop-linked-gradient-expected.txt index af05146..81ccb53 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-update-stop-linked-gradient-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-update-stop-linked-gradient-expected.txt
@@ -5,22 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [10, 210, 430, 80], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect", - "rect": [10, 110, 430, 80], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect", - "rect": [10, 10, 430, 80], - "reason": "SVG resource change" - } + "invalidations": [ + [10, 210, 430, 80], + [10, 110, 430, 80], + [10, 10, 430, 80] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-update-style-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-update-style-expected.txt index eb35c61..4faf44f 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-update-style-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-update-style-expected.txt
@@ -5,27 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [6, 186, 158, 58], - "reason": "style change" - }, - { - "object": "LayoutSVGRect rect", - "rect": [6, 126, 158, 58], - "reason": "style change" - }, - { - "object": "LayoutSVGRect rect", - "rect": [6, 66, 158, 58], - "reason": "style change" - }, - { - "object": "LayoutSVGRect rect", - "rect": [6, 6, 158, 58], - "reason": "style change" - } + "invalidations": [ + [6, 186, 158, 58], + [6, 126, 158, 58], + [6, 66, 158, 58], + [6, 6, 158, 58] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-update-transform-addition-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-update-transform-addition-expected.txt index fcf3f21..d9aaa1cb 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-update-transform-addition-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-update-transform-addition-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRoot svg", - "rect": [253, 208, 184, 129], - "reason": "chunk appeared" - } + "invalidations": [ + [253, 208, 184, 129] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-update-transform-changes-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-update-transform-changes-expected.txt index fcf3f21..d9aaa1cb 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-update-transform-changes-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/js-update-transform-changes-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRoot svg", - "rect": [253, 208, 184, 129], - "reason": "chunk appeared" - } + "invalidations": [ + [253, 208, 184, 129] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/marker-child-changes-css-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/marker-child-changes-css-expected.txt index 77ceb69..701b236d 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/marker-child-changes-css-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/marker-child-changes-css-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGPath path", - "rect": [113, 118, 84, 84], - "reason": "style change" - } + "invalidations": [ + [113, 118, 84, 84] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/marker-child-changes-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/marker-child-changes-expected.txt index 77ceb69..701b236d 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/marker-child-changes-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/marker-child-changes-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGPath path", - "rect": [113, 118, 84, 84], - "reason": "style change" - } + "invalidations": [ + [113, 118, 84, 84] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/marker-strokeWidth-changes-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/marker-strokeWidth-changes-expected.txt index dff37d6d..701b236d 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/marker-strokeWidth-changes-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/marker-strokeWidth-changes-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGPath path id='path'", - "rect": [113, 118, 84, 84], - "reason": "style change" - } + "invalidations": [ + [113, 118, 84, 84] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/marker-text-decoration-change-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/marker-text-decoration-change-expected.txt index 30638103..9b4af47 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/marker-text-decoration-change-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/marker-text-decoration-change-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGPath path", - "rect": [8, 13, 146, 19], - "reason": "style change" - }, - { - "object": "LayoutSVGPath path", - "rect": [8, 13, 146, 19], - "reason": "style change" - } + "invalidations": [ + [8, 13, 146, 19] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/marker-viewBox-changes-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/marker-viewBox-changes-expected.txt index cfe83cf..a60af0f 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/marker-viewBox-changes-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/marker-viewBox-changes-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGPath path id='go'", - "rect": [89, 94, 108, 108], - "reason": "full" - } + "invalidations": [ + [89, 94, 108, 108] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/mask-child-changes-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/mask-child-changes-expected.txt index 9821c262..50911ea2 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/mask-child-changes-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/mask-child-changes-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [0, 100, 800, 100], - "reason": "style change" - }, - { - "object": "LayoutSVGRect rect", - "rect": [0, 100, 800, 100], - "reason": "style change" - } + "invalidations": [ + [0, 100, 800, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/mask-clip-target-transform-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/mask-clip-target-transform-expected.txt index 24f1dee..3dbdf70 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/mask-clip-target-transform-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/mask-clip-target-transform-expected.txt
@@ -5,37 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGContainer g", - "rect": [150, 50, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRect rect id='masker'", - "rect": [150, 50, 100, 100], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGRect rect id='clipper'", - "rect": [50, 150, 100, 100], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer g", - "rect": [150, 50, 100, 50], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGContainer g", - "rect": [150, 50, 100, 50], - "reason": "paint property change" - }, - { - "object": "LayoutSVGContainer g", - "rect": [100, 150, 50, 100], - "reason": "chunk disappeared" - } + "invalidations": [ + [150, 50, 100, 100], + [50, 150, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/mask-invalidation-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/mask-invalidation-expected.txt index 14e7a00..ce440a6 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/mask-invalidation-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/mask-invalidation-expected.txt
@@ -5,47 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [50, 50, 453, 299], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGRect rect", - "rect": [50, 50, 453, 299], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGRect rect", - "rect": [200, 100, 403, 249], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGRect rect", - "rect": [200, 100, 403, 249], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGRect rect", - "rect": [200, 100, 403, 249], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGRect rect", - "rect": [200, 100, 403, 249], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGRect rect", - "rect": [100, 100, 403, 249], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGRect rect", - "rect": [100, 100, 403, 249], - "reason": "chunk appeared" - } + "invalidations": [ + [50, 50, 453, 299], + [200, 100, 403, 249] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/modify-inserted-listitem-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/modify-inserted-listitem-expected.txt index 21b0436c..4a706768 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/modify-inserted-listitem-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/modify-inserted-listitem-expected.txt
@@ -5,27 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect id='move'", - "rect": [28, 38, 10, 10], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRect rect id='move'", - "rect": [28, 18, 10, 10], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGRect rect id='move'", - "rect": [28, 18, 10, 10], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRect rect id='move'", - "rect": [18, 18, 10, 10], - "reason": "disappeared" - } + "invalidations": [ + [28, 38, 10, 10], + [28, 18, 10, 10], + [18, 18, 10, 10] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/modify-text-node-in-tspan-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/modify-text-node-in-tspan-expected.txt index a69393d..3acd84d 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/modify-text-node-in-tspan-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/modify-text-node-in-tspan-expected.txt
@@ -5,57 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox ' '", - "rect": [10, 60, 310, 380], - "reason": "appeared" - }, - { - "object": "InlineTextBox ' '", - "rect": [10, 60, 310, 380], - "reason": "appeared" - }, - { - "object": "InlineTextBox ' '", - "rect": [10, 60, 310, 380], - "reason": "disappeared" - }, - { - "object": "InlineTextBox ' '", - "rect": [10, 60, 310, 380], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'PASS'", - "rect": [10, 300, 280, 140], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'PASS'", - "rect": [10, 300, 280, 140], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'PASS'", - "rect": [10, 180, 280, 140], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'PASS'", - "rect": [10, 180, 280, 140], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'PASS'", - "rect": [10, 60, 280, 140], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'PA'", - "rect": [10, 60, 150, 140], - "reason": "disappeared" - } + "invalidations": [ + [10, 60, 310, 380] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/modify-transferred-listitem-different-attr-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/modify-transferred-listitem-different-attr-expected.txt index 779ace7..7ca5da5 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/modify-transferred-listitem-different-attr-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/modify-transferred-listitem-different-attr-expected.txt
@@ -5,62 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox ' B C'", - "rect": [23, 8, 85, 23], - "reason": "appeared" - }, - { - "object": "InlineTextBox ' B C'", - "rect": [23, 8, 85, 23], - "reason": "appeared" - }, - { - "object": "InlineTextBox ' B C'", - "rect": [23, 8, 85, 23], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'A'", - "rect": [23, 8, 85, 23], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'A'", - "rect": [23, 8, 85, 23], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'A'", - "rect": [23, 8, 85, 23], - "reason": "disappeared" - }, - { - "object": "InlineTextBox ' B C'", - "rect": [23, 8, 80, 23], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'A'", - "rect": [23, 8, 80, 23], - "reason": "disappeared" - }, - { - "object": "InlineTextBox ' Y Z'", - "rect": [58, 45, 50, 26], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'X'", - "rect": [58, 45, 50, 26], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'X Y Z'", - "rect": [58, 45, 50, 16], - "reason": "appeared" - } + "invalidations": [ + [23, 8, 85, 23], + [58, 45, 50, 26] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/modify-transferred-listitem-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/modify-transferred-listitem-expected.txt index 4cb073e..907517c 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/modify-transferred-listitem-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/modify-transferred-listitem-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGPath polygon id='target'", - "rect": [18, 18, 30, 20], - "reason": "full" - }, - { - "object": "LayoutSVGPath polygon id='target'", - "rect": [18, 18, 20, 20], - "reason": "full" - } + "invalidations": [ + [18, 18, 30, 20] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/nested-embedded-svg-size-changes-no-layout-triggers-1-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/nested-embedded-svg-size-changes-no-layout-triggers-1-expected.txt index d298a06c..be35d425 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/nested-embedded-svg-size-changes-no-layout-triggers-1-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/nested-embedded-svg-size-changes-no-layout-triggers-1-expected.txt
@@ -5,47 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutEmbeddedObject OBJECT", - "rect": [0, 0, 402, 202], - "reason": "appeared" - }, - { - "object": "HorizontalScrollbar", - "rect": [0, 135, 285, 15], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGRect rect", - "rect": [211, 11, 180, 180], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [11, 11, 180, 180], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [10, 10, 180, 125], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRect rect", - "rect": [210, 10, 75, 125], - "reason": "paint property change" - }, - { - "object": "VerticalScrollbar", - "rect": [285, 0, 15, 135], - "reason": "chunk disappeared" - }, - { - "object": "Scroll corner of LayoutView #document", - "rect": [285, 135, 15, 15], - "reason": "chunk disappeared" - } + "invalidations": [ + [0, 0, 402, 202] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/nested-embedded-svg-size-changes-no-layout-triggers-2-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/nested-embedded-svg-size-changes-no-layout-triggers-2-expected.txt index d298a06c..be35d425 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/nested-embedded-svg-size-changes-no-layout-triggers-2-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/nested-embedded-svg-size-changes-no-layout-triggers-2-expected.txt
@@ -5,47 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutEmbeddedObject OBJECT", - "rect": [0, 0, 402, 202], - "reason": "appeared" - }, - { - "object": "HorizontalScrollbar", - "rect": [0, 135, 285, 15], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGRect rect", - "rect": [211, 11, 180, 180], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [11, 11, 180, 180], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [10, 10, 180, 125], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRect rect", - "rect": [210, 10, 75, 125], - "reason": "paint property change" - }, - { - "object": "VerticalScrollbar", - "rect": [285, 0, 15, 135], - "reason": "chunk disappeared" - }, - { - "object": "Scroll corner of LayoutView #document", - "rect": [285, 135, 15, 15], - "reason": "chunk disappeared" - } + "invalidations": [ + [0, 0, 402, 202] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/object-sizing-no-width-height-change-content-box-size-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/object-sizing-no-width-height-change-content-box-size-expected.txt index 4bd4a2b..658f824 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/object-sizing-no-width-height-change-content-box-size-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/object-sizing-no-width-height-change-content-box-size-expected.txt
@@ -5,27 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow div id='contentBox'", - "rect": [8, 8, 402, 402], - "reason": "geometry" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [9, 9, 400, 400], - "reason": "paint property change" - }, - { - "object": "LayoutEmbeddedObject object", - "rect": [209, 9, 200, 400], - "reason": "incremental" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [9, 109, 200, 200], - "reason": "paint property change" - } + "invalidations": [ + [8, 8, 402, 402] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/outline-offset-shape-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/outline-offset-shape-expected.txt index 5ef4a4d..6b8f5118 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/outline-offset-shape-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/outline-offset-shape-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [133, 18, 130, 130], - "reason": "full" - }, - { - "object": "LayoutSVGRect rect", - "rect": [18, 18, 130, 130], - "reason": "full" - } + "invalidations": [ + [133, 18, 130, 130], + [18, 18, 130, 130] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/outline-offset-text-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/outline-offset-text-expected.txt index 6ecc09a..7a1f41ef 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/outline-offset-text-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/outline-offset-text-expected.txt
@@ -5,27 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Foo'", - "rect": [103, 26, 160, 113], - "reason": "disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [103, 26, 160, 113], - "reason": "full" - }, - { - "object": "InlineTextBox 'Foo'", - "rect": [63, 26, 160, 113], - "reason": "appeared" - }, - { - "object": "LayoutSVGText text", - "rect": [63, 26, 160, 113], - "reason": "full" - } + "invalidations": [ + [103, 26, 160, 113], + [63, 26, 160, 113] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/overflow-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/overflow-repaint-expected.txt index ffd4c54..a3d86505 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/overflow-repaint-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/overflow-repaint-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRoot svg id='svg'", - "rect": [8, 108, 100, 100], - "reason": "chunk appeared" - } + "invalidations": [ + [8, 108, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/paintorder-filtered-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/paintorder-filtered-expected.txt index f617ea05..706700e 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/paintorder-filtered-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/paintorder-filtered-expected.txt
@@ -5,27 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGContainer use", - "rect": [451, 160, 140, 140], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGContainer use id='t2'", - "rect": [179, 160, 140, 140], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGContainer use id='t1'", - "rect": [42, 160, 140, 140], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGViewportContainer svg", - "rect": [318, 163, 137, 137], - "reason": "SVG resource change" - } + "invalidations": [ + [451, 160, 140, 140], + [179, 160, 140, 140], + [42, 160, 140, 140], + [318, 163, 137, 137] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/path-pathlength-change-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/path-pathlength-change-expected.txt index 685f9ac..9a68f27 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/path-pathlength-change-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/path-pathlength-change-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGPath path", - "rect": [67, 67, 182, 182], - "reason": "full" - } + "invalidations": [ + [67, 67, 182, 182] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/pending-resource-after-removal-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/pending-resource-after-removal-expected.txt index 6533522..6c3520a8 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/pending-resource-after-removal-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/pending-resource-after-removal-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect id='shape'", - "rect": [0, 0, 200, 200], - "reason": "style change" - }, - { - "object": "LayoutSVGRect rect id='shape'", - "rect": [0, 0, 200, 200], - "reason": "SVG resource change" - } + "invalidations": [ + [0, 0, 200, 200] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/rect-modify-rx-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/rect-modify-rx-expected.txt index ffcfeba..d8b2f9a 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/rect-modify-rx-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/rect-modify-rx-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect id='r'", - "rect": [0, 0, 100, 100], - "reason": "full" - } + "invalidations": [ + [0, 0, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/relative-sized-content-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/relative-sized-content-expected.txt index 3e9460f..65635a94 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/relative-sized-content-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/relative-sized-content-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow div id='contentBox'", - "rect": [8, 72, 402, 402], - "reason": "geometry" - }, - { - "object": "LayoutSVGRect rect id='targetRect'", - "rect": [9, 73, 400, 400], - "reason": "geometry" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [109, 73, 300, 400], - "reason": "incremental" - } + "invalidations": [ + [8, 72, 402, 402] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/relative-sized-content-with-resources-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/relative-sized-content-with-resources-expected.txt index 250dc18..65635a94 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/relative-sized-content-with-resources-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/relative-sized-content-with-resources-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow div id='contentBox'", - "rect": [8, 72, 402, 402], - "reason": "geometry" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [47, 111, 324, 324], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [8, 154, 102, 238], - "reason": "paint property change" - } + "invalidations": [ + [8, 72, 402, 402] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/relative-sized-deep-shadow-tree-content-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/relative-sized-deep-shadow-tree-content-expected.txt index 8ae0900e..65635a94 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/relative-sized-deep-shadow-tree-content-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/relative-sized-deep-shadow-tree-content-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow div id='contentBox'", - "rect": [8, 72, 402, 402], - "reason": "geometry" - }, - { - "object": "LayoutSVGContainer use id='targetUse'", - "rect": [209, 273, 200, 200], - "reason": "paint property change" - }, - { - "object": "LayoutSVGContainer use id='targetUse'", - "rect": [59, 273, 50, 200], - "reason": "paint property change" - } + "invalidations": [ + [8, 72, 402, 402] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/relative-sized-document-scrollbars-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/relative-sized-document-scrollbars-expected.txt index 55b3c33..51f97ecd 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/relative-sized-document-scrollbars-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/relative-sized-document-scrollbars-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 800, 600], - "reason": "background" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [6, 2, 788, 595], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [6, 4, 788, 592], - "reason": "paint property change" - } + "invalidations": [ + [0, 0, 800, 600] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/relative-sized-image-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/relative-sized-image-expected.txt index 985ff80..65635a94 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/relative-sized-image-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/relative-sized-image-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow div id='contentBox'", - "rect": [8, 72, 402, 402], - "reason": "geometry" - }, - { - "object": "LayoutSVGImage image", - "rect": [9, 73, 400, 400], - "reason": "image" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [109, 73, 300, 400], - "reason": "incremental" - } + "invalidations": [ + [8, 72, 402, 402] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/relative-sized-inner-svg-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/relative-sized-inner-svg-expected.txt index f541c9c..bad6328 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/relative-sized-inner-svg-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/relative-sized-inner-svg-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow div id='contentBox'", - "rect": [8, 52, 402, 402], - "reason": "geometry" - }, - { - "object": "LayoutSVGViewportContainer svg", - "rect": [27, 69, 364, 366], - "reason": "paint property change" - }, - { - "object": "LayoutSVGViewportContainer svg", - "rect": [13, 207, 92, 92], - "reason": "paint property change" - } + "invalidations": [ + [8, 52, 402, 402] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/relative-sized-shadow-tree-content-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/relative-sized-shadow-tree-content-expected.txt index 3eca2d78..65635a94 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/relative-sized-shadow-tree-content-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/relative-sized-shadow-tree-content-expected.txt
@@ -5,32 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow div id='contentBox'", - "rect": [8, 72, 402, 402], - "reason": "geometry" - }, - { - "object": "LayoutSVGContainer use", - "rect": [209, 273, 200, 200], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRect rect id='targetRect1'", - "rect": [9, 73, 200, 200], - "reason": "geometry" - }, - { - "object": "LayoutSVGRect rect id='targetRect1'", - "rect": [59, 73, 150, 200], - "reason": "incremental" - }, - { - "object": "LayoutSVGContainer use", - "rect": [59, 273, 50, 200], - "reason": "paint property change" - } + "invalidations": [ + [8, 72, 402, 402] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/relative-sized-shadow-tree-content-with-symbol-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/relative-sized-shadow-tree-content-with-symbol-expected.txt index bb86d64..65635a94 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/relative-sized-shadow-tree-content-with-symbol-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/relative-sized-shadow-tree-content-with-symbol-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow div id='contentBox'", - "rect": [8, 72, 402, 402], - "reason": "geometry" - }, - { - "object": "LayoutSVGViewportContainer svg id='targetSymbol'", - "rect": [9, 73, 400, 400], - "reason": "paint property change" - }, - { - "object": "LayoutSVGViewportContainer svg id='targetSymbol'", - "rect": [9, 223, 100, 100], - "reason": "paint property change" - } + "invalidations": [ + [8, 72, 402, 402] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/relative-sized-use-on-symbol-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/relative-sized-use-on-symbol-expected.txt index e86e8541..bad6328 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/relative-sized-use-on-symbol-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/relative-sized-use-on-symbol-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow div id='contentBox'", - "rect": [8, 52, 402, 402], - "reason": "geometry" - }, - { - "object": "LayoutSVGViewportContainer svg id='gamesBorder'", - "rect": [45, 87, 328, 330], - "reason": "paint property change" - }, - { - "object": "LayoutSVGViewportContainer svg id='gamesBorder'", - "rect": [18, 211, 82, 83], - "reason": "paint property change" - } + "invalidations": [ + [8, 52, 402, 402] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.txt index 4d66bb6..bad6328 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow div id='contentBox'", - "rect": [8, 52, 402, 402], - "reason": "geometry" - }, - { - "object": "LayoutSVGViewportContainer svg id='gamesBorder'", - "rect": [27, 69, 364, 366], - "reason": "paint property change" - }, - { - "object": "LayoutSVGViewportContainer svg id='gamesBorder'", - "rect": [13, 207, 92, 92], - "reason": "paint property change" - } + "invalidations": [ + [8, 52, 402, 402] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/remove-background-property-on-root-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/remove-background-property-on-root-expected.txt index a339d62..ae2e746 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/remove-background-property-on-root-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/remove-background-property-on-root-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [8, 8, 100, 100], - "reason": "appeared" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [8, 8, 100, 100], - "reason": "chunk disappeared" - } + "invalidations": [ + [8, 8, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/remove-border-property-on-root-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/remove-border-property-on-root-expected.txt index 770fcaa9..c36ec60 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/remove-border-property-on-root-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/remove-border-property-on-root-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRoot (positioned) svg", - "rect": [8, 8, 120, 120], - "reason": "chunk disappeared" - } + "invalidations": [ + [8, 8, 120, 120] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/remove-outline-property-on-root-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/remove-outline-property-on-root-expected.txt index 27dca8f1..de58512 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/remove-outline-property-on-root-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/remove-outline-property-on-root-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRoot svg", - "rect": [0, 0, 118, 118], - "reason": "chunk disappeared" - } + "invalidations": [ + [0, 0, 118, 118] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/remove-text-node-from-tspan-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/remove-text-node-from-tspan-expected.txt index bcddaef..3acd84d 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/remove-text-node-from-tspan-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/remove-text-node-from-tspan-expected.txt
@@ -5,47 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox ' '", - "rect": [10, 60, 310, 380], - "reason": "disappeared" - }, - { - "object": "InlineTextBox ' '", - "rect": [10, 60, 310, 380], - "reason": "disappeared" - }, - { - "object": "InlineTextBox ' '", - "rect": [10, 180, 310, 260], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'PASS'", - "rect": [10, 300, 280, 140], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'PASS'", - "rect": [10, 300, 280, 140], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'PASS'", - "rect": [10, 180, 280, 140], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'PASS'", - "rect": [10, 180, 280, 140], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'FAIL'", - "rect": [10, 60, 260, 140], - "reason": "disappeared" - } + "invalidations": [ + [10, 60, 310, 380] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/remove-tspan-from-text-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/remove-tspan-from-text-expected.txt index 987ab9c..e46d196 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/remove-tspan-from-text-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/remove-tspan-from-text-expected.txt
@@ -5,47 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox ' '", - "rect": [10, 60, 310, 260], - "reason": "appeared" - }, - { - "object": "InlineTextBox ' '", - "rect": [10, 60, 310, 260], - "reason": "disappeared" - }, - { - "object": "InlineTextBox ' '", - "rect": [10, 60, 310, 260], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'PASS'", - "rect": [10, 180, 280, 140], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'PASS'", - "rect": [10, 180, 280, 140], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'PASS'", - "rect": [10, 60, 280, 140], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'PASS'", - "rect": [10, 60, 280, 140], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'FAIL'", - "rect": [10, 60, 260, 140], - "reason": "disappeared" - } + "invalidations": [ + [10, 60, 310, 260] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/repaint-in-scrolled-view-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/repaint-in-scrolled-view-expected.txt index 894474aa..1be7a94 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/repaint-in-scrolled-view-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/repaint-in-scrolled-view-expected.txt
@@ -5,12 +5,8 @@ "bounds": [2000, 2000], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect id='rect'", - "rect": [400, 400, 100, 100], - "reason": "style change" - } + "invalidations": [ + [400, 400, 100, 100] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/repaint-moving-svg-and-div-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/repaint-moving-svg-and-div-expected.txt index 517397c..72141f6 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/repaint-moving-svg-and-div-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/repaint-moving-svg-and-div-expected.txt
@@ -5,407 +5,29 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [550, 350, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [535, 325, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [535, 325, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [520, 300, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [520, 300, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [505, 275, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [505, 275, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [490, 250, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [490, 250, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [475, 225, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [475, 225, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [460, 200, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [460, 200, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [445, 175, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [445, 175, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [430, 150, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [430, 150, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [415, 125, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [415, 125, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [400, 100, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [250, 350, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [235, 325, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [235, 325, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [220, 300, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [220, 300, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [205, 275, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [205, 275, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [190, 250, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [190, 250, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [175, 225, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [175, 225, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [160, 200, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [160, 200, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [145, 175, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [145, 175, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [130, 150, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [130, 150, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [115, 125, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [115, 125, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [100, 100, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow div class='innerBox'", - "rect": [575, 375, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow div class='innerBox'", - "rect": [560, 350, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow div class='innerBox'", - "rect": [560, 350, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow div class='innerBox'", - "rect": [545, 325, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow div class='innerBox'", - "rect": [545, 325, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow div class='innerBox'", - "rect": [530, 300, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow div class='innerBox'", - "rect": [530, 300, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow div class='innerBox'", - "rect": [515, 275, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow div class='innerBox'", - "rect": [515, 275, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow div class='innerBox'", - "rect": [500, 250, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow div class='innerBox'", - "rect": [500, 250, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow div class='innerBox'", - "rect": [485, 225, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow div class='innerBox'", - "rect": [485, 225, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow div class='innerBox'", - "rect": [470, 200, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow div class='innerBox'", - "rect": [470, 200, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow div class='innerBox'", - "rect": [455, 175, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow div class='innerBox'", - "rect": [455, 175, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow div class='innerBox'", - "rect": [440, 150, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow div class='innerBox'", - "rect": [440, 150, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow div class='innerBox'", - "rect": [425, 125, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [275, 375, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [260, 350, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [260, 350, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [245, 325, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [245, 325, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [230, 300, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [230, 300, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [215, 275, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [215, 275, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [200, 250, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [200, 250, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [185, 225, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [185, 225, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [170, 200, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [170, 200, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [155, 175, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [155, 175, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [140, 150, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [140, 150, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [125, 125, 100, 100], - "reason": "paint property change" - } + "invalidations": [ + [550, 350, 150, 150], + [535, 325, 150, 150], + [520, 300, 150, 150], + [505, 275, 150, 150], + [490, 250, 150, 150], + [475, 225, 150, 150], + [460, 200, 150, 150], + [445, 175, 150, 150], + [430, 150, 150, 150], + [415, 125, 150, 150], + [400, 100, 150, 150], + [250, 350, 150, 150], + [235, 325, 150, 150], + [220, 300, 150, 150], + [205, 275, 150, 150], + [190, 250, 150, 150], + [175, 225, 150, 150], + [160, 200, 150, 150], + [145, 175, 150, 150], + [130, 150, 150, 150], + [115, 125, 150, 150], + [100, 100, 150, 150] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/repaint-non-scaling-stroke-text-decoration-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/repaint-non-scaling-stroke-text-decoration-expected.txt index a6e97dfc..874838f6 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/repaint-non-scaling-stroke-text-decoration-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/repaint-non-scaling-stroke-text-decoration-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGContainer g", - "rect": [9, 13, 48, 28], - "reason": "chunk appeared" - } + "invalidations": [ + [9, 13, 48, 28] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/repaint-non-scaling-stroke-text-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/repaint-non-scaling-stroke-text-expected.txt index a6e97dfc..874838f6 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/repaint-non-scaling-stroke-text-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/repaint-non-scaling-stroke-text-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGContainer g", - "rect": [9, 13, 48, 28], - "reason": "chunk appeared" - } + "invalidations": [ + [9, 13, 48, 28] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/repaint-on-constant-size-change-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/repaint-on-constant-size-change-expected.txt index c4bedbaa..86b6f96 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/repaint-on-constant-size-change-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/repaint-on-constant-size-change-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGImage image", - "rect": [0, 0, 200, 100], - "reason": "full" - } + "invalidations": [ + [0, 0, 200, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/repaint-on-image-bounds-change-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/repaint-on-image-bounds-change-expected.txt index aeebc6c..d8b2f9a 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/repaint-on-image-bounds-change-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/repaint-on-image-bounds-change-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGImage image id='target'", - "rect": [0, 0, 100, 100], - "reason": "disappeared" - } + "invalidations": [ + [0, 0, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/repaint-paintorder-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/repaint-paintorder-expected.txt index ac31b30..fc1114e 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/repaint-paintorder-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/repaint-paintorder-expected.txt
@@ -5,27 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGPath polygon id='t3'", - "rect": [317, 163, 139, 138], - "reason": "style change" - }, - { - "object": "LayoutSVGPath polygon", - "rect": [44, 163, 139, 138], - "reason": "style change" - }, - { - "object": "LayoutSVGPath polygon", - "rect": [454, 163, 138, 138], - "reason": "style change" - }, - { - "object": "LayoutSVGPath polygon", - "rect": [181, 163, 138, 138], - "reason": "style change" - } + "invalidations": [ + [317, 163, 139, 138], + [44, 163, 139, 138], + [454, 163, 138, 138], + [181, 163, 138, 138] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/repaint-stroke-width-changes-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/repaint-stroke-width-changes-expected.txt index a549bae..003ab76902 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/repaint-stroke-width-changes-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/repaint-stroke-width-changes-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [9, 9, 462, 342], - "reason": "style change" - } + "invalidations": [ + [9, 9, 462, 342] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/resize-svg-invalidate-children-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/resize-svg-invalidate-children-expected.txt index d0e5cbbf..7f3d7da 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/resize-svg-invalidate-children-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/resize-svg-invalidate-children-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRoot svg", - "rect": [58, 58, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [33, 33, 50, 50], - "reason": "paint property change" - } + "invalidations": [ + [58, 58, 100, 100], + [33, 33, 50, 50] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/resize-svg-root-with-child-stroke-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/resize-svg-root-with-child-stroke-expected.txt index 48013f28..3ed4544 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/resize-svg-root-with-child-stroke-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/resize-svg-root-with-child-stroke-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRoot svg id='svg'", - "rect": [7, 7, 102, 115], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot svg id='svg'", - "rect": [7, 7, 3, 115], - "reason": "paint property change" - } + "invalidations": [ + [7, 7, 102, 115] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/resource-client-removal-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/resource-client-removal-expected.txt index 4bcda722..d8b2f9a 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/resource-client-removal-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/resource-client-removal-expected.txt
@@ -5,82 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGPath path id='hp'", - "rect": [0, 0, 100, 100], - "reason": "appeared" - }, - { - "object": "LayoutSVGPath path id='hp'", - "rect": [0, 0, 100, 100], - "reason": "appeared" - }, - { - "object": "LayoutSVGPath path id='hp'", - "rect": [0, 0, 100, 100], - "reason": "appeared" - }, - { - "object": "LayoutSVGPath path id='hp'", - "rect": [0, 0, 100, 100], - "reason": "appeared" - }, - { - "object": "LayoutSVGPath path id='hp'", - "rect": [0, 0, 100, 100], - "reason": "appeared" - }, - { - "object": "LayoutSVGPath path id='hp'", - "rect": [0, 0, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutSVGPath path id='hp'", - "rect": [0, 0, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutSVGPath path id='hp'", - "rect": [0, 0, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutSVGPath path id='hp'", - "rect": [0, 0, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutSVGPath path id='hp'", - "rect": [0, 0, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutSVGPath path id='hp'", - "rect": [0, 0, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGPath path id='hp'", - "rect": [0, 0, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGPath path id='hp'", - "rect": [0, 0, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGPath path id='hp'", - "rect": [0, 0, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGPath path id='hp'", - "rect": [0, 0, 100, 100], - "reason": "SVG resource change" - } + "invalidations": [ + [0, 0, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/resource-invalidate-on-target-update-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/resource-invalidate-on-target-update-expected.txt index 92d3aff6..dd45b79 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/resource-invalidate-on-target-update-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/resource-invalidate-on-target-update-expected.txt
@@ -5,42 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect id='rect3'", - "rect": [0, 240, 230, 120], - "reason": "full" - }, - { - "object": "LayoutSVGRect rect id='rect2'", - "rect": [10, 130, 200, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRect rect id='rect1'", - "rect": [10, 10, 200, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRect rect id='rect1'", - "rect": [10, 10, 200, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRect rect id='rect2'", - "rect": [10, 130, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRect rect id='rect1'", - "rect": [10, 10, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRect rect id='rect1'", - "rect": [10, 10, 100, 100], - "reason": "paint property change" - } + "invalidations": [ + [0, 240, 230, 120], + [10, 130, 200, 100], + [10, 10, 200, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/rounded-rect-height-change-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/rounded-rect-height-change-expected.txt index ac7416c..980a3afb 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/rounded-rect-height-change-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/rounded-rect-height-change-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [8, 8, 100, 200], - "reason": "geometry" - } + "invalidations": [ + [8, 8, 100, 200] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/scale-change-huge-geometry-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/scale-change-huge-geometry-expected.txt index 8287668..c4a5a0a 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/scale-change-huge-geometry-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/scale-change-huge-geometry-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGViewportContainer svg id='huge-symbol'", - "rect": [8, 8, 25, 25], - "reason": "paint property change" - }, - { - "object": "LayoutSVGViewportContainer svg id='huge-symbol'", - "rect": [8, 8, 20, 20], - "reason": "paint property change" - } + "invalidations": [ + [8, 8, 25, 25] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.txt index 4bac262..f0d1694c 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.txt
@@ -5,42 +5,12 @@ "bounds": [1026, 996], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'pservers-pattern-01-b \u2190'", - "rect": [208, 972, 173, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u2192 script-handle-01-b'", - "rect": [427, 972, 150, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalBoxFragment LayoutInline A", - "rect": [381, 969, 46, 25], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'index'", - "rect": [384, 972, 40, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'index'", - "rect": [384, 972, 40, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment ' '", - "rect": [423, 972, 5, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' '", - "rect": [380, 972, 5, 19], - "reason": "geometry" - } + "invalidations": [ + [208, 972, 173, 19], + [427, 972, 150, 19], + [381, 969, 46, 25], + [423, 972, 5, 19], + [380, 972, 5, 19] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/shape-transform-change-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/shape-transform-change-expected.txt index 68e88d8..20201d4 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/shape-transform-change-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/shape-transform-change-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [8, 8, 200, 200], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGRect rect", - "rect": [8, 8, 100, 100], - "reason": "disappeared" - } + "invalidations": [ + [8, 8, 200, 200] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/shape-with-nested-outline-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/shape-with-nested-outline-expected.txt index 8d1168b..ad2fd30 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/shape-with-nested-outline-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/shape-with-nested-outline-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGContainer g", - "rect": [8, 8, 500, 500], - "reason": "outline" - }, - { - "object": "LayoutSVGRect rect id='r'", - "rect": [108, 108, 300, 300], - "reason": "style change" - } + "invalidations": [ + [8, 8, 500, 500] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/stroke-opacity-update-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/stroke-opacity-update-expected.txt index 8ea02cf..fc886102e 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/stroke-opacity-update-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/stroke-opacity-update-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGEllipse circle", - "rect": [0, 0, 204, 204], - "reason": "style change" - } + "invalidations": [ + [0, 0, 204, 204] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/svg-absolute-children-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/svg-absolute-children-expected.txt index e0b6a10..d8b2f9a 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/svg-absolute-children-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/svg-absolute-children-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect id='rect'", - "rect": [0, 0, 100, 100], - "reason": "full" - } + "invalidations": [ + [0, 0, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/svg-background-partial-redraw-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/svg-background-partial-redraw-expected.txt index dc6bbdf..a4c7670 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/svg-background-partial-redraw-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/svg-background-partial-redraw-expected.txt
@@ -5,22 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='test'", - "rect": [8, 52, 200, 200], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='test' class='revealed'", - "rect": [8, 52, 200, 200], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='revealer'", - "rect": [9, 153, 200, 100], - "reason": "disappeared" - } + "invalidations": [ + [8, 52, 200, 200], + [9, 153, 200, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/svg-image-change-content-size-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/svg-image-change-content-size-expected.txt index 06c510bd7..ea84236 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/svg-image-change-content-size-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/svg-image-change-content-size-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow div id='contentBox'", - "rect": [8, 52, 602, 422], - "reason": "geometry" - } + "invalidations": [ + [8, 52, 602, 422] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/svg-image-par-resize-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/svg-image-par-resize-expected.txt index e82fd29..20201d4 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/svg-image-par-resize-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/svg-image-par-resize-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGImage image", - "rect": [8, 8, 200, 200], - "reason": "full" - } + "invalidations": [ + [8, 8, 200, 200] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/svg-length-ch-unit-font-size-change-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/svg-length-ch-unit-font-size-change-expected.txt index 11db9b8..20201d4 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/svg-length-ch-unit-font-size-change-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/svg-length-ch-unit-font-size-change-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [8, 8, 200, 200], - "reason": "style change" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [8, 108, 200, 100], - "reason": "incremental" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [108, 8, 100, 100], - "reason": "incremental" - } + "invalidations": [ + [8, 8, 200, 200] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/svg-length-rem-unit-font-size-change-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/svg-length-rem-unit-font-size-change-expected.txt index 38852e2..2d025689f 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/svg-length-rem-unit-font-size-change-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/svg-length-rem-unit-font-size-change-expected.txt
@@ -5,22 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRoot svg", - "rect": [8, 108, 200, 100], - "reason": "incremental" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [108, 8, 100, 100], - "reason": "incremental" - }, - { - "object": "LayoutSVGRect rect", - "rect": [8, 8, 100, 100], - "reason": "geometry" - } + "invalidations": [ + [8, 108, 200, 100], + [108, 8, 100, 100], + [8, 8, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/svgsvgelement-repaint-children-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/svgsvgelement-repaint-children-expected.txt index 514be46..ae2e746 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/svgsvgelement-repaint-children-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/svgsvgelement-repaint-children-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGPath path id='path'", - "rect": [8, 8, 100, 100], - "reason": "disappeared" - } + "invalidations": [ + [8, 8, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/tabgroup-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/tabgroup-expected.txt index 562511f..8ba34b7 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/tabgroup-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/tabgroup-expected.txt
@@ -5,72 +5,12 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGContainer g", - "rect": [388, 37, 318, 83], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer g", - "rect": [261, 277, 305, 305], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer g", - "rect": [5, 255, 240, 162], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGPath path", - "rect": [5, 255, 240, 162], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGPath path", - "rect": [5, 255, 240, 162], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGPath path", - "rect": [5, 255, 240, 162], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer g", - "rect": [505, 232, 240, 161], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGText text id='contentTabGroupTriangle0'", - "rect": [15, 291, 211, 37], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer g id='tabgroupRect'", - "rect": [37, 5, 161, 240], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGText text", - "rect": [66, 257, 57, 29], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGText text", - "rect": [11, 257, 49, 29], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGText text", - "rect": [130, 257, 47, 29], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGText text", - "rect": [183, 257, 32, 29], - "reason": "chunk appeared" - } + "invalidations": [ + [388, 37, 318, 83], + [261, 277, 305, 305], + [5, 255, 240, 162], + [505, 232, 240, 161], + [37, 5, 161, 240] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/text-dom-removal-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/text-dom-removal-expected.txt index 56529e81..b3bbf75 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/text-dom-removal-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/text-dom-removal-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'This should not be visible'", - "rect": [49, 109, 164, 21], - "reason": "disappeared" - }, - { - "object": "LayoutSVGRect rect", - "rect": [0, 0, 21, 21], - "reason": "disappeared" - } + "invalidations": [ + [49, 109, 164, 21], + [0, 0, 21, 21] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/text-mask-update-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/text-mask-update-expected.txt index cd817691..5d86f2ac 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/text-mask-update-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/text-mask-update-expected.txt
@@ -5,27 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [10, 3, 45, 22], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGRect rect", - "rect": [10, 3, 45, 22], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGRect rect", - "rect": [10, 33, 43, 17], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGRect rect", - "rect": [10, 33, 43, 17], - "reason": "chunk disappeared" - } + "invalidations": [ + [10, 3, 45, 22], + [10, 33, 43, 17] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/text-pattern-update-2-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/text-pattern-update-2-expected.txt index 5c3df0cc..406950be 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/text-pattern-update-2-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/text-pattern-update-2-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'X'", - "rect": [8, 8, 300, 100], - "reason": "subtree" - }, - { - "object": "InlineTextBox 'Z'", - "rect": [8, 8, 300, 100], - "reason": "subtree" - }, - { - "object": "InlineTextBox 'Y'", - "rect": [108, 8, 100, 100], - "reason": "subtree" - } + "invalidations": [ + [8, 8, 300, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/text-pattern-update-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/text-pattern-update-expected.txt index 57a9ead..ae2e746 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/text-pattern-update-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/text-pattern-update-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'X'", - "rect": [8, 8, 100, 100], - "reason": "subtree" - } + "invalidations": [ + [8, 8, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/text-repaint-including-stroke-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/text-repaint-including-stroke-expected.txt index f37ec34..53acb92 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/text-repaint-including-stroke-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/text-repaint-including-stroke-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGText text id='bounce'", - "rect": [80, 0, 553, 117], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [30, 0, 404, 59], - "reason": "chunk disappeared" - } + "invalidations": [ + [80, 0, 553, 117], + [30, 0, 404, 59] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/text-rescale-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/text-rescale-expected.txt index 88776b5b..fa46e4a 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/text-rescale-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/text-rescale-expected.txt
@@ -5,57 +5,17 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGText text", - "rect": [0, 114, 192, 46], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGRoot (positioned) svg", - "rect": [0, 14, 192, 46], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGViewportContainer svg", - "rect": [310, 114, 91, 46], - "reason": "paint property change" - }, - { - "object": "LayoutSVGViewportContainer svg", - "rect": [310, 14, 91, 46], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGForeignObject foreignObject", - "rect": [210, 114, 91, 46], - "reason": "paint property change" - }, - { - "object": "LayoutSVGForeignObject foreignObject", - "rect": [210, 14, 91, 46], - "reason": "paint property change" - }, - { - "object": "LayoutSVGContainer g id='text3g'", - "rect": [0, 3, 8, 3], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGViewportContainer svg", - "rect": [9, 3, 4, 3], - "reason": "paint property change" - }, - { - "object": "LayoutSVGForeignObject foreignObject", - "rect": [6, 3, 4, 2], - "reason": "paint property change" - }, - { - "object": "LayoutSVGForeignObject foreignObject", - "rect": [0, 0, 1, 1], - "reason": "paint property change" - } + "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/composite-after-paint/paint/invalidation/svg/text-selection-text-05-t-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/text-selection-text-05-t-expected.txt index 31b3f3b..0b6bbb8 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/text-selection-text-05-t-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/text-selection-text-05-t-expected.txt
@@ -5,707 +5,50 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox '$Revision: 1.8 $'", - "rect": [16, 522, 450, 78], - "reason": "selection" - }, - { - "object": "LayoutSVGText text id='revision'", - "rect": [16, 522, 450, 78], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'text-anchor'", - "rect": [519, 12, 129, 36], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [519, 12, 129, 36], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'text-anchor'", - "rect": [352, 12, 129, 36], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [352, 12, 129, 36], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'text-anchor'", - "rect": [186, 12, 128, 36], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [186, 12, 128, 36], - "reason": "appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [266, 485, 113, 29], - "reason": "selection" - }, - { - "object": "InlineTextBox '234'", - "rect": [266, 485, 113, 29], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [266, 485, 113, 29], - "reason": "appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [266, 201, 113, 21], - "reason": "selection" - }, - { - "object": "InlineTextBox '234'", - "rect": [266, 201, 113, 21], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [266, 201, 113, 21], - "reason": "appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [428, 485, 104, 29], - "reason": "selection" - }, - { - "object": "InlineTextBox '234'", - "rect": [428, 485, 104, 29], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [428, 485, 104, 29], - "reason": "appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [428, 201, 104, 21], - "reason": "selection" - }, - { - "object": "InlineTextBox '234'", - "rect": [428, 201, 104, 21], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [428, 201, 104, 21], - "reason": "appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [590, 485, 95, 29], - "reason": "selection" - }, - { - "object": "InlineTextBox '234'", - "rect": [590, 485, 95, 29], - "reason": "selection" - }, - { - "object": "InlineTextBox '1'", - "rect": [590, 201, 95, 21], - "reason": "selection" - }, - { - "object": "InlineTextBox '234'", - "rect": [590, 201, 95, 21], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [590, 485, 94, 29], - "reason": "appeared" - }, - { - "object": "LayoutSVGText text", - "rect": [590, 201, 94, 21], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'middle'", - "rect": [376, 36, 82, 35], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [376, 36, 82, 35], - "reason": "appeared" - }, - { - "object": "InlineTextBox '2.x 2.y'", - "rect": [16, 491, 79, 34], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [16, 491, 79, 34], - "reason": "appeared" - }, - { - "object": "InlineTextBox '4.x 2.y'", - "rect": [16, 441, 79, 34], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [16, 441, 79, 34], - "reason": "appeared" - }, - { - "object": "InlineTextBox '1.x 2.y'", - "rect": [16, 391, 79, 34], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [16, 391, 79, 34], - "reason": "appeared" - }, - { - "object": "InlineTextBox '2.x 4.y'", - "rect": [16, 341, 79, 34], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [16, 341, 79, 34], - "reason": "appeared" - }, - { - "object": "InlineTextBox '4.x 4.y'", - "rect": [16, 291, 79, 34], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [16, 291, 79, 34], - "reason": "appeared" - }, - { - "object": "InlineTextBox '1.x 4.y'", - "rect": [16, 241, 79, 34], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [16, 241, 79, 34], - "reason": "appeared" - }, - { - "object": "InlineTextBox '2.x 1.y'", - "rect": [16, 191, 79, 34], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [16, 191, 79, 34], - "reason": "appeared" - }, - { - "object": "InlineTextBox '4.x 1.y'", - "rect": [16, 141, 79, 34], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [16, 141, 79, 34], - "reason": "appeared" - }, - { - "object": "InlineTextBox '1.x 1.y'", - "rect": [16, 91, 79, 34], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [16, 91, 79, 34], - "reason": "appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [590, 285, 62, 54], - "reason": "selection" - }, - { - "object": "InlineTextBox '2'", - "rect": [590, 285, 62, 54], - "reason": "selection" - }, - { - "object": "InlineTextBox '3'", - "rect": [590, 285, 62, 54], - "reason": "selection" - }, - { - "object": "InlineTextBox '4'", - "rect": [590, 285, 62, 54], - "reason": "selection" - }, - { - "object": "InlineTextBox '1'", - "rect": [590, 435, 62, 29], - "reason": "selection" - }, - { - "object": "InlineTextBox '2'", - "rect": [590, 435, 62, 29], - "reason": "selection" - }, - { - "object": "InlineTextBox '3'", - "rect": [590, 435, 62, 29], - "reason": "selection" - }, - { - "object": "InlineTextBox '4'", - "rect": [590, 435, 62, 29], - "reason": "selection" - }, - { - "object": "InlineTextBox '1'", - "rect": [590, 151, 62, 21], - "reason": "selection" - }, - { - "object": "InlineTextBox '2'", - "rect": [590, 151, 62, 21], - "reason": "selection" - }, - { - "object": "InlineTextBox '3'", - "rect": [590, 151, 62, 21], - "reason": "selection" - }, - { - "object": "InlineTextBox '4'", - "rect": [590, 151, 62, 21], - "reason": "selection" - }, - { - "object": "InlineTextBox '1'", - "rect": [428, 285, 61, 54], - "reason": "selection" - }, - { - "object": "InlineTextBox '2'", - "rect": [428, 285, 61, 54], - "reason": "selection" - }, - { - "object": "InlineTextBox '3'", - "rect": [428, 285, 61, 54], - "reason": "selection" - }, - { - "object": "InlineTextBox '4'", - "rect": [428, 285, 61, 54], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [428, 285, 61, 54], - "reason": "appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [266, 285, 61, 54], - "reason": "selection" - }, - { - "object": "InlineTextBox '2'", - "rect": [266, 285, 61, 54], - "reason": "selection" - }, - { - "object": "InlineTextBox '3'", - "rect": [266, 285, 61, 54], - "reason": "selection" - }, - { - "object": "InlineTextBox '4'", - "rect": [266, 285, 61, 54], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [266, 285, 61, 54], - "reason": "appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [428, 435, 61, 29], - "reason": "selection" - }, - { - "object": "InlineTextBox '2'", - "rect": [428, 435, 61, 29], - "reason": "selection" - }, - { - "object": "InlineTextBox '3'", - "rect": [428, 435, 61, 29], - "reason": "selection" - }, - { - "object": "InlineTextBox '4'", - "rect": [428, 435, 61, 29], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [428, 435, 61, 29], - "reason": "appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [266, 435, 61, 29], - "reason": "selection" - }, - { - "object": "InlineTextBox '2'", - "rect": [266, 435, 61, 29], - "reason": "selection" - }, - { - "object": "InlineTextBox '3'", - "rect": [266, 435, 61, 29], - "reason": "selection" - }, - { - "object": "InlineTextBox '4'", - "rect": [266, 435, 61, 29], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [266, 435, 61, 29], - "reason": "appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [428, 151, 61, 21], - "reason": "selection" - }, - { - "object": "InlineTextBox '2'", - "rect": [428, 151, 61, 21], - "reason": "selection" - }, - { - "object": "InlineTextBox '3'", - "rect": [428, 151, 61, 21], - "reason": "selection" - }, - { - "object": "InlineTextBox '4'", - "rect": [428, 151, 61, 21], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [428, 151, 61, 21], - "reason": "appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [266, 151, 61, 21], - "reason": "selection" - }, - { - "object": "InlineTextBox '2'", - "rect": [266, 151, 61, 21], - "reason": "selection" - }, - { - "object": "InlineTextBox '3'", - "rect": [266, 151, 61, 21], - "reason": "selection" - }, - { - "object": "InlineTextBox '4'", - "rect": [266, 151, 61, 21], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [266, 151, 61, 21], - "reason": "appeared" - }, - { - "object": "LayoutSVGText text", - "rect": [590, 285, 60, 54], - "reason": "appeared" - }, - { - "object": "LayoutSVGText text", - "rect": [590, 435, 60, 29], - "reason": "appeared" - }, - { - "object": "LayoutSVGText text", - "rect": [590, 151, 60, 21], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'start'", - "rect": [224, 36, 52, 35], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [224, 36, 52, 35], - "reason": "appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [428, 335, 46, 54], - "reason": "selection" - }, - { - "object": "InlineTextBox '2'", - "rect": [428, 335, 46, 54], - "reason": "selection" - }, - { - "object": "InlineTextBox '3'", - "rect": [428, 335, 46, 54], - "reason": "selection" - }, - { - "object": "InlineTextBox '4'", - "rect": [428, 335, 46, 54], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [428, 335, 46, 54], - "reason": "appeared" - }, - { - "object": "LayoutSVGText text", - "rect": [266, 335, 46, 54], - "reason": "appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [590, 335, 45, 54], - "reason": "selection" - }, - { - "object": "InlineTextBox '2'", - "rect": [590, 335, 45, 54], - "reason": "selection" - }, - { - "object": "InlineTextBox '3'", - "rect": [590, 335, 45, 54], - "reason": "selection" - }, - { - "object": "InlineTextBox '4'", - "rect": [590, 335, 45, 54], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [590, 335, 45, 54], - "reason": "appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [266, 335, 44, 54], - "reason": "selection" - }, - { - "object": "InlineTextBox '2'", - "rect": [266, 335, 44, 54], - "reason": "selection" - }, - { - "object": "InlineTextBox '3'", - "rect": [266, 335, 44, 54], - "reason": "selection" - }, - { - "object": "InlineTextBox '4'", - "rect": [266, 335, 44, 54], - "reason": "selection" - }, - { - "object": "InlineTextBox 'end'", - "rect": [562, 36, 42, 35], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [562, 36, 42, 35], - "reason": "appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [573, 235, 39, 54], - "reason": "selection" - }, - { - "object": "InlineTextBox '2'", - "rect": [573, 235, 39, 54], - "reason": "selection" - }, - { - "object": "InlineTextBox '3'", - "rect": [573, 235, 39, 54], - "reason": "selection" - }, - { - "object": "InlineTextBox '4'", - "rect": [573, 235, 39, 54], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [573, 235, 39, 54], - "reason": "appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [411, 235, 39, 54], - "reason": "selection" - }, - { - "object": "InlineTextBox '2'", - "rect": [411, 235, 39, 54], - "reason": "selection" - }, - { - "object": "InlineTextBox '3'", - "rect": [411, 235, 39, 54], - "reason": "selection" - }, - { - "object": "InlineTextBox '4'", - "rect": [411, 235, 39, 54], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [411, 235, 38, 54], - "reason": "appeared" - }, - { - "object": "InlineTextBox '1234'", - "rect": [546, 101, 38, 21], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [546, 101, 38, 21], - "reason": "appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [250, 235, 37, 54], - "reason": "selection" - }, - { - "object": "InlineTextBox '2'", - "rect": [250, 235, 37, 54], - "reason": "selection" - }, - { - "object": "InlineTextBox '3'", - "rect": [250, 235, 37, 54], - "reason": "selection" - }, - { - "object": "InlineTextBox '4'", - "rect": [250, 235, 37, 54], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [250, 235, 37, 54], - "reason": "appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [250, 385, 37, 45], - "reason": "selection" - }, - { - "object": "InlineTextBox '234'", - "rect": [250, 385, 37, 45], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [250, 385, 37, 45], - "reason": "appeared" - }, - { - "object": "InlineTextBox '1234'", - "rect": [398, 101, 37, 21], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [398, 101, 37, 21], - "reason": "appeared" - }, - { - "object": "InlineTextBox '1234'", - "rect": [250, 101, 37, 21], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [250, 101, 37, 21], - "reason": "appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [565, 385, 29, 45], - "reason": "selection" - }, - { - "object": "InlineTextBox '234'", - "rect": [565, 385, 29, 45], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [565, 385, 29, 45], - "reason": "appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [411, 385, 29, 45], - "reason": "selection" - }, - { - "object": "InlineTextBox '234'", - "rect": [411, 385, 29, 45], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [411, 385, 29, 45], - "reason": "appeared" - } + "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, 95, 29], + [590, 201, 95, 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], + [590, 285, 62, 54], + [590, 435, 62, 29], + [590, 151, 62, 21], + [428, 285, 61, 54], + [266, 285, 61, 54], + [428, 435, 61, 29], + [266, 435, 61, 29], + [428, 151, 61, 21], + [266, 151, 61, 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, 39, 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/composite-after-paint/paint/invalidation/svg/text-selection-update-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/text-selection-update-expected.txt index 4f997d9..1d6d47f 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/text-selection-update-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/text-selection-update-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'foobar'", - "rect": [23, 0, 23, 14], - "reason": "selection" - } + "invalidations": [ + [23, 0, 23, 14] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/text-viewbox-rescale-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/text-viewbox-rescale-expected.txt index 6137275..6c3520a8 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/text-viewbox-rescale-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/text-viewbox-rescale-expected.txt
@@ -5,32 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGViewportContainer svg id='inner1'", - "rect": [0, 0, 200, 200], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox 'PASS '", - "rect": [0, 100, 200, 100], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'PASS '", - "rect": [0, 100, 200, 100], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'PASS'", - "rect": [0, 100, 200, 100], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'PASS'", - "rect": [0, 100, 200, 100], - "reason": "disappeared" - } + "invalidations": [ + [0, 0, 200, 200] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/text-xy-updates-SVGList-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/text-xy-updates-SVGList-expected.txt index a2194c2..151be098 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/text-xy-updates-SVGList-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/text-xy-updates-SVGList-expected.txt
@@ -5,17 +5,9 @@ "bounds": [808, 621], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Passes, if text is at 200x20'", - "rect": [208, 13, 166, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'Passes, if text is at 200x20'", - "rect": [18, 193, 166, 19], - "reason": "disappeared" - } + "invalidations": [ + [208, 13, 166, 19], + [18, 193, 166, 19] ] }, {
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/transform-changed-state-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/transform-changed-state-expected.txt index 18910a7..f76c8c6 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/transform-changed-state-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/transform-changed-state-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [108, 108, 100, 100], - "reason": "full" - }, - { - "object": "LayoutSVGRect rect", - "rect": [108, 8, 100, 100], - "reason": "full" - } + "invalidations": [ + [108, 108, 100, 100], + [108, 8, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/transform-focus-ring-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/transform-focus-ring-repaint-expected.txt index 103055f..8954e2b 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/transform-focus-ring-repaint-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/transform-focus-ring-repaint-expected.txt
@@ -12,17 +12,8 @@ "bounds": [204, 204], "backfaceVisibility": "hidden", "backgroundColor": "#FFFF00", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target'", - "rect": [0, 0, 204, 204], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target'", - "rect": [0, 0, 200, 200], - "reason": "paint property change" - } + "invalidations": [ + [0, 0, 204, 204] ] }, {
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/transform-foreign-object-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/transform-foreign-object-expected.txt index 0dfd947..e47d1e17 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/transform-foreign-object-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/transform-foreign-object-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGForeignObject foreignObject", - "rect": [108, 8, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGForeignObject foreignObject", - "rect": [8, 8, 100, 100], - "reason": "paint property change" - } + "invalidations": [ + [108, 8, 100, 100], + [8, 8, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/transform-text-element-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/transform-text-element-expected.txt index 1640477..b876177 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/transform-text-element-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/transform-text-element-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGText text", - "rect": [8, 58, 400, 100], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [8, 8, 400, 100], - "reason": "chunk disappeared" - } + "invalidations": [ + [8, 58, 400, 100], + [8, 8, 400, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/tspan-dynamic-positioning-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/tspan-dynamic-positioning-expected.txt index 3e6a3858..250c320 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/tspan-dynamic-positioning-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/tspan-dynamic-positioning-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'This text should be at visible at 200,200'", - "rect": [200, 185, 251, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'This text should be at visible at 200,200'", - "rect": [20, 5, 251, 19], - "reason": "disappeared" - } + "invalidations": [ + [200, 185, 251, 19], + [20, 5, 251, 19] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/tspan-pattern-update-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/tspan-pattern-update-expected.txt index d7404c8..59b5c22d 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/tspan-pattern-update-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/tspan-pattern-update-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Y'", - "rect": [108, 8, 100, 100], - "reason": "subtree" - } + "invalidations": [ + [108, 8, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/use-clipped-hit-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/use-clipped-hit-expected.txt index bb56de7c..50ba755 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/use-clipped-hit-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/use-clipped-hit-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Unknown'", - "rect": [90, 115, 64, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'Passed'", - "rect": [90, 115, 43, 19], - "reason": "appeared" - } + "invalidations": [ + [90, 115, 64, 19] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/use-detach-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/use-detach-expected.txt index 6520818..e1e53776 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/use-detach-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/use-detach-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGContainer g", - "rect": [207, 57, 50, 66], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer g", - "rect": [207, 57, 50, 66], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer g", - "rect": [207, 57, 50, 66], - "reason": "chunk disappeared" - } + "invalidations": [ + [207, 57, 50, 66] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/use-disappears-after-style-update-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/use-disappears-after-style-update-expected.txt index 45fa15e..a1e32eb 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/use-disappears-after-style-update-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/use-disappears-after-style-update-expected.txt
@@ -5,22 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGContainer use", - "rect": [50, 10, 36, 36], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='rect'", - "rect": [10, 10, 30, 30], - "reason": "appeared" - }, - { - "object": "LayoutSVGRect rect id='rect'", - "rect": [10, 10, 30, 30], - "reason": "disappeared" - } + "invalidations": [ + [50, 10, 36, 36], + [10, 10, 30, 30] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/use-inherit-style-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/use-inherit-style-expected.txt index 53e41f8..882801e 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/use-inherit-style-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/use-inherit-style-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect id='rect'", - "rect": [0, 0, 100, 60], - "reason": "style change" - } + "invalidations": [ + [0, 0, 100, 60] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/use-setAttribute-crash-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/use-setAttribute-crash-expected.txt index 3e22981..2336018 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/use-setAttribute-crash-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/use-setAttribute-crash-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGEllipse svg:circle id='circle'", - "rect": [27, 27, 62, 62], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGEllipse svg:circle id='circle'", - "rect": [51, 51, 14, 14], - "reason": "chunk disappeared" - } + "invalidations": [ + [27, 27, 62, 62] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/window-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/window-expected.txt index ba458ee..adf6bd9 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/window-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/window-expected.txt
@@ -5,182 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGContainer g id='bigWindow'", - "rect": [37, 142, 551, 394], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGRect rect id='titleBarbigWindow'", - "rect": [37, 142, 551, 17], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer g id='nestedWindow'", - "rect": [76, 181, 316, 238], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGRect rect id='titleBarnestedWindow'", - "rect": [76, 181, 316, 17], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGRect rect id='decoGroupMinimizednavWindow'", - "rect": [612, 80, 187, 18], - "reason": "appeared" - }, - { - "object": "LayoutSVGContainer g id='navWindow'", - "rect": [623, 91, 176, 160], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer g id='colourPickerWindow'", - "rect": [76, 194, 176, 144], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer g id='smallWindow'", - "rect": [311, 376, 160, 145], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer g id='statusWindow'", - "rect": [248, 343, 144, 66], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer g id='minimalWindow'", - "rect": [38, 475, 121, 50], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGRect rect", - "rect": [612, 80, 18, 160], - "reason": "appeared" - }, - { - "object": "LayoutSVGText text", - "rect": [615, 153, 14, 81], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer use id='closeButtonnavWindow'", - "rect": [615, 83, 12, 12], - "reason": "paint property change" - }, - { - "object": "LayoutSVGContainer use id='closeButtonnavWindow'", - "rect": [782, 94, 12, 11], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer use id='closeButtonnavWindow'", - "rect": [782, 94, 12, 11], - "reason": "paint property change" - }, - { - "object": "LayoutSVGContainer use id='maximizeButtonnavWindow'", - "rect": [615, 99, 12, 11], - "reason": "paint property change" - }, - { - "object": "LayoutSVGContainer use id='closeButtonbigWindow'", - "rect": [571, 145, 12, 11], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer use id='closeButtoncolourPickerWindow'", - "rect": [235, 197, 12, 11], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer use id='minimizeButtonnavWindow'", - "rect": [615, 123, 12, 3], - "reason": "paint property change" - }, - { - "object": "LayoutSVGContainer use id='minimizeButtonnestedWindow'", - "rect": [349, 192, 12, 3], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer use id='maximizeButtonstatusWindow'", - "rect": [376, 345, 11, 12], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer use id='maximizeButtonnavWindow'", - "rect": [769, 94, 11, 11], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer use id='maximizeButtonnavWindow'", - "rect": [769, 94, 11, 11], - "reason": "paint property change" - }, - { - "object": "LayoutSVGContainer use id='maximizeButtonbigWindow'", - "rect": [558, 145, 11, 11], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer use id='closeButtonsmallWindow'", - "rect": [454, 379, 11, 11], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer use id='maximizeButtonsmallWindow'", - "rect": [441, 379, 11, 11], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer use id='closeButtonnestedWindow'", - "rect": [376, 184, 11, 11], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer use id='maximizeButtonnestedWindow'", - "rect": [363, 184, 11, 11], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer use id='maximizeButtoncolourPickerWindow'", - "rect": [222, 197, 11, 11], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer use id='minimizeButtonbigWindow'", - "rect": [545, 153, 11, 3], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer use id='minimizeButtonstatusWindow'", - "rect": [363, 354, 11, 3], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer use id='minimizeButtonnavWindow'", - "rect": [756, 103, 11, 2], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer use id='minimizeButtonnavWindow'", - "rect": [756, 103, 11, 2], - "reason": "paint property change" - }, - { - "object": "LayoutSVGContainer use id='minimizeButtonsmallWindow'", - "rect": [428, 388, 11, 2], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer use id='minimizeButtoncolourPickerWindow'", - "rect": [209, 206, 11, 2], - "reason": "chunk appeared" - } + "invalidations": [ + [37, 142, 551, 394], + [612, 80, 187, 18], + [623, 91, 176, 160], + [612, 80, 18, 160] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/add-table-overpaint-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/add-table-overpaint-expected.txt index 2bcf728..dff0dd8 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/add-table-overpaint-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/add-table-overpaint-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGTableCell TD", - "rect": [2, 314, 152, 152], - "reason": "appeared" - } + "invalidations": [ + [2, 314, 152, 152] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/animated-row-background-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/animated-row-background-expected.txt index 2d5ae72..e7f93c8d 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/animated-row-background-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/animated-row-background-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR id='row'", - "rect": [8, 10, 210, 102], - "reason": "background" - }, - { - "object": "LayoutImage IMG id='image'", - "rect": [8, 114, 50, 50], - "reason": "image" - } + "invalidations": [ + [8, 10, 210, 102], + [8, 114, 50, 50] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/border-collapse-change-collapse-to-separate-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/border-collapse-change-collapse-to-separate-expected.txt index 9514c32..a24676f 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/border-collapse-change-collapse-to-separate-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/border-collapse-change-collapse-to-separate-expected.txt
@@ -5,22 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR", - "rect": [8, 8, 212, 108], - "reason": "disappeared" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [118, 10, 108, 108], - "reason": "appeared" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [10, 10, 106, 108], - "reason": "appeared" - } + "invalidations": [ + [8, 8, 212, 108], + [118, 10, 108, 108], + [10, 10, 106, 108] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/border-collapse-change-separate-to-collapse-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/border-collapse-change-separate-to-collapse-expected.txt index 3171490..a24676f 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/border-collapse-change-separate-to-collapse-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/border-collapse-change-separate-to-collapse-expected.txt
@@ -5,22 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR", - "rect": [8, 8, 212, 108], - "reason": "appeared" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [118, 10, 108, 108], - "reason": "disappeared" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [10, 10, 106, 108], - "reason": "disappeared" - } + "invalidations": [ + [8, 8, 212, 108], + [118, 10, 108, 108], + [10, 10, 106, 108] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-69296-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-69296-expected.txt index b6ffd990..cff74a8 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-69296-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-69296-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR id='row1'", - "rect": [20, 20, 160, 51], - "reason": "background" - }, - { - "object": "LayoutTableRow TR id='row1' class='change'", - "rect": [20, 20, 160, 51], - "reason": "background" - } + "invalidations": [ + [20, 20, 160, 51] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-cell-append-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-cell-append-expected.txt index d6ced91..f651f8f5 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-cell-append-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-cell-append-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR id='row'", - "rect": [8, 8, 120, 56], - "reason": "style change" - } + "invalidations": [ + [8, 8, 120, 56] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-cell-remove-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-cell-remove-expected.txt index c756376..98c003e 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-cell-remove-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-cell-remove-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR id='row'", - "rect": [8, 8, 168, 54], - "reason": "style change" - } + "invalidations": [ + [8, 8, 168, 54] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-change-cell-border-color-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-change-cell-border-color-expected.txt index a27f52ac..e5474a03d 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-change-cell-border-color-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-change-cell-border-color-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR", - "rect": [8, 8, 114, 54], - "reason": "style change" - } + "invalidations": [ + [8, 8, 114, 54] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-change-cell-border-width-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-change-cell-border-width-expected.txt index a27f52ac..e5474a03d 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-change-cell-border-width-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-change-cell-border-width-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR", - "rect": [8, 8, 114, 54], - "reason": "style change" - } + "invalidations": [ + [8, 8, 114, 54] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-change-cell-sl-border-color-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-change-cell-sl-border-color-expected.txt index bc5ff0d..e5474a03d 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-change-cell-sl-border-color-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-change-cell-sl-border-color-expected.txt
@@ -5,27 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR", - "rect": [8, 8, 114, 54], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='blockDiv'", - "rect": [90, 30, 20, 20], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='blockDiv'", - "rect": [90, 30, 20, 20], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'A'", - "rect": [90, 30, 12, 19], - "reason": "disappeared" - } + "invalidations": [ + [8, 8, 114, 54] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-change-col-border-color-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-change-col-border-color-expected.txt index 71507b9..ca7a6b8 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-change-col-border-color-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-change-col-border-color-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR", - "rect": [8, 59, 113, 53], - "reason": "style change" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 8, 113, 53], - "reason": "style change" - } + "invalidations": [ + [8, 59, 113, 53], + [8, 8, 113, 53] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-change-col-border-width-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-change-col-border-width-expected.txt index 2397ee1..b1c73cfa 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-change-col-border-width-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-change-col-border-width-expected.txt
@@ -5,22 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR", - "rect": [8, 59, 113, 53], - "reason": "style change" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 8, 113, 53], - "reason": "style change" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 58, 109, 52], - "reason": "style change" - } + "invalidations": [ + [8, 59, 113, 53], + [8, 8, 113, 53], + [8, 58, 109, 52] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-change-colgroup-border-color-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-change-colgroup-border-color-expected.txt index 0301c99..46a9640 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-change-colgroup-border-color-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-change-colgroup-border-color-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR", - "rect": [8, 59, 167, 53], - "reason": "style change" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 8, 167, 53], - "reason": "style change" - } + "invalidations": [ + [8, 59, 167, 53], + [8, 8, 167, 53] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-change-colgroup-border-width-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-change-colgroup-border-width-expected.txt index 8075823..d3c610d 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-change-colgroup-border-width-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-change-colgroup-border-width-expected.txt
@@ -5,22 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR", - "rect": [8, 59, 167, 53], - "reason": "style change" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 8, 167, 53], - "reason": "style change" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 58, 162, 52], - "reason": "style change" - } + "invalidations": [ + [8, 59, 167, 53], + [8, 8, 167, 53], + [8, 58, 162, 52] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-change-row-border-color-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-change-row-border-color-expected.txt index 290082622..69126da 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-change-row-border-color-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-change-row-border-color-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR id='row'", - "rect": [8, 8, 60, 54], - "reason": "style change" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 58, 60, 53], - "reason": "style change" - } + "invalidations": [ + [8, 8, 60, 54], + [8, 58, 60, 53] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-change-row-border-width-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-change-row-border-width-expected.txt index 290082622..69126da 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-change-row-border-width-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-change-row-border-width-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR id='row'", - "rect": [8, 8, 60, 54], - "reason": "style change" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 58, 60, 53], - "reason": "style change" - } + "invalidations": [ + [8, 8, 60, 54], + [8, 58, 60, 53] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-change-table-border-color-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-change-table-border-color-expected.txt index 0da47ac..879620b 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-change-table-border-color-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-change-table-border-color-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR", - "rect": [8, 8, 60, 54], - "reason": "style change" - } + "invalidations": [ + [8, 8, 60, 54] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-change-table-border-width-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-change-table-border-width-expected.txt index 0da47ac..879620b 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-change-table-border-width-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-change-table-border-width-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR", - "rect": [8, 8, 60, 54], - "reason": "style change" - } + "invalidations": [ + [8, 8, 60, 54] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-change-tbody-border-color-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-change-tbody-border-color-expected.txt index bea519a..c269946 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-change-tbody-border-color-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-change-tbody-border-color-expected.txt
@@ -5,22 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR", - "rect": [8, 108, 114, 53], - "reason": "style change" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 59, 114, 53], - "reason": "style change" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 8, 114, 53], - "reason": "style change" - } + "invalidations": [ + [8, 108, 114, 53], + [8, 59, 114, 53], + [8, 8, 114, 53] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-change-tbody-border-width-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-change-tbody-border-width-expected.txt index 5395fb2..458f2ae 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-change-tbody-border-width-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/cached-change-tbody-border-width-expected.txt
@@ -5,27 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR", - "rect": [8, 108, 114, 53], - "reason": "style change" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 59, 114, 53], - "reason": "style change" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 8, 114, 53], - "reason": "style change" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 58, 109, 52], - "reason": "style change" - } + "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/composite-after-paint/paint/invalidation/table/caret-contenteditable-content-after-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/caret-contenteditable-content-after-expected.txt index 020fd1d..4e0fe839 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/caret-contenteditable-content-after-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/caret-contenteditable-content-after-expected.txt
@@ -5,117 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='editor'", - "rect": [6, 46, 788, 24], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV id='editor'", - "rect": [6, 46, 788, 24], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV id='editor'", - "rect": [6, 46, 788, 24], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV id='editor'", - "rect": [6, 46, 788, 24], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'abc'", - "rect": [8, 48, 22, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'ab'", - "rect": [8, 48, 15, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'ab'", - "rect": [8, 48, 15, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'x'", - "rect": [30, 48, 8, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'x'", - "rect": [23, 48, 8, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'x'", - "rect": [23, 48, 8, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'x'", - "rect": [15, 48, 8, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'x'", - "rect": [15, 48, 8, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'x'", - "rect": [8, 48, 8, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'a'", - "rect": [8, 48, 7, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'a'", - "rect": [8, 48, 7, 19], - "reason": "disappeared" - }, - { - "object": "Caret", - "rect": [8, 48, 1, 20], - "reason": "appeared" - }, - { - "object": "Caret", - "rect": [8, 48, 1, 20], - "reason": "caret" - }, - { - "object": "Caret", - "rect": [30, 48, 1, 19], - "reason": "caret" - }, - { - "object": "Caret", - "rect": [23, 48, 1, 19], - "reason": "caret" - }, - { - "object": "Caret", - "rect": [23, 48, 1, 19], - "reason": "caret" - }, - { - "object": "Caret", - "rect": [15, 48, 1, 19], - "reason": "caret" - }, - { - "object": "Caret", - "rect": [15, 48, 1, 19], - "reason": "caret" - } + "invalidations": [ + [6, 46, 788, 24] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/collapsed-border-cell-resize-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/collapsed-border-cell-resize-expected.txt index c1cd2b2..70c8ea42 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/collapsed-border-cell-resize-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/collapsed-border-cell-resize-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR", - "rect": [8, 8, 104, 204], - "reason": "geometry" - } + "invalidations": [ + [8, 8, 104, 204] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/collapsed-border-change-rowspan-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/collapsed-border-change-rowspan-expected.txt index 60b44e47..ca40cae 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/collapsed-border-change-rowspan-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/collapsed-border-change-rowspan-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR id='row1'", - "rect": [8, 8, 200, 300], - "reason": "style change" - }, - { - "object": "LayoutTableRow TR id='row3'", - "rect": [8, 207, 200, 101], - "reason": "style change" - }, - { - "object": "LayoutTableRow TR id='row2'", - "rect": [8, 107, 200, 101], - "reason": "style change" - } + "invalidations": [ + [8, 8, 200, 300] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-background-col-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-background-col-expected.txt index 87b6ca9..6eca02d 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-background-col-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-background-col-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY", - "rect": [8, 28, 186, 134], - "reason": "style change" - } + "invalidations": [ + [8, 28, 186, 134] ] }, {
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-background-col-initial-empty-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-background-col-initial-empty-expected.txt index 97274dd..6eca02d 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-background-col-initial-empty-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-background-col-initial-empty-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY", - "rect": [8, 28, 186, 134], - "reason": "appeared" - } + "invalidations": [ + [8, 28, 186, 134] ] }, {
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-background-col-span-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-background-col-span-expected.txt index 16451a2..14f72cc 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-background-col-span-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-background-col-span-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY", - "rect": [8, 28, 186, 134], - "reason": "style change" - } + "invalidations": [ + [8, 28, 186, 134] ] }, {
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-background-col-span-initial-empty-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-background-col-span-initial-empty-expected.txt index 4b2d67c..14f72cc 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-background-col-span-initial-empty-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-background-col-span-initial-empty-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY", - "rect": [8, 28, 186, 134], - "reason": "appeared" - } + "invalidations": [ + [8, 28, 186, 134] ] }, {
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-background-colgroup-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-background-colgroup-expected.txt index af47ff8..2412647c 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-background-colgroup-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-background-colgroup-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY", - "rect": [8, 28, 186, 134], - "reason": "style change" - } + "invalidations": [ + [8, 28, 186, 134] ] }, {
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-background-colgroup-initial-empty-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-background-colgroup-initial-empty-expected.txt index bf74968..2412647c 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-background-colgroup-initial-empty-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-background-colgroup-initial-empty-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY", - "rect": [8, 28, 186, 134], - "reason": "appeared" - } + "invalidations": [ + [8, 28, 186, 134] ] }, {
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-background-composited-row-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-background-composited-row-expected.txt index 580f304..0ae4ea1 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-background-composited-row-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-background-composited-row-expected.txt
@@ -11,12 +11,8 @@ "position": [8, 96], "bounds": [186, 64], "backgroundColor": "#ADD8E6", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR id='target'", - "rect": [0, 0, 186, 64], - "reason": "background" - } + "invalidations": [ + [0, 0, 186, 64] ] }, {
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-background-composited-row-initial-empty-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-background-composited-row-initial-empty-expected.txt index 3ef1aed..0ae4ea1 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-background-composited-row-initial-empty-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-background-composited-row-initial-empty-expected.txt
@@ -11,12 +11,8 @@ "position": [8, 96], "bounds": [186, 64], "backgroundColor": "#ADD8E6", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR id='target'", - "rect": [0, 0, 186, 64], - "reason": "appeared" - } + "invalidations": [ + [0, 0, 186, 64] ] }, {
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-background-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-background-expected.txt index b7cf3451..6e18925 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-background-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-background-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR id='target'", - "rect": [8, 96, 186, 64], - "reason": "background" - } + "invalidations": [ + [8, 96, 186, 64] ] }, {
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-background-initial-empty-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-background-initial-empty-expected.txt index 8616b1d8..6e18925 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-background-initial-empty-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-background-initial-empty-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR id='target'", - "rect": [8, 96, 186, 64], - "reason": "appeared" - } + "invalidations": [ + [8, 96, 186, 64] ] }, {
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-background-section-composited-row-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-background-section-composited-row-expected.txt index 23e82d4..a1b88e8 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-background-section-composited-row-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-background-section-composited-row-expected.txt
@@ -11,12 +11,8 @@ "position": [8, 28], "bounds": [186, 134], "backgroundColor": "#ADD8E6", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY id='target'", - "rect": [0, 0, 186, 134], - "reason": "background" - } + "invalidations": [ + [0, 0, 186, 134] ] }, {
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-background-section-composited-row-initial-empty-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-background-section-composited-row-initial-empty-expected.txt index 7965e48..a1b88e8 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-background-section-composited-row-initial-empty-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-background-section-composited-row-initial-empty-expected.txt
@@ -11,17 +11,8 @@ "position": [8, 28], "bounds": [186, 134], "backgroundColor": "#ADD8E6", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY id='target'", - "rect": [0, 0, 186, 134], - "reason": "paint property change" - }, - { - "object": "LayoutTableSection TBODY id='target'", - "rect": [26, 22, 134, 19], - "reason": "paint property change" - } + "invalidations": [ + [0, 0, 186, 134] ] }, {
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-background-section-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-background-section-expected.txt index 85dbfcce..5c54129 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-background-section-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-background-section-expected.txt
@@ -11,12 +11,8 @@ "position": [8, 28], "bounds": [186, 134], "backgroundColor": "#ADD8E6", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY id='target'", - "rect": [0, 0, 186, 134], - "reason": "background" - } + "invalidations": [ + [0, 0, 186, 134] ] }, {
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-background-section-initial-empty-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-background-section-initial-empty-expected.txt index 20de1ceb..5c54129 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-background-section-initial-empty-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-background-section-initial-empty-expected.txt
@@ -11,17 +11,8 @@ "position": [8, 28], "bounds": [186, 134], "backgroundColor": "#ADD8E6", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY id='target'", - "rect": [0, 0, 186, 134], - "reason": "paint property change" - }, - { - "object": "LayoutTableSection TBODY id='target'", - "rect": [26, 22, 134, 85], - "reason": "paint property change" - } + "invalidations": [ + [0, 0, 186, 134] ] }, {
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-row-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-row-expected.txt index feccd7b78..9dcdda89 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-row-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/composited-table-row-expected.txt
@@ -11,12 +11,8 @@ "position": [8, 8], "bounds": [74, 24], "backgroundColor": "#FF0000", - "paintInvalidations": [ - { - "object": "LayoutNGTableCell TD id='target'", - "rect": [0, 0, 37, 23], - "reason": "appeared" - } + "invalidations": [ + [0, 0, 37, 23] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/dynamic-table-vertical-alignment-change-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/dynamic-table-vertical-alignment-change-expected.txt index 86066732..c7b9ac34 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/dynamic-table-vertical-alignment-change-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/dynamic-table-vertical-alignment-change-expected.txt
@@ -5,12 +5,8 @@ "bounds": [808, 585], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (floating) DIV id='target'", - "rect": [11, 75, 100, 100], - "reason": "appeared" - } + "invalidations": [ + [11, 75, 100, 100] ] }, {
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/fixed-table-cell-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/fixed-table-cell-expected.txt index 753c4a1b..6faddda 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/fixed-table-cell-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/fixed-table-cell-expected.txt
@@ -5,12 +5,8 @@ "bounds": [785, 2016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGTableCell TD id='moveMe'", - "rect": [200, 200, 100, 100], - "reason": "disappeared" - } + "invalidations": [ + [200, 200, 100, 100] ], "transform": 1 }, @@ -24,12 +20,8 @@ "bounds": [100, 100], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) TD id='moveMe' class='fixed'", - "rect": [0, 0, 100, 100], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 2 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/fixed-table-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/fixed-table-overflow-expected.txt index 05a7ecc6c..ed12f88 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/fixed-table-overflow-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/fixed-table-overflow-expected.txt
@@ -5,17 +5,9 @@ "bounds": [785, 2016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGTableCell TD id='moveMe'", - "rect": [100, 100, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV class='green'", - "rect": [0, 100, 100, 100], - "reason": "disappeared" - } + "invalidations": [ + [100, 100, 100, 100], + [0, 100, 100, 100] ], "transform": 1 }, @@ -30,12 +22,8 @@ "bounds": [200, 100], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) TD id='moveMe' class='fixed'", - "rect": [0, 0, 200, 100], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 200, 100] ], "transform": 2 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/fixed-table-overflow-zindex-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/fixed-table-overflow-zindex-expected.txt index 8387203..60365aa9 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/fixed-table-overflow-zindex-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/fixed-table-overflow-zindex-expected.txt
@@ -5,12 +5,8 @@ "bounds": [785, 2016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGTableCell TD id='moveMe'", - "rect": [0, 100, 100, 100], - "reason": "disappeared" - } + "invalidations": [ + [0, 100, 100, 100] ], "transform": 1 }, @@ -24,12 +20,8 @@ "bounds": [100, 100], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) TD id='moveMe' class='fixed'", - "rect": [0, 0, 100, 100], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 2 }
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/input-overflow-in-table-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/input-overflow-in-table-expected.txt index bcdf9c93..6bfd2ec8 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/input-overflow-in-table-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/input-overflow-in-table-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='test'", - "rect": [7, 7, 102, 22], - "reason": "appeared" - } + "invalidations": [ + [7, 7, 102, 22] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/invalidate-cell-in-row-with-offset-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/invalidate-cell-in-row-with-offset-expected.txt index e6a4f85f..eb8e19b 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/invalidate-cell-in-row-with-offset-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/invalidate-cell-in-row-with-offset-expected.txt
@@ -17,12 +17,8 @@ "position": [8, 140], "bounds": [234, 102], "backgroundColor": "#0000FF", - "paintInvalidations": [ - { - "object": "LayoutNGTableCell TD id='target'", - "rect": [10, 0, 102, 102], - "reason": "background" - } + "invalidations": [ + [10, 0, 102, 102] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/invisible-col-visible-td-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/invisible-col-visible-td-expected.txt index 4bd25cb..09ab61c 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/invisible-col-visible-td-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/invisible-col-visible-td-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY", - "rect": [9, 9, 198, 198], - "reason": "style change" - } + "invalidations": [ + [9, 9, 198, 198] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/invisible-tbody-visible-td-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/invisible-tbody-visible-td-expected.txt index 1db1e66..09ab61c 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/invisible-tbody-visible-td-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/invisible-tbody-visible-td-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY id='tbody'", - "rect": [9, 9, 198, 198], - "reason": "background" - } + "invalidations": [ + [9, 9, 198, 198] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/invisible-tr-visible-td-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/invisible-tr-visible-td-expected.txt index 17cd6ae..20201d4 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/invisible-tr-visible-td-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/invisible-tr-visible-td-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR id='row'", - "rect": [8, 8, 200, 200], - "reason": "background" - } + "invalidations": [ + [8, 8, 200, 200] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/repaint-table-row-in-composited-document-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/repaint-table-row-in-composited-document-expected.txt index 3aae636..720344d 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/repaint-table-row-in-composited-document-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/repaint-table-row-in-composited-document-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGTableCell TD", - "rect": [256, 306, 204, 104], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [256, 156, 204, 104], - "reason": "geometry" - } + "invalidations": [ + [256, 306, 204, 104], + [256, 156, 204, 104] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/replace-col-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/replace-col-expected.txt index b6cbaab5..cac3b6a 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/replace-col-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/replace-col-expected.txt
@@ -5,22 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableSection THEAD", - "rect": [8, 82, 56, 26], - "reason": "style change" - }, - { - "object": "LayoutTableSection TFOOT", - "rect": [8, 132, 56, 24], - "reason": "style change" - }, - { - "object": "LayoutTableSection TBODY", - "rect": [8, 108, 56, 24], - "reason": "style change" - } + "invalidations": [ + [8, 82, 56, 26], + [8, 132, 56, 24], + [8, 108, 56, 24] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/resize-table-repaint-percent-size-cell-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/resize-table-repaint-percent-size-cell-expected.txt index 7909350..5226674 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/resize-table-repaint-percent-size-cell-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/resize-table-repaint-percent-size-cell-expected.txt
@@ -5,42 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR", - "rect": [0, 52, 106, 238], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [0, 292, 106, 236], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [0, 102, 106, 46], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'ROW2'", - "rect": [3, 400, 46, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'ROW1'", - "rect": [3, 161, 46, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'ROW2'", - "rect": [3, 115, 46, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'ROW1'", - "rect": [3, 66, 46, 19], - "reason": "geometry" - } + "invalidations": [ + [0, 52, 106, 238], + [0, 292, 106, 236] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/resize-table-repaint-vertical-align-cell-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/resize-table-repaint-vertical-align-cell-expected.txt index 7b84f9b7..9f6b9a0 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/resize-table-repaint-vertical-align-cell-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/resize-table-repaint-vertical-align-cell-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'MIDDLE'", - "rect": [3, 280, 63, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'MIDDLE'", - "rect": [3, 90, 63, 19], - "reason": "geometry" - } + "invalidations": [ + [3, 280, 63, 19], + [3, 90, 63, 19] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/resize-table-row-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/resize-table-row-repaint-expected.txt index 1559ba0..153ffbf4 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/resize-table-row-repaint-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/resize-table-row-repaint-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'MIDDLE'", - "rect": [3, 192, 63, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'MIDDLE'", - "rect": [3, 142, 63, 19], - "reason": "geometry" - } + "invalidations": [ + [3, 192, 63, 19], + [3, 142, 63, 19] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/row-change-background-rowspan-cell-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/row-change-background-rowspan-cell-expected.txt index ec1c062b..4a1198cd 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/row-change-background-rowspan-cell-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/row-change-background-rowspan-cell-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR id='target'", - "rect": [8, 298, 110, 106], - "reason": "appeared" - } + "invalidations": [ + [8, 298, 110, 106] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/scroll-inside-table-cell-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/scroll-inside-table-cell-expected.txt index 0bf62cc..bb55c62 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/scroll-inside-table-cell-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/scroll-inside-table-cell-expected.txt
@@ -5,22 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='absolute green'", - "rect": [314, 114, 435, 450], - "reason": "chunk appeared" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV class='relative red'", - "rect": [314, 114, 435, 450], - "reason": "chunk disappeared" - }, - { - "object": "HorizontalScrollbar", - "rect": [314, 564, 435, 15], - "reason": "scroll control" - } + "invalidations": [ + [314, 114, 435, 450], + [314, 564, 435, 15] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/scroll-relative-table-inside-table-cell-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/scroll-relative-table-inside-table-cell-expected.txt index 58be8990..1f01b59 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/scroll-relative-table-inside-table-cell-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/scroll-relative-table-inside-table-cell-expected.txt
@@ -5,22 +5,9 @@ "bounds": [1566, 1781], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='absolute green'", - "rect": [1114, 1314, 435, 450], - "reason": "chunk appeared" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV class='relative red'", - "rect": [1114, 1314, 435, 450], - "reason": "chunk disappeared" - }, - { - "object": "HorizontalScrollbar", - "rect": [1114, 1764, 435, 15], - "reason": "scroll control" - } + "invalidations": [ + [1114, 1314, 435, 450], + [1114, 1764, 435, 15] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/single-line-cells-repeating-thead-break-inside-on-thead-only-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/single-line-cells-repeating-thead-break-inside-on-thead-only-expected.txt index 11aa65d..9b1d7f5 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/single-line-cells-repeating-thead-break-inside-on-thead-only-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/single-line-cells-repeating-thead-break-inside-on-thead-only-expected.txt
@@ -5,27 +5,8 @@ "bounds": [1059, 585], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Col 1'", - "rect": [10, 74, 836, 19], - "reason": "style change" - }, - { - "object": "InlineTextBox 'Col 1'", - "rect": [10, 74, 836, 19], - "reason": "style change" - }, - { - "object": "InlineTextBox 'Col 1'", - "rect": [10, 74, 836, 19], - "reason": "style change" - }, - { - "object": "InlineTextBox 'Col 1'", - "rect": [10, 74, 836, 19], - "reason": "style change" - } + "invalidations": [ + [10, 74, 836, 19] ] }, {
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-cell-collapsed-border-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-cell-collapsed-border-expected.txt index 3282830b..0e853f8 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-cell-collapsed-border-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-cell-collapsed-border-expected.txt
@@ -5,42 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR", - "rect": [3, 264, 441, 110], - "reason": "style change" - }, - { - "object": "LayoutTableRow TR", - "rect": [3, 166, 441, 108], - "reason": "style change" - }, - { - "object": "LayoutTableRow TR", - "rect": [3, 364, 441, 105], - "reason": "style change" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 64, 436, 108], - "reason": "style change" - }, - { - "object": "LayoutNGTableCell TD id='t3'", - "rect": [225, 269, 112, 100], - "reason": "style change" - }, - { - "object": "LayoutNGTableCell TD id='t1'", - "rect": [225, 69, 112, 100], - "reason": "style change" - }, - { - "object": "LayoutNGTableCell TD id='t2'", - "rect": [8, 269, 110, 100], - "reason": "style change" - } + "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/composite-after-paint/paint/invalidation/table/table-cell-move-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-cell-move-expected.txt index 9ba77ab..cf1f29dd 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-cell-move-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-cell-move-expected.txt
@@ -5,22 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGTableCell TD", - "rect": [8, 326, 60, 60], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [8, 266, 60, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [8, 206, 60, 60], - "reason": "geometry" - } + "invalidations": [ + [8, 326, 60, 60], + [8, 266, 60, 60], + [8, 206, 60, 60] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-cell-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-cell-overflow-expected.txt index e994512..8931aa2 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-cell-overflow-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-cell-overflow-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [111, 9, 100, 100], - "reason": "disappeared" - } + "invalidations": [ + [111, 9, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-col-background-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-col-background-expected.txt index 06fd911d..e80f225 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-col-background-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-col-background-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY", - "rect": [8, 108, 106, 104], - "reason": "style change" - } + "invalidations": [ + [8, 108, 106, 104] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-col-background-offset-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-col-background-offset-expected.txt index 717dad1e..194e06ed 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-col-background-offset-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-col-background-offset-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY", - "rect": [8, 108, 210, 104], - "reason": "style change" - } + "invalidations": [ + [8, 108, 210, 104] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-collapsed-border-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-collapsed-border-expected.txt index 92abdcd..791738cb 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-collapsed-border-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-collapsed-border-expected.txt
@@ -5,102 +5,17 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR id='r2'", - "rect": [8, 224, 108, 22], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 338, 99, 30], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 286, 99, 30], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 154, 99, 30], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 102, 99, 30], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 316, 99, 22], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR id='r'", - "rect": [8, 132, 99, 22], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 62, 95, 30], - "reason": "style change" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 10, 95, 30], - "reason": "style change" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 40, 95, 22], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'ipsum dolor'", - "rect": [23, 317, 76, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'ipsum dolor'", - "rect": [23, 133, 76, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'sit amet'", - "rect": [23, 339, 49, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'sit amet'", - "rect": [23, 155, 49, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Lorem'", - "rect": [23, 295, 43, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Lorem'", - "rect": [23, 111, 43, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'dolor'", - "rect": [23, 225, 34, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [17, 225, 4, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [17, 133, 4, 19], - "reason": "geometry" - } + "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/composite-after-paint/paint/invalidation/table/table-outer-border-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-outer-border-expected.txt index e40f932..ef2d363 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-outer-border-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-outer-border-expected.txt
@@ -5,47 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR", - "rect": [8, 75, 132, 82], - "reason": "appeared" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 75, 132, 82], - "reason": "disappeared" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 8, 132, 82], - "reason": "appeared" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 8, 132, 82], - "reason": "disappeared" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [15, 82, 117, 67], - "reason": "appeared" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [15, 82, 117, 67], - "reason": "disappeared" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [15, 15, 117, 67], - "reason": "appeared" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [15, 15, 117, 67], - "reason": "disappeared" - } + "invalidations": [ + [8, 75, 132, 82], + [8, 8, 132, 82] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-overflow-auto-in-overflow-auto-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-overflow-auto-in-overflow-auto-scrolled-expected.txt index 2d6a4df..29d76aa 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-overflow-auto-in-overflow-auto-scrolled-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-overflow-auto-in-overflow-auto-scrolled-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='innerDiv'", - "rect": [10, 8, 302, 300], - "reason": "paint property change" - }, - { - "object": "VerticalScrollbar", - "rect": [762, 8, 15, 300], - "reason": "scroll control" - } + "invalidations": [ + [10, 8, 302, 300], + [762, 8, 15, 300] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-overflow-scroll-in-overflow-scroll-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-overflow-scroll-in-overflow-scroll-scrolled-expected.txt index 2d6a4df..29d76aa 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-overflow-scroll-in-overflow-scroll-scrolled-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-overflow-scroll-in-overflow-scroll-scrolled-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='innerDiv'", - "rect": [10, 8, 302, 300], - "reason": "paint property change" - }, - { - "object": "VerticalScrollbar", - "rect": [762, 8, 15, 300], - "reason": "scroll control" - } + "invalidations": [ + [10, 8, 302, 300], + [762, 8, 15, 300] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-row-bg-change-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-row-bg-change-expected.txt index efe7dea..394af0a 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-row-bg-change-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-row-bg-change-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR id='first'", - "rect": [8, 10, 200, 97], - "reason": "background" - } + "invalidations": [ + [8, 10, 200, 97] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-row-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-row-expected.txt index 497b986..1167fa2 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-row-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-row-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR id='target' class='green'", - "rect": [8, 10, 106, 100], - "reason": "background" - } + "invalidations": [ + [8, 10, 106, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-section-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-section-overflow-expected.txt index a9050ae..88a0a7d 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-section-overflow-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-section-overflow-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [33, 58, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [33, 8, 100, 100], - "reason": "geometry" - } + "invalidations": [ + [33, 58, 100, 100], + [33, 8, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-section-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-section-repaint-expected.txt index f1bafd8c..37303f1 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-section-repaint-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-section-repaint-expected.txt
@@ -5,97 +5,20 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR", - "rect": [8, 353, 60, 38], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 338, 60, 38], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 323, 60, 38], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 308, 60, 38], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD class='red half'", - "rect": [8, 248, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD class='green half'", - "rect": [8, 218, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD class='red half'", - "rect": [8, 218, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD class='green half'", - "rect": [8, 188, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD class='green half'", - "rect": [8, 158, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD class='green half'", - "rect": [8, 128, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD class='red half'", - "rect": [8, 128, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV id='top' class='blue half'", - "rect": [8, 98, 60, 30], - "reason": "disappeared" - }, - { - "object": "LayoutNGTableCell TD class='red half'", - "rect": [8, 98, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD class='green half'", - "rect": [8, 68, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD class='green half'", - "rect": [8, 38, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD class='red half'", - "rect": [8, 38, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCaption CAPTION id='caption1' class='blue half'", - "rect": [8, 8, 60, 30], - "reason": "disappeared" - }, - { - "object": "LayoutNGTableCell TD class='red half'", - "rect": [8, 8, 60, 30], - "reason": "geometry" - } + "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/composite-after-paint/paint/invalidation/table/table-section-visual-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-section-visual-overflow-expected.txt index c5f43653..1f7d2bf9 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-section-visual-overflow-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-section-visual-overflow-expected.txt
@@ -4,17 +4,9 @@ "name": "Scrolling background of LayoutView #document", "bounds": [800, 600], "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableSection DIV id='test'", - "rect": [143, 0, 120, 118], - "reason": "geometry" - }, - { - "object": "LayoutTableSection DIV id='test'", - "rect": [0, 0, 118, 118], - "reason": "geometry" - } + "invalidations": [ + [143, 0, 120, 118], + [0, 0, 118, 118] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-shrink-row-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-shrink-row-repaint-expected.txt index 1394342..17d5057 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-shrink-row-repaint-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-shrink-row-repaint-expected.txt
@@ -5,222 +5,26 @@ "bounds": [785, 850], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGTableCell TD id='resizeMe'", - "rect": [8, 112, 769, 210], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 782, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 742, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 722, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 682, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 662, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 622, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 602, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 562, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 542, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 502, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 482, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 442, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 422, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 382, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 362, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 322, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 302, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 242, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 182, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 122, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 802, 769, 48], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '10'", - "rect": [13, 822, 16, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '13'", - "rect": [13, 802, 16, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '12'", - "rect": [13, 742, 16, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '10'", - "rect": [13, 622, 16, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '11'", - "rect": [13, 682, 15, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '9'", - "rect": [13, 762, 8, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '8'", - "rect": [13, 702, 8, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '7'", - "rect": [13, 642, 8, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '6'", - "rect": [13, 582, 8, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '9'", - "rect": [13, 562, 8, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '5'", - "rect": [13, 522, 8, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '8'", - "rect": [13, 502, 8, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '4'", - "rect": [13, 462, 8, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '7'", - "rect": [13, 442, 8, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '3'", - "rect": [13, 402, 8, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '6'", - "rect": [13, 382, 8, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '2'", - "rect": [13, 342, 8, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '5'", - "rect": [13, 322, 8, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '4'", - "rect": [13, 262, 8, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '3'", - "rect": [13, 202, 8, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '2'", - "rect": [13, 142, 8, 19], - "reason": "geometry" - } + "invalidations": [ + [8, 112, 769, 210], + [8, 782, 769, 60], + [8, 742, 769, 60], + [8, 722, 769, 60], + [8, 682, 769, 60], + [8, 662, 769, 60], + [8, 622, 769, 60], + [8, 602, 769, 60], + [8, 562, 769, 60], + [8, 542, 769, 60], + [8, 502, 769, 60], + [8, 482, 769, 60], + [8, 442, 769, 60], + [8, 422, 769, 60], + [8, 382, 769, 60], + [8, 362, 769, 60], + [8, 322, 769, 60], + [8, 302, 769, 60], + [8, 802, 769, 48] ] }, {
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-two-pass-layout-overpaint-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-two-pass-layout-overpaint-expected.txt index 37d4c4f..aaf33f6 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-two-pass-layout-overpaint-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-two-pass-layout-overpaint-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [61, 45, 50, 25], - "reason": "incremental" - } + "invalidations": [ + [61, 45, 50, 25] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-with-padding-row-invalidation-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-with-padding-row-invalidation-expected.txt index afdbaad..f044c5da 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-with-padding-row-invalidation-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/table/table-with-padding-row-invalidation-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR", - "rect": [0, 0, 260, 50], - "reason": "background" - } + "invalidations": [ + [0, 0, 260, 50] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/text-append-dirty-lines-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/text-append-dirty-lines-expected.txt index 0d8203f..5aa0b1c 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/text-append-dirty-lines-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/text-append-dirty-lines-expected.txt
@@ -5,42 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Curabitur a velit.'", - "rect": [8, 44, 756, 139], - "reason": "full" - }, - { - "object": "NGPhysicalTextFragment 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse placerat. Morbi tristique. Mauris eu lacus sed felis'", - "rect": [8, 44, 756, 139], - "reason": "full" - }, - { - "object": "NGPhysicalTextFragment 'fermentum ut, tortor. Sed rhoncus. Quisque enim metus, luctus tincidunt, vestibulum eu, vestibulum eu, libero. Mauris'", - "rect": [8, 44, 756, 139], - "reason": "full" - }, - { - "object": "NGPhysicalTextFragment 'feugiat molestie, mi lorem bibendum leo, ac gravida orci nunc nec nulla. Nunc nunc lorem, rhoncus et, rutrum ac,'", - "rect": [8, 44, 756, 139], - "reason": "full" - }, - { - "object": "NGPhysicalTextFragment 'laoreet feugiat. Phasellus mollis pulvinar mi. Etiam ut neque sed eros egestas laoreet. Vestibulum ullamcorper, nulla non'", - "rect": [8, 44, 756, 139], - "reason": "full" - }, - { - "object": "NGPhysicalTextFragment 'pellentesque cursus. Proin vitae nulla. Vivamus in ipsum. Etiam mi. Nam malesuada purus in sem. Sed eget elit vel erat'", - "rect": [8, 44, 756, 139], - "reason": "full" - }, - { - "object": "NGPhysicalTextFragment 'sagittis aliquam nunc. Nullam pharetra molestie eros. Donec tempus purus ut ligula. Phasellus non nisl. Etiam eu mauris.'", - "rect": [8, 44, 756, 139], - "reason": "full" - } + "invalidations": [ + [8, 44, 756, 139] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/text-line-clamp-truncation-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/text-line-clamp-truncation-expected.txt index 36b3f60..d717dfd 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/text-line-clamp-truncation-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/text-line-clamp-truncation-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutDeprecatedFlexibleBox DIV id='container' class='folded'", - "rect": [8, 8, 285, 24], - "reason": "chunk disappeared" - }, - { - "object": "LayoutFlexibleBox DIV id='container'", - "rect": [8, 10, 284, 43], - "reason": "chunk appeared" - } + "invalidations": [ + [8, 8, 285, 24], + [8, 10, 284, 43] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/text-match-document-change-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/text-match-document-change-expected.txt index a32dfe5..0b1ee94f 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/text-match-document-change-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/text-match-document-change-expected.txt
@@ -5,27 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Find-in-page 'findme', then click here)'", - "rect": [18, 130, 251, 39], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'To be changed: findme (Manual testing:'", - "rect": [18, 130, 251, 39], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'After change'", - "rect": [18, 130, 82, 19], - "reason": "appeared" - }, - { - "object": "VerticalScrollbar", - "rect": [295, 102, 15, 400], - "reason": "scroll control" - } + "invalidations": [ + [18, 130, 251, 39], + [295, 102, 15, 400] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/transform/caret-with-transformation-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/transform/caret-with-transformation-expected.txt index e92ceac..77296d4 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/transform/caret-with-transformation-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/transform/caret-with-transformation-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Caret", - "rect": [337, 206, 11, 18], - "reason": "caret" - }, - { - "object": "Caret", - "rect": [42, 36, 11, 18], - "reason": "caret" - } + "invalidations": [ + [337, 206, 11, 18], + [42, 36, 11, 18] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/transform/change-transform-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/transform/change-transform-expected.txt index cbea73f..8a00293c6 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/transform/change-transform-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/transform/change-transform-expected.txt
@@ -5,27 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='square'", - "rect": [10, 10, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='overlay'", - "rect": [35, 35, 50, 50], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='overlay'", - "rect": [35, 35, 50, 50], - "reason": "chunk appeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='square'", - "rect": [35, 35, 50, 50], - "reason": "chunk appeared" - } + "invalidations": [ + [10, 10, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/transform/invalidation-with-scale-transform-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/transform/invalidation-with-scale-transform-expected.txt index 787d1d9..991945e 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/transform/invalidation-with-scale-transform-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/transform/invalidation-with-scale-transform-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target'", - "rect": [85, 70, 91, 92], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target'", - "rect": [84, 70, 91, 92], - "reason": "geometry" - } + "invalidations": [ + [85, 70, 91, 92], + [84, 70, 91, 92] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/transform/resize-skewed-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/transform/resize-skewed-expected.txt index ab9e480..adf6fd9 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/transform/resize-skewed-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/transform/resize-skewed-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='skewed'", - "rect": [100, 50, 600, 500], - "reason": "incremental" - } + "invalidations": [ + [100, 50, 600, 500] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/transform/subpixel-offset-scaled-transform-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/transform/subpixel-offset-scaled-transform-expected.txt index 03bf5c4..9893b53b 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/transform/subpixel-offset-scaled-transform-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/transform/subpixel-offset-scaled-transform-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV class='child scale'", - "rect": [9, 58, 40, 40], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV class='child scale'", - "rect": [8, 58, 40, 40], - "reason": "paint property change" - } + "invalidations": [ + [9, 58, 40, 40], + [8, 58, 40, 40] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/transform/subtree-layoutstate-transform-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/transform/subtree-layoutstate-transform-expected.txt index 60a0a8e..457cdb93 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/transform/subtree-layoutstate-transform-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/transform/subtree-layoutstate-transform-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='layoutroot'", - "rect": [28, 48, 200, 200], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [128, 48, 100, 200], - "reason": "incremental" - } + "invalidations": [ + [28, 48, 200, 200] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/transform/transform-disable-layoutstate-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/transform/transform-disable-layoutstate-expected.txt index 4cb75a0..ea3ee07 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/transform/transform-disable-layoutstate-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/transform/transform-disable-layoutstate-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [58, 138, 500, 63], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [58, 256, 500, 45], - "reason": "incremental" - } + "invalidations": [ + [58, 138, 500, 63], + [58, 256, 500, 45] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/transform/transform-inline-layered-child-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/transform/transform-inline-layered-child-expected.txt index c551106..a9b3825 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/transform/transform-inline-layered-child-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/transform/transform-inline-layered-child-expected.txt
@@ -5,57 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutInline (relative positioned) SPAN id='child'", - "rect": [135, 361, 159, 194], - "reason": "chunk appeared" - }, - { - "object": "NGPhysicalTextFragment 'A B C'", - "rect": [300, 302, 80, 176], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'D E F'", - "rect": [300, 302, 80, 176], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'G H I'", - "rect": [300, 302, 80, 176], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'J K L'", - "rect": [300, 302, 80, 176], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'M N O'", - "rect": [300, 302, 80, 176], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'P Q R'", - "rect": [300, 302, 80, 176], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'S T U'", - "rect": [300, 302, 80, 176], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'V W X'", - "rect": [300, 302, 80, 176], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'Y Z'", - "rect": [300, 302, 80, 176], - "reason": "disappeared" - } + "invalidations": [ + [135, 361, 159, 194], + [300, 302, 80, 176] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/transform/transform-layout-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/transform/transform-layout-repaint-expected.txt index 9880e55..fc9ecda 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/transform/transform-layout-repaint-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/transform/transform-layout-repaint-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'PASS'", - "rect": [52, 51, 43, 32], - "reason": "full" - } + "invalidations": [ + [52, 51, 43, 32] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/transform/transform-repaint-descendants-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/transform/transform-repaint-descendants-expected.txt index 259834cc..b68169f 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/transform/transform-repaint-descendants-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/transform/transform-repaint-descendants-expected.txt
@@ -5,27 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [176, 220, 394, 185], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [176, 220, 388, 203], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='box'", - "rect": [76, 120, 266, 266], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='box'", - "rect": [79, 123, 260, 260], - "reason": "paint property change" - } + "invalidations": [ + [176, 220, 394, 185], + [176, 220, 388, 203], + [76, 120, 266, 266] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/transform/transform-replaced-shadows-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/transform/transform-replaced-shadows-expected.txt index f7f5bcb..1fd31d2 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/transform/transform-replaced-shadows-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/transform/transform-replaced-shadows-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutImage IMG id='box' class='smaller'", - "rect": [0, 8, 288, 320], - "reason": "paint property change" - }, - { - "object": "LayoutImage IMG id='box' class='smaller'", - "rect": [0, 18, 158, 160], - "reason": "paint property change" - } + "invalidations": [ + [0, 8, 288, 320] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/transform/transform-rotate-and-remove-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/transform/transform-rotate-and-remove-expected.txt index 8fc4a3d..65876ab 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/transform/transform-rotate-and-remove-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/transform/transform-rotate-and-remove-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='rel'", - "rect": [8, 8, 220, 70], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='rel' class='rotated'", - "rect": [20, 0, 196, 150], - "reason": "chunk disappeared" - } + "invalidations": [ + [8, 8, 220, 70], + [20, 0, 196, 150] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/transform/transform-translate-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/transform/transform-translate-expected.txt index 01782899..40b581c 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/transform/transform-translate-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/transform/transform-translate-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [28, 66, 106, 107], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [8, 66, 106, 107], - "reason": "paint property change" - } + "invalidations": [ + [28, 66, 106, 107], + [8, 66, 106, 107] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/vertical-align-length1-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/vertical-align-length1-expected.txt index 55a581f..88a0454 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/vertical-align-length1-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/vertical-align-length1-expected.txt
@@ -5,27 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='other'", - "rect": [120, 130, 20, 20], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='other'", - "rect": [120, 100, 20, 20], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='other'", - "rect": [0, 130, 20, 20], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='other'", - "rect": [0, 100, 20, 20], - "reason": "geometry" - } + "invalidations": [ + [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/composite-after-paint/paint/invalidation/vertical-align-length2-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/vertical-align-length2-expected.txt index 3478a1c..e36167d 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/vertical-align-length2-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/vertical-align-length2-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [200, 80, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [200, 50, 100, 100], - "reason": "geometry" - } + "invalidations": [ + [200, 80, 100, 100], + [200, 50, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/vertical-align1-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/vertical-align1-expected.txt index a8cec71f..aa50214 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/vertical-align1-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/vertical-align1-expected.txt
@@ -5,27 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='other'", - "rect": [120, 33, 20, 21], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='other'", - "rect": [0, 33, 20, 21], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='other'", - "rect": [120, 80, 20, 20], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='other'", - "rect": [0, 80, 20, 20], - "reason": "geometry" - } + "invalidations": [ + [120, 33, 20, 21], + [0, 33, 20, 21], + [120, 80, 20, 20], + [0, 80, 20, 20] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/vertical-align2-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/vertical-align2-expected.txt index f673c7b..d1beab8 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/vertical-align2-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/vertical-align2-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [200, 146, 100, 101], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [200, 100, 100, 100], - "reason": "geometry" - } + "invalidations": [ + [200, 146, 100, 101], + [200, 100, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/vertical-rl-as-paint-container-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/vertical-rl-as-paint-container-expected.txt index e411de9..590c932 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/vertical-rl-as-paint-container-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/vertical-rl-as-paint-container-expected.txt
@@ -11,27 +11,8 @@ "position": [8, 8], "bounds": [600, 400], "backfaceVisibility": "hidden", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Lorem ipsum dolor'", - "rect": [520, 0, 80, 340], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'adipiscing elit.'", - "rect": [520, 0, 80, 340], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'consectetur'", - "rect": [520, 0, 80, 340], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'sit amet,'", - "rect": [520, 0, 80, 340], - "reason": "style change" - } + "invalidations": [ + [520, 0, 80, 340] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-background-image-fixed-centered-composited-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-background-image-fixed-centered-composited-expected.txt index 09bfad01..822e231 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-background-image-fixed-centered-composited-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-background-image-fixed-centered-composited-expected.txt
@@ -5,12 +5,8 @@ "bounds": [600, 250], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutView #document", - "rect": [0, 0, 600, 250], - "reason": "background" - } + "invalidations": [ + [0, 0, 600, 250] ] }, { @@ -27,12 +23,8 @@ "bounds": [400, 250], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutView #document", - "rect": [0, 0, 400, 250], - "reason": "background" - } + "invalidations": [ + [0, 0, 400, 250] ] }, { @@ -49,12 +41,8 @@ "bounds": [400, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutView #document", - "rect": [0, 0, 400, 600], - "reason": "background" - } + "invalidations": [ + [0, 0, 400, 600] ] }, { @@ -71,12 +59,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutView #document", - "rect": [0, 0, 800, 600], - "reason": "background" - } + "invalidations": [ + [0, 0, 800, 600] ] }, {
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-background-image-fixed-centered-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-background-image-fixed-centered-expected.txt index 29fb9d45..7979199 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-background-image-fixed-centered-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-background-image-fixed-centered-expected.txt
@@ -5,12 +5,8 @@ "bounds": [600, 250], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 600, 250], - "reason": "background" - } + "invalidations": [ + [0, 0, 600, 250] ] } ] @@ -22,12 +18,8 @@ "bounds": [400, 250], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 400, 250], - "reason": "background" - } + "invalidations": [ + [0, 0, 400, 250] ] } ] @@ -39,12 +31,8 @@ "bounds": [400, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 400, 600], - "reason": "background" - } + "invalidations": [ + [0, 0, 400, 600] ] } ] @@ -56,12 +44,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 800, 600], - "reason": "background" - } + "invalidations": [ + [0, 0, 800, 600] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-background-image-fixed-generated-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-background-image-fixed-generated-expected.txt index 29fb9d45..7979199 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-background-image-fixed-generated-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-background-image-fixed-generated-expected.txt
@@ -5,12 +5,8 @@ "bounds": [600, 250], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 600, 250], - "reason": "background" - } + "invalidations": [ + [0, 0, 600, 250] ] } ] @@ -22,12 +18,8 @@ "bounds": [400, 250], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 400, 250], - "reason": "background" - } + "invalidations": [ + [0, 0, 400, 250] ] } ] @@ -39,12 +31,8 @@ "bounds": [400, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 400, 600], - "reason": "background" - } + "invalidations": [ + [0, 0, 400, 600] ] } ] @@ -56,12 +44,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 800, 600], - "reason": "background" - } + "invalidations": [ + [0, 0, 800, 600] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-background-image-fixed-scrolling-contents-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-background-image-fixed-scrolling-contents-expected.txt index 8291a63e..6da7e99a 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-background-image-fixed-scrolling-contents-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-background-image-fixed-scrolling-contents-expected.txt
@@ -5,12 +5,8 @@ "bounds": [585, 3016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 585, 3016], - "reason": "background" - } + "invalidations": [ + [0, 0, 585, 3016] ] }, { @@ -27,12 +23,8 @@ "bounds": [385, 3016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 385, 3016], - "reason": "background" - } + "invalidations": [ + [0, 0, 385, 3016] ] }, { @@ -49,12 +41,8 @@ "bounds": [385, 3016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 385, 3016], - "reason": "background" - } + "invalidations": [ + [0, 0, 385, 3016] ] }, { @@ -71,12 +59,8 @@ "bounds": [785, 3016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 785, 3016], - "reason": "background" - } + "invalidations": [ + [0, 0, 785, 3016] ] }, {
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-background-image-non-fixed-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-background-image-non-fixed-expected.txt index c77b97e..e5b49c0 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-background-image-non-fixed-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-background-image-non-fixed-expected.txt
@@ -25,12 +25,8 @@ "bounds": [400, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 250, 400, 350], - "reason": "incremental" - } + "invalidations": [ + [0, 250, 400, 350] ] } ] @@ -42,12 +38,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [400, 0, 400, 600], - "reason": "incremental" - } + "invalidations": [ + [400, 0, 400, 600] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-centered-inline-under-fixed-pos-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-centered-inline-under-fixed-pos-expected.txt index fbc5c48..84a42cd4 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-centered-inline-under-fixed-pos-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-centered-inline-under-fixed-pos-expected.txt
@@ -11,17 +11,8 @@ "bounds": [600, 250], "contentsOpaque": true, "backgroundColor": "#D3D3D3", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='container'", - "rect": [0, 0, 600, 250], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV class='child'", - "rect": [0, 125, 6, 30], - "reason": "geometry" - } + "invalidations": [ + [0, 0, 600, 250] ] } ] @@ -39,12 +30,8 @@ "bounds": [400, 250], "contentsOpaque": true, "backgroundColor": "#D3D3D3", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='container'", - "rect": [0, 0, 400, 250], - "reason": "geometry" - } + "invalidations": [ + [0, 0, 400, 250] ] } ] @@ -56,12 +43,8 @@ "bounds": [400, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 250, 400, 350], - "reason": "incremental" - } + "invalidations": [ + [0, 250, 400, 350] ] }, { @@ -69,27 +52,8 @@ "bounds": [400, 600], "contentsOpaque": true, "backgroundColor": "#D3D3D3", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='container'", - "rect": [0, 0, 400, 600], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='parent'", - "rect": [0, 250, 6, 350], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV class='child'", - "rect": [0, 300, 6, 30], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV class='child'", - "rect": [0, 125, 6, 30], - "reason": "geometry" - } + "invalidations": [ + [0, 0, 400, 600] ] } ] @@ -101,12 +65,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [400, 0, 400, 600], - "reason": "incremental" - } + "invalidations": [ + [400, 0, 400, 600] ] }, { @@ -114,12 +74,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#D3D3D3", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='container'", - "rect": [0, 0, 800, 600], - "reason": "geometry" - } + "invalidations": [ + [0, 0, 800, 600] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-child-background-image-fixed-centered-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-child-background-image-fixed-centered-expected.txt index fa09bdd..3f6fa5b 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-child-background-image-fixed-centered-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-child-background-image-fixed-centered-expected.txt
@@ -5,12 +5,8 @@ "bounds": [1008, 1016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [8, 8, 1000, 1000], - "reason": "background" - } + "invalidations": [ + [8, 8, 1000, 1000] ] }, { @@ -27,12 +23,8 @@ "name": "Scroll corner of LayoutView #document", "position": [585, 235], "bounds": [15, 15], - "paintInvalidations": [ - { - "object": "Scroll corner of LayoutView #document", - "rect": [0, 0, 15, 15], - "reason": "paint property change" - } + "invalidations": [ + [0, 0, 15, 15] ] } ] @@ -44,12 +36,8 @@ "bounds": [1008, 1016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [8, 8, 1000, 1000], - "reason": "background" - } + "invalidations": [ + [8, 8, 1000, 1000] ] }, { @@ -66,12 +54,8 @@ "name": "Scroll corner of LayoutView #document", "position": [385, 235], "bounds": [15, 15], - "paintInvalidations": [ - { - "object": "Scroll corner of LayoutView #document", - "rect": [0, 0, 15, 15], - "reason": "paint property change" - } + "invalidations": [ + [0, 0, 15, 15] ] } ] @@ -83,12 +67,8 @@ "bounds": [1008, 1016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [8, 8, 1000, 1000], - "reason": "background" - } + "invalidations": [ + [8, 8, 1000, 1000] ] }, { @@ -105,12 +85,8 @@ "name": "Scroll corner of LayoutView #document", "position": [385, 585], "bounds": [15, 15], - "paintInvalidations": [ - { - "object": "Scroll corner of LayoutView #document", - "rect": [0, 0, 15, 15], - "reason": "paint property change" - } + "invalidations": [ + [0, 0, 15, 15] ] } ] @@ -122,12 +98,8 @@ "bounds": [1008, 1016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [8, 8, 1000, 1000], - "reason": "background" - } + "invalidations": [ + [8, 8, 1000, 1000] ] }, { @@ -144,12 +116,8 @@ "name": "Scroll corner of LayoutView #document", "position": [785, 585], "bounds": [15, 15], - "paintInvalidations": [ - { - "object": "Scroll corner of LayoutView #document", - "rect": [0, 0, 15, 15], - "reason": "paint property change" - } + "invalidations": [ + [0, 0, 15, 15] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-child-background-image-fixed-tiled-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-child-background-image-fixed-tiled-expected.txt index fa09bdd..3f6fa5b 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-child-background-image-fixed-tiled-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-child-background-image-fixed-tiled-expected.txt
@@ -5,12 +5,8 @@ "bounds": [1008, 1016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [8, 8, 1000, 1000], - "reason": "background" - } + "invalidations": [ + [8, 8, 1000, 1000] ] }, { @@ -27,12 +23,8 @@ "name": "Scroll corner of LayoutView #document", "position": [585, 235], "bounds": [15, 15], - "paintInvalidations": [ - { - "object": "Scroll corner of LayoutView #document", - "rect": [0, 0, 15, 15], - "reason": "paint property change" - } + "invalidations": [ + [0, 0, 15, 15] ] } ] @@ -44,12 +36,8 @@ "bounds": [1008, 1016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [8, 8, 1000, 1000], - "reason": "background" - } + "invalidations": [ + [8, 8, 1000, 1000] ] }, { @@ -66,12 +54,8 @@ "name": "Scroll corner of LayoutView #document", "position": [385, 235], "bounds": [15, 15], - "paintInvalidations": [ - { - "object": "Scroll corner of LayoutView #document", - "rect": [0, 0, 15, 15], - "reason": "paint property change" - } + "invalidations": [ + [0, 0, 15, 15] ] } ] @@ -83,12 +67,8 @@ "bounds": [1008, 1016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [8, 8, 1000, 1000], - "reason": "background" - } + "invalidations": [ + [8, 8, 1000, 1000] ] }, { @@ -105,12 +85,8 @@ "name": "Scroll corner of LayoutView #document", "position": [385, 585], "bounds": [15, 15], - "paintInvalidations": [ - { - "object": "Scroll corner of LayoutView #document", - "rect": [0, 0, 15, 15], - "reason": "paint property change" - } + "invalidations": [ + [0, 0, 15, 15] ] } ] @@ -122,12 +98,8 @@ "bounds": [1008, 1016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [8, 8, 1000, 1000], - "reason": "background" - } + "invalidations": [ + [8, 8, 1000, 1000] ] }, { @@ -144,12 +116,8 @@ "name": "Scroll corner of LayoutView #document", "position": [785, 585], "bounds": [15, 15], - "paintInvalidations": [ - { - "object": "Scroll corner of LayoutView #document", - "rect": [0, 0, 15, 15], - "reason": "paint property change" - } + "invalidations": [ + [0, 0, 15, 15] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-frameset-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-frameset-expected.txt index c333375a..7979199 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-frameset-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-frameset-expected.txt
@@ -5,12 +5,8 @@ "bounds": [600, 250], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutFrameSet FRAMESET", - "rect": [0, 0, 600, 250], - "reason": "geometry" - } + "invalidations": [ + [0, 0, 600, 250] ] } ] @@ -22,12 +18,8 @@ "bounds": [400, 250], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutFrameSet FRAMESET", - "rect": [0, 0, 400, 250], - "reason": "geometry" - } + "invalidations": [ + [0, 0, 400, 250] ] } ] @@ -39,17 +31,8 @@ "bounds": [400, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutFrameSet FRAMESET", - "rect": [0, 0, 400, 600], - "reason": "geometry" - }, - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 250, 400, 350], - "reason": "incremental" - } + "invalidations": [ + [0, 0, 400, 600] ] } ] @@ -61,17 +44,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutFrameSet FRAMESET", - "rect": [0, 0, 800, 600], - "reason": "geometry" - }, - { - "object": "Scrolling background of LayoutView #document", - "rect": [400, 0, 400, 600], - "reason": "incremental" - } + "invalidations": [ + [0, 0, 800, 600] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-media-query-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-media-query-expected.txt index e29ff84..dbd4016a 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-media-query-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-media-query-expected.txt
@@ -25,12 +25,8 @@ "bounds": [400, 600], "contentsOpaque": true, "backgroundColor": "#0000FF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 250, 400, 350], - "reason": "incremental" - } + "invalidations": [ + [0, 250, 400, 350] ] } ] @@ -42,12 +38,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#0000FF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [400, 0, 400, 600], - "reason": "incremental" - } + "invalidations": [ + [400, 0, 400, 600] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-percent-html-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-percent-html-expected.txt index 387d51d..f98a698 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-percent-html-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-percent-html-expected.txt
@@ -5,12 +5,8 @@ "bounds": [600, 250], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [0, 0, 300, 125], - "reason": "geometry" - } + "invalidations": [ + [0, 0, 300, 125] ] } ] @@ -22,12 +18,8 @@ "bounds": [400, 250], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [0, 0, 300, 63], - "reason": "geometry" - } + "invalidations": [ + [0, 0, 300, 63] ] } ] @@ -39,17 +31,9 @@ "bounds": [400, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 250, 400, 350], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [0, 0, 200, 150], - "reason": "geometry" - } + "invalidations": [ + [0, 250, 400, 350], + [0, 0, 200, 150] ] } ] @@ -61,17 +45,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [400, 0, 400, 600], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [200, 0, 200, 150], - "reason": "incremental" - } + "invalidations": [ + [400, 0, 400, 600], + [200, 0, 200, 150] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-percent-width-height-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-percent-width-height-expected.txt index d6d36e81..06c296f 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-percent-width-height-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-percent-width-height-expected.txt
@@ -5,12 +5,8 @@ "bounds": [600, 250], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [0, 125, 300, 125], - "reason": "incremental" - } + "invalidations": [ + [0, 125, 300, 125] ] } ] @@ -22,12 +18,8 @@ "bounds": [400, 250], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [200, 0, 100, 125], - "reason": "incremental" - } + "invalidations": [ + [200, 0, 100, 125] ] } ] @@ -39,17 +31,9 @@ "bounds": [400, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 250, 400, 350], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [0, 125, 200, 175], - "reason": "incremental" - } + "invalidations": [ + [0, 250, 400, 350], + [0, 125, 200, 175] ] } ] @@ -61,17 +45,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [400, 0, 400, 600], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [200, 0, 200, 300], - "reason": "incremental" - } + "invalidations": [ + [400, 0, 400, 600], + [200, 0, 200, 300] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-positioned-bottom-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-positioned-bottom-expected.txt index bb939bd..70fb0604 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-positioned-bottom-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-positioned-bottom-expected.txt
@@ -5,12 +5,8 @@ "bounds": [600, 250], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [0, 210, 20, 20], - "reason": "geometry" - } + "invalidations": [ + [0, 210, 20, 20] ] } ] @@ -32,22 +28,9 @@ "bounds": [400, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 250, 400, 350], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [0, 560, 20, 20], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [0, 210, 20, 20], - "reason": "geometry" - } + "invalidations": [ + [0, 250, 400, 350], + [0, 210, 20, 20] ] } ] @@ -59,12 +42,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [400, 0, 400, 600], - "reason": "incremental" - } + "invalidations": [ + [400, 0, 400, 600] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-positioned-percent-top-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-positioned-percent-top-expected.txt index 91b05db..0144869 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-positioned-percent-top-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-positioned-percent-top-expected.txt
@@ -5,12 +5,8 @@ "bounds": [600, 250], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [0, 125, 20, 20], - "reason": "geometry" - } + "invalidations": [ + [0, 125, 20, 20] ] } ] @@ -32,22 +28,9 @@ "bounds": [400, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 250, 400, 350], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [0, 300, 20, 20], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [0, 125, 20, 20], - "reason": "geometry" - } + "invalidations": [ + [0, 250, 400, 350], + [0, 125, 20, 20] ] } ] @@ -59,12 +42,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [400, 0, 400, 600], - "reason": "incremental" - } + "invalidations": [ + [400, 0, 400, 600] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-vertical-writing-mode-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-vertical-writing-mode-expected.txt index 6912bb95c..4f5b2c8 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-vertical-writing-mode-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-vertical-writing-mode-expected.txt
@@ -5,52 +5,8 @@ "bounds": [939, 235], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 939, 235], - "reason": "background" - }, - { - "object": "LayoutNGBlockFlow HTML", - "rect": [10, 8, 920, 212], - "reason": "chunk appeared" - }, - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 600, 235], - "reason": "background" - }, - { - "object": "NGPhysicalTextFragment 'AAAA BBBB'", - "rect": [168, 8, 423, 227], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'CCCC DDDD'", - "rect": [168, 8, 423, 227], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'EEEE FFFF GGGG'", - "rect": [168, 8, 423, 227], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'HHHH IIII JJJJ'", - "rect": [168, 8, 423, 227], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'KKKK LLLL'", - "rect": [168, 8, 423, 227], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'MMMM NNNN'", - "rect": [168, 8, 423, 227], - "reason": "disappeared" - } + "invalidations": [ + [0, 0, 939, 235] ], "transform": 1 }, @@ -79,12 +35,8 @@ "bounds": [939, 235], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 939, 235], - "reason": "background" - } + "invalidations": [ + [0, 0, 939, 235] ], "transform": 1 }, @@ -113,47 +65,9 @@ "bounds": [400, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow HTML", - "rect": [10, 8, 920, 212], - "reason": "chunk disappeared" - }, - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 400, 600], - "reason": "background" - }, - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 400, 235], - "reason": "background" - }, - { - "object": "NGPhysicalTextFragment 'AAAA BBBB CCCC'", - "rect": [39, 8, 352, 561], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'DDDD EEEE FFFF'", - "rect": [39, 8, 352, 561], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'GGGG HHHH IIII JJJJ'", - "rect": [39, 8, 352, 561], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'KKKK LLLL MMMM'", - "rect": [39, 8, 352, 561], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'NNNN'", - "rect": [39, 8, 352, 561], - "reason": "appeared" - } + "invalidations": [ + [10, 8, 920, 212], + [0, 0, 400, 600] ] } ] @@ -165,62 +79,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [400, 0, 400, 600], - "reason": "incremental" - }, - { - "object": "NGPhysicalTextFragment 'AAAA BBBB CCCC'", - "rect": [439, 8, 352, 561], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'DDDD EEEE FFFF'", - "rect": [439, 8, 352, 561], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'GGGG HHHH IIII JJJJ'", - "rect": [439, 8, 352, 561], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'KKKK LLLL MMMM'", - "rect": [439, 8, 352, 561], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'NNNN'", - "rect": [439, 8, 352, 561], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'AAAA BBBB CCCC'", - "rect": [39, 8, 352, 561], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'DDDD EEEE FFFF'", - "rect": [39, 8, 352, 561], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'GGGG HHHH IIII JJJJ'", - "rect": [39, 8, 352, 561], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'KKKK LLLL MMMM'", - "rect": [39, 8, 352, 561], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'NNNN'", - "rect": [39, 8, 352, 561], - "reason": "geometry" - } + "invalidations": [ + [400, 0, 400, 600], + [39, 8, 352, 561] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-viewport-percent-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-viewport-percent-expected.txt index 005ae034..42e1fa8e 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-viewport-percent-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/window-resize/window-resize-viewport-percent-expected.txt
@@ -5,17 +5,9 @@ "bounds": [600, 250], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [0, 25, 50, 25], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [25, 0, 25, 50], - "reason": "incremental" - } + "invalidations": [ + [0, 25, 50, 25], + [25, 0, 25, 50] ] } ] @@ -37,22 +29,10 @@ "bounds": [400, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 250, 400, 350], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [0, 25, 60, 35], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [25, 0, 35, 60], - "reason": "incremental" - } + "invalidations": [ + [0, 250, 400, 350], + [0, 25, 60, 35], + [25, 0, 35, 60] ] } ] @@ -64,12 +44,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [400, 0, 400, 600], - "reason": "incremental" - } + "invalidations": [ + [400, 0, 400, 600] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/pagination/pagination-change-clip-crash-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/pagination/pagination-change-clip-crash-expected.txt index 9bc1442..dc3f6626 100644 --- a/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/pagination/pagination-change-clip-crash-expected.txt +++ b/third_party/blink/web_tests/flag-specific/composite-after-paint/paint/pagination/pagination-change-clip-crash-expected.txt
@@ -5,12 +5,8 @@ "bounds": [785, 736], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 636, 785, 100], - "reason": "incremental" - } + "invalidations": [ + [0, 636, 785, 100] ] }, {
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 index 193a8264..982d1f2 100644 --- 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
@@ -56,12 +56,8 @@ "name": "Squashing Layer (first squashed layer: LayoutBlockFlow (positioned) DIV id='A' class='overlap1')", "position": [80, 80], "bounds": [260, 260], - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='C' class='overlap3'", - "rect": [160, 160, 100, 100], - "reason": "chunk appeared" - } + "invalidations": [ + [160, 160, 100, 100] ], "transform": 1 } @@ -99,12 +95,8 @@ "name": "Squashing Layer (first squashed layer: LayoutBlockFlow (positioned) DIV id='A' class='overlap1')", "position": [80, 80], "bounds": [260, 260], - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='B' class='overlap2'", - "rect": [80, 80, 100, 100], - "reason": "chunk disappeared" - } + "invalidations": [ + [80, 80, 100, 100] ], "transform": 1 } @@ -142,17 +134,8 @@ "name": "Squashing Layer (first squashed layer: LayoutBlockFlow (positioned) DIV id='C' class='overlap3')", "position": [240, 240], "bounds": [100, 100], - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='A' class='overlap1'", - "rect": [0, 0, 100, 100], - "reason": "chunk disappeared" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='C' class='overlap3'", - "rect": [0, 0, 100, 100], - "reason": "paint property change" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 1 } @@ -190,22 +173,9 @@ "name": "Squashing Layer (first squashed layer: LayoutBlockFlow (positioned) DIV id='B' class='overlap2')", "position": [160, 160], "bounds": [180, 180], - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='C' class='overlap3'", - "rect": [80, 80, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='B' class='overlap2'", - "rect": [0, 0, 100, 100], - "reason": "chunk appeared" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='C' class='overlap3'", - "rect": [0, 0, 100, 100], - "reason": "paint property change" - } + "invalidations": [ + [80, 80, 100, 100], + [0, 0, 100, 100] ], "transform": 1 } @@ -243,27 +213,9 @@ "name": "Squashing Layer (first squashed layer: LayoutBlockFlow (positioned) DIV id='A' class='overlap1')", "position": [80, 80], "bounds": [180, 180], - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='B' class='overlap2'", - "rect": [80, 80, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='C' class='overlap3'", - "rect": [80, 80, 100, 100], - "reason": "chunk disappeared" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='A' class='overlap1'", - "rect": [0, 0, 100, 100], - "reason": "chunk appeared" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='B' class='overlap2'", - "rect": [0, 0, 100, 100], - "reason": "paint property change" - } + "invalidations": [ + [80, 80, 100, 100], + [0, 0, 100, 100] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/invalidations-with-large-negative-margin-inline-content-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/invalidations-with-large-negative-margin-inline-content-expected.txt deleted file mode 100644 index 397409c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/invalidations-with-large-negative-margin-inline-content-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='chip'", - "rect": [408, 108, 20, 20], - "reason": "background" - } - ] - } - ] -} -
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 index 69933e97..ec70799 100644 --- 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
@@ -54,12 +54,8 @@ "name": "Squashing Layer (first squashed layer: LayoutBlockFlow (positioned) DIV class='box top')", "position": [80, 80], "bounds": [100, 100], - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='inner'", - "rect": [10, 10, 50, 50], - "reason": "background" - } + "invalidations": [ + [10, 10, 50, 50] ], "transform": 1 }
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 index b82b6b7..f33b949 100644 --- 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
@@ -16,17 +16,8 @@ "name": "Squashing Layer (first squashed layer: LayoutBlockFlow (positioned) DIV class='item')", "position": [7, 27], "bounds": [100, 210], - "paintInvalidations": [ - { - "object": "InlineTextBox 'ipsum'", - "rect": [0, 80, 40, 39], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'lorem'", - "rect": [0, 80, 40, 39], - "reason": "geometry" - } + "invalidations": [ + [0, 80, 40, 39] ], "transform": 1 } @@ -61,27 +52,9 @@ "name": "Squashing Layer (first squashed layer: LayoutBlockFlow (positioned) DIV class='item')", "position": [7, 27], "bounds": [100, 210], - "paintInvalidations": [ - { - "object": "InlineTextBox 'ipsum'", - "rect": [0, 80, 42, 39], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'lorem'", - "rect": [0, 80, 42, 39], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'ipsum'", - "rect": [0, 160, 40, 39], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'lorem'", - "rect": [0, 160, 40, 39], - "reason": "geometry" - } + "invalidations": [ + [0, 80, 42, 39], + [0, 160, 40, 39] ], "transform": 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 index c02e5ce..275841b 100644 --- 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
@@ -58,17 +58,9 @@ "bounds": [785, 1400], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (relative positioned) DIV id='paragraph-f' class='overlapping lime'", - "rect": [0, 500, 200, 100], - "reason": "chunk disappeared" - }, - { - "object": "LayoutBlockFlow (relative positioned) DIV id='paragraph-b' class='overlapping lime'", - "rect": [0, 100, 200, 100], - "reason": "chunk appeared" - } + "invalidations": [ + [0, 500, 200, 100], + [0, 100, 200, 100] ], "transform": 1 }, @@ -85,12 +77,8 @@ "bounds": [200, 100], "contentsOpaque": true, "backgroundColor": "#00FFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (relative positioned) DIV id='paragraph-c' class='overlapping cyan'", - "rect": [0, 0, 200, 100], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 200, 100] ], "transform": 1 }, @@ -98,12 +86,8 @@ "name": "Squashing Layer (first squashed layer: LayoutBlockFlow (relative positioned) DIV id='paragraph-d' class='overlapping lime')", "position": [0, 300], "bounds": [200, 300], - "paintInvalidations": [ - { - "object": "Squashing Layer (first squashed layer: LayoutBlockFlow (relative positioned) DIV id='paragraph-d' class='overlapping lime')", - "rect": [0, 0, 200, 300], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 200, 300] ], "transform": 1 }, @@ -204,17 +188,9 @@ "bounds": [785, 1400], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (relative positioned) DIV id='paragraph-g' class='overlapping cyan'", - "rect": [0, 600, 200, 100], - "reason": "chunk disappeared" - }, - { - "object": "LayoutBlockFlow (relative positioned) DIV id='paragraph-c' class='overlapping cyan'", - "rect": [0, 200, 200, 100], - "reason": "chunk appeared" - } + "invalidations": [ + [0, 600, 200, 100], + [0, 200, 200, 100] ], "transform": 1 }, @@ -231,12 +207,8 @@ "bounds": [200, 100], "contentsOpaque": true, "backgroundColor": "#00FF00", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (relative positioned) DIV id='paragraph-d' class='overlapping lime'", - "rect": [0, 0, 200, 100], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 200, 100] ], "transform": 1 }, @@ -244,12 +216,8 @@ "name": "Squashing Layer (first squashed layer: LayoutBlockFlow (relative positioned) DIV id='paragraph-e' class='overlapping cyan')", "position": [0, 400], "bounds": [200, 300], - "paintInvalidations": [ - { - "object": "Squashing Layer (first squashed layer: LayoutBlockFlow (relative positioned) DIV id='paragraph-e' class='overlapping cyan')", - "rect": [0, 0, 200, 300], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 200, 300] ], "transform": 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 index a1ba440..e306c8053 100644 --- 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
@@ -147,12 +147,8 @@ "position": [100, 100], "bounds": [200, 4000], "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='innerScrolling'", - "rect": [100, 0, 100, 100], - "reason": "chunk appeared" - } + "invalidations": [ + [100, 0, 100, 100] ], "transform": 1 },
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 index 118a3a5..c1de8cb 100644 --- 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
@@ -26,12 +26,8 @@ "bounds": [100, 100], "contentsOpaque": true, "backgroundColor": "#FF0000", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='foo'", - "rect": [0, 0, 100, 100], - "reason": "background" - } + "invalidations": [ + [0, 0, 100, 100] ] } ], @@ -75,12 +71,8 @@ "bounds": [100, 100], "contentsOpaque": true, "backgroundColor": "#0000FF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='foo'", - "rect": [0, 0, 100, 100], - "reason": "background" - } + "invalidations": [ + [0, 0, 100, 100] ] } ],
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 index a8c968e..dd86b55 100644 --- 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
@@ -54,12 +54,8 @@ "name": "Squashing Layer (first squashed layer: LayoutBlockFlow (positioned) DIV class='box middle')", "position": [-101, -101], "bounds": [281, 281], - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV class='box middle'", - "rect": [0, 0, 142, 142], - "reason": "background" - } + "invalidations": [ + [0, 0, 142, 142] ], "transform": 1 } @@ -97,17 +93,8 @@ "name": "Squashing Layer (first squashed layer: LayoutBlockFlow (positioned) DIV class='box middle')", "position": [-101, -101], "bounds": [281, 281], - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV class='box middle'", - "rect": [0, 0, 142, 142], - "reason": "background" - }, - { - "object": "LayoutBlockFlow (positioned) DIV class='smallbox'", - "rect": [32, 32, 71, 71], - "reason": "background" - } + "invalidations": [ + [0, 0, 142, 142] ], "transform": 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 index 3ef87fb..dae71b8f 100644 --- 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
@@ -54,12 +54,8 @@ "name": "Squashing Layer (first squashed layer: LayoutBlockFlow (positioned) DIV class='box middle')", "position": [-96, -96], "bounds": [276, 276], - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV class='box middle'", - "rect": [0, 0, 132, 132], - "reason": "background" - } + "invalidations": [ + [0, 0, 132, 132] ], "transform": 1 } @@ -97,17 +93,8 @@ "name": "Squashing Layer (first squashed layer: LayoutBlockFlow (positioned) DIV class='box middle')", "position": [-96, -96], "bounds": [276, 276], - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV class='box middle'", - "rect": [0, 0, 132, 132], - "reason": "background" - }, - { - "object": "LayoutBlockFlow (positioned) DIV class='smallbox'", - "rect": [26, 28, 71, 72], - "reason": "background" - } + "invalidations": [ + [0, 0, 132, 132] ], "transform": 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 index f84ab15..b0ab39b 100644 --- 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
@@ -44,27 +44,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='C' class='overlap3'", - "rect": [300, 300, 100, 100], - "reason": "chunk appeared" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='B' class='overlap2'", - "rect": [220, 220, 100, 100], - "reason": "chunk appeared" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='A' class='overlap1'", - "rect": [140, 140, 100, 100], - "reason": "chunk appeared" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='forceComposited' class='underneath'", - "rect": [60, 60, 100, 100], - "reason": "chunk appeared" - } + "invalidations": [ + [300, 300, 100, 100], + [220, 220, 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 index 71571c75..ec96575 100644 --- 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
@@ -56,12 +56,8 @@ "name": "Squashing Layer (first squashed layer: LayoutBlockFlow (positioned) DIV id='A' class='overlap1')", "position": [80, 80], "bounds": [260, 260], - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='A' class='overlap1'", - "rect": [0, 0, 100, 100], - "reason": "background" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 1 } @@ -99,17 +95,9 @@ "name": "Squashing Layer (first squashed layer: LayoutBlockFlow (positioned) DIV id='A' class='overlap1')", "position": [80, 80], "bounds": [260, 260], - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='B' class='overlap2'", - "rect": [80, 80, 100, 100], - "reason": "background" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='A' class='overlap1'", - "rect": [0, 0, 100, 100], - "reason": "background" - } + "invalidations": [ + [80, 80, 100, 100], + [0, 0, 100, 100] ], "transform": 1 } @@ -147,17 +135,9 @@ "name": "Squashing Layer (first squashed layer: LayoutBlockFlow (positioned) DIV id='A' class='overlap1')", "position": [80, 80], "bounds": [260, 260], - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='C' class='overlap3'", - "rect": [160, 160, 100, 100], - "reason": "background" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='B' class='overlap2'", - "rect": [80, 80, 100, 100], - "reason": "background" - } + "invalidations": [ + [160, 160, 100, 100], + [80, 80, 100, 100] ], "transform": 1 } @@ -195,17 +175,9 @@ "name": "Squashing Layer (first squashed layer: LayoutBlockFlow (positioned) DIV id='A' class='overlap1')", "position": [80, 80], "bounds": [260, 260], - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='C' class='overlap3'", - "rect": [160, 160, 100, 100], - "reason": "background" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='A' class='overlap1'", - "rect": [0, 0, 100, 100], - "reason": "background" - } + "invalidations": [ + [160, 160, 100, 100], + [0, 0, 100, 100] ], "transform": 1 }
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 index 8fadae8..8818f3e 100644 --- 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
@@ -10,17 +10,9 @@ { "name": "LayoutBlockFlow (relative positioned) DIV id='container'", "bounds": [100, 50], - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='test'", - "rect": [11, 0, 14, 12], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='test'", - "rect": [9, 0, 14, 12], - "reason": "geometry" - } + "invalidations": [ + [11, 0, 14, 12], + [9, 0, 14, 12] ], "transform": 1 } @@ -49,17 +41,9 @@ { "name": "LayoutBlockFlow (relative positioned) DIV id='container'", "bounds": [100, 50], - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='test'", - "rect": [11, 0, 14, 12], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='test'", - "rect": [9, 0, 14, 12], - "reason": "geometry" - } + "invalidations": [ + [11, 0, 14, 12], + [9, 0, 14, 12] ], "transform": 1 } @@ -88,17 +72,9 @@ { "name": "LayoutBlockFlow (relative positioned) DIV id='container'", "bounds": [100, 50], - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='test'", - "rect": [12, 0, 14, 12], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='test'", - "rect": [10, 0, 14, 12], - "reason": "geometry" - } + "invalidations": [ + [12, 0, 14, 12], + [10, 0, 14, 12] ], "transform": 1 } @@ -127,17 +103,9 @@ { "name": "LayoutBlockFlow (relative positioned) DIV id='container'", "bounds": [100, 50], - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='test'", - "rect": [11, 0, 14, 12], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='test'", - "rect": [9, 0, 14, 12], - "reason": "geometry" - } + "invalidations": [ + [11, 0, 14, 12], + [9, 0, 14, 12] ], "transform": 1 } @@ -166,17 +134,9 @@ { "name": "LayoutBlockFlow (relative positioned) DIV id='container'", "bounds": [100, 50], - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='test'", - "rect": [12, 0, 14, 12], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='test'", - "rect": [10, 0, 14, 12], - "reason": "geometry" - } + "invalidations": [ + [12, 0, 14, 12], + [10, 0, 14, 12] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/background/background-currentColor-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/background/background-currentColor-repaint-expected.txt deleted file mode 100644 index 490cf50b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/background/background-currentColor-repaint-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='div2'", - "rect": [8, 108, 100, 100], - "reason": "appeared" - }, - { - "object": "LayoutBlockFlow DIV id='div1'", - "rect": [8, 8, 100, 100], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/background/background-generated-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/background/background-generated-expected.txt deleted file mode 100644 index 4fd3633..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/background/background-generated-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV", - "rect": [8, 8, 100, 300], - "reason": "background" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/background/background-misaligned-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/background/background-misaligned-expected.txt index cb42c57..95bd2ed 100644 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/background/background-misaligned-expected.txt +++ b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/background/background-misaligned-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='target'", - "rect": [238, 241, 40, 40], - "reason": "disappeared" - } + "invalidations": [ + [238, 241, 40, 40] ] } ]
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 index 6df03dc..a2709aa 100644 --- 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
@@ -11,12 +11,8 @@ "bounds": [60, 44], "contentsOpaque": true, "backfaceVisibility": "hidden", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV class='test image'", - "rect": [0, 40, 60, 4], - "reason": "incremental" - } + "invalidations": [ + [0, 40, 60, 4] ], "transform": 1 }, @@ -25,12 +21,8 @@ "bounds": [60, 44], "contentsOpaque": true, "backfaceVisibility": "hidden", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV class='test image size-cover'", - "rect": [0, 0, 60, 44], - "reason": "background" - } + "invalidations": [ + [0, 0, 60, 44] ], "transform": 2 }, @@ -39,12 +31,8 @@ "bounds": [60, 44], "contentsOpaque": true, "backfaceVisibility": "hidden", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV class='test image size-contain'", - "rect": [0, 0, 60, 44], - "reason": "background" - } + "invalidations": [ + [0, 0, 60, 44] ], "transform": 3 }, @@ -53,12 +41,8 @@ "bounds": [60, 44], "contentsOpaque": true, "backfaceVisibility": "hidden", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV class='test image fixed-height'", - "rect": [0, 40, 60, 4], - "reason": "incremental" - } + "invalidations": [ + [0, 40, 60, 4] ], "transform": 4 }, @@ -67,12 +51,8 @@ "bounds": [60, 44], "contentsOpaque": true, "backfaceVisibility": "hidden", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV class='test image percent-height'", - "rect": [0, 0, 60, 44], - "reason": "background" - } + "invalidations": [ + [0, 0, 60, 44] ], "transform": 5 }, @@ -81,12 +61,8 @@ "bounds": [60, 44], "contentsOpaque": true, "backfaceVisibility": "hidden", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV class='test image top'", - "rect": [0, 40, 60, 4], - "reason": "incremental" - } + "invalidations": [ + [0, 40, 60, 4] ], "transform": 6 }, @@ -95,12 +71,8 @@ "bounds": [60, 44], "contentsOpaque": true, "backfaceVisibility": "hidden", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV class='test image bottom'", - "rect": [0, 0, 60, 44], - "reason": "background" - } + "invalidations": [ + [0, 0, 60, 44] ], "transform": 7 }, @@ -109,12 +81,8 @@ "bounds": [60, 44], "contentsOpaque": true, "backfaceVisibility": "hidden", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV class='test image center'", - "rect": [0, 0, 60, 44], - "reason": "background" - } + "invalidations": [ + [0, 0, 60, 44] ], "transform": 8 }, @@ -122,12 +90,8 @@ "name": "LayoutBlockFlow (positioned) DIV class='test image no-repeat'", "bounds": [60, 44], "backfaceVisibility": "hidden", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV class='test image no-repeat'", - "rect": [0, 40, 60, 4], - "reason": "incremental" - } + "invalidations": [ + [0, 40, 60, 4] ], "transform": 9 }, @@ -135,12 +99,8 @@ "name": "LayoutBlockFlow (positioned) DIV class='test image repeat-space'", "bounds": [60, 44], "backfaceVisibility": "hidden", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV class='test image repeat-space'", - "rect": [0, 0, 60, 44], - "reason": "background" - } + "invalidations": [ + [0, 0, 60, 44] ], "transform": 10 }, @@ -149,12 +109,8 @@ "bounds": [60, 44], "contentsOpaque": true, "backfaceVisibility": "hidden", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV class='test image repeat-round'", - "rect": [0, 0, 60, 44], - "reason": "background" - } + "invalidations": [ + [0, 0, 60, 44] ], "transform": 11 }, @@ -163,12 +119,8 @@ "bounds": [60, 44], "contentsOpaque": true, "backfaceVisibility": "hidden", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV class='test generated'", - "rect": [0, 0, 60, 44], - "reason": "background" - } + "invalidations": [ + [0, 0, 60, 44] ], "transform": 12 }, @@ -177,12 +129,8 @@ "bounds": [60, 44], "contentsOpaque": true, "backfaceVisibility": "hidden", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV class='test generated size-cover'", - "rect": [0, 0, 60, 44], - "reason": "background" - } + "invalidations": [ + [0, 0, 60, 44] ], "transform": 13 }, @@ -191,12 +139,8 @@ "bounds": [60, 44], "contentsOpaque": true, "backfaceVisibility": "hidden", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV class='test generated size-contain'", - "rect": [0, 0, 60, 44], - "reason": "background" - } + "invalidations": [ + [0, 0, 60, 44] ], "transform": 14 }, @@ -205,12 +149,8 @@ "bounds": [60, 44], "contentsOpaque": true, "backfaceVisibility": "hidden", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV class='test generated percent-height'", - "rect": [0, 0, 60, 44], - "reason": "background" - } + "invalidations": [ + [0, 0, 60, 44] ], "transform": 15 }, @@ -219,12 +159,8 @@ "bounds": [60, 44], "contentsOpaque": true, "backfaceVisibility": "hidden", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV class='test generated top'", - "rect": [0, 0, 60, 44], - "reason": "background" - } + "invalidations": [ + [0, 0, 60, 44] ], "transform": 16 }, @@ -233,12 +169,8 @@ "bounds": [60, 44], "contentsOpaque": true, "backfaceVisibility": "hidden", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV class='test generated bottom'", - "rect": [0, 0, 60, 44], - "reason": "background" - } + "invalidations": [ + [0, 0, 60, 44] ], "transform": 17 }, @@ -247,12 +179,8 @@ "bounds": [60, 44], "contentsOpaque": true, "backfaceVisibility": "hidden", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV class='test generated center'", - "rect": [0, 0, 60, 44], - "reason": "background" - } + "invalidations": [ + [0, 0, 60, 44] ], "transform": 18 }, @@ -260,12 +188,8 @@ "name": "LayoutBlockFlow (positioned) DIV class='test generated no-repeat'", "bounds": [60, 44], "backfaceVisibility": "hidden", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV class='test generated no-repeat'", - "rect": [0, 0, 60, 44], - "reason": "background" - } + "invalidations": [ + [0, 0, 60, 44] ], "transform": 19 }, @@ -273,12 +197,8 @@ "name": "LayoutBlockFlow (positioned) DIV class='test generated repeat-space'", "bounds": [60, 44], "backfaceVisibility": "hidden", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV class='test generated repeat-space'", - "rect": [0, 0, 60, 44], - "reason": "background" - } + "invalidations": [ + [0, 0, 60, 44] ], "transform": 20 }, @@ -287,12 +207,8 @@ "bounds": [60, 44], "contentsOpaque": true, "backfaceVisibility": "hidden", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV class='test generated repeat-round'", - "rect": [0, 0, 60, 44], - "reason": "background" - } + "invalidations": [ + [0, 0, 60, 44] ], "transform": 21 }
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/background/background-shorthand-with-gradient-and-height-changes-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/background/background-shorthand-with-gradient-and-height-changes-expected.txt deleted file mode 100644 index bb2a8a4c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/background/background-shorthand-with-gradient-and-height-changes-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='outer'", - "rect": [8, 8, 784, 500], - "reason": "background" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/background/background-size-auto-with-gradient-and-height-changes-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/background/background-size-auto-with-gradient-and-height-changes-expected.txt deleted file mode 100644 index bb2a8a4c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/background/background-size-auto-with-gradient-and-height-changes-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='outer'", - "rect": [8, 8, 784, 500], - "reason": "background" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/background/backgroundSizeRepaint-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/background/backgroundSizeRepaint-expected.txt deleted file mode 100644 index 02e05e3f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/background/backgroundSizeRepaint-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV", - "rect": [19, 339, 200, 60], - "reason": "background" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [19, 177, 200, 60], - "reason": "background" - }, - { - "object": "LayoutBlockFlow DIV id='b'", - "rect": [29, 379, 180, 20], - "reason": "incremental" - }, - { - "object": "LayoutBlockFlow DIV id='a'", - "rect": [29, 217, 180, 20], - "reason": "incremental" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/background/body-background-image-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/background/body-background-image-expected.txt deleted file mode 100644 index 4ffc49c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/background/body-background-image-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow BODY", - "rect": [8, 240, 784, 288], - "reason": "background" - } - ] - } - ] -} -
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 index 09bb5f44..ed48f81 100644 --- 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
@@ -11,12 +11,8 @@ "bounds": [240, 240], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='target'", - "rect": [0, 0, 240, 240], - "reason": "background" - } + "invalidations": [ + [0, 0, 240, 240] ], "transform": 1 }, @@ -26,12 +22,8 @@ "bounds": [185, 3000], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutBlockFlow DIV id='target'", - "rect": [0, 0, 185, 3000], - "reason": "background" - } + "invalidations": [ + [0, 0, 185, 3000] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/background/viewport-gradient-background-html-move-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/background/viewport-gradient-background-html-move-overflow-expected.txt deleted file mode 100644 index bab01e64..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/background/viewport-gradient-background-html-move-overflow-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 800, 600], - "reason": "background" - }, - { - "object": "LayoutBlockFlow HTML", - "rect": [0, 0, 800, 170], - "reason": "style change" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/background/viewport-gradient-background-html-resize-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/background/viewport-gradient-background-html-resize-overflow-expected.txt deleted file mode 100644 index 1492ece7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/background/viewport-gradient-background-html-resize-overflow-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 800, 600], - "reason": "background" - }, - { - "object": "LayoutBlockFlow HTML", - "rect": [0, 0, 800, 200], - "reason": "disappeared" - } - ] - } - ] -} -
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 9f1b688..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/block-layout-inline-children-replaced-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' class='target'", - "rect": [0, 116, 402, 152], - "reason": "geometry" - }, - { - "object": "LayoutImage IMG", - "rect": [151, 117, 100, 100], - "reason": "appeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/block-no-inflow-children-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/block-no-inflow-children-expected.txt deleted file mode 100644 index 6c3d8cc..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/block-no-inflow-children-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'La la la la'", - "rect": [0, 0, 62, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'La la la'", - "rect": [0, 0, 47, 19], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/block-shift-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/block-shift-repaint-expected.txt deleted file mode 100644 index 489d5f6..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/block-shift-repaint-expected.txt +++ /dev/null
@@ -1,93 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV class='half'", - "rect": [8, 353, 60, 38], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='half'", - "rect": [8, 338, 60, 38], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='red half'", - "rect": [8, 248, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='green half'", - "rect": [8, 218, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='red half'", - "rect": [8, 218, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='green half'", - "rect": [8, 188, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='green half'", - "rect": [8, 158, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='green half'", - "rect": [8, 128, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='red half'", - "rect": [8, 128, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='red half'", - "rect": [8, 98, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV id='top' class='blue half'", - "rect": [8, 98, 60, 30], - "reason": "disappeared" - }, - { - "object": "LayoutBlockFlow DIV class='green half'", - "rect": [8, 68, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='green half'", - "rect": [8, 38, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='red half'", - "rect": [8, 38, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='red half'", - "rect": [8, 8, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV id='div1' class='blue half'", - "rect": [8, 8, 60, 30], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/border-current-color-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/border-current-color-expected.txt deleted file mode 100644 index 9251421..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/border-current-color-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='currentColor'", - "rect": [58, 220, 120, 120], - "reason": "style change" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/border-image-outset-add-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/border-image-outset-add-repaint-expected.txt deleted file mode 100644 index 23b6bcc..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/border-image-outset-add-repaint-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='test'", - "rect": [8, 8, 75, 75], - "reason": "style change" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/border-image-outset-change-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/border-image-outset-change-repaint-expected.txt deleted file mode 100644 index 23b6bcc..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/border-image-outset-change-repaint-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='test'", - "rect": [8, 8, 75, 75], - "reason": "style change" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/border-radius-repaint-2-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/border-radius-repaint-2-expected.txt deleted file mode 100644 index 222f84e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/border-radius-repaint-2-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [874, 600], - "contentsOpaque": true, - "backgroundColor": "#3F3F3F", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV", - "rect": [8, 8, 866, 592], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [137, 88, 607, 512], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/border-radius-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/border-radius-repaint-expected.txt deleted file mode 100644 index f623b91..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/border-radius-repaint-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV", - "rect": [19, 245, 200, 88], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [19, 83, 200, 88], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV id='b'", - "rect": [33, 299, 172, 20], - "reason": "incremental" - }, - { - "object": "LayoutBlockFlow DIV id='a'", - "rect": [33, 137, 172, 20], - "reason": "incremental" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/border-radius-without-border-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/border-radius-without-border-expected.txt deleted file mode 100644 index 286f4d9..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/border-radius-without-border-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='target1'", - "rect": [0, 0, 200, 100], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='target2'", - "rect": [0, 200, 100, 200], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/border-repaint-glitch-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/border-repaint-glitch-expected.txt deleted file mode 100644 index b19e2e7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/border-repaint-glitch-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV", - "rect": [19, 349, 200, 88], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [19, 187, 200, 88], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV id='b'", - "rect": [33, 403, 172, 20], - "reason": "incremental" - }, - { - "object": "LayoutBlockFlow DIV id='a'", - "rect": [33, 241, 172, 20], - "reason": "incremental" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/box-shadow-add-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/box-shadow-add-repaint-expected.txt deleted file mode 100644 index 7e9b931..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/box-shadow-add-repaint-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='test'", - "rect": [5, 5, 116, 116], - "reason": "style change" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/box-shadow-change-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/box-shadow-change-repaint-expected.txt deleted file mode 100644 index 31ed28d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/box-shadow-change-repaint-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='test'", - "rect": [3, 3, 130, 130], - "reason": "style change" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/box-shadow-dynamic-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/box-shadow-dynamic-expected.txt deleted file mode 100644 index 38d6b5d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/box-shadow-dynamic-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV", - "rect": [18, 72, 55, 75], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [18, 192, 55, 55], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/box-shadow-inset-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/box-shadow-inset-repaint-expected.txt deleted file mode 100644 index 1354bf8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/box-shadow-inset-repaint-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='container'", - "rect": [8, 8, 230, 130], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [23, 23, 100, 100], - "reason": "appeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/box-sizing-border-keeping-size-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/box-sizing-border-keeping-size-expected.txt deleted file mode 100644 index e61d4f7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/box-sizing-border-keeping-size-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='target2' class='border-box'", - "rect": [0, 200, 100, 100], - "reason": "style change" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='target1' class='content-box'", - "rect": [0, 0, 100, 100], - "reason": "style change" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/box-sizing-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/box-sizing-expected.txt deleted file mode 100644 index 56a3ec4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/box-sizing-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='target2' class='border-box'", - "rect": [0, 200, 440, 140], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='target1' class='content-box'", - "rect": [0, 0, 440, 140], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/box-sizing-padding-keeping-size-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/box-sizing-padding-keeping-size-expected.txt deleted file mode 100644 index e61d4f7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/box-sizing-padding-keeping-size-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='target2' class='border-box'", - "rect": [0, 200, 100, 100], - "reason": "style change" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='target1' class='content-box'", - "rect": [0, 0, 100, 100], - "reason": "style change" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/hover-pseudo-borders-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/hover-pseudo-borders-expected.txt deleted file mode 100644 index 8c15150..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/hover-pseudo-borders-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) ::after", - "rect": [138, 8, 100, 100], - "reason": "style change" - }, - { - "object": "LayoutBlockFlow DIV class='hitregion'", - "rect": [8, 8, 100, 100], - "reason": "background" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/hover-pseudo-borders-whitespace-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/hover-pseudo-borders-whitespace-expected.txt deleted file mode 100644 index 2bc43bbb..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/hover-pseudo-borders-whitespace-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='div_outline'", - "rect": [8, 138, 120, 120], - "reason": "style change" - }, - { - "object": "LayoutBlockFlow DIV id='div_border'", - "rect": [8, 8, 120, 120], - "reason": "style change" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/invalidate-box-shadow-currentColor-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/invalidate-box-shadow-currentColor-expected.txt index edfdb71..dcf8bc3 100644 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/invalidate-box-shadow-currentColor-expected.txt +++ b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/invalidate-box-shadow-currentColor-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineFlowBox", - "rect": [8, 8, 29, 24], - "reason": "style change" - }, - { - "object": "InlineTextBox 'Text'", - "rect": [8, 8, 29, 19], - "reason": "style change" - } + "invalidations": [ + [8, 8, 29, 24] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/margin-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/margin-expected.txt deleted file mode 100644 index e7d2bd0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/margin-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='target'", - "rect": [20, 20, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='target'", - "rect": [0, 0, 100, 100], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/negative-shadow-box-expand-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/negative-shadow-box-expand-expected.txt deleted file mode 100644 index bfa3b18..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/negative-shadow-box-expand-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='outer'", - "rect": [100, 60, 640, 240], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV id='inner2'", - "rect": [100, 200, 600, 100], - "reason": "appeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/negative-shadow-box-shrink-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/negative-shadow-box-shrink-expected.txt deleted file mode 100644 index 497c088..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/negative-shadow-box-shrink-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='outer'", - "rect": [100, 60, 640, 240], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV id='inner2'", - "rect": [100, 200, 600, 100], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/padding-border-keeping-border-box-and-content-box-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/padding-border-keeping-border-box-and-content-box-expected.txt deleted file mode 100644 index 24ddf0a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/padding-border-keeping-border-box-and-content-box-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='target'", - "rect": [0, 0, 180, 180], - "reason": "style change" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/padding-keeping-content-size-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/padding-keeping-content-size-expected.txt deleted file mode 100644 index 1710589..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/padding-keeping-content-size-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='target2' class='outer'", - "rect": [0, 200, 140, 140], - "reason": "appeared" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='target1' class='outer'", - "rect": [0, 0, 140, 140], - "reason": "style change" - }, - { - "object": "LayoutBlockFlow DIV class='inner'", - "rect": [20, 220, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='inner'", - "rect": [0, 200, 100, 100], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/padding-keeping-visual-size-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/padding-keeping-visual-size-expected.txt deleted file mode 100644 index f544ca77..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/padding-keeping-visual-size-expected.txt +++ /dev/null
@@ -1,28 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='target2' class='outer'", - "rect": [0, 200, 100, 100], - "reason": "appeared" - }, - { - "object": "LayoutBlockFlow DIV class='inner'", - "rect": [0, 200, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='target1' class='outer'", - "rect": [0, 0, 100, 100], - "reason": "style change" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/resize-with-border-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/resize-with-border-expected.txt deleted file mode 100644 index a0b5db2..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/resize-with-border-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='div'", - "rect": [100, 100, 420, 220], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/shadow-box-resize-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/shadow-box-resize-expected.txt deleted file mode 100644 index 38065ba..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/shadow-box-resize-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='target1'", - "rect": [100, 100, 190, 120], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='target3'", - "rect": [100, 300, 140, 170], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='target4'", - "rect": [300, 300, 140, 120], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='target2'", - "rect": [300, 100, 140, 120], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/shadow-box-resize-writing-mode-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/shadow-box-resize-writing-mode-expected.txt deleted file mode 100644 index 38065ba..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/shadow-box-resize-writing-mode-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='target1'", - "rect": [100, 100, 190, 120], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='target3'", - "rect": [100, 300, 140, 170], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='target4'", - "rect": [300, 300, 140, 120], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='target2'", - "rect": [300, 100, 140, 120], - "reason": "geometry" - } - ] - } - ] -} -
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 index ce8996f2..dae6c37 100644 --- 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
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='im'", - "rect": [11, 131, 100, 100], - "reason": "geometry" - }, - { - "object": "InlineTextBox '\u00A0'", - "rect": [11, 131, 4, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox '\u00A0'", - "rect": [11, 131, 4, 19], - "reason": "disappeared" - } + "invalidations": [ + [11, 131, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/bugzilla-5699-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/bugzilla-5699-expected.txt deleted file mode 100644 index 450b1ee..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/bugzilla-5699-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Hello'", - "rect": [8, 184, 35, 19], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'Hello'", - "rect": [8, 156, 35, 19], - "reason": "geometry" - }, - { - "object": "InlineTextBox '\u00A0'", - "rect": [8, 150, 4, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox '\u00A0'", - "rect": [8, 136, 4, 19], - "reason": "disappeared" - } - ] - } - ] -} -
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 index cd3fcaa..70e6856 100644 --- 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
@@ -5,127 +5,12 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV", - "rect": [10, 138, 292, 160], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [10, 303, 292, 50], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'Curabitur pretium, quam quis semper'", - "rect": [10, 138, 291, 159], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'Phasellus vehicula, sem at posuere vehicula,'", - "rect": [10, 138, 291, 159], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'augue nibh molestie nisl, nec ullamcorper'", - "rect": [10, 138, 291, 159], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'fringilla orci nibh sed neque. Quisque eu nulla'", - "rect": [10, 138, 291, 159], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'lacus ante vulputate pede.'", - "rect": [10, 138, 291, 159], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'laoreet ac, laoreet non, suscipit sed, sapien.'", - "rect": [10, 138, 291, 159], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'malesuada, est libero feugiat libero, vel'", - "rect": [10, 138, 291, 159], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'non nisi molestie accumsan. Etiam tellus urna,'", - "rect": [10, 138, 291, 159], - "reason": "disappeared" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [10, 138, 242, 200], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [10, 343, 242, 50], - "reason": "geometry" - }, - { - "object": "LayoutTableCell TD id='col1'", - "rect": [10, 353, 242, 40], - "reason": "incremental" - }, - { - "object": "InlineTextBox 'Curabitur pretium, quam quis semper'", - "rect": [10, 138, 235, 199], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'Phasellus vehicula, sem at posuere'", - "rect": [10, 138, 235, 199], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'Quisque eu nulla non nisi molestie'", - "rect": [10, 138, 235, 199], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'ac, laoreet non, suscipit sed, sapien.'", - "rect": [10, 138, 235, 199], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'accumsan. Etiam tellus urna, laoreet'", - "rect": [10, 138, 235, 199], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'malesuada, est libero feugiat libero,'", - "rect": [10, 138, 235, 199], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'nec ullamcorper lacus ante vulputate'", - "rect": [10, 138, 235, 199], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'pede.'", - "rect": [10, 138, 235, 199], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'vehicula, augue nibh molestie nisl,'", - "rect": [10, 138, 235, 199], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'vel fringilla orci nibh sed neque.'", - "rect": [10, 138, 235, 199], - "reason": "appeared" - }, - { - "object": "LayoutTableCell TD id='col1'", - "rect": [252, 138, 50, 215], - "reason": "incremental" - } + "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/bugzilla-6388-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/bugzilla-6388-expected.txt deleted file mode 100644 index 673c321..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/bugzilla-6388-expected.txt +++ /dev/null
@@ -1,28 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV", - "rect": [8, 136, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) DIV", - "rect": [8, 136, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [8, 136, 100, 100], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/bugzilla-6473-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/bugzilla-6473-expected.txt deleted file mode 100644 index 80450cd..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/bugzilla-6473-expected.txt +++ /dev/null
@@ -1,28 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (relative positioned) P", - "rect": [8, 152, 784, 20], - "reason": "chunk disappeared" - }, - { - "object": "LayoutBlockFlow (relative positioned) P", - "rect": [8, 136, 784, 20], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'SUCCESS'", - "rect": [8, 136, 71, 19], - "reason": "appeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/bugzilla-7235-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/bugzilla-7235-expected.txt deleted file mode 100644 index c25afba..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/bugzilla-7235-expected.txt +++ /dev/null
@@ -1,28 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='t'", - "rect": [8, 176, 100, 100], - "reason": "appeared" - }, - { - "object": "InlineTextBox '\u00A0'", - "rect": [8, 156, 4, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox '\u00A0'", - "rect": [8, 156, 4, 19], - "reason": "disappeared" - } - ] - } - ] -} -
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 index a83b580..6c348a91b 100644 --- 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
@@ -9,12 +9,8 @@ { "name": "LayoutBlockFlow DIV id='target'", "bounds": [100, 10], - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV", - "rect": [0, 0, 50, 10], - "reason": "chunk disappeared" - } + "invalidations": [ + [0, 0, 50, 10] ], "transform": 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 index 08db8ce..583e2ee 100644 --- 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
@@ -10,24 +10,16 @@ "name": "LayoutBlockFlow DIV", "bounds": [200, 200], "backgroundColor": "#0000FF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV", - "rect": [0, 0, 200, 200], - "reason": "full" - } + "invalidations": [ + [0, 0, 200, 200] ], "transform": 1 }, { "name": "Mask Layer", "bounds": [200, 200], - "paintInvalidations": [ - { - "object": "Mask Layer", - "rect": [0, 0, 200, 200], - "reason": "paint property change" - } + "invalidations": [ + [0, 0, 200, 200] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/clip/clip-path-resize-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/clip/clip-path-resize-expected.txt deleted file mode 100644 index ce7a04a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/clip/clip-path-resize-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": [8, 8, 200, 100], - "reason": "paint property change" - }, - { - "object": "LayoutBlockFlow DIV id='target'", - "rect": [8, 8, 100, 100], - "reason": "paint property change" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/clip/clip-unclip-and-change-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/clip/clip-unclip-and-change-expected.txt deleted file mode 100644 index f1f5ca2..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/clip/clip-unclip-and-change-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='content'", - "rect": [8, 120, 100, 300], - "reason": "background" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/clip/clip-with-layout-delta-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/clip/clip-with-layout-delta-expected.txt deleted file mode 100644 index f547e00..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/clip/clip-with-layout-delta-expected.txt +++ /dev/null
@@ -1,38 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (relative positioned) DIV", - "rect": [108, 8, 100, 100], - "reason": "chunk appeared" - }, - { - "object": "LayoutBlockFlow (relative positioned) DIV", - "rect": [108, 8, 100, 100], - "reason": "chunk disappeared" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [8, 8, 100, 100], - "reason": "appeared" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [8, 8, 100, 100], - "reason": "chunk disappeared" - }, - { - "object": "InlineTextBox '\u00A0'", - "rect": [8, 8, 4, 19], - "reason": "appeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/clip/css-clip-change-stacking-child-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/clip/css-clip-change-stacking-child-expected.txt deleted file mode 100644 index 0576187..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/clip/css-clip-change-stacking-child-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV", - "rect": [8, 8, 300, 200], - "reason": "subtree" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [8, 208, 300, 100], - "reason": "incremental" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/clip/intermediate-layout-position-clip-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/clip/intermediate-layout-position-clip-expected.txt deleted file mode 100644 index 544d923..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/clip/intermediate-layout-position-clip-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='target'", - "rect": [8, 8, 40, 20], - "reason": "incremental" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/clip/mask-clip-change-stacking-child-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/clip/mask-clip-change-stacking-child-expected.txt deleted file mode 100644 index c7b45f2..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/clip/mask-clip-change-stacking-child-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='target'", - "rect": [8, 8, 300, 300], - "reason": "paint property change" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [8, 8, 300, 300], - "reason": "paint property change" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='target'", - "rect": [8, 8, 300, 200], - "reason": "paint property change" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [8, 8, 300, 200], - "reason": "paint property change" - } - ] - } - ] -} -
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 index defd1f0..442b303 100644 --- 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
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) A id='link' class='updated'", - "rect": [48, 108, 90, 25], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox 'Lorem Ipsum'", - "rect": [48, 108, 86, 19], - "reason": "disappeared" - } + "invalidations": [ + [48, 108, 90, 25] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/clip/resize-with-border-clipped-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/clip/resize-with-border-clipped-expected.txt deleted file mode 100644 index 65fb204..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/clip/resize-with-border-clipped-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='container'", - "rect": [100, 100, 200, 200], - "reason": "chunk appeared" - }, - { - "object": "LayoutBlockFlow DIV id='target'", - "rect": [100, 100, 120, 120], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/clip/subtree-root-clip-2-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/clip/subtree-root-clip-2-expected.txt deleted file mode 100644 index 35662fc7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/clip/subtree-root-clip-2-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [8, 8, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutBlockFlow DIV id='target'", - "rect": [8, 8, 100, 100], - "reason": "appeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/clip/subtree-root-clip-3-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/clip/subtree-root-clip-3-expected.txt deleted file mode 100644 index 600d8a2..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/clip/subtree-root-clip-3-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV", - "rect": [15, 60, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutBlockFlow DIV id='target'", - "rect": [15, 60, 100, 100], - "reason": "appeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/clip/subtree-root-clip-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/clip/subtree-root-clip-expected.txt deleted file mode 100644 index 9c871c6..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/clip/subtree-root-clip-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [8, 8, 100, 100], - "reason": "appeared" - }, - { - "object": "LayoutBlockFlow DIV id='inner'", - "rect": [8, 8, 100, 100], - "reason": "disappeared" - } - ] - } - ] -} -
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 index b5a8000b..f1194e3 100644 --- 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
@@ -17,12 +17,8 @@ "bounds": [400, 2000], "contentsOpaque": true, "backgroundColor": "#0000FF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutBlockFlow DIV id='container'", - "rect": [0, 500, 400, 1500], - "reason": "incremental" - } + "invalidations": [ + [0, 500, 400, 1500] ], "transform": 2 },
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 index b5a8000b..f1194e3 100644 --- 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
@@ -17,12 +17,8 @@ "bounds": [400, 2000], "contentsOpaque": true, "backgroundColor": "#0000FF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutBlockFlow DIV id='container'", - "rect": [0, 500, 400, 1500], - "reason": "incremental" - } + "invalidations": [ + [0, 500, 400, 1500] ], "transform": 2 },
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 index 270a4997..559f356 100644 --- 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
@@ -10,12 +10,8 @@ "name": "LayoutBlockFlow (positioned) DIV class='container'", "bounds": [14, 14], "backgroundColor": "#FF0000", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='target' class='green'", - "rect": [0, 0, 14, 14], - "reason": "style change" - } + "invalidations": [ + [0, 0, 14, 14] ], "transform": 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 index e6689c5..28a91430 100644 --- 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
@@ -9,17 +9,9 @@ { "name": "LayoutBlockFlow DIV", "bounds": [784, 550], - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='chunk3'", - "rect": [400, 400, 100, 100], - "reason": "chunk reordered" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='chunk2'", - "rect": [0, 0, 1, 1], - "reason": "chunk reordered" - } + "invalidations": [ + [400, 400, 100, 100], + [0, 0, 1, 1] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/column-span-under-composited-column-child-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/column-span-under-composited-column-child-expected.txt index 5bf3d77f..0c6ce1c 100644 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/column-span-under-composited-column-child-expected.txt +++ b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/column-span-under-composited-column-child-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (column spanner) DIV id='target'", - "rect": [8, 8, 100, 100], - "reason": "background" - } + "invalidations": [ + [8, 8, 100, 100] ] }, {
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/compositing-reason-removed-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/compositing-reason-removed-expected.txt deleted file mode 100644 index 2266d61..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/compositing-reason-removed-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (relative positioned) DIV id='square'", - "rect": [8, 8, 30, 30], - "reason": "appeared" - } - ] - } - ] -} -
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 index 2c4b0674..fbdf692 100644 --- 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
@@ -5,29 +5,17 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV class='fixed'", - "rect": [50, 50, 75, 75], - "reason": "chunk disappeared" - } + "invalidations": [ + [50, 50, 75, 75] ] }, { "name": "LayoutBlockFlow (positioned) DIV id='container'", "bounds": [125, 125], "backgroundColor": "#0000FF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='container'", - "rect": [0, 0, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutBlockFlow (positioned) DIV class='fixed'", - "rect": [50, 50, 75, 75], - "reason": "chunk appeared" - } + "invalidations": [ + [0, 0, 100, 100], + [50, 50, 75, 75] ], "transform": 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 index 2c4b0674..fbdf692 100644 --- 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
@@ -5,29 +5,17 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV class='fixed'", - "rect": [50, 50, 75, 75], - "reason": "chunk disappeared" - } + "invalidations": [ + [50, 50, 75, 75] ] }, { "name": "LayoutBlockFlow (positioned) DIV id='container'", "bounds": [125, 125], "backgroundColor": "#0000FF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='container'", - "rect": [0, 0, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutBlockFlow (positioned) DIV class='fixed'", - "rect": [50, 50, 75, 75], - "reason": "chunk appeared" - } + "invalidations": [ + [0, 0, 100, 100], + [50, 50, 75, 75] ], "transform": 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 index 971fdad4..0ebde0d 100644 --- 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
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV class='fixed'", - "rect": [50, 50, 75, 75], - "reason": "chunk appeared" - } + "invalidations": [ + [50, 50, 75, 75] ] }, { @@ -18,17 +14,9 @@ "bounds": [100, 100], "contentsOpaque": true, "backgroundColor": "#0000FF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='container'", - "rect": [0, 0, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutBlockFlow (positioned) DIV class='fixed'", - "rect": [50, 50, 75, 75], - "reason": "chunk disappeared" - } + "invalidations": [ + [0, 0, 100, 100], + [50, 50, 75, 75] ], "transform": 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 index 7fe2f25..ac59508 100644 --- 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
@@ -6,12 +6,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV class='fixed'", - "rect": [50, 50, 75, 75], - "reason": "chunk appeared" - } + "invalidations": [ + [50, 50, 75, 75] ] }, { @@ -19,17 +15,9 @@ "bounds": [100, 100], "contentsOpaque": true, "backgroundColor": "#0000FF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='container'", - "rect": [0, 0, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutBlockFlow (positioned) DIV class='fixed'", - "rect": [50, 50, 75, 75], - "reason": "chunk disappeared" - } + "invalidations": [ + [0, 0, 100, 100], + [50, 50, 75, 75] ], "transform": 1 }
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 index 8f9a5c5..7d0fb74 100644 --- 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
@@ -9,12 +9,8 @@ { "name": "LayoutBlockFlow DIV", "bounds": [304, 200], - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV", - "rect": [10, 10, 50, 50], - "reason": "background" - } + "invalidations": [ + [10, 10, 50, 50] ], "transform": 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 index 1ca9937..0151590 100644 --- 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
@@ -17,12 +17,8 @@ "name": "Squashing Layer (first squashed layer: LayoutBlockFlow (positioned) DIV)", "position": [42, 42], "bounds": [200, 200], - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='target'", - "rect": [0, 0, 200, 200], - "reason": "disappeared" - } + "invalidations": [ + [0, 0, 200, 200] ], "transform": 1 }, @@ -31,12 +27,8 @@ "bounds": [200, 200], "contentsOpaque": true, "backgroundColor": "#ADD8E6", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='target'", - "rect": [0, 0, 200, 200], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 200, 200] ], "transform": 2 }
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 index 172ae11c..2811bba 100644 --- 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
@@ -17,12 +17,8 @@ "name": "Squashing Layer (first squashed layer: LayoutBlockFlow (positioned) DIV)", "position": [42, 42], "bounds": [251, 251], - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='target'", - "rect": [50, 50, 201, 201], - "reason": "background" - } + "invalidations": [ + [50, 50, 201, 201] ], "transform": 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 index 12bec44..ff9a37d 100644 --- 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
@@ -11,12 +11,8 @@ "bounds": [400, 400], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='parent'", - "rect": [0, 0, 400, 400], - "reason": "background" - } + "invalidations": [ + [0, 0, 400, 400] ], "transform": 1 }, @@ -25,12 +21,8 @@ "bounds": [75, 75], "contentsOpaque": true, "backgroundColor": "#0000FF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (relative positioned) DIV id='child'", - "rect": [0, 0, 75, 75], - "reason": "background" - } + "invalidations": [ + [0, 0, 75, 75] ], "transform": 2 }
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/invalidations-with-large-negative-margin-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/invalidations-with-large-negative-margin-expected.txt deleted file mode 100644 index 0de1681..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/invalidations-with-large-negative-margin-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='chip'", - "rect": [408, 8, 50, 50], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='chip'", - "rect": [8, 8, 50, 50], - "reason": "geometry" - } - ] - } - ] -} -
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 index e45da36f..39d6444 100644 --- 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
@@ -14,12 +14,8 @@ { "name": "Scrolling Contents Layer", "bounds": [200, 200], - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV", - "rect": [0, 0, 200, 200], - "reason": "chunk disappeared" - } + "invalidations": [ + [0, 0, 200, 200] ], "transform": 1 }, @@ -40,12 +36,8 @@ "bounds": [200, 200], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='target'", - "rect": [0, 0, 200, 200], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 200, 200] ], "transform": 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 index 8b93f8cd..ff4a4eef9 100644 --- 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
@@ -9,12 +9,8 @@ { "name": "LayoutBlockFlow DIV id='target'", "bounds": [100, 100], - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='target'", - "rect": [0, 0, 100, 100], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 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 index efa98ab..58ae6553 100644 --- 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
@@ -15,17 +15,9 @@ { "name": "Squashing Layer (first squashed layer: LayoutBlockFlow (relative positioned) DIV class='mv-tile')", "bounds": [1000, 105], - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (relative positioned) DIV class='mv-tile'", - "rect": [0, 55, 100, 50], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (relative positioned) DIV class='mv-tile'", - "rect": [0, 0, 100, 50], - "reason": "geometry" - } + "invalidations": [ + [0, 55, 100, 50], + [0, 0, 100, 50] ], "transform": 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 index 1fe437a..011ff15 100644 --- 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
@@ -16,12 +16,8 @@ { "name": "Squashing Layer (first squashed layer: LayoutBlockFlow (positioned) DIV id='foo')", "bounds": [100, 1000], - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='foo'", - "rect": [0, 0, 100, 1000], - "reason": "background" - } + "invalidations": [ + [0, 0, 100, 1000] ], "transform": 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 index d4ca243..5e9051b 100644 --- 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
@@ -17,12 +17,8 @@ "name": "Squashing Layer (first squashed layer: LayoutBlockFlow (positioned) DIV)", "position": [0, -8], "bounds": [592, 600], - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='imgElement'", - "rect": [392, 400, 200, 200], - "reason": "background" - } + "invalidations": [ + [392, 400, 200, 200] ], "transform": 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 index b909066..b2931b4 100644 --- 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
@@ -17,17 +17,8 @@ "name": "Squashing Layer (first squashed layer: LayoutBlockFlow (positioned) SPAN class='child')", "position": [42, 42], "bounds": [50, 50], - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) SPAN class='child embiggen'", - "rect": [0, 0, 50, 50], - "reason": "chunk appeared" - }, - { - "object": "LayoutBlockFlow (positioned) SPAN class='child'", - "rect": [0, 0, 40, 40], - "reason": "disappeared" - } + "invalidations": [ + [0, 0, 50, 50] ], "transform": 1 }
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 index dc5d831f..a714c52 100644 --- 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
@@ -9,22 +9,8 @@ { "name": "LayoutBlockFlow DIV id='resizing'", "bounds": [402, 207], - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='resizing'", - "rect": [0, 0, 402, 207], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [2, 155, 398, 50], - "reason": "appeared" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [2, 104, 398, 50], - "reason": "appeared" - } + "invalidations": [ + [0, 0, 402, 207] ], "transform": 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 index 21b9998..e4f856f 100644 --- 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
@@ -16,22 +16,8 @@ "name": "Squashing Layer (first squashed layer: LayoutBlockFlow (positioned) DIV)", "position": [47, 47], "bounds": [500, 500], - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV", - "rect": [0, 0, 500, 500], - "reason": "paint property change" - }, - { - "object": "LayoutBlockFlow (positioned) DIV", - "rect": [55, 55, 445, 445], - "reason": "paint property change" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='to-be-removed'", - "rect": [0, 0, 50, 50], - "reason": "chunk disappeared" - } + "invalidations": [ + [0, 0, 500, 500] ], "transform": 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 index 0b07c39..8dc5ab4 100644 --- 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
@@ -14,12 +14,8 @@ { "name": "LayoutHTMLCanvas (positioned) CANVAS", "bounds": [200, 200], - "paintInvalidations": [ - { - "object": "LayoutHTMLCanvas (positioned) CANVAS", - "rect": [0, 0, 200, 200], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 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 index 9e0b92a4..2469530 100644 --- 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
@@ -14,12 +14,8 @@ { "name": "Scrolling Contents Layer", "bounds": [1000, 1000], - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='content'", - "rect": [0, 0, 1000, 1000], - "reason": "background" - } + "invalidations": [ + [0, 0, 1000, 1000] ], "transform": 2 },
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/should-not-clip-composited-viewport-scrolling-layer-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/should-not-clip-composited-viewport-scrolling-layer-expected.txt deleted file mode 100644 index e9e3c3a0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/should-not-clip-composited-viewport-scrolling-layer-expected.txt +++ /dev/null
@@ -1,47 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [2008, 1516], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='content'", - "rect": [8, 8, 2000, 1500], - "reason": "background" - } - ], - "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], - [-900, -700, 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 index 3a51b6b..f8dd35e 100644 --- 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
@@ -13,17 +13,8 @@ "contentsOpaque": true, "backfaceVisibility": "hidden", "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='composited-box'", - "rect": [0, 0, 20, 70], - "reason": "full layer" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='composited-box'", - "rect": [0, 0, 10, 60], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 20, 70] ], "transform": 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 index e1335138..12456ad 100644 --- 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
@@ -11,12 +11,8 @@ "position": [-10, -10], "bounds": [220, 220], "backgroundColor": "#0000FF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='target'", - "rect": [0, 0, 220, 220], - "reason": "style change" - } + "invalidations": [ + [0, 0, 220, 220] ], "transform": 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 index ad9e0cce..97852b7 100644 --- 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
@@ -17,12 +17,8 @@ "name": "Squashing Layer (first squashed layer: LayoutBlockFlow (positioned) DIV class='box middle')", "position": [80, 80], "bounds": [262, 200], - "paintInvalidations": [ - { - "object": "LayoutImage (positioned) IMG id='repaintdiv' class='repaintdiv'", - "rect": [80, 80, 182, 29], - "reason": "background" - } + "invalidations": [ + [80, 80, 182, 29] ], "transform": 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 index bd0ecef..bd2eda0e 100644 --- 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
@@ -17,12 +17,8 @@ "name": "Squashing Layer (first squashed layer: LayoutBlockFlow (positioned) DIV id='target')", "position": [20, 20], "bounds": [100, 100], - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='target'", - "rect": [0, 0, 100, 100], - "reason": "background" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 2 }
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 bb6b052d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/text-color-change-expected.txt +++ /dev/null
@@ -1,133 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox '\n'", - "rect": [8, 61, 48, 185], - "reason": "style change" - }, - { - "object": "InlineTextBox '\n'", - "rect": [8, 61, 48, 185], - "reason": "style change" - }, - { - "object": "InlineTextBox '\n'", - "rect": [8, 61, 48, 185], - "reason": "style change" - }, - { - "object": "InlineTextBox '\n'", - "rect": [8, 61, 48, 185], - "reason": "style change" - }, - { - "object": "InlineTextBox '\n'", - "rect": [8, 61, 48, 185], - "reason": "style change" - }, - { - "object": "InlineTextBox '\n'", - "rect": [8, 61, 48, 185], - "reason": "style change" - }, - { - "object": "InlineTextBox '\n'", - "rect": [8, 61, 48, 185], - "reason": "style change" - }, - { - "object": "InlineTextBox '\n'", - "rect": [8, 61, 48, 185], - "reason": "style change" - }, - { - "object": "InlineTextBox '\n'", - "rect": [8, 61, 48, 185], - "reason": "style change" - }, - { - "object": "InlineTextBox '\n'", - "rect": [8, 61, 48, 185], - "reason": "style change" - }, - { - "object": "InlineTextBox '\n'", - "rect": [8, 61, 48, 185], - "reason": "style change" - }, - { - "object": "InlineTextBox '\n'", - "rect": [8, 61, 48, 185], - "reason": "style change" - }, - { - "object": "InlineTextBox ' Text'", - "rect": [8, 61, 48, 185], - "reason": "style change" - }, - { - "object": "InlineTextBox ' Text'", - "rect": [8, 61, 48, 185], - "reason": "style change" - }, - { - "object": "InlineTextBox ' Text'", - "rect": [8, 61, 48, 185], - "reason": "style change" - }, - { - "object": "InlineTextBox ' Text'", - "rect": [8, 61, 48, 185], - "reason": "style change" - }, - { - "object": "InlineTextBox ' Text'", - "rect": [8, 61, 48, 185], - "reason": "style change" - }, - { - "object": "InlineTextBox ' Text'", - "rect": [8, 61, 48, 185], - "reason": "style change" - }, - { - "object": "InlineTextBox ' Text'", - "rect": [8, 61, 48, 185], - "reason": "style change" - }, - { - "object": "InlineTextBox ' Text'", - "rect": [8, 61, 48, 185], - "reason": "style change" - }, - { - "object": "InlineTextBox ' Text'", - "rect": [8, 61, 48, 185], - "reason": "style change" - }, - { - "object": "InlineTextBox ' Text'", - "rect": [8, 61, 48, 185], - "reason": "style change" - }, - { - "object": "InlineTextBox ' Text'", - "rect": [8, 61, 48, 185], - "reason": "style change" - }, - { - "object": "InlineTextBox ' Text'", - "rect": [8, 61, 48, 185], - "reason": "style change" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/text-match-highlight-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/text-match-highlight-expected.txt deleted file mode 100644 index 0c9376f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/text-match-highlight-expected.txt +++ /dev/null
@@ -1,53 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Can you findme in this boring text?'", - "rect": [10, 135, 223, 19], - "reason": "DocumentMarker change" - }, - { - "object": "InlineTextBox 'Findme on a path! Did you findme?'", - "rect": [20, 224, 182, 72], - "reason": "DocumentMarker change" - }, - { - "object": "InlineTextBox 'Findme in a typewriter!'", - "rect": [10, 191, 138, 12], - "reason": "DocumentMarker change" - }, - { - "object": "InlineTextBox 'findme'", - "rect": [278, 40, 44, 19], - "reason": "DocumentMarker change" - }, - { - "object": "InlineTextBox 'findme'", - "rect": [264, 60, 44, 19], - "reason": "DocumentMarker change" - }, - { - "object": "InlineTextBox 'findme'", - "rect": [220, 60, 44, 19], - "reason": "DocumentMarker change" - }, - { - "object": "InlineTextBox 'findme'", - "rect": [89, 60, 44, 19], - "reason": "DocumentMarker change" - }, - { - "object": "InlineTextBox 'findme'", - "rect": [51, 80, 44, 19], - "reason": "DocumentMarker change" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/updating-scrolling-container-and-content-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/updating-scrolling-container-and-content-expected.txt deleted file mode 100644 index 189b5c3..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/updating-scrolling-container-and-content-expected.txt +++ /dev/null
@@ -1,63 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'CONTENT'", - "rect": [8, 258, 77, 19], - "reason": "style change" - }, - { - "object": "InlineTextBox 'CONTENT'", - "rect": [8, 238, 77, 19], - "reason": "style change" - }, - { - "object": "InlineTextBox 'CONTENT'", - "rect": [8, 218, 77, 19], - "reason": "style change" - }, - { - "object": "InlineTextBox 'CONTENT'", - "rect": [8, 198, 77, 19], - "reason": "style change" - }, - { - "object": "InlineTextBox 'CONTENT'", - "rect": [8, 178, 77, 19], - "reason": "style change" - }, - { - "object": "InlineTextBox 'CONTENT'", - "rect": [8, 158, 77, 19], - "reason": "style change" - }, - { - "object": "InlineTextBox 'CONTENT'", - "rect": [8, 138, 77, 19], - "reason": "style change" - }, - { - "object": "InlineTextBox 'CONTENT'", - "rect": [8, 118, 77, 19], - "reason": "style change" - }, - { - "object": "InlineTextBox 'CONTENT'", - "rect": [8, 278, 77, 15], - "reason": "style change" - }, - { - "object": "InlineTextBox 'CONTENT'", - "rect": [8, 108, 77, 9], - "reason": "style change" - } - ] - } - ] -} -
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 index 26ab2661..f3e25be 100644 --- 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
@@ -14,12 +14,8 @@ { "name": "Scrolling Contents Layer", "bounds": [185, 1200], - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='indicator'", - "rect": [0, 0, 185, 200], - "reason": "background" - } + "invalidations": [ + [0, 0, 185, 200] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/crbug-371640-2-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/crbug-371640-2-expected.txt deleted file mode 100644 index 69c433e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/crbug-371640-2-expected.txt +++ /dev/null
@@ -1,28 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='keep' class='item'", - "rect": [348, 88, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV id='to_remove' class='item'", - "rect": [348, 88, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutBlockFlow DIV id='keep' class='item'", - "rect": [88, 88, 100, 100], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/crbug-371640-3-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/crbug-371640-3-expected.txt deleted file mode 100644 index d7afe9f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/crbug-371640-3-expected.txt +++ /dev/null
@@ -1,28 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='keep_child'", - "rect": [508, 208, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='remove_child'", - "rect": [508, 88, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutBlockFlow DIV id='keep_child'", - "rect": [408, 208, 100, 100], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/crbug-371640-4-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/crbug-371640-4-expected.txt deleted file mode 100644 index ba0a319..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/crbug-371640-4-expected.txt +++ /dev/null
@@ -1,43 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='keep' class='item'", - "rect": [408, 88, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV id='to_remove' class='item'", - "rect": [408, 88, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutBlockFlow DIV id='keep' class='item'", - "rect": [208, 88, 100, 100], - "reason": "geometry" - }, - { - "object": "InlineTextBox '\u00A0'", - "rect": [408, 88, 4, 19], - "reason": "geometry" - }, - { - "object": "InlineTextBox '\u00A0'", - "rect": [408, 88, 4, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox '\u00A0'", - "rect": [208, 88, 4, 19], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/crbug-371640-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/crbug-371640-expected.txt deleted file mode 100644 index febe303..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/crbug-371640-expected.txt +++ /dev/null
@@ -1,43 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='keep' class='item'", - "rect": [348, 88, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV id='to_remove' class='item'", - "rect": [348, 88, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutBlockFlow DIV id='keep' class='item'", - "rect": [88, 88, 100, 100], - "reason": "geometry" - }, - { - "object": "InlineTextBox '\u00A0'", - "rect": [348, 88, 4, 19], - "reason": "geometry" - }, - { - "object": "InlineTextBox '\u00A0'", - "rect": [348, 88, 4, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox '\u00A0'", - "rect": [88, 88, 4, 19], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/create-layer-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/create-layer-repaint-expected.txt deleted file mode 100644 index 2e58ed70..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/create-layer-repaint-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='test' class='big stretchy'", - "rect": [28, 56, 500, 50], - "reason": "disappeared" - }, - { - "object": "LayoutBlockFlow DIV id='test' class='stretchy'", - "rect": [28, 56, 250, 50], - "reason": "chunk appeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/css-grid-layout/align-items-change-from-baseline-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/css-grid-layout/align-items-change-from-baseline-expected.txt deleted file mode 100644 index 8a1615a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/css-grid-layout/align-items-change-from-baseline-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV class='item2'", - "rect": [50, 77, 50, 50], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='item2'", - "rect": [50, 52, 50, 50], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='item1'", - "rect": [0, 77, 50, 25], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='item1'", - "rect": [0, 52, 50, 25], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/css-grid-layout/align-items-change-to-baseline-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/css-grid-layout/align-items-change-to-baseline-expected.txt deleted file mode 100644 index 8a1615a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/css-grid-layout/align-items-change-to-baseline-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV class='item2'", - "rect": [50, 77, 50, 50], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='item2'", - "rect": [50, 52, 50, 50], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='item1'", - "rect": [0, 77, 50, 25], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='item1'", - "rect": [0, 52, 50, 25], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/css-grid-layout/align-self-change-from-baseline-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/css-grid-layout/align-self-change-from-baseline-expected.txt deleted file mode 100644 index e6dcb50..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/css-grid-layout/align-self-change-from-baseline-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV class='item2'", - "rect": [50, 77, 50, 50], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='item2'", - "rect": [50, 52, 50, 50], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='item1'", - "rect": [0, 127, 50, 25], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='item1'", - "rect": [0, 77, 50, 25], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/css-grid-layout/align-self-change-to-baseline-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/css-grid-layout/align-self-change-to-baseline-expected.txt deleted file mode 100644 index e6dcb50..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/css-grid-layout/align-self-change-to-baseline-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV class='item2'", - "rect": [50, 77, 50, 50], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='item2'", - "rect": [50, 52, 50, 50], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='item1'", - "rect": [0, 127, 50, 25], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='item1'", - "rect": [0, 77, 50, 25], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/css-grid-layout/grid-element-change-columns-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/css-grid-layout/grid-element-change-columns-repaint-expected.txt deleted file mode 100644 index 27a4546..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/css-grid-layout/grid-element-change-columns-repaint-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutGrid DIV class='grid min-content'", - "rect": [8, 48, 250, 50], - "reason": "style change" - }, - { - "object": "LayoutBlockFlow DIV class='sizedToGridArea'", - "rect": [58, 48, 50, 50], - "reason": "incremental" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/css-grid-layout/grid-element-change-rows-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/css-grid-layout/grid-element-change-rows-repaint-expected.txt deleted file mode 100644 index 1d91c84..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/css-grid-layout/grid-element-change-rows-repaint-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutGrid DIV class='grid fit-content'", - "rect": [8, 48, 100, 150], - "reason": "style change" - }, - { - "object": "LayoutBlockFlow DIV class='sizedToGridArea'", - "rect": [8, 98, 100, 50], - "reason": "incremental" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/css-grid-layout/grid-item-change-column-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/css-grid-layout/grid-item-change-column-repaint-expected.txt deleted file mode 100644 index ae3ed6f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/css-grid-layout/grid-item-change-column-repaint-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV class='sizedToGridArea'", - "rect": [8, 38, 100, 50], - "reason": "style change" - }, - { - "object": "LayoutBlockFlow DIV class='sizedToGridArea'", - "rect": [208, 38, 50, 50], - "reason": "style change" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/css-grid-layout/grid-item-change-row-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/css-grid-layout/grid-item-change-row-repaint-expected.txt deleted file mode 100644 index 87fdb83..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/css-grid-layout/grid-item-change-row-repaint-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV class='sizedToGridArea'", - "rect": [8, 88, 100, 100], - "reason": "style change" - }, - { - "object": "LayoutBlockFlow DIV class='sizedToGridArea'", - "rect": [8, 38, 100, 50], - "reason": "style change" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/css-grid-layout/grid-item-z-index-change-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/css-grid-layout/grid-item-z-index-change-repaint-expected.txt deleted file mode 100644 index 56d448f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/css-grid-layout/grid-item-z-index-change-repaint-expected.txt +++ /dev/null
@@ -1,53 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow HTML", - "rect": [8, 16, 454, 320], - "reason": "chunk disappeared" - }, - { - "object": "InlineTextBox 'This test checks that grid items correctly repaint when 'z-index' changes.'", - "rect": [8, 16, 454, 19], - "reason": "appeared" - }, - { - "object": "LayoutGrid DIV class='grid fit-content'", - "rect": [8, 236, 400, 100], - "reason": "appeared" - }, - { - "object": "LayoutGrid DIV class='grid fit-content'", - "rect": [8, 126, 400, 100], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'For this test to pass, there should be no red below.'", - "rect": [8, 52, 314, 19], - "reason": "appeared" - }, - { - "object": "LayoutBlockFlow DIV class='sizedToGridArea red'", - "rect": [208, 236, 200, 100], - "reason": "appeared" - }, - { - "object": "LayoutBlockFlow DIV class='sizedToGridArea red'", - "rect": [208, 126, 200, 100], - "reason": "appeared" - }, - { - "object": "LayoutBlockFlow DIV id='item2' class='sizedToGridArea green'", - "rect": [8, 236, 200, 100], - "reason": "chunk appeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-composite-1-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-composite-1-expected.txt deleted file mode 100644 index 7aa3c17..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-composite-1-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV class='box'", - "rect": [128, 120, 100, 100], - "reason": "background" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-composite-2-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-composite-2-expected.txt deleted file mode 100644 index bfee21e6..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-composite-2-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV class='box'", - "rect": [128, 120, 200, 200], - "reason": "background" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-composite-3-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-composite-3-expected.txt deleted file mode 100644 index c6f44f6e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-composite-3-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV class='box'", - "rect": [0, 0, 328, 320], - "reason": "background" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-composite-4-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-composite-4-expected.txt deleted file mode 100644 index bfee21e6..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-composite-4-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV class='box'", - "rect": [128, 120, 200, 200], - "reason": "background" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-composite-5-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-composite-5-expected.txt deleted file mode 100644 index 7aa3c17..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-composite-5-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV class='box'", - "rect": [128, 120, 100, 100], - "reason": "background" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-composite-6-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-composite-6-expected.txt deleted file mode 100644 index dadcef8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-composite-6-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV class='box'", - "rect": [28, 20, 300, 300], - "reason": "background" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-displacement-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-displacement-expected.txt deleted file mode 100644 index af2bd3cb..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-displacement-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV class='box'", - "rect": [8, 0, 240, 240], - "reason": "background" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-gaussianblur-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-gaussianblur-expected.txt deleted file mode 100644 index 88e9024..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-gaussianblur-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV class='box'", - "rect": [0, 0, 318, 310], - "reason": "background" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-gaussianblur-xonly-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-gaussianblur-xonly-expected.txt deleted file mode 100644 index 5e753e9..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-gaussianblur-xonly-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV class='box'", - "rect": [0, 50, 318, 200], - "reason": "background" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-gaussianblur-yonly-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-gaussianblur-yonly-expected.txt deleted file mode 100644 index af64639..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-gaussianblur-yonly-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV class='box'", - "rect": [58, 0, 200, 310], - "reason": "background" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-lighting-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-lighting-expected.txt deleted file mode 100644 index cbbe001..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-lighting-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV class='box'", - "rect": [78, 70, 100, 100], - "reason": "appeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-merge-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-merge-expected.txt deleted file mode 100644 index dadcef8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-merge-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV class='box'", - "rect": [28, 20, 300, 300], - "reason": "background" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-morphology-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-morphology-expected.txt deleted file mode 100644 index 11536c7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-morphology-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV class='box'", - "rect": [33, 25, 250, 250], - "reason": "background" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-morphology-xonly-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-morphology-xonly-expected.txt deleted file mode 100644 index a8e79cde26..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-morphology-xonly-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV class='box'", - "rect": [33, 50, 250, 200], - "reason": "background" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-morphology-yonly-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-morphology-yonly-expected.txt deleted file mode 100644 index faac4b6..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-morphology-yonly-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV class='box'", - "rect": [58, 25, 200, 250], - "reason": "background" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-offset-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-offset-expected.txt deleted file mode 100644 index f12d059..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-offset-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV class='box'", - "rect": [198, 198, 110, 110], - "reason": "background" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-primitive-attr-mutation-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-primitive-attr-mutation-expected.txt deleted file mode 100644 index 18c3cbd..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-primitive-attr-mutation-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV class='target'", - "rect": [8, 8, 100, 100], - "reason": "paint property change" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-primitive-attr-removal-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-primitive-attr-removal-expected.txt deleted file mode 100644 index 18c3cbd..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-primitive-attr-removal-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV class='target'", - "rect": [8, 8, 100, 100], - "reason": "paint property change" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-primitive-removed-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-primitive-removed-expected.txt deleted file mode 100644 index 18c3cbd..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/effect-reference-repaint-primitive-removed-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV class='target'", - "rect": [8, 8, 100, 100], - "reason": "paint property change" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/filter-invalidation-after-display-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/filter-invalidation-after-display-expected.txt deleted file mode 100644 index 35a59a8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/filter-invalidation-after-display-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='box' class='green drop-shadowed box'", - "rect": [300, 8, 330, 330], - "reason": "chunk disappeared" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='box' class='green box'", - "rect": [300, 8, 200, 200], - "reason": "appeared" - } - ] - } - ] -} -
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 cfa05bb..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/filter-invalidation-positioned-child-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='box'", - "rect": [8, 8, 430, 230], - "reason": "paint property change" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='positioned'", - "rect": [408, 408, 380, 180], - "reason": "paint property change" - }, - { - "object": "LayoutBlockFlow DIV id='box'", - "rect": [8, 8, 380, 180], - "reason": "paint property change" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='positioned'", - "rect": [408, 408, 330, 130], - "reason": "paint property change" - } - ] - } - ] -} -
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 index 7e7a66e..8a0f3485 100644 --- 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
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='box' class='green drop-shadowed box'", - "rect": [8, 8, 330, 330], - "reason": "chunk disappeared" - } + "invalidations": [ + [8, 8, 330, 330] ] }, { @@ -18,12 +14,8 @@ "bounds": [200, 200], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='box' class='green box blurry'", - "rect": [0, 0, 200, 200], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 200, 200] ], "transform": 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 index 104f7e6..90f8640 100644 --- 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
@@ -15,17 +15,8 @@ "name": "LayoutBlockFlow DIV class='accelerated'", "position": [-12, -12], "bounds": [212, 257], - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='resize' class='drop-shadow'", - "rect": [0, 0, 212, 257], - "reason": "paint property change" - }, - { - "object": "LayoutBlockFlow DIV id='resize' class='drop-shadow'", - "rect": [0, 0, 158, 257], - "reason": "paint property change" - } + "invalidations": [ + [0, 0, 212, 257] ], "transform": 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 index 5e4a380..ce8b265 100644 --- 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
@@ -16,12 +16,8 @@ "bounds": [100, 200], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='resize' class='drop-shadow accelerated'", - "rect": [0, 0, 100, 200], - "reason": "geometry" - } + "invalidations": [ + [0, 0, 100, 200] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/align-content-change-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/align-content-change-expected.txt deleted file mode 100644 index 1528a34..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/align-content-change-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV class='item'", - "rect": [0, 202, 200, 150], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='item'", - "rect": [0, 52, 200, 150], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/align-content-distribution-change-grid-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/align-content-distribution-change-grid-expected.txt deleted file mode 100644 index 6b0e845..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/align-content-distribution-change-grid-expected.txt +++ /dev/null
@@ -1,28 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV class='item'", - "rect": [0, 252, 200, 100], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='item'", - "rect": [0, 152, 200, 100], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='item'", - "rect": [0, 52, 200, 100], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/align-items-change-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/align-items-change-expected.txt deleted file mode 100644 index 13694f4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/align-items-change-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV class='item'", - "rect": [100, 52, 100, 300], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='item'", - "rect": [0, 52, 100, 300], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/align-self-change-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/align-self-change-expected.txt deleted file mode 100644 index 13694f4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/align-self-change-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV class='item'", - "rect": [100, 52, 100, 300], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='item'", - "rect": [0, 52, 100, 300], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/align-self-change-grid-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/align-self-change-grid-expected.txt deleted file mode 100644 index 6ae94ae..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/align-self-change-grid-expected.txt +++ /dev/null
@@ -1,38 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV class='item1'", - "rect": [0, 52, 100, 300], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='item3'", - "rect": [100, 202, 100, 150], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='item2'", - "rect": [100, 127, 100, 150], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='item3'", - "rect": [100, 127, 100, 150], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='item2'", - "rect": [100, 52, 100, 150], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/justify-content-change-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/justify-content-change-expected.txt deleted file mode 100644 index e8c69e6..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/justify-content-change-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV class='item'", - "rect": [148, 52, 52, 300], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='item'", - "rect": [124, 52, 52, 300], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='item'", - "rect": [24, 52, 52, 300], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='item'", - "rect": [0, 52, 52, 300], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/justify-content-distribution-change-grid-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/justify-content-distribution-change-grid-expected.txt deleted file mode 100644 index f2af1cc0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/justify-content-distribution-change-grid-expected.txt +++ /dev/null
@@ -1,28 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV class='item'", - "rect": [200, 52, 100, 200], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='item'", - "rect": [100, 52, 100, 200], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='item'", - "rect": [0, 52, 100, 200], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/justify-items-change-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/justify-items-change-expected.txt deleted file mode 100644 index cc9c633a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/justify-items-change-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV class='item'", - "rect": [150, 52, 50, 300], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='item'", - "rect": [0, 52, 50, 300], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/justify-items-legacy-change-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/justify-items-legacy-change-expected.txt deleted file mode 100644 index c5b1c12..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/justify-items-legacy-change-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV class='item2'", - "rect": [124, 52, 52, 150], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='item2'", - "rect": [100, 52, 52, 150], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='item1'", - "rect": [24, 52, 52, 150], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='item1'", - "rect": [0, 52, 52, 150], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/justify-self-change-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/justify-self-change-expected.txt deleted file mode 100644 index 382aeb75..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/justify-self-change-expected.txt +++ /dev/null
@@ -1,38 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV class='item1'", - "rect": [0, 52, 100, 300], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='item3'", - "rect": [150, 52, 50, 300], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='item2'", - "rect": [125, 52, 50, 300], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='item3'", - "rect": [125, 52, 50, 300], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='item2'", - "rect": [100, 52, 50, 300], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/remove-inline-block-descendant-of-flex-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/remove-inline-block-descendant-of-flex-expected.txt deleted file mode 100644 index d0d5a49..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/remove-inline-block-descendant-of-flex-expected.txt +++ /dev/null
@@ -1,28 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='inline-block-2' class='item'", - "rect": [0, 200, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV id='inline-block-1' class='item'", - "rect": [0, 100, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutBlockFlow DIV id='inline-block-2' class='item'", - "rect": [0, 100, 100, 100], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/repaint-column-reverse-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/repaint-column-reverse-expected.txt deleted file mode 100644 index 352b6e46..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/repaint-column-reverse-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='blue' class='flex-item'", - "rect": [8, 68, 200, 30], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV id='blue' class='flex-item'", - "rect": [9, 69, 198, 30], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/repaint-during-resize-no-flex-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/repaint-during-resize-no-flex-expected.txt deleted file mode 100644 index d1f4860..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/repaint-during-resize-no-flex-expected.txt +++ /dev/null
@@ -1,38 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='flex-item-1' class='flex-item width'", - "rect": [30, 20, 40, 50], - "reason": "incremental" - }, - { - "object": "LayoutBlockFlow DIV class='flex-item'", - "rect": [160, 20, 10, 50], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='flex-item'", - "rect": [120, 20, 10, 50], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='flex-item'", - "rect": [110, 20, 10, 50], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='flex-item'", - "rect": [70, 20, 10, 50], - "reason": "geometry" - } - ] - } - ] -} -
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 3967a98..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/repaint-expected.txt +++ /dev/null
@@ -1,163 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='content'", - "rect": [138, 128, 654, 100], - "reason": "style change" - }, - { - "object": "LayoutBlockFlow DIV id='content'", - "rect": [148, 128, 644, 100], - "reason": "style change" - }, - { - "object": "InlineTextBox 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean laoreet dolor id urna eleifend aliquet.'", - "rect": [138, 128, 636, 99], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'Nulla vel dolor ipsum. Aliquam ut turpis nisl, in vulputate sapien. Cum sociis natoque penatibus et'", - "rect": [138, 128, 636, 99], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'Sed volutpat, tellus vel varius vestibulum, purus quam mollis sapien, in condimentum leo neque sed'", - "rect": [138, 128, 636, 99], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'magnis dis parturient montes, nascetur ridiculus mus. Sed congue magna vitae dolor feugiat vehicula.'", - "rect": [138, 128, 636, 99], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'nulla. Nunc quis porta elit. Pellentesque erat lectus, ultricies a lobortis id, faucibus id quam.'", - "rect": [138, 128, 636, 99], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean laoreet dolor id urna eleifend aliquet.'", - "rect": [148, 128, 635, 99], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean laoreet dolor id urna eleifend aliquet.'", - "rect": [148, 128, 635, 99], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'Nulla vel dolor ipsum. Aliquam ut turpis nisl, in vulputate sapien. Cum sociis natoque penatibus et'", - "rect": [148, 128, 635, 99], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'Nulla vel dolor ipsum. Aliquam ut turpis nisl, in vulputate sapien. Cum sociis natoque penatibus et'", - "rect": [148, 128, 635, 99], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'Sed volutpat, tellus vel varius vestibulum, purus quam mollis sapien, in condimentum leo neque sed'", - "rect": [148, 128, 635, 99], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'Sed volutpat, tellus vel varius vestibulum, purus quam mollis sapien, in condimentum leo neque sed'", - "rect": [148, 128, 635, 99], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'magnis dis parturient montes, nascetur ridiculus mus. Sed congue magna vitae dolor feugiat vehicula.'", - "rect": [148, 128, 635, 99], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'magnis dis parturient montes, nascetur ridiculus mus. Sed congue magna vitae dolor feugiat vehicula.'", - "rect": [148, 128, 635, 99], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'nulla. Nunc quis porta elit. Pellentesque erat lectus, ultricies a lobortis id, faucibus id quam.'", - "rect": [148, 128, 635, 99], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'nulla. Nunc quis porta elit. Pellentesque erat lectus, ultricies a lobortis id, faucibus id quam.'", - "rect": [148, 128, 635, 99], - "reason": "disappeared" - }, - { - "object": "LayoutBlockFlow DIV id='content'", - "rect": [400, 128, 392, 180], - "reason": "style change" - }, - { - "object": "LayoutBlockFlow DIV id='left'", - "rect": [8, 228, 392, 80], - "reason": "incremental" - }, - { - "object": "InlineTextBox 'Aenean laoreet dolor id urna eleifend aliquet. Nulla vel dolor'", - "rect": [400, 128, 391, 179], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.'", - "rect": [400, 128, 391, 179], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'Sed volutpat, tellus vel varius vestibulum, purus quam mollis'", - "rect": [400, 128, 391, 179], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'elit. Pellentesque erat lectus, ultricies a lobortis id, faucibus id'", - "rect": [400, 128, 391, 179], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'ipsum. Aliquam ut turpis nisl, in vulputate sapien. Cum sociis'", - "rect": [400, 128, 391, 179], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'natoque penatibus et magnis dis parturient montes, nascetur'", - "rect": [400, 128, 391, 179], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'quam.'", - "rect": [400, 128, 391, 179], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'ridiculus mus. Sed congue magna vitae dolor feugiat vehicula.'", - "rect": [400, 128, 391, 179], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'sapien, in condimentum leo neque sed nulla. Nunc quis porta'", - "rect": [400, 128, 391, 179], - "reason": "disappeared" - }, - { - "object": "LayoutBlockFlow DIV id='left'", - "rect": [148, 128, 252, 180], - "reason": "incremental" - }, - { - "object": "LayoutBlockFlow DIV id='left'", - "rect": [8, 128, 140, 100], - "reason": "geometry" - } - ] - } - ] -} -
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 727768d1..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/repaint-on-layout-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='badge'", - "rect": [712, 8, 80, 20], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/repaint-on-margin-change-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/repaint-on-margin-change-expected.txt deleted file mode 100644 index f345b8d0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/repaint-on-margin-change-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='child-to-grow' class='child'", - "rect": [48, 28, 20, 20], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV id='child-to-grow' class='child'", - "rect": [8, 28, 20, 20], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/repaint-opacity-change-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/repaint-opacity-change-expected.txt deleted file mode 100644 index 7e4f4ed..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/repaint-opacity-change-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' class='item'", - "rect": [18, 18, 764, 20], - "reason": "appeared" - }, - { - "object": "LayoutBlockFlow DIV id='target' class='item'", - "rect": [18, 18, 764, 20], - "reason": "chunk disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/repaint-rtl-column-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/repaint-rtl-column-expected.txt deleted file mode 100644 index b1e1e88..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/repaint-rtl-column-expected.txt +++ /dev/null
@@ -1,53 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='content'", - "rect": [8, 116, 200, 252], - "reason": "style change" - }, - { - "object": "LayoutBlockFlow DIV id='content'", - "rect": [8, 119, 200, 249], - "reason": "style change" - }, - { - "object": "LayoutBlockFlow DIV id='left'", - "rect": [8, 68, 200, 145], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV id='left'", - "rect": [8, 68, 200, 52], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [13, 124, 190, 351], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [13, 124, 190, 351], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [13, 121, 190, 351], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [13, 218, 190, 350], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/scrollbars-changed-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/scrollbars-changed-expected.txt deleted file mode 100644 index 20b9752..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/scrollbars-changed-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'a'", - "rect": [0, 5, 15, 15], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'z'", - "rect": [0, 5, 15, 15], - "reason": "appeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/float-in-new-block-with-layout-delta-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/float-in-new-block-with-layout-delta-expected.txt deleted file mode 100644 index ec2696e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/float-in-new-block-with-layout-delta-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [8, 108, 100, 100], - "reason": "appeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/float-move-during-layout-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/float-move-during-layout-expected.txt deleted file mode 100644 index 6163cd28..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/float-move-during-layout-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [8, 210, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [8, 110, 100, 100], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/float-new-in-block-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/float-new-in-block-expected.txt index 852158b..e6987437 100644 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/float-new-in-block-expected.txt +++ b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/float-new-in-block-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (floating) DIV id='target'", - "rect": [8, 8, 100, 100], - "reason": "appeared" - } + "invalidations": [ + [8, 8, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/forms/details-marker-color-change-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/forms/details-marker-color-change-expected.txt deleted file mode 100644 index dfb46386..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/forms/details-marker-color-change-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Details'", - "rect": [24, 8, 45, 19], - "reason": "style change" - }, - { - "object": "LayoutDetailsMarker DIV id='details-marker'", - "rect": [8, 12, 11, 11], - "reason": "style change" - } - ] - } - ] -} -
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 index fb06b66..817ecd9 100644 --- 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
@@ -5,32 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='box4' class='box'", - "rect": [344, 18, 302, 122], - "reason": "style change" - }, - { - "object": "LayoutBlockFlow DIV id='box3' class='box'", - "rect": [18, 18, 302, 122], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='indicator'", - "rect": [345, 19, 240, 20], - "reason": "style change" - }, - { - "object": "InlineTextBox '\n'", - "rect": [330, 135, 4, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox '\n'", - "rect": [330, 135, 4, 19], - "reason": "disappeared" - } + "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/iframe-rounding-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/iframe-rounding-expected.txt deleted file mode 100644 index 7bcb8dc3..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/iframe-rounding-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (relative positioned) DIV id='target'", - "rect": [19, 18, 101, 100], - "reason": "background" - } - ] - } - ] -} -
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 index eeadcf9d..107fd22 100644 --- 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
@@ -5,447 +5,51 @@ "bounds": [785, 933], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutHTMLCanvas CANVAS id='copyvideo'", - "rect": [571, 515, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='copyvideo'", - "rect": [571, 515, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-atopvideo'", - "rect": [571, 415, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-atopvideo'", - "rect": [571, 415, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-invideo'", - "rect": [571, 315, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-invideo'", - "rect": [571, 315, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-outvideo'", - "rect": [571, 165, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-outvideo'", - "rect": [571, 165, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-invideo'", - "rect": [571, 115, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-invideo'", - "rect": [571, 115, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='copycanvas'", - "rect": [429, 515, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='copycanvas'", - "rect": [429, 515, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-atopcanvas'", - "rect": [429, 415, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-atopcanvas'", - "rect": [429, 415, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-incanvas'", - "rect": [429, 315, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-incanvas'", - "rect": [429, 315, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-outcanvas'", - "rect": [429, 165, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-outcanvas'", - "rect": [429, 165, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-incanvas'", - "rect": [429, 115, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-incanvas'", - "rect": [429, 115, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='copyimage'", - "rect": [287, 515, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='copyimage'", - "rect": [287, 515, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-atopimage'", - "rect": [287, 415, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-atopimage'", - "rect": [287, 415, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-inimage'", - "rect": [287, 315, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-inimage'", - "rect": [287, 315, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-outimage'", - "rect": [287, 165, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-outimage'", - "rect": [287, 165, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-inimage'", - "rect": [287, 115, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-inimage'", - "rect": [287, 115, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='copysolid color'", - "rect": [145, 515, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='copysolid color'", - "rect": [145, 515, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-atopsolid color'", - "rect": [145, 415, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-atopsolid color'", - "rect": [145, 415, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-insolid color'", - "rect": [145, 315, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-insolid color'", - "rect": [145, 315, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-outsolid color'", - "rect": [145, 165, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-outsolid color'", - "rect": [145, 165, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-insolid color'", - "rect": [145, 115, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-insolid color'", - "rect": [145, 115, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='xorvideo'", - "rect": [601, 565, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='xorvideo'", - "rect": [601, 565, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='lightervideo'", - "rect": [601, 465, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='lightervideo'", - "rect": [601, 465, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-outvideo'", - "rect": [601, 365, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-outvideo'", - "rect": [601, 365, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-overvideo'", - "rect": [601, 265, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-overvideo'", - "rect": [601, 265, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-atopvideo'", - "rect": [601, 215, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-atopvideo'", - "rect": [601, 215, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-overvideo'", - "rect": [601, 65, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-overvideo'", - "rect": [601, 65, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='xorcanvas'", - "rect": [459, 565, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='xorcanvas'", - "rect": [459, 565, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='lightercanvas'", - "rect": [459, 465, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='lightercanvas'", - "rect": [459, 465, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-outcanvas'", - "rect": [459, 365, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-outcanvas'", - "rect": [459, 365, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-overcanvas'", - "rect": [459, 265, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-overcanvas'", - "rect": [459, 265, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-atopcanvas'", - "rect": [459, 215, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-atopcanvas'", - "rect": [459, 215, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-overcanvas'", - "rect": [459, 65, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-overcanvas'", - "rect": [459, 65, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='xorimage'", - "rect": [317, 565, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='xorimage'", - "rect": [317, 565, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='lighterimage'", - "rect": [317, 465, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='lighterimage'", - "rect": [317, 465, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-outimage'", - "rect": [317, 365, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-outimage'", - "rect": [317, 365, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-overimage'", - "rect": [317, 265, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-overimage'", - "rect": [317, 265, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-atopimage'", - "rect": [317, 215, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-atopimage'", - "rect": [317, 215, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-overimage'", - "rect": [317, 65, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-overimage'", - "rect": [317, 65, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='xorsolid color'", - "rect": [175, 565, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='xorsolid color'", - "rect": [175, 565, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='lightersolid color'", - "rect": [175, 465, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='lightersolid color'", - "rect": [175, 465, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-outsolid color'", - "rect": [175, 365, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-outsolid color'", - "rect": [175, 365, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-oversolid color'", - "rect": [175, 265, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-oversolid color'", - "rect": [175, 265, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-atopsolid color'", - "rect": [175, 215, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-atopsolid color'", - "rect": [175, 215, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-oversolid color'", - "rect": [175, 65, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-oversolid color'", - "rect": [175, 65, 50, 40], - "reason": "invalidate paint rectangle" - } + "invalidations": [ + [571, 515, 80, 40], + [571, 415, 80, 40], + [571, 315, 80, 40], + [571, 165, 80, 40], + [571, 115, 80, 40], + [429, 515, 80, 40], + [429, 415, 80, 40], + [429, 315, 80, 40], + [429, 165, 80, 40], + [429, 115, 80, 40], + [287, 515, 80, 40], + [287, 415, 80, 40], + [287, 315, 80, 40], + [287, 165, 80, 40], + [287, 115, 80, 40], + [145, 515, 80, 40], + [145, 415, 80, 40], + [145, 315, 80, 40], + [145, 165, 80, 40], + [145, 115, 80, 40], + [601, 565, 50, 40], + [601, 465, 50, 40], + [601, 365, 50, 40], + [601, 265, 50, 40], + [601, 215, 50, 40], + [601, 65, 50, 40], + [459, 565, 50, 40], + [459, 465, 50, 40], + [459, 365, 50, 40], + [459, 265, 50, 40], + [459, 215, 50, 40], + [459, 65, 50, 40], + [317, 565, 50, 40], + [317, 465, 50, 40], + [317, 365, 50, 40], + [317, 265, 50, 40], + [317, 215, 50, 40], + [317, 65, 50, 40], + [175, 565, 50, 40], + [175, 465, 50, 40], + [175, 365, 50, 40], + [175, 265, 50, 40], + [175, 215, 50, 40], + [175, 65, 50, 40] ] }, {
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/in-scaled-iframe-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/in-scaled-iframe-expected.txt deleted file mode 100644 index 5a947c2..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/in-scaled-iframe-expected.txt +++ /dev/null
@@ -1,24 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [785, 825], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='div'", - "rect": [209, 209, 100, 100], - "reason": "background" - } - ] - }, - { - "name": "ContentsLayer for Vertical Scrollbar Layer", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/inline-block-resize-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/inline-block-resize-expected.txt deleted file mode 100644 index 42dc41eb..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/inline-block-resize-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='target'", - "rect": [8, 8, 100, 100], - "reason": "appeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/inline-color-change-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/inline-color-change-expected.txt deleted file mode 100644 index 5357cc7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/inline-color-change-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineFlowBox", - "rect": [8, 72, 38, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'PASS'", - "rect": [8, 72, 38, 19], - "reason": "style change" - } - ] - } - ] -} -
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 4eb825b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/inline-reflow-expected.txt +++ /dev/null
@@ -1,148 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'A A A A A AA AA'", - "rect": [0, 0, 300, 200], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'A A'", - "rect": [0, 0, 300, 200], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'AA AA AA A A A'", - "rect": [0, 0, 300, 200], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'AA AA AAA AAA'", - "rect": [0, 0, 300, 200], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'AAA AAA AAA AA'", - "rect": [0, 0, 300, 200], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'AAA AAAA AAAA'", - "rect": [0, 0, 300, 200], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'AAAAA AAAA AAAA'", - "rect": [0, 0, 300, 200], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'AAAAA AAAAA'", - "rect": [0, 0, 300, 200], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'AAAAAA AAAAA'", - "rect": [0, 0, 300, 200], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'AAAAAA AAAAAAA'", - "rect": [0, 0, 300, 200], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'A A A A A'", - "rect": [0, 0, 200, 300], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'A A A A'", - "rect": [0, 0, 200, 300], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'AA AA AA A'", - "rect": [0, 0, 200, 300], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'AA AA AA'", - "rect": [0, 0, 200, 300], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'AA AAA AAA'", - "rect": [0, 0, 200, 300], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'AAA AAA AA'", - "rect": [0, 0, 200, 300], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'AAA AAAA'", - "rect": [0, 0, 200, 300], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'AAAA AAA'", - "rect": [0, 0, 200, 300], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'AAAA AAAAA'", - "rect": [0, 0, 200, 300], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'AAAAA AAAA'", - "rect": [0, 0, 200, 300], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'AAAAA'", - "rect": [0, 0, 200, 300], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'AAAAA'", - "rect": [0, 0, 200, 300], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'AAAAAA'", - "rect": [0, 0, 200, 300], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'AAAAAA'", - "rect": [0, 0, 200, 300], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'AAAAAAA'", - "rect": [0, 0, 200, 300], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'A A A A A'", - "rect": [0, 300, 180, 20], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'A A A A A'", - "rect": [0, 300, 180, 20], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/invalidate-descendants-when-receiving-paint-layer-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/invalidate-descendants-when-receiving-paint-layer-expected.txt index b375541..73b5448 100644 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/invalidate-descendants-when-receiving-paint-layer-expected.txt +++ b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/invalidate-descendants-when-receiving-paint-layer-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='child'", - "rect": [9, 9, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutBlockFlow DIV id='target'", - "rect": [9, 9, 100, 100], - "reason": "chunk appeared" - } + "invalidations": [ + [9, 9, 100, 100] ] }, {
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/invalidate-invisible-element-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/invalidate-invisible-element-expected.txt deleted file mode 100644 index e2f1e2f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/invalidate-invisible-element-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='target'", - "rect": [200, 300, 200, 200], - "reason": "appeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/invalidation-after-opacity-change-subtree-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/invalidation-after-opacity-change-subtree-expected.txt deleted file mode 100644 index 1a01a58..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/invalidation-after-opacity-change-subtree-expected.txt +++ /dev/null
@@ -1,51 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [785, 2350], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'This test checks that switching opacity'", - "rect": [8, 2046, 774, 107], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'invalidates the full subtree.'", - "rect": [8, 2046, 774, 107], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'This text should be visible in the'", - "rect": [8, 2196, 655, 107], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'output.'", - "rect": [8, 2196, 655, 107], - "reason": "appeared" - } - ], - "transform": 1 - }, - { - "name": "ContentsLayer for Vertical Scrollbar Layer", - "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, -1750, 0, 1] - ] - } - ] -} -
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 index 9d56a6b..6017201b 100644 --- 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
@@ -29,12 +29,8 @@ { "name": "LayoutBlockFlow DIV (foreground) Layer", "bounds": [300, 300], - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='target'", - "rect": [100, 100, 200, 200], - "reason": "background" - } + "invalidations": [ + [100, 100, 200, 200] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/invalidation-with-zero-size-object-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/invalidation-with-zero-size-object-expected.txt deleted file mode 100644 index cbd36666..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/invalidation-with-zero-size-object-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='element'", - "rect": [8, 8, 200, 200], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/layer-full-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/layer-full-repaint-expected.txt deleted file mode 100644 index cf1bcfc..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/layer-full-repaint-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (relative positioned) DIV id='test' class='selected'", - "rect": [8, 8, 100, 100], - "reason": "background" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/layer-hide-when-needs-layout-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/layer-hide-when-needs-layout-expected.txt deleted file mode 100644 index 68d565f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/layer-hide-when-needs-layout-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='target'", - "rect": [8, 8, 100, 100], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/layer-visibility-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/layer-visibility-expected.txt deleted file mode 100644 index 96f428a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/layer-visibility-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='target'", - "rect": [100, 0, 100, 100], - "reason": "background" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='target'", - "rect": [0, 0, 100, 100], - "reason": "background" - } - ] - } - ] -} -
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 index 42ca960..1fbe98e 100644 --- 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
@@ -5,92 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'The chief difficulty Alice found at first was in managing'", - "rect": [14, 80, 406, 119], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'away,\n'", - "rect": [14, 80, 406, 119], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'but generally, just as she had got its'", - "rect": [14, 80, 406, 119], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'comfortably enough, under her arm, with its legs'", - "rect": [14, 80, 406, 119], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'flamingo: she succeeded in getting its body tucked'", - "rect": [14, 80, 406, 119], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'hanging down,\n'", - "rect": [14, 80, 406, 119], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'hedgehog a blow with its head, it\n'", - "rect": [14, 80, 406, 119], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'her\n'", - "rect": [14, 80, 406, 119], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'neck nicely straightened\n'", - "rect": [14, 80, 406, 119], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'out, and was going to give the'", - "rect": [14, 80, 406, 119], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'away,\n'", - "rect": [14, 80, 354, 119], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'but generally, just as she had got its'", - "rect": [14, 80, 354, 119], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'comfortably enough, under her arm, with its legs'", - "rect": [14, 80, 354, 119], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'hanging down,\n'", - "rect": [14, 80, 354, 119], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'neck nicely straightened\n'", - "rect": [14, 80, 354, 119], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'out, and was going to give the'", - "rect": [14, 80, 354, 119], - "reason": "disappeared" - }, - { - "object": "LayoutBlockFlow (floating) DIV id='pinkFloat'", - "rect": [378, 138, 70, 30], - "reason": "incremental" - } + "invalidations": [ + [14, 80, 406, 119], + [378, 138, 70, 30] ] } ]
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 index 913602b1..956d103 100644 --- 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
@@ -5,292 +5,16 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Alice began to feel very uneasy: to be sure, she had not as\n'", - "rect": [14, 520, 407, 80], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'Alice began to feel very uneasy: to be sure, she had not as\n'", - "rect": [14, 520, 407, 80], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'become of\n'", - "rect": [14, 520, 407, 80], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'become of\n'", - "rect": [14, 520, 407, 80], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 520, 407, 80], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 520, 407, 80], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 520, 407, 80], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 520, 407, 80], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 520, 407, 80], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 520, 407, 80], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'yet'", - "rect": [14, 520, 407, 80], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'yet'", - "rect": [14, 520, 407, 80], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'a ridge or furrow in the way wherever\n'", - "rect": [14, 240, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'begin again, it was very'", - "rect": [14, 240, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'getting up and walking off to other parts of\n'", - "rect": [14, 240, 406, 139], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'getting up and walking off to other parts of\n'", - "rect": [14, 240, 406, 139], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'hedgehog to, and, as the doubled-up\n'", - "rect": [14, 240, 406, 139], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'hedgehog to, and, as the doubled-up\n'", - "rect": [14, 240, 406, 139], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'in the act of crawling away: besides all\n'", - "rect": [14, 240, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'provoking to find that the hedgehog had\n'", - "rect": [14, 240, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'she wanted to send the'", - "rect": [14, 240, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'soldiers were always'", - "rect": [14, 240, 406, 139], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'soldiers were always'", - "rect": [14, 240, 406, 139], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'soon came to the conclusion that it was a very\n'", - "rect": [14, 240, 406, 139], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'soon came to the conclusion that it was a very\n'", - "rect": [14, 240, 406, 139], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'the ground, Alice'", - "rect": [14, 240, 406, 139], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'the ground, Alice'", - "rect": [14, 240, 406, 139], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'this, there was generally'", - "rect": [14, 240, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'unrolled itself, and was'", - "rect": [14, 240, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'difficult'", - "rect": [65, 360, 356, 39], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'difficult'", - "rect": [65, 360, 356, 39], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'game indeed.\n'", - "rect": [65, 360, 356, 39], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'game indeed.\n'", - "rect": [65, 360, 356, 39], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'Queen'", - "rect": [14, 440, 355, 39], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'the'", - "rect": [14, 440, 355, 39], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'a very short time '", - "rect": [14, 420, 355, 39], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'for the hedgehogs; and in\n'", - "rect": [14, 420, 355, 39], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'for turns,\n'", - "rect": [14, 420, 355, 39], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'quarrelling all the while, and fighting'", - "rect": [14, 420, 355, 39], - "reason": "disappeared" - }, - { - "object": "InlineTextBox ' was in a furious passion, and went\n'", - "rect": [14, 460, 354, 59], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'about once in a minute.\n'", - "rect": [14, 460, 354, 59], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'about, and shouting \u2018Off with his head!\u2019 or \u2018Off with'", - "rect": [14, 460, 354, 59], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'her head!\u2019 about once in a minute.\n'", - "rect": [14, 460, 354, 59], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'her head!\u2019'", - "rect": [14, 460, 354, 59], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'shouting \u2018Off with his head!\u2019 or \u2018Off with\n'", - "rect": [14, 460, 354, 59], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'stamping about, and'", - "rect": [14, 460, 354, 59], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'stamping'", - "rect": [14, 460, 354, 59], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'was in a furious passion, and went\n'", - "rect": [14, 460, 354, 59], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'a very short time '", - "rect": [65, 420, 304, 39], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'for the hedgehogs; and in\n'", - "rect": [65, 420, 304, 39], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'for turns,\n'", - "rect": [65, 420, 304, 39], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'quarrelling all the while, and fighting'", - "rect": [65, 420, 304, 39], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'The players all played at once without waiting'", - "rect": [65, 400, 304, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'The players all played at once without waiting'", - "rect": [65, 400, 304, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'the Queen'", - "rect": [302, 440, 66, 19], - "reason": "disappeared" - }, - { - "object": "LayoutBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 363, 48, 65], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 374, 48, 64], - "reason": "geometry" - } + "invalidations": [ + [14, 520, 407, 80], + [14, 240, 406, 139], + [65, 360, 356, 39], + [14, 440, 355, 39], + [14, 420, 355, 39], + [14, 460, 354, 59], + [65, 400, 304, 19], + [14, 363, 48, 65], + [14, 374, 48, 64] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-2-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-2-expected.txt deleted file mode 100644 index e6e7ce6..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-2-expected.txt +++ /dev/null
@@ -1,488 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow P", - "rect": [8, 74, 418, 526], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'Alice began to feel very uneasy: to be sure, she had not as\n'", - "rect": [14, 520, 407, 80], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'become of\n'", - "rect": [14, 520, 407, 80], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 520, 407, 80], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 520, 407, 80], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 520, 407, 80], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'yet'", - "rect": [14, 520, 407, 80], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'Alice began to feel very uneasy: to be sure, she had not as\n'", - "rect": [14, 521, 407, 79], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'become of\n'", - "rect": [14, 521, 407, 79], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 521, 407, 79], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 521, 407, 79], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 521, 407, 79], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'yet'", - "rect": [14, 521, 407, 79], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'a ridge or furrow in the way wherever\n'", - "rect": [14, 241, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'begin again, it was very'", - "rect": [14, 241, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'getting up and walking off to other parts of\n'", - "rect": [14, 241, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'hedgehog to, and, as the doubled-up\n'", - "rect": [14, 241, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'in the act of crawling away: besides all\n'", - "rect": [14, 241, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'provoking to find that the hedgehog had\n'", - "rect": [14, 241, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'she wanted to send the'", - "rect": [14, 241, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'soldiers were always'", - "rect": [14, 241, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'soon came to the conclusion that it was a very\n'", - "rect": [14, 241, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'the ground, Alice'", - "rect": [14, 241, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'this, there was generally'", - "rect": [14, 241, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'unrolled itself, and was'", - "rect": [14, 241, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'a ridge or furrow in the way wherever\n'", - "rect": [14, 240, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'begin again, it was very'", - "rect": [14, 240, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'getting up and walking off to other parts of\n'", - "rect": [14, 240, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'hedgehog to, and, as the doubled-up\n'", - "rect": [14, 240, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'in the act of crawling away: besides all\n'", - "rect": [14, 240, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'provoking to find that the hedgehog had\n'", - "rect": [14, 240, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'she wanted to send the'", - "rect": [14, 240, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'soldiers were always'", - "rect": [14, 240, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'soon came to the conclusion that it was a very\n'", - "rect": [14, 240, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'the ground, Alice'", - "rect": [14, 240, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'this, there was generally'", - "rect": [14, 240, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'unrolled itself, and was'", - "rect": [14, 240, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox ' twist itself round and'", - "rect": [14, 181, 406, 79], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'could not help bursting out\n'", - "rect": [14, 181, 406, 79], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'head down, and was going to\n'", - "rect": [14, 181, 406, 79], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'laughing: and when she had got its'", - "rect": [14, 181, 406, 79], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'look up in her face, with\n'", - "rect": [14, 181, 406, 79], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'such a puzzled expression that she'", - "rect": [14, 181, 406, 79], - "reason": "geometry" - }, - { - "object": "InlineTextBox ' twist itself round and'", - "rect": [14, 180, 406, 79], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'could not help bursting out\n'", - "rect": [14, 180, 406, 79], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'head down, and was going to\n'", - "rect": [14, 180, 406, 79], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'laughing: and when she had got its'", - "rect": [14, 180, 406, 79], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'look up in her face, with\n'", - "rect": [14, 180, 406, 79], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'such a puzzled expression that she'", - "rect": [14, 180, 406, 79], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'difficult'", - "rect": [65, 361, 356, 39], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'game indeed.\n'", - "rect": [65, 361, 356, 39], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'difficult'", - "rect": [65, 360, 356, 39], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'game indeed.\n'", - "rect": [65, 360, 356, 39], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'a very short time '", - "rect": [14, 421, 355, 39], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'for the hedgehogs; and in\n'", - "rect": [14, 421, 355, 39], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'for turns,\n'", - "rect": [14, 421, 355, 39], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'quarrelling all the while, and fighting'", - "rect": [14, 421, 355, 39], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'a very short time '", - "rect": [14, 420, 355, 39], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'for the hedgehogs; and in\n'", - "rect": [14, 420, 355, 39], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'for turns,\n'", - "rect": [14, 420, 355, 39], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'quarrelling all the while, and fighting'", - "rect": [14, 420, 355, 39], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'The chief difficulty Alice found at first was in managing'", - "rect": [14, 80, 354, 120], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'away,\n'", - "rect": [14, 80, 354, 120], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'but generally, just as she had got its'", - "rect": [14, 80, 354, 120], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'comfortably enough, under her arm, with its legs'", - "rect": [14, 80, 354, 120], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'flamingo: she succeeded in getting its body tucked'", - "rect": [14, 80, 354, 120], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'hanging down,\n'", - "rect": [14, 80, 354, 120], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'hedgehog a blow with its head, it\n'", - "rect": [14, 80, 354, 120], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'her\n'", - "rect": [14, 80, 354, 120], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'neck nicely straightened\n'", - "rect": [14, 80, 354, 120], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'out, and was going to give the'", - "rect": [14, 80, 354, 120], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'hedgehog a blow with its head, it\n'", - "rect": [14, 80, 354, 119], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'neck nicely straightened\n'", - "rect": [14, 80, 354, 119], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'out, and was going to give the'", - "rect": [14, 80, 354, 119], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'about once in a minute.\n'", - "rect": [14, 461, 354, 59], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'her head!\u2019'", - "rect": [14, 461, 354, 59], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'shouting \u2018Off with his head!\u2019 or \u2018Off with\n'", - "rect": [14, 461, 354, 59], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'stamping about, and'", - "rect": [14, 461, 354, 59], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'was in a furious passion, and went\n'", - "rect": [14, 461, 354, 59], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'about once in a minute.\n'", - "rect": [14, 460, 354, 59], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'her head!\u2019'", - "rect": [14, 460, 354, 59], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'shouting \u2018Off with his head!\u2019 or \u2018Off with\n'", - "rect": [14, 460, 354, 59], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'stamping about, and'", - "rect": [14, 460, 354, 59], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'was in a furious passion, and went\n'", - "rect": [14, 460, 354, 59], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'The players all played at once without waiting'", - "rect": [65, 401, 304, 19], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'The players all played at once without waiting'", - "rect": [65, 400, 304, 19], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'the Queen'", - "rect": [302, 441, 66, 19], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'the Queen'", - "rect": [302, 440, 66, 19], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) SPAN id='greenFloat'", - "rect": [372, 404, 48, 81], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) SPAN id='greenFloat'", - "rect": [372, 403, 48, 81], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 364, 48, 65], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 363, 48, 65], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'would'", - "rect": [235, 180, 45, 20], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'would'", - "rect": [238, 180, 40, 19], - "reason": "disappeared" - }, - { - "object": "VerticalScrollbar", - "rect": [485, 0, 15, 600], - "reason": "scroll control" - } - ] - } - ] -} -
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 index 7df15669..9944fdc 100644 --- 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
@@ -5,277 +5,15 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Alice began to feel very uneasy: to be sure, she had not as\n'", - "rect": [14, 520, 407, 80], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'Alice began to feel very uneasy: to be sure, she had not as\n'", - "rect": [14, 520, 407, 80], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'become of\n'", - "rect": [14, 520, 407, 80], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'become of\n'", - "rect": [14, 520, 407, 80], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 520, 407, 80], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 520, 407, 80], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 520, 407, 80], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 520, 407, 80], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 520, 407, 80], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 520, 407, 80], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'yet'", - "rect": [14, 520, 407, 80], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'yet'", - "rect": [14, 520, 407, 80], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'a ridge or furrow in the way wherever\n'", - "rect": [14, 240, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'begin again, it was very'", - "rect": [14, 240, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'getting up and walking off to other parts of\n'", - "rect": [14, 240, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'hedgehog to, and, as the doubled-up\n'", - "rect": [14, 240, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'in the act of crawling away: besides all\n'", - "rect": [14, 240, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'provoking to find that the hedgehog had\n'", - "rect": [14, 240, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'she wanted to send the'", - "rect": [14, 240, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'soldiers were always'", - "rect": [14, 240, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'soon came to the conclusion that it was a very\n'", - "rect": [14, 240, 406, 139], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'soon came to the conclusion that it was a very\n'", - "rect": [14, 240, 406, 139], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'the ground, Alice'", - "rect": [14, 240, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'this, there was generally'", - "rect": [14, 240, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'unrolled itself, and was'", - "rect": [14, 240, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'a very short time '", - "rect": [14, 400, 406, 59], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'for turns,'", - "rect": [14, 400, 406, 59], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'hedgehogs; and in\n'", - "rect": [14, 400, 406, 59], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'quarrelling all the while, and fighting for the'", - "rect": [14, 400, 406, 59], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'difficult'", - "rect": [65, 360, 356, 39], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'difficult'", - "rect": [65, 360, 356, 39], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'game indeed.\n'", - "rect": [65, 360, 356, 39], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'game indeed.\n'", - "rect": [65, 360, 356, 39], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'a very short time '", - "rect": [14, 420, 355, 39], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'for the hedgehogs; and in\n'", - "rect": [14, 420, 355, 39], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'for turns,\n'", - "rect": [14, 420, 355, 39], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'quarrelling all the while, and fighting'", - "rect": [14, 420, 355, 39], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'about once in a minute.\n'", - "rect": [14, 460, 354, 59], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'her head!\u2019'", - "rect": [14, 460, 354, 59], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'shouting \u2018Off with his head!\u2019 or \u2018Off with\n'", - "rect": [14, 460, 354, 59], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'stamping about, and'", - "rect": [14, 460, 354, 59], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'was in a furious passion, and went\n'", - "rect": [14, 460, 354, 59], - "reason": "disappeared" - }, - { - "object": "InlineTextBox ' was in'", - "rect": [14, 440, 338, 79], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'a furious passion, and went\n'", - "rect": [14, 440, 338, 79], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'about once in a minute.\n'", - "rect": [14, 440, 338, 79], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'her head!\u2019'", - "rect": [14, 440, 338, 79], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'shouting \u2018Off with his head!\u2019 or \u2018Off with\n'", - "rect": [14, 440, 338, 79], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'stamping about, and'", - "rect": [14, 440, 338, 79], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'The players all played at once without waiting'", - "rect": [65, 400, 304, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'The players all played at once without waiting\n'", - "rect": [65, 400, 298, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'the Queen'", - "rect": [302, 440, 66, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'the Queen'", - "rect": [242, 440, 65, 19], - "reason": "appeared" - }, - { - "object": "LayoutBlockFlow (floating) SPAN id='greenFloat'", - "rect": [356, 423, 64, 81], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) SPAN id='greenFloat'", - "rect": [372, 403, 48, 81], - "reason": "geometry" - } + "invalidations": [ + [14, 520, 407, 80], + [14, 240, 406, 139], + [14, 400, 406, 59], + [65, 360, 356, 39], + [14, 460, 354, 59], + [14, 440, 338, 79], + [356, 423, 64, 81], + [372, 403, 48, 81] ] } ]
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 index b6deee6..cb06202 100644 --- 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
@@ -5,267 +5,14 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Alice began to feel very uneasy: to be sure, she had not as\n'", - "rect": [14, 520, 407, 80], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'Alice began to feel very uneasy: to be sure, she had not as\n'", - "rect": [14, 520, 407, 80], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'become of\n'", - "rect": [14, 520, 407, 80], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'become of\n'", - "rect": [14, 520, 407, 80], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 520, 407, 80], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 520, 407, 80], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 520, 407, 80], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 520, 407, 80], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 520, 407, 80], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 520, 407, 80], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'yet'", - "rect": [14, 520, 407, 80], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'yet'", - "rect": [14, 520, 407, 80], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'a ridge or furrow in the way wherever\n'", - "rect": [14, 240, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'begin again, it was very'", - "rect": [14, 240, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'getting up and walking off to other parts of\n'", - "rect": [14, 240, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'hedgehog to, and, as the doubled-up\n'", - "rect": [14, 240, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'in the act of crawling away: besides all\n'", - "rect": [14, 240, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'provoking to find that the hedgehog had\n'", - "rect": [14, 240, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'she wanted to send the'", - "rect": [14, 240, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'soldiers were always'", - "rect": [14, 240, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'soon came to the conclusion that it was a very\n'", - "rect": [14, 240, 406, 139], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'soon came to the conclusion that it was a very\n'", - "rect": [14, 240, 406, 139], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'the ground, Alice'", - "rect": [14, 240, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'this, there was generally'", - "rect": [14, 240, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'unrolled itself, and was'", - "rect": [14, 240, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'her head!\u2019 about once'", - "rect": [14, 460, 406, 59], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'in a minute.\n'", - "rect": [14, 460, 406, 59], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'shouting \u2018Off with his head!\u2019 or \u2018Off with\n'", - "rect": [14, 460, 406, 59], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'stamping about, and'", - "rect": [14, 460, 406, 59], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'was in a furious passion, and went\n'", - "rect": [14, 460, 406, 59], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'difficult'", - "rect": [65, 360, 356, 39], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'difficult'", - "rect": [65, 360, 356, 39], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'game indeed.\n'", - "rect": [65, 360, 356, 39], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'game indeed.\n'", - "rect": [65, 360, 356, 39], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'a very short time '", - "rect": [14, 420, 355, 39], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'a very short time '", - "rect": [14, 420, 355, 39], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'for the hedgehogs; and in\n'", - "rect": [14, 420, 355, 39], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'for the hedgehogs; and in\n'", - "rect": [14, 420, 355, 39], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'for turns,\n'", - "rect": [14, 420, 355, 39], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'for turns,\n'", - "rect": [14, 420, 355, 39], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'quarrelling all the while, and fighting'", - "rect": [14, 420, 355, 39], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'quarrelling all the while, and fighting'", - "rect": [14, 420, 355, 39], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'about once in a minute.\n'", - "rect": [14, 460, 354, 59], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'her head!\u2019'", - "rect": [14, 460, 354, 59], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'shouting \u2018Off with his head!\u2019 or \u2018Off with\n'", - "rect": [14, 460, 354, 59], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'stamping about, and'", - "rect": [14, 460, 354, 59], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'was in a furious passion, and went\n'", - "rect": [14, 460, 354, 59], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'The players all played at once without waiting'", - "rect": [65, 400, 304, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'The players all played at once without waiting'", - "rect": [65, 400, 304, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'the Queen'", - "rect": [302, 440, 66, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'the Queen'", - "rect": [302, 440, 66, 19], - "reason": "disappeared" - }, - { - "object": "LayoutBlockFlow (floating) SPAN id='greenFloat'", - "rect": [372, 403, 48, 81], - "reason": "geometry" - } + "invalidations": [ + [14, 520, 407, 80], + [14, 240, 406, 139], + [14, 460, 406, 59], + [65, 360, 356, 39], + [14, 420, 355, 39], + [65, 400, 304, 19], + [372, 403, 48, 81] ] } ]
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 index b14579a..3e81077 100644 --- 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
@@ -5,297 +5,13 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Alice began to feel very uneasy: to be sure, she had not as\n'", - "rect": [14, 520, 407, 80], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'Alice began to feel very uneasy: to be sure, she had not as\n'", - "rect": [14, 520, 407, 80], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'become of\n'", - "rect": [14, 520, 407, 80], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'become of\n'", - "rect": [14, 520, 407, 80], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 520, 407, 80], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 520, 407, 80], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 520, 407, 80], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 520, 407, 80], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 520, 407, 80], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 520, 407, 80], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'yet'", - "rect": [14, 520, 407, 80], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'yet'", - "rect": [14, 520, 407, 80], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'a ridge or furrow in the way wherever\n'", - "rect": [14, 240, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'begin again, it was very'", - "rect": [14, 240, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'getting up and walking off to other parts of\n'", - "rect": [14, 240, 406, 139], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'getting up and walking off to other parts of\n'", - "rect": [14, 240, 406, 139], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'hedgehog to, and, as the doubled-up\n'", - "rect": [14, 240, 406, 139], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'hedgehog to, and, as the doubled-up\n'", - "rect": [14, 240, 406, 139], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'in the act of crawling away: besides all\n'", - "rect": [14, 240, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'provoking to find that the hedgehog had\n'", - "rect": [14, 240, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'she wanted to send the'", - "rect": [14, 240, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'soldiers were always'", - "rect": [14, 240, 406, 139], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'soldiers were always'", - "rect": [14, 240, 406, 139], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'soon came to the conclusion that it was a very\n'", - "rect": [14, 240, 406, 139], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'soon came to the conclusion that it was a very\n'", - "rect": [14, 240, 406, 139], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'the ground, Alice'", - "rect": [14, 240, 406, 139], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'the ground, Alice'", - "rect": [14, 240, 406, 139], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'this, there was generally'", - "rect": [14, 240, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'unrolled itself, and was'", - "rect": [14, 240, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'difficult'", - "rect": [49, 360, 372, 39], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'game indeed.\n'", - "rect": [49, 360, 372, 39], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'a very short time '", - "rect": [14, 400, 356, 59], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'for'", - "rect": [14, 400, 356, 59], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'hedgehogs; and in\n'", - "rect": [14, 400, 356, 59], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'quarrelling all the while, and fighting for the'", - "rect": [14, 400, 356, 59], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'turns,\n'", - "rect": [14, 400, 356, 59], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'difficult'", - "rect": [65, 360, 356, 39], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'game indeed.\n'", - "rect": [65, 360, 356, 39], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'a very short time '", - "rect": [14, 420, 355, 39], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'for the hedgehogs; and in\n'", - "rect": [14, 420, 355, 39], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'for turns,\n'", - "rect": [14, 420, 355, 39], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'quarrelling all the while, and fighting'", - "rect": [14, 420, 355, 39], - "reason": "disappeared" - }, - { - "object": "InlineTextBox ' was in a'", - "rect": [14, 440, 354, 79], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'furious passion, and went\n'", - "rect": [14, 440, 354, 79], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'her head!\u2019 about once'", - "rect": [14, 440, 354, 79], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'in a minute.\n'", - "rect": [14, 440, 354, 79], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'stamping about, and shouting'", - "rect": [14, 440, 354, 79], - "reason": "appeared" - }, - { - "object": "InlineTextBox '\u2018Off with his head!\u2019 or \u2018Off with\n'", - "rect": [14, 440, 354, 79], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'about once in a minute.\n'", - "rect": [14, 460, 354, 59], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'her head!\u2019'", - "rect": [14, 460, 354, 59], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'shouting \u2018Off with his head!\u2019 or \u2018Off with\n'", - "rect": [14, 460, 354, 59], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'stamping about, and'", - "rect": [14, 460, 354, 59], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'was in a furious passion, and went\n'", - "rect": [14, 460, 354, 59], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'The players all played at once without waiting'", - "rect": [65, 400, 304, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'The players all played at once without waiting\n'", - "rect": [49, 400, 302, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'the Queen'", - "rect": [302, 440, 66, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'the Queen'", - "rect": [245, 440, 65, 19], - "reason": "appeared" - }, - { - "object": "LayoutBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 363, 48, 65], - "reason": "geometry" - } + "invalidations": [ + [14, 520, 407, 80], + [14, 240, 406, 139], + [49, 360, 372, 39], + [14, 400, 356, 59], + [14, 440, 354, 79], + [14, 363, 48, 65] ] } ]
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 index 8b0229e2..ddff78fc 100644 --- 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
@@ -5,132 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'a ridge or furrow in the way wherever\n'", - "rect": [14, 240, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'begin again, it was very'", - "rect": [14, 240, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'getting up and walking off to other parts of\n'", - "rect": [14, 240, 406, 139], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'getting up and walking off to other parts of\n'", - "rect": [14, 240, 406, 139], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'hedgehog to, and, as the doubled-up\n'", - "rect": [14, 240, 406, 139], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'hedgehog to, and, as the doubled-up\n'", - "rect": [14, 240, 406, 139], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'in the act of crawling away: besides all\n'", - "rect": [14, 240, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'provoking to find that the hedgehog had\n'", - "rect": [14, 240, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'she wanted to send the'", - "rect": [14, 240, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'soldiers were always'", - "rect": [14, 240, 406, 139], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'soldiers were always'", - "rect": [14, 240, 406, 139], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'soon came to the conclusion that it was a very\n'", - "rect": [14, 240, 406, 139], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'soon came to the conclusion that it was a very\n'", - "rect": [14, 240, 406, 139], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'the ground, Alice'", - "rect": [14, 240, 406, 139], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'the ground, Alice'", - "rect": [14, 240, 406, 139], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'this, there was generally'", - "rect": [14, 240, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'unrolled itself, and was'", - "rect": [14, 240, 406, 139], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'difficult'", - "rect": [65, 360, 356, 39], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'difficult'", - "rect": [65, 360, 356, 39], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'game indeed.\n'", - "rect": [65, 360, 356, 39], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'game indeed.\n'", - "rect": [65, 360, 356, 39], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'The players all played at once without waiting'", - "rect": [65, 400, 304, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'The players all played at once without waiting'", - "rect": [65, 400, 304, 19], - "reason": "disappeared" - }, - { - "object": "LayoutBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 363, 48, 65], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'foo'", - "rect": [27, 363, 22, 20], - "reason": "appeared" - } + "invalidations": [ + [14, 240, 406, 139], + [65, 360, 356, 39], + [65, 400, 304, 19], + [14, 363, 48, 65] ] } ]
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 index c8628228..4560f0f2 100644 --- 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
@@ -5,57 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'a very short time '", - "rect": [14, 420, 355, 39], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'a very short time '", - "rect": [14, 420, 355, 39], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'for the hedgehogs; and in\n'", - "rect": [14, 420, 355, 39], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'for the hedgehogs; and in\n'", - "rect": [14, 420, 355, 39], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'for turns,\n'", - "rect": [14, 420, 355, 39], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'for turns,\n'", - "rect": [14, 420, 355, 39], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'quarrelling all the while, and fighting'", - "rect": [14, 420, 355, 39], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'quarrelling all the while, and fighting'", - "rect": [14, 420, 355, 39], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'the Queen'", - "rect": [298, 440, 70, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'the Queen'", - "rect": [302, 440, 66, 19], - "reason": "disappeared" - } + "invalidations": [ + [14, 420, 355, 39] ] } ]
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 index 443b531..f02ec31 100644 --- 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
@@ -5,442 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow P", - "rect": [8, 74, 418, 526], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'a ridge or furrow in the way wherever\n'", - "rect": [14, 240, 406, 139], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'a ridge or furrow in the way wherever\n'", - "rect": [14, 240, 406, 139], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'begin again, it was very'", - "rect": [14, 240, 406, 139], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'begin again, it was very'", - "rect": [14, 240, 406, 139], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'getting up and walking off to other parts of\n'", - "rect": [14, 240, 406, 139], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'getting up and walking off to other parts of\n'", - "rect": [14, 240, 406, 139], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'hedgehog to, and, as the doubled-up\n'", - "rect": [14, 240, 406, 139], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'hedgehog to, and, as the doubled-up\n'", - "rect": [14, 240, 406, 139], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'in the act of crawling away: besides all\n'", - "rect": [14, 240, 406, 139], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'in the act of crawling away: besides all\n'", - "rect": [14, 240, 406, 139], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'provoking to find that the hedgehog had\n'", - "rect": [14, 240, 406, 139], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'provoking to find that the hedgehog had\n'", - "rect": [14, 240, 406, 139], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'she wanted to send the'", - "rect": [14, 240, 406, 139], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'she wanted to send the'", - "rect": [14, 240, 406, 139], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'soldiers were always'", - "rect": [14, 240, 406, 139], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'soldiers were always'", - "rect": [14, 240, 406, 139], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'soon came to the conclusion that it was a very\n'", - "rect": [14, 240, 406, 139], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'soon came to the conclusion that it was a very\n'", - "rect": [14, 240, 406, 139], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'the ground, Alice'", - "rect": [14, 240, 406, 139], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'the ground, Alice'", - "rect": [14, 240, 406, 139], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'this, there was generally'", - "rect": [14, 240, 406, 139], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'this, there was generally'", - "rect": [14, 240, 406, 139], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'unrolled itself, and was'", - "rect": [14, 240, 406, 139], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'unrolled itself, and was'", - "rect": [14, 240, 406, 139], - "reason": "disappeared" - }, - { - "object": "InlineTextBox ' twist itself round and'", - "rect": [14, 180, 406, 79], - "reason": "appeared" - }, - { - "object": "InlineTextBox ' twist itself round and'", - "rect": [14, 180, 406, 79], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'could not help bursting out\n'", - "rect": [14, 180, 406, 79], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'could not help bursting out\n'", - "rect": [14, 180, 406, 79], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'head down, and was going to\n'", - "rect": [14, 180, 406, 79], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'head down, and was going to\n'", - "rect": [14, 180, 406, 79], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'laughing: and when she had got its'", - "rect": [14, 180, 406, 79], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'laughing: and when she had got its'", - "rect": [14, 180, 406, 79], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'look up in her face, with\n'", - "rect": [14, 180, 406, 79], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'look up in her face, with\n'", - "rect": [14, 180, 406, 79], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'such a puzzled expression that she'", - "rect": [14, 180, 406, 79], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'such a puzzled expression that she'", - "rect": [14, 180, 406, 79], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'difficult game'", - "rect": [14, 360, 406, 39], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'indeed.\n'", - "rect": [14, 360, 406, 39], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'difficult'", - "rect": [65, 360, 356, 39], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'game indeed.\n'", - "rect": [65, 360, 356, 39], - "reason": "disappeared" - }, - { - "object": "InlineTextBox ' was in a furious'", - "rect": [14, 440, 355, 79], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'her head!\u2019 about once in a'", - "rect": [14, 440, 355, 79], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'minute.\n'", - "rect": [14, 440, 355, 79], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'passion, and went\n'", - "rect": [14, 440, 355, 79], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'stamping about, and shouting \u2018Off'", - "rect": [14, 440, 355, 79], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'with his head!\u2019 or \u2018Off with\n'", - "rect": [14, 440, 355, 79], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'a very short time '", - "rect": [14, 420, 355, 39], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'for the hedgehogs; and in\n'", - "rect": [14, 420, 355, 39], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'for turns,\n'", - "rect": [14, 420, 355, 39], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'quarrelling all the while, and fighting'", - "rect": [14, 420, 355, 39], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'The chief difficulty Alice found at first was in managing'", - "rect": [14, 80, 354, 119], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'The chief difficulty Alice found at first was in managing'", - "rect": [14, 80, 354, 119], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'away,\n'", - "rect": [14, 80, 354, 119], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'away,\n'", - "rect": [14, 80, 354, 119], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'but generally, just as she had got its'", - "rect": [14, 80, 354, 119], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'but generally, just as she had got its'", - "rect": [14, 80, 354, 119], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'comfortably enough, under her arm, with its legs'", - "rect": [14, 80, 354, 119], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'comfortably enough, under her arm, with its legs'", - "rect": [14, 80, 354, 119], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'flamingo: she succeeded in getting its body tucked'", - "rect": [14, 80, 354, 119], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'flamingo: she succeeded in getting its body tucked'", - "rect": [14, 80, 354, 119], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'hanging down,\n'", - "rect": [14, 80, 354, 119], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'hanging down,\n'", - "rect": [14, 80, 354, 119], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'hedgehog a blow with its head, it\n'", - "rect": [14, 80, 354, 119], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'hedgehog a blow with its head, it\n'", - "rect": [14, 80, 354, 119], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'her\n'", - "rect": [14, 80, 354, 119], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'her\n'", - "rect": [14, 80, 354, 119], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'neck nicely straightened\n'", - "rect": [14, 80, 354, 119], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'neck nicely straightened\n'", - "rect": [14, 80, 354, 119], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'out, and was going to give the'", - "rect": [14, 80, 354, 119], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'out, and was going to give the'", - "rect": [14, 80, 354, 119], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'about once in a minute.\n'", - "rect": [14, 460, 354, 59], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'her head!\u2019'", - "rect": [14, 460, 354, 59], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'shouting \u2018Off with his head!\u2019 or \u2018Off with\n'", - "rect": [14, 460, 354, 59], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'stamping about, and'", - "rect": [14, 460, 354, 59], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'was in a furious passion, and went\n'", - "rect": [14, 460, 354, 59], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'a very short time '", - "rect": [14, 400, 354, 59], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'and in\n'", - "rect": [14, 400, 354, 59], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'for turns,'", - "rect": [14, 400, 354, 59], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'quarrelling all the while, and fighting for the hedgehogs;'", - "rect": [14, 400, 354, 59], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'The players all played at once without waiting'", - "rect": [65, 400, 304, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'The players all played at once without waiting\n'", - "rect": [14, 400, 297, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'the Queen'", - "rect": [184, 440, 68, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'the Queen'", - "rect": [302, 440, 66, 19], - "reason": "disappeared" - }, - { - "object": "LayoutBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 363, 48, 65], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'would'", - "rect": [238, 180, 40, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'would'", - "rect": [238, 180, 40, 19], - "reason": "disappeared" - } + "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.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-9-expected.txt index 64b9ea28..d578b59 100644 --- 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
@@ -5,382 +5,17 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Alice began to feel very uneasy: to be sure, she had not as\n'", - "rect": [14, 520, 407, 80], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'Alice began to feel very uneasy: to be sure, she had not as\n'", - "rect": [14, 520, 407, 80], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'become of\n'", - "rect": [14, 520, 407, 80], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'become of\n'", - "rect": [14, 520, 407, 80], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 520, 407, 80], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 520, 407, 80], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 520, 407, 80], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 520, 407, 80], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 520, 407, 80], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 520, 407, 80], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'yet'", - "rect": [14, 520, 407, 80], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'yet'", - "rect": [14, 520, 407, 80], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'a ridge or furrow in the way wherever\n'", - "rect": [14, 240, 406, 139], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'and was in the act of crawling away: besides all\n'", - "rect": [14, 240, 406, 139], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'begin again, it was very'", - "rect": [14, 240, 406, 139], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'begin again, it was very'", - "rect": [14, 240, 406, 139], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'getting up and walking off to other parts of\n'", - "rect": [14, 240, 406, 139], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'ground, Alice soon came to the conclusion that it was a very'", - "rect": [14, 240, 406, 139], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'hedgehog to, and, as the doubled-up\n'", - "rect": [14, 240, 406, 139], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'in the act of crawling away: besides all\n'", - "rect": [14, 240, 406, 139], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'provoking to find that the hedgehog had\n'", - "rect": [14, 240, 406, 139], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'provoking to find that the hedgehog had\n'", - "rect": [14, 240, 406, 139], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'she wanted to send the'", - "rect": [14, 240, 406, 139], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'she'", - "rect": [14, 240, 406, 139], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'soldiers were always'", - "rect": [14, 240, 406, 139], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'soldiers'", - "rect": [14, 240, 406, 139], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'soon came to the conclusion that it was a very\n'", - "rect": [14, 240, 406, 139], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'the ground, Alice'", - "rect": [14, 240, 406, 139], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'the'", - "rect": [14, 240, 406, 139], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'there was generally a ridge or furrow in the way wherever\n'", - "rect": [14, 240, 406, 139], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'this, there was generally'", - "rect": [14, 240, 406, 139], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'this,'", - "rect": [14, 240, 406, 139], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'unrolled itself, and was'", - "rect": [14, 240, 406, 139], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'unrolled itself,'", - "rect": [14, 240, 406, 139], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'wanted to send the hedgehog to, and, as the doubled-up\n'", - "rect": [14, 240, 406, 139], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'were always getting up and walking off to other parts of\n'", - "rect": [14, 240, 406, 139], - "reason": "appeared" - }, - { - "object": "InlineTextBox ' twist itself round and'", - "rect": [14, 180, 406, 79], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'could not help bursting out\n'", - "rect": [14, 180, 406, 79], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'could not help bursting out\n'", - "rect": [14, 180, 406, 79], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'head down, and was going to\n'", - "rect": [14, 180, 406, 79], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'head down, and was going to\n'", - "rect": [14, 180, 406, 79], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'laughing: and when she had got its'", - "rect": [14, 180, 406, 79], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'laughing: and when she had got its'", - "rect": [14, 180, 406, 79], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'look up in her face, with\n'", - "rect": [14, 180, 406, 79], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'look up in her face, with\n'", - "rect": [14, 180, 406, 79], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'such a puzzled expression that she'", - "rect": [14, 180, 406, 79], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'such a puzzled expression that she'", - "rect": [14, 180, 406, 79], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'difficult'", - "rect": [65, 360, 356, 39], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'game indeed.\n'", - "rect": [65, 360, 356, 39], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'Queen'", - "rect": [14, 440, 355, 39], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'the'", - "rect": [14, 440, 355, 39], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'a very short time '", - "rect": [14, 420, 355, 39], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'for the hedgehogs; and in\n'", - "rect": [14, 420, 355, 39], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'for turns,\n'", - "rect": [14, 420, 355, 39], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'quarrelling all the while, and fighting'", - "rect": [14, 420, 355, 39], - "reason": "disappeared" - }, - { - "object": "InlineTextBox ' was in a furious passion, and went\n'", - "rect": [14, 460, 354, 59], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'about once in a minute.\n'", - "rect": [14, 460, 354, 59], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'about, and shouting \u2018Off with his head!\u2019 or \u2018Off with'", - "rect": [14, 460, 354, 59], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'her head!\u2019 about once in a minute.\n'", - "rect": [14, 460, 354, 59], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'her head!\u2019'", - "rect": [14, 460, 354, 59], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'shouting \u2018Off with his head!\u2019 or \u2018Off with\n'", - "rect": [14, 460, 354, 59], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'stamping about, and'", - "rect": [14, 460, 354, 59], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'stamping'", - "rect": [14, 460, 354, 59], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'was in a furious passion, and went\n'", - "rect": [14, 460, 354, 59], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'a very short time '", - "rect": [65, 420, 304, 39], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'for the hedgehogs; and in\n'", - "rect": [65, 420, 304, 39], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'for turns,\n'", - "rect": [65, 420, 304, 39], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'quarrelling all the while, and fighting'", - "rect": [65, 420, 304, 39], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'The players all played at once without waiting'", - "rect": [65, 400, 304, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'The players all played at once without waiting'", - "rect": [65, 400, 304, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'difficult game indeed.\n'", - "rect": [65, 380, 142, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'the Queen'", - "rect": [302, 440, 66, 19], - "reason": "disappeared" - }, - { - "object": "LayoutBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 383, 48, 65], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 363, 48, 65], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) SPAN id='yellowFloat'", - "rect": [372, 243, 48, 49], - "reason": "appeared" - } + "invalidations": [ + [14, 520, 407, 80], + [14, 240, 406, 139], + [14, 180, 406, 79], + [65, 360, 356, 39], + [14, 440, 355, 39], + [14, 420, 355, 39], + [14, 460, 354, 59], + [65, 400, 304, 19], + [14, 383, 48, 65], + [14, 363, 48, 65] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/lines-with-layout-delta-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/lines-with-layout-delta-expected.txt deleted file mode 100644 index ee8f77d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/lines-with-layout-delta-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'PASS'", - "rect": [8, 58, 38, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'FAIL'", - "rect": [8, 58, 35, 19], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/list-marker-2-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/list-marker-2-expected.txt deleted file mode 100644 index 3183c2b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/list-marker-2-expected.txt +++ /dev/null
@@ -1,28 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutImage IMG id='target'", - "rect": [48, 100, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutOutsideListMarker ::marker", - "rect": [30, 185, 7, 19], - "reason": "geometry" - }, - { - "object": "LayoutOutsideListMarker ::marker", - "rect": [30, 135, 7, 19], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/make-children-non-inline-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/make-children-non-inline-expected.txt deleted file mode 100644 index 93d2ae6..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/make-children-non-inline-expected.txt +++ /dev/null
@@ -1,108 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'about all the stuff'", - "rect": [8, 264, 110, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'about all the stuff'", - "rect": [8, 164, 110, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'write a book'", - "rect": [8, 144, 79, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'write a book'", - "rect": [8, 144, 79, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'more words.'", - "rect": [8, 104, 79, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'more words.'", - "rect": [8, 104, 79, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'that comes'", - "rect": [8, 284, 67, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'that comes'", - "rect": [8, 184, 67, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'the break.'", - "rect": [8, 324, 62, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'the break.'", - "rect": [8, 224, 62, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'I could'", - "rect": [8, 124, 44, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'I could'", - "rect": [8, 124, 44, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'words,'", - "rect": [8, 84, 43, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'words,'", - "rect": [8, 84, 43, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'Word,'", - "rect": [8, 64, 39, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'Word,'", - "rect": [8, 64, 39, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'after'", - "rect": [8, 304, 29, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'after'", - "rect": [8, 204, 29, 19], - "reason": "disappeared" - }, - { - "object": "LayoutBlockFlow DIV id='target'", - "rect": [8, 164, 10, 100], - "reason": "appeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/mix-blend-mode-separate-stacking-context-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/mix-blend-mode-separate-stacking-context-expected.txt deleted file mode 100644 index bf07f7d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/mix-blend-mode-separate-stacking-context-expected.txt +++ /dev/null
@@ -1,78 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 800, 600], - "reason": "chunk appeared" - }, - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 800, 600], - "reason": "chunk disappeared" - }, - { - "object": "LayoutBlockFlow (relative positioned) (floating) DIV", - "rect": [128, 28, 80, 80], - "reason": "paint property change" - }, - { - "object": "LayoutBlockFlow (relative positioned) (floating) DIV", - "rect": [28, 28, 80, 80], - "reason": "paint property change" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [348, 48, 60, 60], - "reason": "paint property change" - }, - { - "object": "LayoutBlockFlow (relative positioned) (floating) DIV id='fourth'", - "rect": [328, 28, 60, 60], - "reason": "chunk appeared" - }, - { - "object": "LayoutBlockFlow HTML", - "rect": [328, 28, 60, 60], - "reason": "chunk disappeared" - }, - { - "object": "LayoutBlockFlow (floating) DIV id='third'", - "rect": [248, 48, 60, 60], - "reason": "paint property change" - }, - { - "object": "LayoutBlockFlow (relative positioned) (floating) DIV", - "rect": [228, 28, 60, 60], - "reason": "paint property change" - }, - { - "object": "LayoutBlockFlow (floating) DIV id='second'", - "rect": [148, 48, 60, 60], - "reason": "chunk disappeared" - }, - { - "object": "LayoutBlockFlow (relative positioned) (floating) DIV", - "rect": [128, 28, 60, 60], - "reason": "paint property change" - }, - { - "object": "LayoutBlockFlow (floating) DIV id='first'", - "rect": [48, 48, 60, 60], - "reason": "chunk appeared" - }, - { - "object": "LayoutBlockFlow (relative positioned) (floating) DIV", - "rect": [28, 28, 60, 60], - "reason": "paint property change" - } - ] - } - ] -} -
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 db38d6b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/non-text-link-invalidation-optimization-expected.txt +++ /dev/null
@@ -1,43 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox ' text is invalidated and '", - "rect": [164, 8, 145, 19], - "reason": "style change" - }, - { - "object": "InlineTextBox ' passes if '", - "rect": [75, 8, 61, 19], - "reason": "style change" - }, - { - "object": "InlineTextBox 'This test '", - "rect": [8, 8, 57, 19], - "reason": "style change" - }, - { - "object": "InlineTextBox ' images.'", - "rect": [353, 8, 52, 19], - "reason": "style change" - }, - { - "object": "InlineTextBox 'only'", - "rect": [136, 8, 28, 19], - "reason": "style change" - }, - { - "object": "InlineTextBox ' no '", - "rect": [319, 8, 24, 19], - "reason": "style change" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/opacity-from-zero-to-non-zero-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/opacity-from-zero-to-non-zero-expected.txt deleted file mode 100644 index fb8fcb3..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/opacity-from-zero-to-non-zero-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='target'", - "rect": [8, 8, 100, 100], - "reason": "chunk appeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/border-outline-0-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/border-outline-0-expected.txt deleted file mode 100644 index 77cbbe3..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/border-outline-0-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='border-image'", - "rect": [10, 10, 200, 200], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/border-radius-with-outline-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/border-radius-with-outline-expected.txt deleted file mode 100644 index 82b6cc8c5..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/border-radius-with-outline-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='target'", - "rect": [45, 45, 310, 310], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/inline-outline-repaint-2-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/inline-outline-repaint-2-expected.txt deleted file mode 100644 index c54cd1d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/inline-outline-repaint-2-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutInline SPAN", - "rect": [210, 0, 50, 15], - "reason": "outline" - }, - { - "object": "InlineTextBox 'Test'", - "rect": [215, 0, 40, 10], - "reason": "style change" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/outline-add-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/outline-add-repaint-expected.txt deleted file mode 100644 index 5a5f2cb..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/outline-add-repaint-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='test'", - "rect": [0, 0, 110, 110], - "reason": "style change" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/outline-change-invalidation-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/outline-change-invalidation-expected.txt deleted file mode 100644 index 511002e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/outline-change-invalidation-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow A id='link'", - "rect": [43, 83, 754, 30], - "reason": "appeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/outline-change-offset-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/outline-change-offset-expected.txt deleted file mode 100644 index c8f8208..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/outline-change-offset-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='target'", - "rect": [35, 35, 130, 130], - "reason": "style change" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/outline-change-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/outline-change-repaint-expected.txt deleted file mode 100644 index 5a5f2cb..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/outline-change-repaint-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='test'", - "rect": [0, 0, 110, 110], - "reason": "style change" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/outline-change-vertical-rl-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/outline-change-vertical-rl-expected.txt deleted file mode 100644 index 9054169..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/outline-change-vertical-rl-expected.txt +++ /dev/null
@@ -1,36 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [1016, 585], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='target'", - "rect": [0, 0, 1016, 128], - "reason": "style change" - } - ], - "transform": 1 - }, - { - "name": "ContentsLayer for Horizontal Scrollbar Layer", - "position": [0, 585], - "bounds": [800, 15], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [-216, 0, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/outline-child-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/outline-child-repaint-expected.txt deleted file mode 100644 index 8c15887..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/outline-child-repaint-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV class='outlined'", - "rect": [0, 240, 220, 50], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='outlined'", - "rect": [0, 140, 220, 50], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/outline-containing-image-in-non-standard-mode-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/outline-containing-image-in-non-standard-mode-expected.txt deleted file mode 100644 index 8b5d067..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/outline-containing-image-in-non-standard-mode-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutInline SPAN id='target'", - "rect": [6, 6, 204, 58], - "reason": "style change" - }, - { - "object": "LayoutImage IMG", - "rect": [8, 8, 200, 50], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/outline-continuations-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/outline-continuations-expected.txt deleted file mode 100644 index f1a214bc..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/outline-continuations-expected.txt +++ /dev/null
@@ -1,38 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutInline SPAN id='outer'", - "rect": [16, 108, 90, 63], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'CONTENTS'", - "rect": [18, 150, 86, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'CONTENTS'", - "rect": [18, 150, 86, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'CONTENTS'", - "rect": [18, 110, 86, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'CONTENTS'", - "rect": [18, 110, 86, 19], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/outline-current-color-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/outline-current-color-expected.txt deleted file mode 100644 index 4696b71b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/outline-current-color-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='currentColor'", - "rect": [48, 190, 120, 120], - "reason": "style change" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/outline-inset-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/outline-inset-expected.txt deleted file mode 100644 index bff65922..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/outline-inset-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV", - "rect": [19, 191, 200, 60], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [19, 29, 200, 60], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV id='b'", - "rect": [29, 231, 180, 20], - "reason": "incremental" - }, - { - "object": "LayoutBlockFlow DIV id='a'", - "rect": [29, 69, 180, 20], - "reason": "incremental" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/outline-not-affected-by-descendant-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/outline-not-affected-by-descendant-expected.txt deleted file mode 100644 index 4625001..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/outline-not-affected-by-descendant-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='child'", - "rect": [8, 8, 50, 50], - "reason": "background" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/outline-repaint-glitch-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/outline-repaint-glitch-expected.txt deleted file mode 100644 index 398d7c19..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/outline-repaint-glitch-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV", - "rect": [15, 391, 208, 68], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [15, 229, 208, 68], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV id='b'", - "rect": [29, 435, 180, 20], - "reason": "incremental" - }, - { - "object": "LayoutBlockFlow DIV id='a'", - "rect": [29, 273, 180, 20], - "reason": "incremental" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/outline-shrinking-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/outline-shrinking-expected.txt deleted file mode 100644 index 68290b9..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/outline-shrinking-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='t'", - "rect": [4, 114, 108, 108], - "reason": "style change" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/align-items-overflow-change-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/align-items-overflow-change-expected.txt deleted file mode 100644 index df82247..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/align-items-overflow-change-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV class='item1'", - "rect": [0, 52, 200, 200], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='item1'", - "rect": [0, 2, 200, 200], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/align-self-overflow-change-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/align-self-overflow-change-expected.txt deleted file mode 100644 index df82247..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/align-self-overflow-change-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV class='item1'", - "rect": [0, 52, 200, 200], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='item1'", - "rect": [0, 2, 200, 200], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/clipped-overflow-visible-subtree-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/clipped-overflow-visible-subtree-expected.txt deleted file mode 100644 index 0e0eea6..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/clipped-overflow-visible-subtree-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV", - "rect": [308, 8, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [8, 8, 100, 100], - "reason": "geometry" - } - ] - } - ] -} -
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 index 4abcc0d..bce2b25 100644 --- 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
@@ -9,24 +9,16 @@ { "name": "LayoutBlockFlow DIV id='scroller'", "bounds": [200, 200], - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='scroller'", - "rect": [0, 0, 200, 200], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 200, 200] ], "transform": 1 }, { "name": "Scrolling Contents Layer", "bounds": [185, 352], - "paintInvalidations": [ - { - "object": "Scrolling Contents Layer", - "rect": [0, 0, 185, 352], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 185, 352] ], "transform": 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 index f0be362..4ea2206 100644 --- 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
@@ -11,12 +11,8 @@ "bounds": [220, 220], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='scroller'", - "rect": [0, 0, 220, 220], - "reason": "background" - } + "invalidations": [ + [0, 0, 220, 220] ], "transform": 1 }, @@ -26,12 +22,8 @@ "bounds": [185, 300], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutBlockFlow DIV id='scroller'", - "rect": [0, 0, 185, 300], - "reason": "background" - } + "invalidations": [ + [0, 0, 185, 300] ], "transform": 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 index 9b247a8..707a6d4 100644 --- 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
@@ -17,12 +17,8 @@ "bounds": [185, 300], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutBlockFlow DIV id='scroller'", - "rect": [0, 0, 185, 300], - "reason": "background" - } + "invalidations": [ + [0, 0, 185, 300] ], "transform": 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 index 58a7c52..7a77f0c5 100644 --- 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
@@ -37,12 +37,8 @@ { "name": "Decoration Layer", "bounds": [200, 200], - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='scroller'", - "rect": [0, 0, 200, 200], - "reason": "style change" - } + "invalidations": [ + [0, 0, 200, 200] ], "transform": 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 index 096bea8..2db055a 100644 --- 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
@@ -11,12 +11,8 @@ "position": [-50, 0], "bounds": [150, 100], "backgroundColor": "#0000FF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='div'", - "rect": [0, 0, 150, 100], - "reason": "style change" - } + "invalidations": [ + [0, 0, 150, 100] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/content-into-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/content-into-overflow-expected.txt deleted file mode 100644 index 15f6a6b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/content-into-overflow-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV", - "rect": [8, 158, 106, 106], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) DIV", - "rect": [8, 8, 106, 106], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [8, 308, 100, 100], - "reason": "appeared" - }, - { - "object": "LayoutBlockFlow DIV id='target3'", - "rect": [8, 388, 100, 20], - "reason": "appeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/erase-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/erase-overflow-expected.txt deleted file mode 100644 index 346684e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/erase-overflow-expected.txt +++ /dev/null
@@ -1,28 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV class='square'", - "rect": [8, 108, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutBlockFlow DIV class='square'", - "rect": [8, 8, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutBlockFlow DIV id='target' class='square'", - "rect": [8, 8, 100, 100], - "reason": "chunk appeared" - } - ] - } - ] -} -
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 d6591b5..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,39 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [785, 2016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV class='absolute green'", - "rect": [108, 308, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutBlockFlow (positioned) DIV class='absolute green'", - "rect": [108, 308, 100, 100], - "reason": "chunk appeared" - }, - { - "object": "LayoutBlockFlow (relative positioned) DIV id='container' class='relative blue'", - "rect": [8, 208, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutBlockFlow (relative positioned) DIV id='container' class='relative blue'", - "rect": [8, 208, 100, 100], - "reason": "chunk appeared" - } - ] - }, - { - "name": "ContentsLayer for Vertical Scrollbar Layer", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/inline-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/inline-overflow-expected.txt deleted file mode 100644 index 9c55894..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/inline-overflow-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'A\u00A0\u00A0B'", - "rect": [33, 33, 250, 100], - "reason": "style change" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/inline-vertical-lr-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/inline-vertical-lr-overflow-expected.txt deleted file mode 100644 index 5927ce7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/inline-vertical-lr-overflow-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'A\u00A0\u00A0B'", - "rect": [33, 33, 100, 250], - "reason": "style change" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/inline-vertical-rl-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/inline-vertical-rl-overflow-expected.txt deleted file mode 100644 index 7eed371..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/inline-vertical-rl-overflow-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'A\u00A0\u00A0B'", - "rect": [667, 33, 100, 250], - "reason": "style change" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/justify-items-overflow-change-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/justify-items-overflow-change-expected.txt deleted file mode 100644 index eaa9b77..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/justify-items-overflow-change-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV class='item1'", - "rect": [0, 52, 160, 300], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='item1'", - "rect": [0, 52, 100, 300], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/justify-self-overflow-change-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/justify-self-overflow-change-expected.txt deleted file mode 100644 index 3ad3e33..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/justify-self-overflow-change-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV class='item1'", - "rect": [0, 52, 150, 300], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='item1'", - "rect": [0, 52, 100, 300], - "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 45175f3..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/line-overflow-expected.txt +++ /dev/null
@@ -1,103 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox ' eleifend'", - "rect": [8, 122, 195, 99], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'convallis.'", - "rect": [8, 122, 195, 99], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'lacus, at sagittis eros leo'", - "rect": [8, 122, 195, 99], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'pulvinar velit. Integer'", - "rect": [8, 122, 195, 99], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'sollicitudin nisi ut urna blandit'", - "rect": [8, 122, 195, 99], - "reason": "appeared" - }, - { - "object": "InlineTextBox ' eleifend lacus,'", - "rect": [8, 142, 195, 79], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'at sagittis eros leo pulvinar'", - "rect": [8, 142, 195, 79], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'urna blandit convallis.'", - "rect": [8, 142, 195, 79], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'velit. Integer sollicitudin nisi ut'", - "rect": [8, 142, 195, 79], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'Cras faucibus. Nunc'", - "rect": [8, 82, 192, 59], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'adipiscing, enim in scelerisque'", - "rect": [8, 82, 192, 59], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'augue '", - "rect": [8, 82, 192, 59], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'augue'", - "rect": [8, 82, 192, 59], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'convallis,\n'", - "rect": [8, 82, 192, 59], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'convallis,\n'", - "rect": [8, 82, 192, 59], - "reason": "disappeared" - }, - { - "object": "InlineFlowBox", - "rect": [114, 92, 35, 49], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'purus'", - "rect": [114, 122, 35, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'purus'", - "rect": [38, 142, 35, 19], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/negative-text-indent-with-overflow-hidden-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/negative-text-indent-with-overflow-hidden-expected.txt deleted file mode 100644 index 403f4ad..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/negative-text-indent-with-overflow-hidden-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='target' class='changed'", - "rect": [550, 8, 200, 50], - "reason": "background" - } - ] - } - ] -} -
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 index f34ef13..bf7d391 100644 --- 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
@@ -5,57 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Make sure when a layer'", - "rect": [8, 8, 761, 59], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'REGRESSION (r41203): Facebook friend suggestions disappear on update. '", - "rect": [8, 8, 761, 59], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'You should'", - "rect": [8, 8, 761, 59], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'see a 100x100 green square below.\nIf you see any red, the test has failed.'", - "rect": [8, 8, 761, 59], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'switches\nfrom being self-painting to non-self-painting that a layout happens to fix up the floating objects lists. '", - "rect": [8, 8, 761, 59], - "reason": "disappeared" - }, - { - "object": "LayoutBlockFlow HTML", - "rect": [8, 8, 761, 59], - "reason": "chunk appeared" - }, - { - "object": "LayoutBlockFlow (floating) DIV class='green'", - "rect": [8, 84, 100, 100], - "reason": "chunk disappeared" - }, - { - "object": "LayoutBlockFlow (floating) DIV class='red'", - "rect": [8, 84, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutBlockFlow (floating) DIV class='red'", - "rect": [8, 84, 100, 100], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox 'Repaint test for '", - "rect": [8, 8, 100, 19], - "reason": "disappeared" - } + "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 index 55aee50..0127dfcb0 100644 --- 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
@@ -10,17 +10,8 @@ "name": "LayoutBlockFlow DIV id='parent'", "position": [-1, -1], "bounds": [745, 102], - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='parent'", - "rect": [0, 0, 745, 102], - "reason": "full layer" - }, - { - "object": "LayoutBlockFlow DIV id='parent'", - "rect": [0, 0, 744, 100], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 745, 102] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/overflow-hide-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/overflow-hide-expected.txt deleted file mode 100644 index 4cbd074..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/overflow-hide-expected.txt +++ /dev/null
@@ -1,29 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [785, 2016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (relative positioned) DIV class='relative red'", - "rect": [108, 108, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='overflowParent' class='absolute green'", - "rect": [8, 8, 100, 100], - "reason": "style change" - } - ] - }, - { - "name": "ContentsLayer for Vertical Scrollbar Layer", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/overflow-into-content-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/overflow-into-content-expected.txt deleted file mode 100644 index c03a9ef23..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/overflow-into-content-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV", - "rect": [8, 158, 106, 106], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) DIV", - "rect": [8, 8, 106, 106], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [8, 308, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutBlockFlow DIV id='target3'", - "rect": [8, 388, 100, 20], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/overflow-show-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/overflow-show-expected.txt deleted file mode 100644 index 249a5c2..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/overflow-show-expected.txt +++ /dev/null
@@ -1,29 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [785, 2016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (relative positioned) DIV class='relative green'", - "rect": [108, 108, 100, 100], - "reason": "appeared" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='overflowParent' class='absolute green'", - "rect": [8, 8, 100, 100], - "reason": "style change" - } - ] - }, - { - "name": "ContentsLayer for Vertical Scrollbar Layer", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/rel-positioned-inline-with-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/rel-positioned-inline-with-overflow-expected.txt deleted file mode 100644 index f640775..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/rel-positioned-inline-with-overflow-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='target'", - "rect": [8, 94, 100, 50], - "reason": "background" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/repaint-resized-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/repaint-resized-overflow-expected.txt deleted file mode 100644 index 4d4a03c2..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/repaint-resized-overflow-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='s'", - "rect": [8, 156, 108, 108], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/resize-child-within-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/resize-child-within-overflow-expected.txt deleted file mode 100644 index 858faa5..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/resize-child-within-overflow-expected.txt +++ /dev/null
@@ -1,35 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 1000], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV class='container'", - "rect": [400, 0, 200, 1000], - "reason": "incremental" - } - ] - }, - { - "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] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/trailing-floats-root-line-box-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/trailing-floats-root-line-box-overflow-expected.txt deleted file mode 100644 index e70b4ebe..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/trailing-floats-root-line-box-overflow-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='target'", - "rect": [8, 58, 100, 100], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/vertical-overflow-child-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/vertical-overflow-child-expected.txt deleted file mode 100644 index a6a144d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/vertical-overflow-child-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV class='container'", - "rect": [214, 21, 100, 100], - "reason": "chunk appeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/vertical-overflow-parent-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/vertical-overflow-parent-expected.txt deleted file mode 100644 index 2ad892c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/vertical-overflow-parent-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV class='container'", - "rect": [29, 29, 100, 100], - "reason": "chunk appeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/vertical-overflow-same-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/vertical-overflow-same-expected.txt deleted file mode 100644 index 7bc05cc..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/vertical-overflow-same-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV class='vertical-rl container'", - "rect": [29, 21, 100, 100], - "reason": "chunk appeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/vertical-rl-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/vertical-rl-overflow-expected.txt deleted file mode 100644 index 737949f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/vertical-rl-overflow-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='div'", - "rect": [50, 100, 150, 100], - "reason": "style change" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overhanging-float-detach-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overhanging-float-detach-repaint-expected.txt deleted file mode 100644 index e2b091d3c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overhanging-float-detach-repaint-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (floating) DIV class='float'", - "rect": [8, 68, 100, 100], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/paint-invalidation-with-opacity-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/paint-invalidation-with-opacity-expected.txt deleted file mode 100644 index affe5f4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/paint-invalidation-with-opacity-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": [8, 8, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutBlockFlow DIV id='target'", - "rect": [8, 8, 100, 100], - "reason": "chunk appeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/paint-invalidation-with-reparent-across-frame-boundaries-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/paint-invalidation-with-reparent-across-frame-boundaries-expected.txt deleted file mode 100644 index ac191927..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/paint-invalidation-with-reparent-across-frame-boundaries-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'abc'", - "rect": [18, 18, 22, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'abc'", - "rect": [8, 187, 22, 19], - "reason": "appeared" - } - ] - } - ] -} -
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 index f417810..3197197 100644 --- 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
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='absolute'", - "rect": [100, 100, 100, 100], - "reason": "disappeared" - } + "invalidations": [ + [100, 100, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/absolute-margin-change-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/absolute-margin-change-repaint-expected.txt deleted file mode 100644 index 2231bcb..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/absolute-margin-change-repaint-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='test'", - "rect": [0, 60, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='test'", - "rect": [0, 40, 100, 100], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/absolute-position-change-containing-block-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/absolute-position-change-containing-block-expected.txt deleted file mode 100644 index cdb9775..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/absolute-position-change-containing-block-expected.txt +++ /dev/null
@@ -1,29 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [785, 2016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV class='absolute green'", - "rect": [100, 100, 100, 100], - "reason": "appeared" - }, - { - "object": "LayoutBlockFlow DIV id='container' class='fixed blue'", - "rect": [8, 8, 100, 100], - "reason": "appeared" - } - ] - }, - { - "name": "ContentsLayer for Vertical Scrollbar Layer", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ] -} -
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 index 4fbb349f..eafe953f 100644 --- 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
@@ -5,12 +5,8 @@ "bounds": [800, 2016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='absoluteDiv' class='absolute green'", - "rect": [100, 500, 100, 100], - "reason": "disappeared" - } + "invalidations": [ + [100, 500, 100, 100] ], "transform": 1 }, @@ -27,12 +23,8 @@ "bounds": [100, 100], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='absoluteDiv' class='absolute green'", - "rect": [0, 0, 100, 100], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/absolute-position-moved-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/absolute-position-moved-expected.txt index b13afde..9782dc26 100644 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/absolute-position-moved-expected.txt +++ b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/absolute-position-moved-expected.txt
@@ -5,12 +5,8 @@ "bounds": [785, 2016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='absoluteDiv' class='absolute green'", - "rect": [100, 100, 100, 100], - "reason": "appeared" - } + "invalidations": [ + [100, 100, 100, 100] ] }, { @@ -18,12 +14,8 @@ "bounds": [100, 100], "contentsOpaque": true, "backgroundColor": "#FF0000", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='absoluteDiv' class='absolute green'", - "rect": [100, 100, 100, 100], - "reason": "chunk disappeared" - } + "invalidations": [ + [100, 100, 100, 100] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/abspos-shift-image-incorrect-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/abspos-shift-image-incorrect-repaint-expected.txt deleted file mode 100644 index eccbbe8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/abspos-shift-image-incorrect-repaint-expected.txt +++ /dev/null
@@ -1,44 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [1250, 585], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutImage IMG", - "rect": [704, 0, 214, 232], - "reason": "disappeared" - }, - { - "object": "LayoutBlockFlow (relative positioned) DIV class='imageWrapper'", - "rect": [454, 0, 214, 232], - "reason": "chunk appeared" - }, - { - "object": "LayoutImage IMG", - "rect": [0, 0, 214, 232], - "reason": "disappeared" - }, - { - "object": "InlineTextBox '\n'", - "rect": [700, 217, 4, 19], - "reason": "disappeared" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='shiftMe'", - "rect": [450, 217, 4, 19], - "reason": "chunk appeared" - } - ] - }, - { - "name": "ContentsLayer for Horizontal Scrollbar Layer", - "position": [0, 585], - "bounds": [800, 15], - "contentsOpaque": true - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/align-content-position-change-grid-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/align-content-position-change-grid-expected.txt deleted file mode 100644 index 6c90a47..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/align-content-position-change-grid-expected.txt +++ /dev/null
@@ -1,43 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV class='item'", - "rect": [0, 302, 200, 50], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='item'", - "rect": [0, 252, 200, 50], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='item'", - "rect": [0, 202, 200, 50], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='item'", - "rect": [0, 152, 200, 50], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='item'", - "rect": [0, 102, 200, 50], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='item'", - "rect": [0, 52, 200, 50], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/block-layout-inline-children-float-positioned-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/block-layout-inline-children-float-positioned-expected.txt index ba3f915..1cbf9a67 100644 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/block-layout-inline-children-float-positioned-expected.txt +++ b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/block-layout-inline-children-float-positioned-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'the quick brown fox jumped over the lazy dog'", - "rect": [309, 37, 292, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'the quick brown fox jumped over the lazy dog'", - "rect": [155, 37, 292, 19], - "reason": "appeared" - } + "invalidations": [ + [309, 37, 292, 19], + [155, 37, 292, 19] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/containing-block-position-change-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/containing-block-position-change-expected.txt deleted file mode 100644 index e7e3f35..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/containing-block-position-change-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV", - "rect": [158, 74, 50, 50], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) DIV", - "rect": [100, 74, 50, 50], - "reason": "geometry" - } - ] - } - ] -} -
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 index 3297c7e..7031569 100644 --- 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
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='moveMe'", - "rect": [150, 150, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='moveMe'", - "rect": [8, 88, 100, 100], - "reason": "geometry" - } + "invalidations": [ + [150, 150, 100, 100], + [8, 88, 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 index ffda1355..28ad621d 100644 --- 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
@@ -12,12 +12,8 @@ "bounds": [100, 100], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='t'", - "rect": [0, 0, 100, 100], - "reason": "background" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 2 },
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 2231bcb..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/fixed-margin-change-repaint-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='test'", - "rect": [0, 60, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='test'", - "rect": [0, 40, 100, 100], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/fixed-to-relative-position-with-absolute-child-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/fixed-to-relative-position-with-absolute-child-expected.txt deleted file mode 100644 index f5fad0a4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/fixed-to-relative-position-with-absolute-child-expected.txt +++ /dev/null
@@ -1,29 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [785, 2016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV class='absolute green'", - "rect": [108, 308, 100, 100], - "reason": "appeared" - }, - { - "object": "LayoutBlockFlow (relative positioned) DIV id='container' class='fixed blue'", - "rect": [8, 208, 100, 100], - "reason": "appeared" - } - ] - }, - { - "name": "ContentsLayer for Vertical Scrollbar Layer", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ] -} -
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 index 7f3d564..27ba43d 100644 --- 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
@@ -13,12 +13,8 @@ "bounds": [100, 100], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='test'", - "rect": [0, 0, 100, 100], - "reason": "background" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 2 },
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/inline-relative-positioned-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/inline-relative-positioned-expected.txt deleted file mode 100644 index f1040aa..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/inline-relative-positioned-expected.txt +++ /dev/null
@@ -1,28 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'a'", - "rect": [8, 88, 100, 100], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'p'", - "rect": [8, 88, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutBlockFlow DIV id='target'", - "rect": [8, 88, 100, 100], - "reason": "geometry" - } - ] - } - ] -} -
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 4ef91de..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/intermediate-layout-position-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTable TABLE", - "rect": [8, 172, 46, 20], - "reason": "incremental" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [8, 74, 46, 20], - "reason": "incremental" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/invalidate-paint-for-fixed-pos-inside-iframe-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/invalidate-paint-for-fixed-pos-inside-iframe-expected.txt deleted file mode 100644 index 3cc918bc..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/invalidate-paint-for-fixed-pos-inside-iframe-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV", - "rect": [18, 418, 50, 50], - "reason": "background" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/justify-content-position-change-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/justify-content-position-change-expected.txt deleted file mode 100644 index 4ac0162..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/justify-content-position-change-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV class='item'", - "rect": [100, 52, 52, 300], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='item'", - "rect": [52, 52, 52, 300], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='item'", - "rect": [48, 52, 52, 300], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='item'", - "rect": [0, 52, 52, 300], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/justify-content-position-change-grid-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/justify-content-position-change-grid-expected.txt deleted file mode 100644 index b7b59973..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/justify-content-position-change-grid-expected.txt +++ /dev/null
@@ -1,43 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV class='item'", - "rect": [250, 52, 50, 200], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='item'", - "rect": [200, 52, 50, 200], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='item'", - "rect": [150, 52, 50, 200], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='item'", - "rect": [100, 52, 50, 200], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='item'", - "rect": [50, 52, 50, 200], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='item'", - "rect": [0, 52, 50, 200], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/layout-state-relative-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/layout-state-relative-expected.txt deleted file mode 100644 index c21f46ca..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/layout-state-relative-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'PASS'", - "rect": [8, 152, 38, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'FAIL'", - "rect": [8, 152, 35, 19], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/layoutstate-invalid-invalidation-inline-relative-positioned-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/layoutstate-invalid-invalidation-inline-relative-positioned-expected.txt deleted file mode 100644 index 14568e0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/layoutstate-invalid-invalidation-inline-relative-positioned-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'x'", - "rect": [8, 220, 100, 100], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [8, 200, 100, 100], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/positioned-document-element-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/positioned-document-element-expected.txt deleted file mode 100644 index 5ccb093..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/positioned-document-element-expected.txt +++ /dev/null
@@ -1,28 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 800, 600], - "reason": "background" - }, - { - "object": "InlineTextBox 'Tests that the entire viewport is painted with a floated html element.'", - "rect": [108, 116, 424, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'Tests that the entire viewport is painted with a floated html element.'", - "rect": [8, 16, 424, 19], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/positioned-great-grandparent-change-location-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/positioned-great-grandparent-change-location-expected.txt deleted file mode 100644 index 5c49dc4fa..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/positioned-great-grandparent-change-location-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV", - "rect": [100, 200, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) DIV", - "rect": [100, 100, 100, 100], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'Target'", - "rect": [100, 200, 41, 19], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'Target'", - "rect": [100, 100, 41, 19], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/relative-margin-change-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/relative-margin-change-repaint-expected.txt deleted file mode 100644 index 72fbfb0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/relative-margin-change-repaint-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (relative positioned) DIV id='test'", - "rect": [0, 60, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (relative positioned) DIV id='test'", - "rect": [0, 40, 100, 100], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/shift-relative-positioned-container-with-image-addition-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/shift-relative-positioned-container-with-image-addition-expected.txt deleted file mode 100644 index 8356c47a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/shift-relative-positioned-container-with-image-addition-expected.txt +++ /dev/null
@@ -1,39 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [785, 836], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 742, 785, 94], - "reason": "incremental" - }, - { - "object": "LayoutIFrame IFRAME id='iframe'", - "rect": [8, 92, 732, 94], - "reason": "appeared" - }, - { - "object": "LayoutBlockFlow (relative positioned) DIV class='relative paddingTop'", - "rect": [58, 236, 489, 537], - "reason": "chunk appeared" - }, - { - "object": "LayoutImage IMG", - "rect": [58, 142, 489, 537], - "reason": "disappeared" - } - ] - }, - { - "name": "ContentsLayer for Vertical Scrollbar Layer", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/shift-relative-positioned-container-with-image-removal-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/shift-relative-positioned-container-with-image-removal-expected.txt deleted file mode 100644 index f7a721f6..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/shift-relative-positioned-container-with-image-removal-expected.txt +++ /dev/null
@@ -1,34 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [785, 742], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutIFrame IFRAME id='iframe'", - "rect": [8, 92, 732, 94], - "reason": "disappeared" - }, - { - "object": "LayoutBlockFlow (relative positioned) DIV class='relative paddingTop'", - "rect": [58, 241, 489, 537], - "reason": "chunk disappeared" - }, - { - "object": "LayoutImage IMG", - "rect": [58, 142, 489, 537], - "reason": "appeared" - } - ] - }, - { - "name": "ContentsLayer for Vertical Scrollbar Layer", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/static-to-positioned-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/static-to-positioned-expected.txt deleted file mode 100644 index 80247d4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/static-to-positioned-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='t'", - "rect": [8, 332, 100, 100], - "reason": "style change" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='t'", - "rect": [8, 282, 100, 100], - "reason": "style change" - }, - { - "object": "LayoutBlockFlow (relative positioned) DIV id='a'", - "rect": [8, 132, 100, 100], - "reason": "style change" - }, - { - "object": "LayoutBlockFlow (relative positioned) DIV id='a'", - "rect": [8, 82, 100, 100], - "reason": "style change" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/text-in-relative-positioned-inline-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/text-in-relative-positioned-inline-expected.txt deleted file mode 100644 index 3062fc8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/text-in-relative-positioned-inline-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'ab'", - "rect": [8, 8, 200, 100], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/transform-absolute-child-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/transform-absolute-child-expected.txt deleted file mode 100644 index e2df996..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/transform-absolute-child-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='child'", - "rect": [135, 127, 400, 50], - "reason": "paint property change" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='child'", - "rect": [124, 116, 340, 297], - "reason": "paint property change" - }, - { - "object": "LayoutBlockFlow (relative positioned) DIV id='box' class='rotated'", - "rect": [16, 8, 288, 288], - "reason": "paint property change" - }, - { - "object": "LayoutBlockFlow (relative positioned) DIV id='box' class='rotated'", - "rect": [58, 50, 204, 204], - "reason": "paint property change" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/transform-absolute-in-positioned-container-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/transform-absolute-in-positioned-container-expected.txt deleted file mode 100644 index 0c8f534..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/transform-absolute-in-positioned-container-expected.txt +++ /dev/null
@@ -1,29 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [802, 585], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (relative positioned) DIV id='box' class='rotated'", - "rect": [76, 190, 286, 286], - "reason": "paint property change" - }, - { - "object": "LayoutBlockFlow (relative positioned) DIV id='box' class='rotated'", - "rect": [118, 232, 202, 202], - "reason": "paint property change" - } - ] - }, - { - "name": "ContentsLayer for Horizontal Scrollbar Layer", - "position": [0, 585], - "bounds": [800, 15], - "contentsOpaque": true - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/transform-relative-position-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/transform-relative-position-expected.txt deleted file mode 100644 index 987447c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/transform-relative-position-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (relative positioned) DIV id='box' class='rotated'", - "rect": [66, 110, 286, 286], - "reason": "paint property change" - }, - { - "object": "LayoutBlockFlow (relative positioned) DIV id='box' class='rotated'", - "rect": [108, 152, 202, 202], - "reason": "paint property change" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/push-block-with-first-line-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/push-block-with-first-line-expected.txt deleted file mode 100644 index cac9080..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/push-block-with-first-line-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "RootInlineBox", - "rect": [8, 68, 784, 20], - "reason": "geometry" - }, - { - "object": "RootInlineBox", - "rect": [8, 8, 784, 20], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'JOCULAR'", - "rect": [8, 68, 140, 20], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'JOCULAR'", - "rect": [8, 8, 140, 20], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/quotes-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/quotes-expected.txt deleted file mode 100644 index 6660022..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/quotes-expected.txt +++ /dev/null
@@ -1,43 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'quote 2'", - "rect": [17, 28, 47, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'quote 2'", - "rect": [16, 28, 47, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox '\u003E'", - "rect": [64, 28, 9, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox '\u003C'", - "rect": [8, 28, 9, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox '}'", - "rect": [63, 28, 8, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox '{'", - "rect": [8, 28, 8, 19], - "reason": "appeared" - } - ] - } - ] -} -
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 index bc231ff..6817fab6 100644 --- 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
@@ -5,14 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='target1'", - "rect": [18, 10, 60, 40], - "reason": "background" - } + "invalidations": [ + [18, 10, 60, 40] ], - "underPaintInvalidations": [ + "underInvalidations": [ { "x": 18, "y": 10, @@ -320,14 +316,10 @@ "bounds": [60, 40], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='target2'", - "rect": [0, 0, 60, 40], - "reason": "background" - } + "invalidations": [ + [0, 0, 60, 40] ], - "underPaintInvalidations": [ + "underInvalidations": [ { "x": 0, "y": 0, @@ -636,14 +628,10 @@ "bounds": [150, 150], "contentsOpaque": true, "backgroundColor": "#FFFF00", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (relative positioned) DIV id='target3'", - "rect": [40, 70, 60, 40], - "reason": "background" - } + "invalidations": [ + [40, 70, 60, 40] ], - "underPaintInvalidations": [ + "underInvalidations": [ { "x": 40, "y": 70, @@ -955,14 +943,10 @@ { "name": "Scrolling Contents Layer", "bounds": [4000, 20060], - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (relative positioned) DIV id='target4'", - "rect": [40, 10010, 60, 40], - "reason": "background" - } + "invalidations": [ + [40, 10010, 60, 40] ], - "underPaintInvalidations": [ + "underInvalidations": [ { "x": 40, "y": 10010,
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/reflection/reflection-invalidation-after-display-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/reflection/reflection-invalidation-after-display-expected.txt deleted file mode 100644 index 65e4eaa..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/reflection/reflection-invalidation-after-display-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='box' class='green reflected box'", - "rect": [300, 8, 450, 200], - "reason": "chunk disappeared" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='box' class='green box'", - "rect": [300, 8, 200, 200], - "reason": "appeared" - } - ] - } - ] -} -
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 1f605f0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/reflection/reflection-invalidation-positioned-child-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='box'", - "rect": [0, 0, 100, 220], - "reason": "paint property change" - }, - { - "object": "LayoutBlockFlow DIV id='box'", - "rect": [0, 0, 100, 200], - "reason": "paint property change" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='positioned'", - "rect": [400, 10, 50, 200], - "reason": "paint property change" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='positioned'", - "rect": [400, 10, 50, 180], - "reason": "paint property change" - } - ] - } - ] -} -
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 6de4eb3..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/reflection/reflection-redraw-expected.txt +++ /dev/null
@@ -1,73 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'The color of this'", - "rect": [380, 267, 286, 59], - "reason": "style change" - }, - { - "object": "InlineTextBox 'should be green'", - "rect": [380, 267, 286, 59], - "reason": "style change" - }, - { - "object": "InlineTextBox 'text in the reflection'", - "rect": [380, 267, 286, 59], - "reason": "style change" - }, - { - "object": "InlineTextBox 'The color of this'", - "rect": [70, 267, 286, 59], - "reason": "style change" - }, - { - "object": "InlineTextBox 'should be green'", - "rect": [70, 267, 286, 59], - "reason": "style change" - }, - { - "object": "InlineTextBox 'text in the reflection'", - "rect": [70, 267, 286, 59], - "reason": "style change" - }, - { - "object": "InlineTextBox 'The color of this'", - "rect": [305, 34, 126, 182], - "reason": "style change" - }, - { - "object": "InlineTextBox 'should be green'", - "rect": [305, 34, 126, 182], - "reason": "style change" - }, - { - "object": "InlineTextBox 'text in the reflection'", - "rect": [305, 34, 126, 182], - "reason": "style change" - }, - { - "object": "InlineTextBox 'The color of this'", - "rect": [305, 377, 126, 156], - "reason": "style change" - }, - { - "object": "InlineTextBox 'should be green'", - "rect": [305, 377, 126, 156], - "reason": "style change" - }, - { - "object": "InlineTextBox 'text in the reflection'", - "rect": [305, 377, 126, 156], - "reason": "style change" - } - ] - } - ] -} -
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 index c8077e9..972d1e8 100644 --- 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
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='target'", - "rect": [22, 50, 226, 167], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'PASS'", - "rect": [23, 51, 72, 110], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'FAIL'", - "rect": [23, 51, 69, 109], - "reason": "disappeared" - } + "invalidations": [ + [22, 50, 226, 167] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/reflection/scroll-absolute-layer-with-reflection-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/reflection/scroll-absolute-layer-with-reflection-expected.txt deleted file mode 100644 index e06b0d9..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/reflection/scroll-absolute-layer-with-reflection-expected.txt +++ /dev/null
@@ -1,41 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [785, 2016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV class='absolute red'", - "rect": [250, 230, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutBlockFlow (relative positioned) DIV class='relative reflected'", - "rect": [250, 230, 100, 100], - "reason": "paint property change" - } - ], - "transform": 1 - }, - { - "name": "ContentsLayer for Vertical Scrollbar Layer", - "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] - ] - } - ] -} -
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 index bd8e9d7..4a94833 100644 --- 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
@@ -10,17 +10,8 @@ { "name": "LayoutBlockFlow (positioned) DIV id='moveMe' class='fixed clipped'", "bounds": [100, 100], - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV class='absolute green reflected'", - "rect": [0, 0, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutBlockFlow (positioned) DIV class='absolute red'", - "rect": [0, 0, 100, 100], - "reason": "chunk disappeared" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 2 },
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 index 1388cd8..946a582 100644 --- 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
@@ -11,12 +11,8 @@ "name": "LayoutBlockFlow (positioned) DIV class='reflected fixed'", "bounds": [100, 100], "contentsOpaque": true, - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV class='absolute green reflected'", - "rect": [0, 0, 100, 100], - "reason": "chunk reordered" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 2 },
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/remove-block-after-layout-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/remove-block-after-layout-expected.txt deleted file mode 100644 index 74c18fd..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/remove-block-after-layout-expected.txt +++ /dev/null
@@ -1,28 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='target'", - "rect": [8, 108, 100, 100], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'This div should'", - "rect": [8, 108, 98, 39], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'disappear.'", - "rect": [8, 108, 98, 39], - "reason": "disappeared" - } - ] - } - ] -} -
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 index f48e1ba4..4903780 100644 --- 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
@@ -5,37 +5,12 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'This span should disappear.\n'", - "rect": [112, 193, 178, 19], - "reason": "disappeared" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [290, 108, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [112, 108, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [8, 108, 100, 100], - "reason": "geometry" - }, - { - "object": "InlineTextBox '\n'", - "rect": [108, 193, 4, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox '\n'", - "rect": [108, 193, 4, 19], - "reason": "disappeared" - } + "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 index 86702ff..4903780 100644 --- 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
@@ -5,37 +5,12 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutInline SPAN id='target'", - "rect": [112, 193, 178, 19], - "reason": "chunk disappeared" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [290, 108, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [112, 108, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [8, 108, 100, 100], - "reason": "geometry" - }, - { - "object": "InlineTextBox '\n'", - "rect": [108, 193, 4, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox '\n'", - "rect": [108, 193, 4, 19], - "reason": "disappeared" - } + "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.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 730610b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/repaint-across-writing-mode-boundary-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox '\u7B2C\u4E00\u6BB5\u843D paragraph 1'", - "rect": [548, 191, 23, 36], - "reason": "selection" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/repaint-descandant-on-ancestor-layer-move-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/repaint-descandant-on-ancestor-layer-move-expected.txt deleted file mode 100644 index cbb43b9c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/repaint-descandant-on-ancestor-layer-move-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (relative positioned) DIV", - "rect": [428, 38, 300, 20], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (relative positioned) DIV", - "rect": [28, 38, 300, 20], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'There should only be one copy of this text.'", - "rect": [428, 38, 270, 19], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'There should only be one copy of this text.'", - "rect": [28, 38, 270, 19], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/repaint-in-iframe-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/repaint-in-iframe-expected.txt deleted file mode 100644 index 1336c15..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/repaint-in-iframe-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV", - "rect": [18, 418, 50, 50], - "reason": "background" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/repaint-on-style-change-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/repaint-on-style-change-expected.txt deleted file mode 100644 index 649065bc..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/repaint-on-style-change-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='box'", - "rect": [260, 260, 100, 100], - "reason": "background" - } - ] - } - ] -} -
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 index ab0cef12..8996228 100644 --- 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
@@ -11,12 +11,8 @@ "name": "LayoutBlockFlow (positioned) DIV id='container'", "bounds": [100, 100], "backgroundColor": "#0000FF80", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (relative positioned) DIV id='child1'", - "rect": [20, 20, 10, 10], - "reason": "background" - } + "invalidations": [ + [20, 20, 10, 10] ], "transform": 2 }, @@ -30,12 +26,8 @@ "bounds": [200, 200], "contentsOpaque": true, "backgroundColor": "#FFFF00", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (relative positioned) DIV id='child2'", - "rect": [20, 20, 10, 10], - "reason": "background" - } + "invalidations": [ + [20, 20, 10, 10] ], "transform": 6 },
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/repaint-subrect-grid-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/repaint-subrect-grid-expected.txt deleted file mode 100644 index d6131597..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/repaint-subrect-grid-expected.txt +++ /dev/null
@@ -1,113 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='mask'", - "rect": [45, 18, 20, 19], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='mask'", - "rect": [45, 18, 20, 19], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='mask'", - "rect": [36, 36, 19, 19], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='mask'", - "rect": [36, 36, 19, 19], - "reason": "disappeared" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='mask'", - "rect": [36, 0, 19, 19], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='mask'", - "rect": [36, 0, 19, 19], - "reason": "disappeared" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='mask'", - "rect": [27, 18, 19, 19], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='mask'", - "rect": [27, 18, 19, 19], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='mask'", - "rect": [18, 36, 19, 19], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='mask'", - "rect": [18, 36, 19, 19], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='mask'", - "rect": [18, 0, 19, 19], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='mask'", - "rect": [18, 0, 19, 19], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='mask'", - "rect": [9, 18, 19, 19], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='mask'", - "rect": [9, 18, 19, 19], - "reason": "appeared" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='mask'", - "rect": [0, 36, 19, 19], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='mask'", - "rect": [0, 36, 19, 19], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='mask'", - "rect": [0, 0, 19, 19], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='mask'", - "rect": [0, 0, 19, 19], - "reason": "appeared" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='mask'", - "rect": [0, 18, 10, 19], - "reason": "chunk appeared" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='mask'", - "rect": [0, 18, 10, 19], - "reason": "chunk disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/requestAnimation-translation-leave-traces-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/requestAnimation-translation-leave-traces-expected.txt deleted file mode 100644 index 59aecf1..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/requestAnimation-translation-leave-traces-expected.txt +++ /dev/null
@@ -1,52 +0,0 @@ -This test checks that changing the transform on an element triggers a correct invalidation. -The paint invalidations below should match the transformed element's coordinates. -Tested locations: 1200,1500 -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [1600, 585], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [1300, 0, 300, 585], - "reason": "incremental" - }, - { - "object": "Scrolling background of LayoutView #document", - "rect": [1000, 0, 300, 585], - "reason": "incremental" - }, - { - "object": "LayoutBlockFlow DIV id='box'", - "rect": [1500, 0, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutBlockFlow DIV id='box'", - "rect": [1200, 0, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutBlockFlow DIV id='box'", - "rect": [1200, 0, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutBlockFlow DIV id='box'", - "rect": [900, 0, 100, 100], - "reason": "paint property change" - } - ] - }, - { - "name": "ContentsLayer for Horizontal Scrollbar Layer", - "position": [0, 585], - "bounds": [800, 15], - "contentsOpaque": true - } - ] -} -
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 index 3ec9ced..db3db74 100644 --- 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
@@ -14,22 +14,8 @@ { "name": "Scrolling Contents Layer", "bounds": [205, 1022], - "paintInvalidations": [ - { - "object": "LayoutTextControl INPUT id='text'", - "rect": [0, 998, 205, 24], - "reason": "subtree" - }, - { - "object": "LayoutTextControl INPUT id='text'", - "rect": [0, 998, 205, 24], - "reason": "chunk appeared" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [3, 1003, 1, 16], - "reason": "chunk appeared" - } + "invalidations": [ + [0, 998, 205, 24] ], "transform": 2 },
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 index 5b2e02e..86beb7e 100644 --- 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
@@ -27,12 +27,8 @@ "name": "Scroll Corner Layer", "position": [85, 85], "bounds": [15, 15], - "paintInvalidations": [ - { - "object": "Scroll Corner Layer", - "rect": [0, 0, 15, 15], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 15, 15] ], "transform": 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 index d4dc731..e87705e 100644 --- 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
@@ -11,17 +11,8 @@ "bounds": [200, 200], "contentsOpaque": true, "backgroundColor": "#0000FF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV", - "rect": [0, 0, 200, 200], - "reason": "full layer" - }, - { - "object": "LayoutBlockFlow (positioned) DIV", - "rect": [0, 0, 200, 200], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 200, 200] ], "transform": 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 index e65980c0..04db6d5 100644 --- 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
@@ -5,12 +5,8 @@ "bounds": [785, 2016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='t' class='green absolute'", - "rect": [8, 200, 100, 100], - "reason": "disappeared" - } + "invalidations": [ + [8, 200, 100, 100] ], "transform": 1 }, @@ -26,12 +22,8 @@ "bounds": [100, 100], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='t' class='green absolute'", - "rect": [0, 0, 100, 100], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 3 },
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 index e5a6488..35ed40789 100644 --- 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
@@ -20,12 +20,8 @@ "bounds": [100, 100], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='absoluteDiv' class='absolute green'", - "rect": [0, 0, 100, 100], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 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 index 1ee0bde..cefedfa 100644 --- 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
@@ -12,12 +12,8 @@ "bounds": [100, 100], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='toMove'", - "rect": [0, 0, 100, 100], - "reason": "background" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 2 },
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 index 1ee0bde..cefedfa 100644 --- 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
@@ -12,12 +12,8 @@ "bounds": [100, 100], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='toMove'", - "rect": [0, 0, 100, 100], - "reason": "background" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 2 },
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/fixed-child-of-transformed-move-after-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/fixed-child-of-transformed-move-after-scroll-expected.txt deleted file mode 100644 index daa5c44..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/fixed-child-of-transformed-move-after-scroll-expected.txt +++ /dev/null
@@ -1,41 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [785, 3016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='toMove'", - "rect": [158, 278, 100, 100], - "reason": "background" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='toMove'", - "rect": [18, 278, 100, 100], - "reason": "background" - } - ], - "transform": 1 - }, - { - "name": "ContentsLayer for Vertical Scrollbar Layer", - "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/paint/invalidation/scroll/fixed-child-of-transformed-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/fixed-child-of-transformed-scrolled-expected.txt deleted file mode 100644 index 0ad22c33..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/fixed-child-of-transformed-scrolled-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='fixed'", - "rect": [200, 150, 100, 100], - "reason": "background" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/fixed-descendant-of-transformed-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/fixed-descendant-of-transformed-scrolled-expected.txt deleted file mode 100644 index 0ad22c33..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/fixed-descendant-of-transformed-scrolled-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='fixed'", - "rect": [200, 150, 100, 100], - "reason": "background" - } - ] - } - ] -} -
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 index 1ee0bde..cefedfa 100644 --- 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
@@ -12,12 +12,8 @@ "bounds": [100, 100], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='toMove'", - "rect": [0, 0, 100, 100], - "reason": "background" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 2 },
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 068ebe8..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,35 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 2016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV class='fixed green'", - "rect": [8, 200, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutBlockFlow (positioned) DIV class='fixed green'", - "rect": [8, 100, 100, 100], - "reason": "paint property change" - } - ], - "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-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 index 80039a65..dba80a8 100644 --- 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
@@ -20,12 +20,8 @@ "bounds": [100, 200], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='fixed'", - "rect": [0, 100, 100, 100], - "reason": "incremental" - } + "invalidations": [ + [0, 100, 100, 100] ] }, {
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 index 61de414a..a1d38b4 100644 --- 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
@@ -20,12 +20,8 @@ "bounds": [120, 220], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='fixed'", - "rect": [0, 0, 120, 220], - "reason": "geometry" - } + "invalidations": [ + [0, 0, 120, 220] ] }, {
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 index cad4b8e..8a050d6 100644 --- 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
@@ -14,12 +14,8 @@ { "name": "Scrolling Contents Layer", "bounds": [10000, 385], - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='target'", - "rect": [0, 0, 10000, 200], - "reason": "background" - } + "invalidations": [ + [0, 0, 10000, 200] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/inline-style-change-in-scrolled-view-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/inline-style-change-in-scrolled-view-expected.txt deleted file mode 100644 index bd6c9f7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/inline-style-change-in-scrolled-view-expected.txt +++ /dev/null
@@ -1,47 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [2000, 2000], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Text Text Text Text Text Text Text Text Text Text Text Text Text'", - "rect": [0, 320, 413, 19], - "reason": "style change" - } - ], - "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], - [-200, -200, 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 index 4247619..cc783c95 100644 --- 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
@@ -14,12 +14,8 @@ { "name": "Scrolling Contents Layer", "bounds": [185, 4900], - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='target'", - "rect": [0, 2400, 100, 100], - "reason": "background" - } + "invalidations": [ + [0, 2400, 100, 100] ], "transform": 2 },
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/invalidate-after-composited-scroll-of-window-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/invalidate-after-composited-scroll-of-window-expected.txt deleted file mode 100644 index f55ce7dc..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/invalidate-after-composited-scroll-of-window-expected.txt +++ /dev/null
@@ -1,41 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [785, 4936], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Tests that invalidation of a div after scrolling invalidates just the div and no other area.'", - "rect": [8, 4908, 540, 19], - "reason": "appeared" - }, - { - "object": "LayoutBlockFlow DIV id='target'", - "rect": [8, 2408, 100, 100], - "reason": "background" - } - ], - "transform": 1 - }, - { - "name": "ContentsLayer for Vertical Scrollbar Layer", - "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, -2350, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/layout-state-scrolloffset-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/layout-state-scrolloffset-expected.txt deleted file mode 100644 index ee7b38aa..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/layout-state-scrolloffset-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'before'", - "rect": [100, 120, 40, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'after'", - "rect": [100, 120, 29, 19], - "reason": "appeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/layout-state-scrolloffset2-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/layout-state-scrolloffset2-expected.txt deleted file mode 100644 index 48646bdb..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/layout-state-scrolloffset2-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'before'", - "rect": [102, 122, 40, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'after'", - "rect": [102, 122, 29, 19], - "reason": "appeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/layout-state-scrolloffset3-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/layout-state-scrolloffset3-expected.txt deleted file mode 100644 index 2cca09a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/layout-state-scrolloffset3-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'before'", - "rect": [100, 120, 34, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'after'", - "rect": [100, 120, 29, 19], - "reason": "appeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/line-in-scrolled-clipped-block-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/line-in-scrolled-clipped-block-expected.txt deleted file mode 100644 index 8ffcacc2..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/line-in-scrolled-clipped-block-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox ' FAIL .'", - "rect": [8, 8, 100, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox ' PASS .'", - "rect": [8, 8, 100, 19], - "reason": "appeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/nested-fixed-iframe-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/nested-fixed-iframe-scrolled-expected.txt deleted file mode 100644 index 9b394e66..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/nested-fixed-iframe-scrolled-expected.txt +++ /dev/null
@@ -1,36 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [785, 2016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='div'", - "rect": [22, 522, 100, 100], - "reason": "background" - } - ], - "transform": 1 - }, - { - "name": "ContentsLayer for Vertical Scrollbar Layer", - "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] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/outline-change-in-scrollers-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/outline-change-in-scrollers-expected.txt deleted file mode 100644 index 83202eb..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/outline-change-in-scrollers-expected.txt +++ /dev/null
@@ -1,43 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV class='target'", - "rect": [286, 173, 75, 75], - "reason": "style change" - }, - { - "object": "LayoutBlockFlow DIV class='target'", - "rect": [286, 18, 75, 75], - "reason": "style change" - }, - { - "object": "LayoutBlockFlow DIV class='target'", - "rect": [172, 173, 75, 75], - "reason": "style change" - }, - { - "object": "LayoutBlockFlow DIV class='target'", - "rect": [172, 18, 75, 75], - "reason": "style change" - }, - { - "object": "LayoutBlockFlow DIV class='target'", - "rect": [53, 153, 75, 75], - "reason": "style change" - }, - { - "object": "LayoutBlockFlow DIV class='target'", - "rect": [18, 18, 75, 75], - "reason": "style change" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/outline-change-scrollable-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/outline-change-scrollable-expected.txt deleted file mode 100644 index 5264417..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/outline-change-scrollable-expected.txt +++ /dev/null
@@ -1,24 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [1008, 585], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='target'", - "rect": [0, 0, 1008, 128], - "reason": "style change" - } - ] - }, - { - "name": "ContentsLayer for Horizontal Scrollbar Layer", - "position": [0, 585], - "bounds": [800, 15], - "contentsOpaque": true - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/overflow-auto-in-overflow-auto-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/overflow-auto-in-overflow-auto-scrolled-expected.txt deleted file mode 100644 index c1e22bbe..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/overflow-auto-in-overflow-auto-scrolled-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='innerDiv'", - "rect": [8, 8, 300, 300], - "reason": "paint property change" - }, - { - "object": "VerticalScrollbar", - "rect": [762, 8, 15, 300], - "reason": "scroll control" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/overflow-hidden-in-overflow-hidden-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/overflow-hidden-in-overflow-hidden-scrolled-expected.txt deleted file mode 100644 index 5bc807e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/overflow-hidden-in-overflow-hidden-scrolled-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV class='innerWrapper'", - "rect": [8, 18, 100, 190], - "reason": "paint property change" - } - ] - } - ] -} -
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 index 5fa8fcb..856792c8 100644 --- 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
@@ -10,12 +10,8 @@ "name": "LayoutBlockFlow DIV id='scroller'", "bounds": [302, 302], "backfaceVisibility": "hidden", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='scroller'", - "rect": [1, 201, 100, 100], - "reason": "chunk appeared" - } + "invalidations": [ + [1, 201, 100, 100] ], "transform": 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 index 0c59257..856792c8 100644 --- 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
@@ -10,12 +10,8 @@ "name": "LayoutBlockFlow DIV id='scroller'", "bounds": [302, 302], "backfaceVisibility": "hidden", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='target'", - "rect": [1, 201, 100, 100], - "reason": "chunk appeared" - } + "invalidations": [ + [1, 201, 100, 100] ], "transform": 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 index 7f765f9..5eb42b8 100644 --- 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
@@ -14,17 +14,9 @@ { "name": "Scrolling Contents Layer", "bounds": [685, 600], - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='block'", - "rect": [300, 200, 120, 50], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='block'", - "rect": [50, 200, 120, 50], - "reason": "geometry" - } + "invalidations": [ + [300, 200, 120, 50], + [50, 200, 120, 50] ], "transform": 2 },
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 index 5992aee..aa5eb02 100644 --- 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
@@ -14,17 +14,9 @@ { "name": "Scrolling Contents Layer", "bounds": [285, 900], - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='block'", - "rect": [50, 310, 200, 50], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='block'", - "rect": [50, 200, 200, 50], - "reason": "geometry" - } + "invalidations": [ + [50, 310, 200, 50], + [50, 200, 200, 50] ], "transform": 2 },
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 index 7a59d47..19cf3e659 100644 --- 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
@@ -5,22 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV class='back'", - "rect": [93, 125, 180, 100], - "reason": "paint property change" - }, - { - "object": "LayoutBlockFlow (positioned) DIV class='back'", - "rect": [93, 75, 180, 100], - "reason": "paint property change" - }, - { - "object": "VerticalScrollbar", - "rect": [308, 65, 15, 175], - "reason": "scroll control" - } + "invalidations": [ + [93, 125, 180, 100], + [93, 75, 180, 100], + [308, 65, 15, 175] ] }, {
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/overflow-scroll-delete-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/overflow-scroll-delete-expected.txt deleted file mode 100644 index 442e3f2..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/overflow-scroll-delete-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Passed'", - "rect": [8, 136, 43, 17], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'Failed'", - "rect": [8, 136, 39, 17], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/overflow-scroll-in-overflow-scroll-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/overflow-scroll-in-overflow-scroll-scrolled-expected.txt deleted file mode 100644 index c1e22bbe..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/overflow-scroll-in-overflow-scroll-scrolled-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='innerDiv'", - "rect": [8, 8, 300, 300], - "reason": "paint property change" - }, - { - "object": "VerticalScrollbar", - "rect": [762, 8, 15, 300], - "reason": "scroll control" - } - ] - } - ] -} -
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 index 6fed56c..4b7e173 100644 --- 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
@@ -17,12 +17,8 @@ "bounds": [185, 552], "contentsOpaque": true, "backgroundColor": "#0000FF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutBlockFlow DIV id='scroller'", - "rect": [0, 0, 185, 552], - "reason": "background" - } + "invalidations": [ + [0, 0, 185, 552] ], "transform": 2 },
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 index 5736a76..d97d76a 100644 --- 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
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "HorizontalScrollbar", - "rect": [8, 293, 285, 15], - "reason": "scroll control" - } + "invalidations": [ + [8, 293, 285, 15] ] }, { @@ -18,12 +14,8 @@ "bounds": [600, 600], "contentsOpaque": true, "backgroundColor": "#FF0000", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='inner'", - "rect": [0, 0, 600, 600], - "reason": "appeared" - } + "invalidations": [ + [0, 0, 600, 600] ], "transform": 3 }
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 bbaa459..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,28 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#C0C0C0", - "paintInvalidations": [ - { - "object": "HorizontalScrollbar", - "rect": [3, 300, 235, 15], - "reason": "scroll control" - }, - { - "object": "LayoutBlockFlow HTML", - "rect": [3, 65, 55, 17], - "reason": "paint property change" - }, - { - "object": "VerticalScrollbar", - "rect": [238, 65, 15, 235], - "reason": "scroll control" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/resize-scrollable-div-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/resize-scrollable-div-expected.txt deleted file mode 100644 index bbb9631..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/resize-scrollable-div-expected.txt +++ /dev/null
@@ -1,43 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "HorizontalScrollbar", - "rect": [8, 393, 285, 15], - "reason": "scroll control" - }, - { - "object": "HorizontalScrollbar", - "rect": [8, 193, 85, 15], - "reason": "scroll control" - }, - { - "object": "VerticalScrollbar", - "rect": [293, 108, 15, 285], - "reason": "scroll control" - }, - { - "object": "VerticalScrollbar", - "rect": [93, 108, 15, 85], - "reason": "scroll control" - }, - { - "object": "Scroll corner of LayoutBlockFlow DIV id='div'", - "rect": [293, 393, 15, 15], - "reason": "geometry" - }, - { - "object": "Scroll corner of LayoutBlockFlow DIV id='div'", - "rect": [93, 193, 15, 15], - "reason": "geometry" - } - ] - } - ] -} -
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 index 16d8a63..1d99e2b 100644 --- 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
@@ -5,24 +5,16 @@ "bounds": [785, 1895], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (relative positioned) DIV id='ul'", - "rect": [677, 52, 100, 100], - "reason": "chunk disappeared" - } + "invalidations": [ + [677, 52, 100, 100] ], "transform": 1 }, { "name": "LayoutBlockFlow (positioned) DIV id='scrollpanel'", "bounds": [100, 100], - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='scrollpanel'", - "rect": [0, 0, 100, 100], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 2 },
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 index ad7d475..b27b721e 100644 --- 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
@@ -10,12 +10,8 @@ { "name": "LayoutBlockFlow (positioned) DIV id='moveMe' class='fixed clipped'", "bounds": [100, 100], - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='moveMe' class='fixed clipped'", - "rect": [0, 0, 100, 100], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 2 },
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/scroll-fixed-layer-with-transformed-parent-layer-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/scroll-fixed-layer-with-transformed-parent-layer-expected.txt deleted file mode 100644 index f0a766d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/scroll-fixed-layer-with-transformed-parent-layer-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV class='absolute green'", - "rect": [93, 234, 142, 143], - "reason": "chunk appeared" - }, - { - "object": "LayoutBlockFlow (positioned) DIV class='absolute red'", - "rect": [93, 234, 142, 143], - "reason": "paint property change" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/scroll-in-clipped-layer-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/scroll-in-clipped-layer-expected.txt deleted file mode 100644 index 46318d5..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/scroll-in-clipped-layer-expected.txt +++ /dev/null
@@ -1,29 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [785, 2016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV class='absolute red'", - "rect": [100, 150, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutBlockFlow (relative positioned) DIV class='relative green'", - "rect": [100, 150, 100, 100], - "reason": "chunk appeared" - } - ] - }, - { - "name": "ContentsLayer for Vertical Scrollbar Layer", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ] -} -
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 index ff1c018..b27b721e 100644 --- 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
@@ -10,17 +10,8 @@ { "name": "LayoutBlockFlow (positioned) DIV id='moveMe' class='fixed clipped'", "bounds": [100, 100], - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV class='absolute green'", - "rect": [0, 0, 100, 100], - "reason": "chunk appeared" - }, - { - "object": "LayoutBlockFlow (positioned) DIV class='absolute red'", - "rect": [0, 0, 100, 100], - "reason": "chunk disappeared" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 2 },
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/scroll-in-transformed-layer-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/scroll-in-transformed-layer-expected.txt deleted file mode 100644 index 32d6619..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/scroll-in-transformed-layer-expected.txt +++ /dev/null
@@ -1,28 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV class='absolute green'", - "rect": [79, 129, 142, 142], - "reason": "chunk appeared" - }, - { - "object": "LayoutBlockFlow (positioned) DIV class='absolute red'", - "rect": [114, 129, 107, 36], - "reason": "paint property change" - }, - { - "object": "LayoutBlockFlow (positioned) DIV class='absolute red'", - "rect": [100, 150, 100, 100], - "reason": "paint property change" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/scroll-with-transformed-parent-layer-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/scroll-with-transformed-parent-layer-expected.txt deleted file mode 100644 index 59fe8473..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/scroll-with-transformed-parent-layer-expected.txt +++ /dev/null
@@ -1,28 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV class='absolute green'", - "rect": [79, 129, 142, 142], - "reason": "chunk appeared" - }, - { - "object": "LayoutBlockFlow (positioned) DIV class='absolute red'", - "rect": [79, 129, 142, 142], - "reason": "paint property change" - }, - { - "object": "LayoutBlockFlow (positioned) DIV class='absolute red'", - "rect": [114, 129, 107, 36], - "reason": "paint property change" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/scrollbar-invalidation-on-resize-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/scrollbar-invalidation-on-resize-expected.txt deleted file mode 100644 index 67ff825..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/scrollbar-invalidation-on-resize-expected.txt +++ /dev/null
@@ -1,38 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "HorizontalScrollbar", - "rect": [8, 135, 285, 15], - "reason": "scroll control" - }, - { - "object": "VerticalScrollbar", - "rect": [293, 50, 15, 85], - "reason": "scroll control" - }, - { - "object": "VerticalScrollbar", - "rect": [93, 50, 15, 85], - "reason": "scroll control" - }, - { - "object": "Scroll corner of LayoutBlockFlow (positioned) DIV id='scrollable'", - "rect": [293, 135, 15, 15], - "reason": "geometry" - }, - { - "object": "Scroll corner of LayoutBlockFlow (positioned) DIV id='scrollable'", - "rect": [93, 135, 15, 15], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/scrollbar-invalidation-on-resize-with-border-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/scrollbar-invalidation-on-resize-with-border-expected.txt deleted file mode 100644 index 99ffc69..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/scrollbar-invalidation-on-resize-with-border-expected.txt +++ /dev/null
@@ -1,43 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='scrollable'", - "rect": [8, 50, 320, 120], - "reason": "geometry" - }, - { - "object": "HorizontalScrollbar", - "rect": [18, 145, 285, 15], - "reason": "scroll control" - }, - { - "object": "VerticalScrollbar", - "rect": [303, 60, 15, 85], - "reason": "scroll control" - }, - { - "object": "VerticalScrollbar", - "rect": [103, 60, 15, 85], - "reason": "scroll control" - }, - { - "object": "Scroll corner of LayoutBlockFlow (positioned) DIV id='scrollable'", - "rect": [303, 145, 15, 15], - "reason": "geometry" - }, - { - "object": "Scroll corner of LayoutBlockFlow (positioned) DIV id='scrollable'", - "rect": [103, 145, 15, 15], - "reason": "geometry" - } - ] - } - ] -} -
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 index 11e76c0..558d0b9 100644 --- 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
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'xx'", - "rect": [8, 8, 48, 33], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'y'", - "rect": [8, 8, 48, 33], - "reason": "geometry" - } + "invalidations": [ + [8, 8, 48, 33] ] } ]
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 index 64f5f96..29aa934 100644 --- 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
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'xx'", - "rect": [0, 8, 40, 33], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'y'", - "rect": [0, 8, 40, 33], - "reason": "geometry" - } + "invalidations": [ + [0, 8, 40, 33] ] } ]
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 index 544214ea..1bb24bd 100644 --- 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
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'xx'", - "rect": [8, 8, 33, 48], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'y'", - "rect": [8, 8, 33, 48], - "reason": "geometry" - } + "invalidations": [ + [8, 8, 33, 48] ] } ]
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 index c8b5284..458670f 100644 --- 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
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'xx'", - "rect": [7, 8, 33, 48], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'y'", - "rect": [7, 8, 33, 48], - "reason": "geometry" - } + "invalidations": [ + [7, 8, 33, 48] ] } ]
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 index a97369f4..e1bf08d 100644 --- 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
@@ -5,22 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'b'", - "rect": [8, 24, 32, 17], - "reason": "geometry" - }, - { - "object": "InlineTextBox '\n'", - "rect": [24, 8, 16, 16], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'a'", - "rect": [8, 8, 16, 16], - "reason": "selection" - } + "invalidations": [ + [8, 24, 32, 17], + [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 index ffe3bac8..6507a0c0 100644 --- 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
@@ -5,77 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox '\u3042\u3063\u305F\u304B\u5FD8\u308C\u3066\u3057\u307E\u3063\u305F\u7D4C\u9A13\u306F\u3042\u308A\u307E\u3059\u304B'", - "rect": [334, 123, 441, 404], - "reason": "geometry" - }, - { - "object": "InlineTextBox '\u3057\u305F\u30A6\u30A7\u30D6\u30DA\u30FC\u30B8\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u304B\u3089\u3082\u691C\u7D22'", - "rect": [334, 123, 441, 404], - "reason": "geometry" - }, - { - "object": "InlineTextBox '\u3059\u3002\u8A2A\u554F\u3057\u305F\u30A6\u30A7\u30D6\u30DA\u30FC\u30B8\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u304B'", - "rect": [334, 123, 441, 404], - "reason": "geometry" - }, - { - "object": "InlineTextBox '\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002\u305B\u3063\u304B\u304F\u898B\u3064\u3051\u305F\u3059'", - "rect": [334, 123, 441, 404], - "reason": "geometry" - }, - { - "object": "InlineTextBox '\u305B\u3063\u304B\u304F\u898B\u3064\u3051\u305F\u3059\u3070\u3089\u3057\u3044\u8A18\u4E8B\u304C\u3069\u3053\u306B'", - "rect": [334, 123, 441, 404], - "reason": "geometry" - }, - { - "object": "InlineTextBox '\u3063\u305F\u7D4C\u9A13\u306F\u3042\u308A\u307E\u3059\u304B \u306A\u3089\u30BF\u30A4\u30C8\u30EB\u3068\u30A2'", - "rect": [334, 123, 441, 404], - "reason": "geometry" - }, - { - "object": "InlineTextBox '\u3064\u3051\u305F\u3059\u3070\u3089\u3057\u3044\u8A18\u4E8B\u304C\u3069\u3053\u306B\u3042\u3063\u305F\u304B\u5FD8'", - "rect": [334, 123, 441, 404], - "reason": "geometry" - }, - { - "object": "InlineTextBox '\u306A\u3089\u30BF\u30A4\u30C8\u30EB\u3068\u30A2\u30C9\u30EC\u30B9\u3060\u3051\u3067\u306A\u304F\u3001\u8A2A\u554F'", - "rect": [334, 123, 441, 404], - "reason": "geometry" - }, - { - "object": "InlineTextBox '\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u304B\u3089\u3082\u691C\u7D22\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E'", - "rect": [334, 123, 441, 404], - "reason": "geometry" - }, - { - "object": "InlineTextBox '\u3070\u3089\u3057\u3044\u8A18\u4E8B\u304C\u3069\u3053\u306B\u3042\u3063\u305F\u304B\u5FD8\u308C\u3066\u3057\u307E'", - "rect": [334, 123, 441, 404], - "reason": "geometry" - }, - { - "object": "InlineTextBox '\u3089\u3082\u691C\u7D22\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002\u305B\u3063\u304B\u304F\u898B'", - "rect": [334, 123, 441, 404], - "reason": "geometry" - }, - { - "object": "InlineTextBox '\u308C\u3066\u3057\u307E\u3063\u305F\u7D4C\u9A13\u306F\u3042\u308A\u307E\u3059\u304B \u306A\u3089\u30BF\u30A4'", - "rect": [334, 123, 441, 404], - "reason": "geometry" - }, - { - "object": "InlineTextBox '\u30C8\u30EB\u3068\u30A2\u30C9\u30EC\u30B9\u3060\u3051\u3067\u306A\u304F\u3001\u8A2A\u554F'", - "rect": [334, 123, 441, 404], - "reason": "geometry" - }, - { - "object": "InlineTextBox '\u30C9\u30EC\u30B9\u3060\u3051\u3067\u306A\u304F\u3001\u8A2A\u554F\u3057\u305F\u30A6\u30A7\u30D6\u30DA\u30FC\u30B8'", - "rect": [334, 123, 441, 404], - "reason": "geometry" - } + "invalidations": [ + [334, 123, 441, 404] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/selection-change-in-iframe-with-relative-parent-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/selection-change-in-iframe-with-relative-parent-expected.txt deleted file mode 100644 index 4e9f806..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/selection-change-in-iframe-with-relative-parent-expected.txt +++ /dev/null
@@ -1,53 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Bazz'", - "rect": [18, 238, 40, 10], - "reason": "selection" - }, - { - "object": "InlineTextBox 'Bar'", - "rect": [18, 218, 30, 10], - "reason": "selection" - }, - { - "object": "InlineTextBox 'Foo'", - "rect": [18, 198, 30, 10], - "reason": "selection" - }, - { - "object": "InlineTextBox '\n'", - "rect": [58, 238, 10, 10], - "reason": "appeared" - }, - { - "object": "InlineTextBox '\n'", - "rect": [48, 218, 10, 10], - "reason": "appeared" - }, - { - "object": "InlineTextBox '\n'", - "rect": [48, 198, 10, 10], - "reason": "appeared" - }, - { - "object": "InlineTextBox '\n'", - "rect": [18, 228, 10, 10], - "reason": "appeared" - }, - { - "object": "InlineTextBox '\n'", - "rect": [18, 208, 10, 10], - "reason": "appeared" - } - ] - } - ] -} -
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 index f3b70ee..4486ba2 100644 --- 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
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutImage IMG", - "rect": [100, 300, 50, 50], - "reason": "selection" - } + "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 ec39e50..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/selection-clear-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='firstLine'", - "rect": [8, 8, 100, 200], - "reason": "full" - }, - { - "object": "InlineTextBox 'FAIL: Test did'", - "rect": [8, 48, 97, 119], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'not run'", - "rect": [8, 48, 97, 119], - "reason": "disappeared" - }, - { - "object": "InlineTextBox '\u00A0'", - "rect": [8, 48, 8, 19], - "reason": "appeared" - } - ] - } - ] -} -
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 index a5a7d3f..0b9683b 100644 --- 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
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Second cell'", - "rect": [11, 35, 73, 19], - "reason": "selection" - }, - { - "object": "InlineTextBox 'First cell'", - "rect": [11, 11, 58, 19], - "reason": "geometry" - } + "invalidations": [ + [11, 35, 73, 19], + [11, 11, 58, 19] ] } ]
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 index 395e178..9ad38bc 100644 --- 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
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Testing both hit testing'", - "rect": [773, 38, 19, 83], - "reason": "selection" - } + "invalidations": [ + [773, 38, 19, 83] ] } ]
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 index 7647611..fcc3af8 100644 --- 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
@@ -17,12 +17,8 @@ "bounds": [200, 1620], "contentsOpaque": true, "backgroundColor": "#D3D3D3", - "paintInvalidations": [ - { - "object": "InlineTextBox 'test'", - "rect": [0, 610, 21, 19], - "reason": "selection" - } + "invalidations": [ + [0, 610, 21, 19] ], "transform": 2 },
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 index 68b8f6e..c5634b1 100644 --- 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
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Should have blue, not gray, highlight'", - "rect": [18, 18, 233, 19], - "reason": "selection" - } + "invalidations": [ + [18, 18, 233, 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 index 347470b..7e73b36f 100644 --- 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
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Should have green background'", - "rect": [8, 8, 197, 19], - "reason": "geometry" - } + "invalidations": [ + [8, 8, 197, 19] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/stacked-diacritics-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/stacked-diacritics-expected.txt deleted file mode 100644 index aa4b716..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/stacked-diacritics-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox '\u1EA6\u1EA4\u1EAA\u1EA8\u1EB0'", - "rect": [19, 166, 130, 43], - "reason": "disappeared" - } - ] - } - ] -} -
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 index e4f57e3..cb7f108 100644 --- 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
@@ -12,17 +12,8 @@ "contentsOpaque": true, "backfaceVisibility": "hidden", "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (relative positioned) DIV id='inner'", - "rect": [0, 0, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutBlockFlow (relative positioned) DIV id='outer'", - "rect": [0, 0, 100, 100], - "reason": "appeared" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/absolute-sized-content-with-resources-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/absolute-sized-content-with-resources-expected.txt deleted file mode 100644 index edafbb1..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/absolute-sized-content-with-resources-expected.txt +++ /dev/null
@@ -1,38 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow div id='contentBox'", - "rect": [8, 52, 402, 402], - "reason": "geometry" - }, - { - "object": "LayoutSVGRect rect", - "rect": [42, 119, 334, 268], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRect rect", - "rect": [42, 119, 334, 268], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRect rect", - "rect": [17, 219, 84, 68], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRect rect", - "rect": [17, 219, 84, 68], - "reason": "paint property change" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/add-background-property-on-root-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/add-background-property-on-root-expected.txt deleted file mode 100644 index ff03e49..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/add-background-property-on-root-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV", - "rect": [8, 8, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [8, 8, 100, 100], - "reason": "chunk appeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/object-sizing-no-width-height-change-content-box-size-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/object-sizing-no-width-height-change-content-box-size-expected.txt deleted file mode 100644 index 6680315..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/object-sizing-no-width-height-change-content-box-size-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow div id='contentBox'", - "rect": [8, 8, 402, 402], - "reason": "geometry" - }, - { - "object": "LayoutEmbeddedObject object", - "rect": [9, 9, 400, 400], - "reason": "geometry" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [9, 9, 400, 400], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [9, 109, 200, 200], - "reason": "paint property change" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/relative-sized-content-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/relative-sized-content-expected.txt deleted file mode 100644 index a083d5d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/relative-sized-content-expected.txt +++ /dev/null
@@ -1,28 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow div id='contentBox'", - "rect": [8, 72, 402, 402], - "reason": "geometry" - }, - { - "object": "LayoutSVGRect rect id='targetRect'", - "rect": [9, 73, 400, 400], - "reason": "geometry" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [109, 73, 300, 400], - "reason": "incremental" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/relative-sized-content-with-resources-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/relative-sized-content-with-resources-expected.txt deleted file mode 100644 index 3429a22..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/relative-sized-content-with-resources-expected.txt +++ /dev/null
@@ -1,28 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow div id='contentBox'", - "rect": [8, 72, 402, 402], - "reason": "geometry" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [47, 111, 324, 324], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [8, 154, 102, 238], - "reason": "paint property change" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/relative-sized-deep-shadow-tree-content-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/relative-sized-deep-shadow-tree-content-expected.txt deleted file mode 100644 index 048123c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/relative-sized-deep-shadow-tree-content-expected.txt +++ /dev/null
@@ -1,28 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow div id='contentBox'", - "rect": [8, 72, 402, 402], - "reason": "geometry" - }, - { - "object": "LayoutSVGContainer use id='targetUse'", - "rect": [209, 273, 200, 200], - "reason": "paint property change" - }, - { - "object": "LayoutSVGContainer use id='targetUse'", - "rect": [59, 273, 50, 200], - "reason": "paint property change" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/relative-sized-image-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/relative-sized-image-expected.txt deleted file mode 100644 index 2def95f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/relative-sized-image-expected.txt +++ /dev/null
@@ -1,28 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow div id='contentBox'", - "rect": [8, 72, 402, 402], - "reason": "geometry" - }, - { - "object": "LayoutSVGImage image", - "rect": [9, 73, 400, 400], - "reason": "image" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [109, 73, 300, 400], - "reason": "incremental" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/relative-sized-inner-svg-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/relative-sized-inner-svg-expected.txt deleted file mode 100644 index bcf69bb..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/relative-sized-inner-svg-expected.txt +++ /dev/null
@@ -1,28 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow div id='contentBox'", - "rect": [8, 52, 402, 402], - "reason": "geometry" - }, - { - "object": "LayoutSVGViewportContainer svg", - "rect": [27, 69, 364, 366], - "reason": "paint property change" - }, - { - "object": "LayoutSVGViewportContainer svg", - "rect": [13, 207, 92, 92], - "reason": "paint property change" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/relative-sized-shadow-tree-content-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/relative-sized-shadow-tree-content-expected.txt deleted file mode 100644 index 1626972c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/relative-sized-shadow-tree-content-expected.txt +++ /dev/null
@@ -1,38 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow div id='contentBox'", - "rect": [8, 72, 402, 402], - "reason": "geometry" - }, - { - "object": "LayoutSVGContainer use", - "rect": [209, 273, 200, 200], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRect rect id='targetRect1'", - "rect": [9, 73, 200, 200], - "reason": "geometry" - }, - { - "object": "LayoutSVGRect rect id='targetRect1'", - "rect": [59, 73, 150, 200], - "reason": "incremental" - }, - { - "object": "LayoutSVGContainer use", - "rect": [59, 273, 50, 200], - "reason": "paint property change" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/relative-sized-shadow-tree-content-with-symbol-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/relative-sized-shadow-tree-content-with-symbol-expected.txt deleted file mode 100644 index 4a9740b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/relative-sized-shadow-tree-content-with-symbol-expected.txt +++ /dev/null
@@ -1,28 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow div id='contentBox'", - "rect": [8, 72, 402, 402], - "reason": "geometry" - }, - { - "object": "LayoutSVGViewportContainer svg id='targetSymbol'", - "rect": [9, 73, 400, 400], - "reason": "paint property change" - }, - { - "object": "LayoutSVGViewportContainer svg id='targetSymbol'", - "rect": [9, 223, 100, 100], - "reason": "paint property change" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/relative-sized-use-on-symbol-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/relative-sized-use-on-symbol-expected.txt deleted file mode 100644 index 0c3ee5a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/relative-sized-use-on-symbol-expected.txt +++ /dev/null
@@ -1,28 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow div id='contentBox'", - "rect": [8, 52, 402, 402], - "reason": "geometry" - }, - { - "object": "LayoutSVGViewportContainer svg id='gamesBorder'", - "rect": [45, 87, 328, 330], - "reason": "paint property change" - }, - { - "object": "LayoutSVGViewportContainer svg id='gamesBorder'", - "rect": [18, 211, 82, 83], - "reason": "paint property change" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.txt deleted file mode 100644 index 6b11a3e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.txt +++ /dev/null
@@ -1,28 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow div id='contentBox'", - "rect": [8, 52, 402, 402], - "reason": "geometry" - }, - { - "object": "LayoutSVGViewportContainer svg id='gamesBorder'", - "rect": [27, 69, 364, 366], - "reason": "paint property change" - }, - { - "object": "LayoutSVGViewportContainer svg id='gamesBorder'", - "rect": [13, 207, 92, 92], - "reason": "paint property change" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/remove-background-property-on-root-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/remove-background-property-on-root-expected.txt deleted file mode 100644 index 828aafa..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/remove-background-property-on-root-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV", - "rect": [8, 8, 100, 100], - "reason": "appeared" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [8, 8, 100, 100], - "reason": "chunk disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/repaint-moving-svg-and-div-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/repaint-moving-svg-and-div-expected.txt deleted file mode 100644 index cda5759d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/repaint-moving-svg-and-div-expected.txt +++ /dev/null
@@ -1,413 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [550, 350, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [535, 325, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [535, 325, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [520, 300, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [520, 300, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [505, 275, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [505, 275, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [490, 250, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [490, 250, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [475, 225, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [475, 225, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [460, 200, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [460, 200, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [445, 175, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [445, 175, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [430, 150, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [430, 150, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [415, 125, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [415, 125, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [400, 100, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [250, 350, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [235, 325, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [235, 325, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [220, 300, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [220, 300, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [205, 275, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [205, 275, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [190, 250, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [190, 250, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [175, 225, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [175, 225, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [160, 200, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [160, 200, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [145, 175, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [145, 175, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [130, 150, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [130, 150, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [115, 125, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [115, 125, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [100, 100, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutBlockFlow div class='innerBox'", - "rect": [575, 375, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow div class='innerBox'", - "rect": [560, 350, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow div class='innerBox'", - "rect": [560, 350, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow div class='innerBox'", - "rect": [545, 325, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow div class='innerBox'", - "rect": [545, 325, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow div class='innerBox'", - "rect": [530, 300, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow div class='innerBox'", - "rect": [530, 300, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow div class='innerBox'", - "rect": [515, 275, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow div class='innerBox'", - "rect": [515, 275, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow div class='innerBox'", - "rect": [500, 250, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow div class='innerBox'", - "rect": [500, 250, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow div class='innerBox'", - "rect": [485, 225, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow div class='innerBox'", - "rect": [485, 225, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow div class='innerBox'", - "rect": [470, 200, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow div class='innerBox'", - "rect": [470, 200, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow div class='innerBox'", - "rect": [455, 175, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow div class='innerBox'", - "rect": [455, 175, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow div class='innerBox'", - "rect": [440, 150, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow div class='innerBox'", - "rect": [440, 150, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow div class='innerBox'", - "rect": [425, 125, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [275, 375, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [260, 350, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [260, 350, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [245, 325, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [245, 325, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [230, 300, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [230, 300, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [215, 275, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [215, 275, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [200, 250, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [200, 250, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [185, 225, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [185, 225, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [170, 200, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [170, 200, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [155, 175, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [155, 175, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [140, 150, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [140, 150, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [125, 125, 100, 100], - "reason": "paint property change" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/svg-background-partial-redraw-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/svg-background-partial-redraw-expected.txt index 18b9d832..6f4ea4d9 100644 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/svg-background-partial-redraw-expected.txt +++ b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/svg-background-partial-redraw-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='revealer'", - "rect": [9, 153, 200, 100], - "reason": "disappeared" - } + "invalidations": [ + [9, 153, 200, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/svg-image-change-content-size-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/svg-image-change-content-size-expected.txt deleted file mode 100644 index 4b4852e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/svg-image-change-content-size-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='contentBox'", - "rect": [8, 52, 602, 422], - "reason": "geometry" - }, - { - "object": "LayoutImage img", - "rect": [9, 53, 420, 420], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/add-table-overpaint-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/add-table-overpaint-expected.txt deleted file mode 100644 index 5d86b60..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/add-table-overpaint-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableCell TD", - "rect": [2, 314, 152, 152], - "reason": "appeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/border-collapse-change-collapse-to-separate-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/border-collapse-change-collapse-to-separate-expected.txt deleted file mode 100644 index 5410ef7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/border-collapse-change-collapse-to-separate-expected.txt +++ /dev/null
@@ -1,28 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR", - "rect": [8, 8, 212, 108], - "reason": "disappeared" - }, - { - "object": "LayoutTableCell TD", - "rect": [118, 10, 108, 108], - "reason": "appeared" - }, - { - "object": "LayoutTableCell TD", - "rect": [10, 10, 106, 108], - "reason": "appeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/border-collapse-change-separate-to-collapse-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/border-collapse-change-separate-to-collapse-expected.txt deleted file mode 100644 index a3e1363..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/border-collapse-change-separate-to-collapse-expected.txt +++ /dev/null
@@ -1,28 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR", - "rect": [8, 8, 212, 108], - "reason": "appeared" - }, - { - "object": "LayoutTableCell TD", - "rect": [118, 10, 108, 108], - "reason": "disappeared" - }, - { - "object": "LayoutTableCell TD", - "rect": [10, 10, 106, 108], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/cached-change-cell-sl-border-color-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/cached-change-cell-sl-border-color-expected.txt deleted file mode 100644 index 31962fb..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/cached-change-cell-sl-border-color-expected.txt +++ /dev/null
@@ -1,28 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR", - "rect": [8, 8, 114, 54], - "reason": "style change" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='blockDiv'", - "rect": [90, 30, 20, 20], - "reason": "full" - }, - { - "object": "InlineTextBox 'A'", - "rect": [90, 30, 12, 19], - "reason": "disappeared" - } - ] - } - ] -} -
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 index c9edca3..ee88a53 100644 --- 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
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY", - "rect": [8, 28, 186, 134], - "reason": "style change" - } + "invalidations": [ + [8, 28, 186, 134] ] }, {
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 index 1bf0324d..ee88a53 100644 --- 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
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY", - "rect": [8, 28, 186, 134], - "reason": "appeared" - } + "invalidations": [ + [8, 28, 186, 134] ] }, {
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 index 9d31f63..06f39d7 100644 --- 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
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY", - "rect": [8, 28, 186, 134], - "reason": "style change" - } + "invalidations": [ + [8, 28, 186, 134] ] }, {
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 index eee1abfd..06f39d7 100644 --- 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
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY", - "rect": [8, 28, 186, 134], - "reason": "appeared" - } + "invalidations": [ + [8, 28, 186, 134] ] }, {
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 index 623c15a..3476d88 100644 --- 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
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY", - "rect": [8, 28, 186, 134], - "reason": "style change" - } + "invalidations": [ + [8, 28, 186, 134] ] }, {
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 index 2dd83c8..3476d88 100644 --- 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
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY", - "rect": [8, 28, 186, 134], - "reason": "appeared" - } + "invalidations": [ + [8, 28, 186, 134] ] }, {
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 index 1fbc312..635df9d 100644 --- 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
@@ -11,12 +11,8 @@ "position": [8, 96], "bounds": [186, 64], "backgroundColor": "#ADD8E6", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR id='target'", - "rect": [0, 0, 186, 64], - "reason": "background" - } + "invalidations": [ + [0, 0, 186, 64] ] }, {
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 index 52e7a1c..635df9d 100644 --- 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
@@ -11,12 +11,8 @@ "position": [8, 96], "bounds": [186, 64], "backgroundColor": "#ADD8E6", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR id='target'", - "rect": [0, 0, 186, 64], - "reason": "appeared" - } + "invalidations": [ + [0, 0, 186, 64] ] }, {
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 index 3690669..2efa78d 100644 --- 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
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR id='target'", - "rect": [8, 96, 186, 64], - "reason": "background" - } + "invalidations": [ + [8, 96, 186, 64] ] }, {
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 index c950f1e..2efa78d 100644 --- 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
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR id='target'", - "rect": [8, 96, 186, 64], - "reason": "appeared" - } + "invalidations": [ + [8, 96, 186, 64] ] }, {
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 index 518e0df..6014755 100644 --- 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
@@ -11,12 +11,8 @@ "position": [8, 28], "bounds": [186, 134], "backgroundColor": "#ADD8E6", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY id='target'", - "rect": [0, 0, 186, 134], - "reason": "background" - } + "invalidations": [ + [0, 0, 186, 134] ] }, {
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 index 1dd39d6e..6014755 100644 --- 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
@@ -11,12 +11,8 @@ "position": [8, 28], "bounds": [186, 134], "backgroundColor": "#ADD8E6", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY id='target'", - "rect": [0, 0, 186, 134], - "reason": "appeared" - } + "invalidations": [ + [0, 0, 186, 134] ] }, {
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 index 59c786d..55002c3 100644 --- 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
@@ -11,12 +11,8 @@ "position": [8, 28], "bounds": [186, 134], "backgroundColor": "#ADD8E6", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY id='target'", - "rect": [0, 0, 186, 134], - "reason": "background" - } + "invalidations": [ + [0, 0, 186, 134] ] }, {
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 index 41ba26c14..55002c3 100644 --- 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
@@ -11,12 +11,8 @@ "position": [8, 28], "bounds": [186, 134], "backgroundColor": "#ADD8E6", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY id='target'", - "rect": [0, 0, 186, 134], - "reason": "appeared" - } + "invalidations": [ + [0, 0, 186, 134] ] }, {
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 63cd9bb..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/composited-table-row-expected.txt +++ /dev/null
@@ -1,24 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutTableRow TR", - "position": [8, 8], - "bounds": [74, 24], - "backgroundColor": "#FF0000", - "paintInvalidations": [ - { - "object": "LayoutTableCell TD id='target'", - "rect": [0, 0, 37, 23], - "reason": "appeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/dynamic-table-vertical-alignment-change-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/dynamic-table-vertical-alignment-change-expected.txt deleted file mode 100644 index 897edda..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/dynamic-table-vertical-alignment-change-expected.txt +++ /dev/null
@@ -1,24 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [808, 585], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (floating) DIV id='target'", - "rect": [11, 75, 100, 100], - "reason": "appeared" - } - ] - }, - { - "name": "ContentsLayer for Horizontal Scrollbar Layer", - "position": [0, 585], - "bounds": [800, 15], - "contentsOpaque": true - } - ] -} -
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 index b1bd9103..0294f509 100644 --- 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
@@ -5,12 +5,8 @@ "bounds": [785, 2016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableCell TD id='moveMe'", - "rect": [200, 200, 100, 100], - "reason": "disappeared" - } + "invalidations": [ + [200, 200, 100, 100] ], "transform": 1 }, @@ -19,12 +15,8 @@ "bounds": [100, 100], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) TD id='moveMe' class='fixed'", - "rect": [0, 0, 100, 100], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 2 },
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 index f503c7d..d70d88e 100644 --- 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
@@ -5,17 +5,9 @@ "bounds": [785, 2016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableCell TD id='moveMe'", - "rect": [100, 100, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutBlockFlow (relative positioned) DIV class='green'", - "rect": [0, 100, 100, 100], - "reason": "disappeared" - } + "invalidations": [ + [100, 100, 100, 100], + [0, 100, 100, 100] ], "transform": 1 }, @@ -24,12 +16,8 @@ "position": [-100, 0], "bounds": [200, 100], "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) TD id='moveMe' class='fixed'", - "rect": [0, 0, 200, 100], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 200, 100] ], "transform": 2 },
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 index 103bac97..8ab6ad1 100644 --- 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
@@ -5,12 +5,8 @@ "bounds": [785, 2016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableCell TD id='moveMe'", - "rect": [0, 100, 100, 100], - "reason": "disappeared" - } + "invalidations": [ + [0, 100, 100, 100] ], "transform": 1 }, @@ -19,12 +15,8 @@ "bounds": [100, 100], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) TD id='moveMe' class='fixed'", - "rect": [0, 0, 100, 100], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 2 },
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/input-overflow-in-table-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/input-overflow-in-table-expected.txt deleted file mode 100644 index 6ae081b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/input-overflow-in-table-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='test'", - "rect": [7, 7, 102, 22], - "reason": "appeared" - } - ] - } - ] -} -
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 971bd62..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,36 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutTableRow TR", - "position": [8, 18], - "drawsContent": false, - "backgroundColor": "#0000FF" - }, - { - "name": "LayoutTableRow TR", - "position": [8, 28], - "bounds": [234, 102], - "backgroundColor": "#0000FF" - }, - { - "name": "LayoutTableRow TR class='shadow-inset'", - "position": [8, 140], - "bounds": [234, 102], - "backgroundColor": "#0000FF", - "paintInvalidations": [ - { - "object": "LayoutTableCell TD id='target'", - "rect": [10, 0, 102, 102], - "reason": "background" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/repaint-table-row-in-composited-document-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/repaint-table-row-in-composited-document-expected.txt deleted file mode 100644 index 0bf772a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/repaint-table-row-in-composited-document-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableCell TD", - "rect": [256, 306, 204, 104], - "reason": "geometry" - }, - { - "object": "LayoutTableCell TD", - "rect": [256, 156, 204, 104], - "reason": "geometry" - } - ] - } - ] -} -
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 eb15498..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,48 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR", - "rect": [0, 52, 106, 238], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [0, 292, 106, 236], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [0, 102, 106, 46], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'ROW2'", - "rect": [3, 400, 46, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'ROW1'", - "rect": [3, 161, 46, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'ROW2'", - "rect": [3, 115, 46, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'ROW1'", - "rect": [3, 66, 46, 19], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/resize-table-repaint-vertical-align-cell-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/resize-table-repaint-vertical-align-cell-expected.txt deleted file mode 100644 index 6fed532..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/resize-table-repaint-vertical-align-cell-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'MIDDLE'", - "rect": [3, 280, 63, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'MIDDLE'", - "rect": [3, 90, 63, 19], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/resize-table-row-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/resize-table-row-repaint-expected.txt deleted file mode 100644 index a9cdcf6..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/resize-table-row-repaint-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'MIDDLE'", - "rect": [3, 192, 63, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'MIDDLE'", - "rect": [3, 142, 63, 19], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/scroll-inside-table-cell-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/scroll-inside-table-cell-expected.txt deleted file mode 100644 index 4d1b600..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/scroll-inside-table-cell-expected.txt +++ /dev/null
@@ -1,28 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV class='absolute green'", - "rect": [314, 114, 435, 450], - "reason": "chunk appeared" - }, - { - "object": "LayoutBlockFlow (relative positioned) DIV class='relative red'", - "rect": [314, 114, 435, 450], - "reason": "paint property change" - }, - { - "object": "HorizontalScrollbar", - "rect": [314, 564, 435, 15], - "reason": "scroll control" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/scroll-relative-table-inside-table-cell-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/scroll-relative-table-inside-table-cell-expected.txt deleted file mode 100644 index 4ce6285..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/scroll-relative-table-inside-table-cell-expected.txt +++ /dev/null
@@ -1,57 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [1566, 1781], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV class='absolute green'", - "rect": [1114, 1314, 435, 450], - "reason": "chunk appeared" - }, - { - "object": "LayoutBlockFlow (relative positioned) DIV class='relative red'", - "rect": [1114, 1314, 435, 450], - "reason": "paint property change" - }, - { - "object": "HorizontalScrollbar", - "rect": [1114, 1764, 435, 15], - "reason": "scroll control" - } - ], - "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], - [-781, -1196, 0, 1] - ] - } - ] -} -
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 2b741cc..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/table-cell-collapsed-border-expected.txt +++ /dev/null
@@ -1,48 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR", - "rect": [3, 264, 441, 110], - "reason": "style change" - }, - { - "object": "LayoutTableRow TR", - "rect": [3, 166, 441, 108], - "reason": "style change" - }, - { - "object": "LayoutTableRow TR", - "rect": [3, 364, 441, 105], - "reason": "style change" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 64, 436, 108], - "reason": "style change" - }, - { - "object": "LayoutTableCell TD id='t3'", - "rect": [225, 269, 112, 100], - "reason": "style change" - }, - { - "object": "LayoutTableCell TD id='t1'", - "rect": [225, 69, 112, 100], - "reason": "style change" - }, - { - "object": "LayoutTableCell TD id='t2'", - "rect": [8, 269, 110, 100], - "reason": "style change" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/table-cell-move-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/table-cell-move-expected.txt deleted file mode 100644 index 53b7cc8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/table-cell-move-expected.txt +++ /dev/null
@@ -1,28 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableCell TD", - "rect": [8, 326, 60, 60], - "reason": "disappeared" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [8, 266, 60, 60], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [8, 206, 60, 60], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/table-cell-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/table-cell-overflow-expected.txt deleted file mode 100644 index a7e015c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/table-cell-overflow-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='target'", - "rect": [111, 9, 100, 100], - "reason": "disappeared" - } - ] - } - ] -} -
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 d18d2ca..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/table-collapsed-border-expected.txt +++ /dev/null
@@ -1,138 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR id='r2'", - "rect": [8, 224, 108, 22], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 338, 99, 30], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 286, 99, 30], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 154, 99, 30], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 102, 99, 30], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 316, 99, 22], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR id='r'", - "rect": [8, 132, 99, 22], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 62, 95, 30], - "reason": "style change" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 10, 95, 30], - "reason": "style change" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 40, 95, 22], - "reason": "style change" - }, - { - "object": "InlineTextBox 'ipsum dolor'", - "rect": [23, 317, 76, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'ipsum dolor'", - "rect": [23, 133, 76, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'sit amet'", - "rect": [23, 339, 49, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'sit amet'", - "rect": [23, 339, 49, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'sit amet'", - "rect": [23, 155, 49, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'sit amet'", - "rect": [23, 155, 49, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'Lorem'", - "rect": [23, 295, 43, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'Lorem'", - "rect": [23, 295, 43, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'Lorem'", - "rect": [23, 111, 43, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'Lorem'", - "rect": [23, 111, 43, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'dolor'", - "rect": [23, 225, 34, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox '\u00A0'", - "rect": [17, 225, 4, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox '\u00A0'", - "rect": [17, 225, 4, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox '\u00A0'", - "rect": [17, 133, 4, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox '\u00A0'", - "rect": [17, 133, 4, 19], - "reason": "disappeared" - } - ] - } - ] -} -
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 ea4e898..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/table-outer-border-expected.txt +++ /dev/null
@@ -1,53 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR", - "rect": [8, 75, 132, 82], - "reason": "appeared" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 75, 132, 82], - "reason": "disappeared" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 8, 132, 82], - "reason": "appeared" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 8, 132, 82], - "reason": "disappeared" - }, - { - "object": "LayoutTableCell TD", - "rect": [15, 82, 117, 67], - "reason": "appeared" - }, - { - "object": "LayoutTableCell TD", - "rect": [15, 82, 117, 67], - "reason": "disappeared" - }, - { - "object": "LayoutTableCell TD", - "rect": [15, 15, 117, 67], - "reason": "appeared" - }, - { - "object": "LayoutTableCell TD", - "rect": [15, 15, 117, 67], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/table-overflow-auto-in-overflow-auto-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/table-overflow-auto-in-overflow-auto-scrolled-expected.txt deleted file mode 100644 index b61c0a3f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/table-overflow-auto-in-overflow-auto-scrolled-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='innerDiv'", - "rect": [10, 8, 302, 300], - "reason": "paint property change" - }, - { - "object": "VerticalScrollbar", - "rect": [762, 8, 15, 300], - "reason": "scroll control" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/table-overflow-scroll-in-overflow-scroll-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/table-overflow-scroll-in-overflow-scroll-scrolled-expected.txt deleted file mode 100644 index b61c0a3f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/table-overflow-scroll-in-overflow-scroll-scrolled-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='innerDiv'", - "rect": [10, 8, 302, 300], - "reason": "paint property change" - }, - { - "object": "VerticalScrollbar", - "rect": [762, 8, 15, 300], - "reason": "scroll control" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/table-section-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/table-section-overflow-expected.txt deleted file mode 100644 index 983ea18..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/table-section-overflow-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV", - "rect": [33, 58, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [33, 8, 100, 100], - "reason": "geometry" - } - ] - } - ] -} -
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 13a043a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/table-section-repaint-expected.txt +++ /dev/null
@@ -1,103 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR", - "rect": [8, 353, 60, 38], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 338, 60, 38], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 323, 60, 38], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 308, 60, 38], - "reason": "geometry" - }, - { - "object": "LayoutTableCell TD class='red half'", - "rect": [8, 248, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutTableCell TD class='green half'", - "rect": [8, 218, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutTableCell TD class='red half'", - "rect": [8, 218, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutTableCell TD class='green half'", - "rect": [8, 188, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutTableCell TD class='green half'", - "rect": [8, 158, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutTableCell TD class='green half'", - "rect": [8, 128, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutTableCell TD class='red half'", - "rect": [8, 128, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV id='top' class='blue half'", - "rect": [8, 98, 60, 30], - "reason": "disappeared" - }, - { - "object": "LayoutTableCell TD class='red half'", - "rect": [8, 98, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutTableCell TD class='green half'", - "rect": [8, 68, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutTableCell TD class='green half'", - "rect": [8, 38, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutTableCell TD class='red half'", - "rect": [8, 38, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow CAPTION id='caption1' class='blue half'", - "rect": [8, 8, 60, 30], - "reason": "disappeared" - }, - { - "object": "LayoutTableCell TD class='red half'", - "rect": [8, 8, 60, 30], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/table-shrink-row-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/table-shrink-row-repaint-expected.txt deleted file mode 100644 index 02c6fb58..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/table-shrink-row-repaint-expected.txt +++ /dev/null
@@ -1,234 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [785, 850], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableCell TD id='resizeMe'", - "rect": [8, 112, 769, 210], - "reason": "geometry" - }, - { - "object": "LayoutTableCell TD", - "rect": [8, 782, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutTableCell TD", - "rect": [8, 742, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutTableCell TD", - "rect": [8, 722, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutTableCell TD", - "rect": [8, 682, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutTableCell TD", - "rect": [8, 662, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutTableCell TD", - "rect": [8, 622, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutTableCell TD", - "rect": [8, 602, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutTableCell TD", - "rect": [8, 562, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutTableCell TD", - "rect": [8, 542, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutTableCell TD", - "rect": [8, 502, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutTableCell TD", - "rect": [8, 482, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutTableCell TD", - "rect": [8, 442, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutTableCell TD", - "rect": [8, 422, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutTableCell TD", - "rect": [8, 382, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutTableCell TD", - "rect": [8, 362, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutTableCell TD", - "rect": [8, 322, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutTableCell TD", - "rect": [8, 302, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutTableCell TD", - "rect": [8, 242, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutTableCell TD", - "rect": [8, 182, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutTableCell TD", - "rect": [8, 122, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutTableCell TD", - "rect": [8, 802, 769, 48], - "reason": "geometry" - }, - { - "object": "InlineTextBox '10'", - "rect": [13, 822, 16, 19], - "reason": "geometry" - }, - { - "object": "InlineTextBox '13'", - "rect": [13, 802, 16, 19], - "reason": "geometry" - }, - { - "object": "InlineTextBox '12'", - "rect": [13, 742, 16, 19], - "reason": "geometry" - }, - { - "object": "InlineTextBox '10'", - "rect": [13, 622, 16, 19], - "reason": "geometry" - }, - { - "object": "InlineTextBox '11'", - "rect": [13, 682, 15, 19], - "reason": "geometry" - }, - { - "object": "InlineTextBox '9'", - "rect": [13, 762, 8, 19], - "reason": "geometry" - }, - { - "object": "InlineTextBox '8'", - "rect": [13, 702, 8, 19], - "reason": "geometry" - }, - { - "object": "InlineTextBox '7'", - "rect": [13, 642, 8, 19], - "reason": "geometry" - }, - { - "object": "InlineTextBox '6'", - "rect": [13, 582, 8, 19], - "reason": "geometry" - }, - { - "object": "InlineTextBox '9'", - "rect": [13, 562, 8, 19], - "reason": "geometry" - }, - { - "object": "InlineTextBox '5'", - "rect": [13, 522, 8, 19], - "reason": "geometry" - }, - { - "object": "InlineTextBox '8'", - "rect": [13, 502, 8, 19], - "reason": "geometry" - }, - { - "object": "InlineTextBox '4'", - "rect": [13, 462, 8, 19], - "reason": "geometry" - }, - { - "object": "InlineTextBox '7'", - "rect": [13, 442, 8, 19], - "reason": "geometry" - }, - { - "object": "InlineTextBox '3'", - "rect": [13, 402, 8, 19], - "reason": "geometry" - }, - { - "object": "InlineTextBox '6'", - "rect": [13, 382, 8, 19], - "reason": "geometry" - }, - { - "object": "InlineTextBox '2'", - "rect": [13, 342, 8, 19], - "reason": "geometry" - }, - { - "object": "InlineTextBox '5'", - "rect": [13, 322, 8, 19], - "reason": "geometry" - }, - { - "object": "InlineTextBox '4'", - "rect": [13, 262, 8, 19], - "reason": "geometry" - }, - { - "object": "InlineTextBox '3'", - "rect": [13, 202, 8, 19], - "reason": "geometry" - }, - { - "object": "InlineTextBox '2'", - "rect": [13, 142, 8, 19], - "reason": "geometry" - } - ] - }, - { - "name": "ContentsLayer for Vertical Scrollbar Layer", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ] -} -
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 cd440a1cf..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,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='target'", - "rect": [61, 45, 50, 25], - "reason": "incremental" - } - ] - } - ] -} -
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 d71d0aa..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/text-append-dirty-lines-expected.txt +++ /dev/null
@@ -1,58 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Curabitur a velit'", - "rect": [8, 44, 756, 139], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'Curabitur a velit.'", - "rect": [8, 44, 756, 139], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse placerat. Morbi tristique. Mauris eu lacus sed felis'", - "rect": [8, 44, 756, 139], - "reason": "full" - }, - { - "object": "InlineTextBox 'fermentum ut, tortor. Sed rhoncus. Quisque enim metus, luctus tincidunt, vestibulum eu, vestibulum eu, libero. Mauris'", - "rect": [8, 44, 756, 139], - "reason": "full" - }, - { - "object": "InlineTextBox 'feugiat molestie, mi lorem bibendum leo, ac gravida orci nunc nec nulla. Nunc nunc lorem, rhoncus et, rutrum ac,'", - "rect": [8, 44, 756, 139], - "reason": "full" - }, - { - "object": "InlineTextBox 'laoreet feugiat. Phasellus mollis pulvinar mi. Etiam ut neque sed eros egestas laoreet. Vestibulum ullamcorper, nulla non'", - "rect": [8, 44, 756, 139], - "reason": "full" - }, - { - "object": "InlineTextBox 'pellentesque cursus. Proin vitae nulla. Vivamus in ipsum. Etiam mi. Nam malesuada purus in sem. Sed eget elit vel erat'", - "rect": [8, 44, 756, 139], - "reason": "full" - }, - { - "object": "InlineTextBox 'sagittis aliquam nunc. Nullam pharetra molestie eros. Donec tempus purus ut ligula. Phasellus non nisl. Etiam eu mauris.'", - "rect": [8, 44, 756, 139], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'sagittis aliquam nunc. Nullam pharetra molestie eros. Donec tempus purus ut ligula. Phasellus non nisl. Etiam eu mauris.'", - "rect": [8, 44, 756, 139], - "reason": "disappeared" - } - ] - } - ] -} -
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 c624d41..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/text-match-document-change-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Find-in-page 'findme', then click here)'", - "rect": [18, 130, 251, 39], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'To be changed: findme (Manual testing:'", - "rect": [18, 130, 251, 39], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'After change'", - "rect": [18, 130, 82, 19], - "reason": "appeared" - }, - { - "object": "VerticalScrollbar", - "rect": [295, 102, 15, 400], - "reason": "scroll control" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/transform/change-transform-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/transform/change-transform-expected.txt deleted file mode 100644 index 2218e7b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/transform/change-transform-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='square'", - "rect": [10, 10, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='overlay'", - "rect": [35, 35, 50, 50], - "reason": "disappeared" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='overlay'", - "rect": [35, 35, 50, 50], - "reason": "chunk appeared" - }, - { - "object": "LayoutBlockFlow DIV id='square'", - "rect": [35, 35, 50, 50], - "reason": "chunk appeared" - } - ] - } - ] -} -
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 567b370..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/transform/invalidation-with-scale-transform-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='target'", - "rect": [85, 70, 91, 92], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='target'", - "rect": [84, 70, 91, 92], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/transform/resize-skewed-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/transform/resize-skewed-expected.txt deleted file mode 100644 index 4cf3394d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/transform/resize-skewed-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='skewed'", - "rect": [100, 50, 600, 500], - "reason": "incremental" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/transform/subpixel-offset-scaled-transform-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/transform/subpixel-offset-scaled-transform-expected.txt deleted file mode 100644 index aa717af..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/transform/subpixel-offset-scaled-transform-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (relative positioned) DIV class='child scale'", - "rect": [9, 58, 40, 40], - "reason": "paint property change" - }, - { - "object": "LayoutBlockFlow (relative positioned) DIV class='child scale'", - "rect": [8, 58, 40, 40], - "reason": "paint property change" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/transform/subtree-layoutstate-transform-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/transform/subtree-layoutstate-transform-expected.txt deleted file mode 100644 index 271f2308..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/transform/subtree-layoutstate-transform-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV class='layoutroot'", - "rect": [28, 48, 200, 200], - "reason": "disappeared" - }, - { - "object": "LayoutBlockFlow DIV id='target'", - "rect": [128, 48, 100, 200], - "reason": "incremental" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/transform/transform-disable-layoutstate-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/transform/transform-disable-layoutstate-expected.txt deleted file mode 100644 index 150517dd..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/transform/transform-disable-layoutstate-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV", - "rect": [58, 138, 500, 63], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [58, 256, 500, 45], - "reason": "incremental" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/transform/transform-inline-layered-child-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/transform/transform-inline-layered-child-expected.txt index b61caf74..5758dba 100644 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/transform/transform-inline-layered-child-expected.txt +++ b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/transform/transform-inline-layered-child-expected.txt
@@ -5,57 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='box'", - "rect": [135, 361, 159, 195], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox 'A B C'", - "rect": [300, 302, 80, 177], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'D E F'", - "rect": [300, 302, 80, 177], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'G H I'", - "rect": [300, 302, 80, 177], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'J K L'", - "rect": [300, 302, 80, 177], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'M N O'", - "rect": [300, 302, 80, 177], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'P Q R'", - "rect": [300, 302, 80, 177], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'S T U'", - "rect": [300, 302, 80, 177], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'V W X'", - "rect": [300, 302, 80, 177], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'Y Z'", - "rect": [300, 302, 80, 177], - "reason": "disappeared" - } + "invalidations": [ + [135, 361, 159, 195], + [300, 302, 80, 177] ] } ]
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 index 0645ac1a..533e51b 100644 --- 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
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='target'", - "rect": [40, 50, 208, 118], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'PASS'", - "rect": [52, 51, 43, 32], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'FAIL'", - "rect": [52, 51, 40, 31], - "reason": "disappeared" - } + "invalidations": [ + [40, 50, 208, 118] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/transform/transform-repaint-descendants-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/transform/transform-repaint-descendants-expected.txt deleted file mode 100644 index 87b6244..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/transform/transform-repaint-descendants-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV", - "rect": [176, 220, 394, 185], - "reason": "paint property change" - }, - { - "object": "LayoutBlockFlow (positioned) DIV", - "rect": [176, 220, 388, 203], - "reason": "paint property change" - }, - { - "object": "LayoutBlockFlow (relative positioned) DIV id='box'", - "rect": [76, 120, 266, 266], - "reason": "paint property change" - }, - { - "object": "LayoutBlockFlow (relative positioned) DIV id='box'", - "rect": [79, 123, 260, 260], - "reason": "paint property change" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/transform/transform-rotate-and-remove-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/transform/transform-rotate-and-remove-expected.txt deleted file mode 100644 index a1a915c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/transform/transform-rotate-and-remove-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='rel'", - "rect": [8, 8, 220, 70], - "reason": "appeared" - }, - { - "object": "LayoutBlockFlow DIV id='rel' class='rotated'", - "rect": [20, 0, 196, 150], - "reason": "chunk disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/transform/transform-translate-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/transform/transform-translate-expected.txt deleted file mode 100644 index 7b727a6..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/transform/transform-translate-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": [28, 66, 106, 107], - "reason": "paint property change" - }, - { - "object": "LayoutBlockFlow DIV id='target'", - "rect": [8, 66, 106, 107], - "reason": "paint property change" - } - ] - } - ] -} -
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 index 9f5b9a9..00acebf 100644 --- 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
@@ -5,32 +5,12 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='target'", - "rect": [20, 0, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='other'", - "rect": [120, 130, 20, 20], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='other'", - "rect": [120, 100, 20, 20], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='other'", - "rect": [0, 130, 20, 20], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='other'", - "rect": [0, 100, 20, 20], - "reason": "geometry" - } + "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 index 8ae5da1..edfe59b 100644 --- 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
@@ -5,27 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV class='other'", - "rect": [300, 0, 200, 200], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='other'", - "rect": [0, 0, 200, 200], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV id='target'", - "rect": [200, 80, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV id='target'", - "rect": [200, 50, 100, 100], - "reason": "geometry" - } + "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 index 8fb2979..16d141a 100644 --- 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
@@ -5,32 +5,12 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='target'", - "rect": [20, 0, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='other'", - "rect": [120, 33, 20, 21], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='other'", - "rect": [0, 33, 20, 21], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='other'", - "rect": [120, 80, 20, 20], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='other'", - "rect": [0, 80, 20, 20], - "reason": "geometry" - } + "invalidations": [ + [20, 0, 100, 100], + [120, 33, 20, 21], + [0, 33, 20, 21], + [120, 80, 20, 20], + [0, 80, 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 index a179526e..19c2c02 100644 --- 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
@@ -5,27 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV class='other'", - "rect": [300, 0, 200, 200], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='other'", - "rect": [0, 0, 200, 200], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV id='target'", - "rect": [200, 146, 100, 101], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV id='target'", - "rect": [200, 100, 100, 100], - "reason": "geometry" - } + "invalidations": [ + [300, 0, 200, 200], + [0, 0, 200, 200], + [200, 146, 100, 101], + [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 index 8c1128e..0212eda 100644 --- 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
@@ -10,27 +10,8 @@ "name": "LayoutBlockFlow DIV id='target'", "bounds": [600, 400], "backfaceVisibility": "hidden", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Lorem ipsum dolor'", - "rect": [520, 0, 80, 340], - "reason": "style change" - }, - { - "object": "InlineTextBox 'adipiscing elit.'", - "rect": [520, 0, 80, 340], - "reason": "style change" - }, - { - "object": "InlineTextBox 'consectetur'", - "rect": [520, 0, 80, 340], - "reason": "style change" - }, - { - "object": "InlineTextBox 'sit amet,'", - "rect": [520, 0, 80, 340], - "reason": "style change" - } + "invalidations": [ + [520, 0, 80, 340] ], "transform": 1 }
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 a3fa108..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,124 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [600, 250], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV class='container'", - "rect": [0, 0, 600, 250], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='parent'", - "rect": [0, 0, 6, 250], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (relative positioned) DIV class='child'", - "rect": [0, 125, 6, 30], - "reason": "geometry" - } - ] - } - ] -} -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [400, 250], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV class='container'", - "rect": [0, 0, 400, 250], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='parent'", - "rect": [0, 0, 6, 250], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (relative positioned) DIV class='child'", - "rect": [0, 125, 6, 30], - "reason": "geometry" - } - ] - } - ] -} -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [400, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV class='container'", - "rect": [0, 0, 400, 600], - "reason": "geometry" - }, - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 250, 400, 350], - "reason": "incremental" - }, - { - "object": "LayoutBlockFlow DIV class='parent'", - "rect": [0, 0, 6, 600], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (relative positioned) DIV class='child'", - "rect": [0, 300, 6, 30], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (relative positioned) DIV class='child'", - "rect": [0, 125, 6, 30], - "reason": "geometry" - } - ] - } - ] -} -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV class='container'", - "rect": [0, 0, 800, 600], - "reason": "geometry" - }, - { - "object": "Scrolling background of LayoutView #document", - "rect": [400, 0, 400, 600], - "reason": "incremental" - }, - { - "object": "LayoutBlockFlow DIV class='parent'", - "rect": [0, 0, 6, 600], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (relative positioned) DIV class='child'", - "rect": [0, 300, 6, 30], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/window-resize/window-resize-child-background-image-fixed-centered-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/window-resize/window-resize-child-background-image-fixed-centered-expected.txt deleted file mode 100644 index ba727b3e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/window-resize/window-resize-child-background-image-fixed-centered-expected.txt +++ /dev/null
@@ -1,165 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [1008, 1016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='target'", - "rect": [8, 8, 1000, 1000], - "reason": "background" - } - ] - }, - { - "name": "ContentsLayer for Horizontal Scrollbar Layer", - "position": [0, 235], - "bounds": [585, 15], - "contentsOpaque": true - }, - { - "name": "ContentsLayer for Vertical Scrollbar Layer", - "position": [585, 0], - "bounds": [15, 235], - "contentsOpaque": true - }, - { - "name": "Scroll Corner Layer", - "position": [585, 235], - "bounds": [15, 15], - "paintInvalidations": [ - { - "object": "Scroll Corner Layer", - "rect": [0, 0, 15, 15], - "reason": "full layer" - } - ] - } - ] -} -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [1008, 1016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='target'", - "rect": [8, 8, 1000, 1000], - "reason": "background" - } - ] - }, - { - "name": "ContentsLayer for Horizontal Scrollbar Layer", - "position": [0, 235], - "bounds": [385, 15], - "contentsOpaque": true - }, - { - "name": "ContentsLayer for Vertical Scrollbar Layer", - "position": [385, 0], - "bounds": [15, 235], - "contentsOpaque": true - }, - { - "name": "Scroll Corner Layer", - "position": [385, 235], - "bounds": [15, 15], - "paintInvalidations": [ - { - "object": "Scroll Corner Layer", - "rect": [0, 0, 15, 15], - "reason": "full layer" - } - ] - } - ] -} -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [1008, 1016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='target'", - "rect": [8, 8, 1000, 1000], - "reason": "background" - } - ] - }, - { - "name": "ContentsLayer for Horizontal Scrollbar Layer", - "position": [0, 585], - "bounds": [385, 15], - "contentsOpaque": true - }, - { - "name": "ContentsLayer for Vertical Scrollbar Layer", - "position": [385, 0], - "bounds": [15, 585], - "contentsOpaque": true - }, - { - "name": "Scroll Corner Layer", - "position": [385, 585], - "bounds": [15, 15], - "paintInvalidations": [ - { - "object": "Scroll Corner Layer", - "rect": [0, 0, 15, 15], - "reason": "full layer" - } - ] - } - ] -} -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [1008, 1016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='target'", - "rect": [8, 8, 1000, 1000], - "reason": "background" - } - ] - }, - { - "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], - "paintInvalidations": [ - { - "object": "Scroll Corner Layer", - "rect": [0, 0, 15, 15], - "reason": "full layer" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/window-resize/window-resize-child-background-image-fixed-tiled-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/window-resize/window-resize-child-background-image-fixed-tiled-expected.txt deleted file mode 100644 index ba727b3e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/window-resize/window-resize-child-background-image-fixed-tiled-expected.txt +++ /dev/null
@@ -1,165 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [1008, 1016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='target'", - "rect": [8, 8, 1000, 1000], - "reason": "background" - } - ] - }, - { - "name": "ContentsLayer for Horizontal Scrollbar Layer", - "position": [0, 235], - "bounds": [585, 15], - "contentsOpaque": true - }, - { - "name": "ContentsLayer for Vertical Scrollbar Layer", - "position": [585, 0], - "bounds": [15, 235], - "contentsOpaque": true - }, - { - "name": "Scroll Corner Layer", - "position": [585, 235], - "bounds": [15, 15], - "paintInvalidations": [ - { - "object": "Scroll Corner Layer", - "rect": [0, 0, 15, 15], - "reason": "full layer" - } - ] - } - ] -} -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [1008, 1016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='target'", - "rect": [8, 8, 1000, 1000], - "reason": "background" - } - ] - }, - { - "name": "ContentsLayer for Horizontal Scrollbar Layer", - "position": [0, 235], - "bounds": [385, 15], - "contentsOpaque": true - }, - { - "name": "ContentsLayer for Vertical Scrollbar Layer", - "position": [385, 0], - "bounds": [15, 235], - "contentsOpaque": true - }, - { - "name": "Scroll Corner Layer", - "position": [385, 235], - "bounds": [15, 15], - "paintInvalidations": [ - { - "object": "Scroll Corner Layer", - "rect": [0, 0, 15, 15], - "reason": "full layer" - } - ] - } - ] -} -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [1008, 1016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='target'", - "rect": [8, 8, 1000, 1000], - "reason": "background" - } - ] - }, - { - "name": "ContentsLayer for Horizontal Scrollbar Layer", - "position": [0, 585], - "bounds": [385, 15], - "contentsOpaque": true - }, - { - "name": "ContentsLayer for Vertical Scrollbar Layer", - "position": [385, 0], - "bounds": [15, 585], - "contentsOpaque": true - }, - { - "name": "Scroll Corner Layer", - "position": [385, 585], - "bounds": [15, 15], - "paintInvalidations": [ - { - "object": "Scroll Corner Layer", - "rect": [0, 0, 15, 15], - "reason": "full layer" - } - ] - } - ] -} -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [1008, 1016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='target'", - "rect": [8, 8, 1000, 1000], - "reason": "background" - } - ] - }, - { - "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], - "paintInvalidations": [ - { - "object": "Scroll Corner Layer", - "rect": [0, 0, 15, 15], - "reason": "full layer" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/window-resize/window-resize-percent-html-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/window-resize/window-resize-percent-html-expected.txt deleted file mode 100644 index 57cf96cc..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/window-resize/window-resize-percent-html-expected.txt +++ /dev/null
@@ -1,79 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [600, 250], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV", - "rect": [0, 0, 300, 125], - "reason": "geometry" - } - ] - } - ] -} -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [400, 250], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV", - "rect": [0, 0, 300, 63], - "reason": "geometry" - } - ] - } - ] -} -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [400, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 250, 400, 350], - "reason": "incremental" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [0, 0, 200, 150], - "reason": "geometry" - } - ] - } - ] -} -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [400, 0, 400, 600], - "reason": "incremental" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [200, 0, 200, 150], - "reason": "incremental" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/window-resize/window-resize-percent-width-height-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/window-resize/window-resize-percent-width-height-expected.txt deleted file mode 100644 index 9e6e4dd..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/window-resize/window-resize-percent-width-height-expected.txt +++ /dev/null
@@ -1,79 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [600, 250], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV", - "rect": [0, 125, 300, 125], - "reason": "incremental" - } - ] - } - ] -} -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [400, 250], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV", - "rect": [200, 0, 100, 125], - "reason": "incremental" - } - ] - } - ] -} -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [400, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 250, 400, 350], - "reason": "incremental" - }, - { - "object": "LayoutBlockFlow (positioned) DIV", - "rect": [0, 125, 200, 175], - "reason": "incremental" - } - ] - } - ] -} -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [400, 0, 400, 600], - "reason": "incremental" - }, - { - "object": "LayoutBlockFlow (positioned) DIV", - "rect": [200, 0, 200, 300], - "reason": "incremental" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/window-resize/window-resize-positioned-bottom-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/window-resize/window-resize-positioned-bottom-expected.txt deleted file mode 100644 index 7e111de..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/window-resize/window-resize-positioned-bottom-expected.txt +++ /dev/null
@@ -1,72 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [600, 250], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV", - "rect": [0, 210, 20, 20], - "reason": "geometry" - } - ] - } - ] -} -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [400, 250], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - } - ] -} -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [400, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 250, 400, 350], - "reason": "incremental" - }, - { - "object": "LayoutBlockFlow (positioned) DIV", - "rect": [0, 560, 20, 20], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) DIV", - "rect": [0, 210, 20, 20], - "reason": "geometry" - } - ] - } - ] -} -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [400, 0, 400, 600], - "reason": "incremental" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/window-resize/window-resize-positioned-percent-top-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/window-resize/window-resize-positioned-percent-top-expected.txt deleted file mode 100644 index 482a647..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/window-resize/window-resize-positioned-percent-top-expected.txt +++ /dev/null
@@ -1,72 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [600, 250], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV", - "rect": [0, 125, 20, 20], - "reason": "geometry" - } - ] - } - ] -} -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [400, 250], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - } - ] -} -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [400, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 250, 400, 350], - "reason": "incremental" - }, - { - "object": "LayoutBlockFlow (positioned) DIV", - "rect": [0, 300, 20, 20], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (positioned) DIV", - "rect": [0, 125, 20, 20], - "reason": "geometry" - } - ] - } - ] -} -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [400, 0, 400, 600], - "reason": "incremental" - } - ] - } - ] -} -
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 index b07aab2..cd03c667 100644 --- 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
@@ -5,12 +5,8 @@ "bounds": [939, 235], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling Contents Layer", - "rect": [0, 0, 939, 235], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 939, 235] ], "transform": 1 }, @@ -40,12 +36,8 @@ "bounds": [939, 235], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling Contents Layer", - "rect": [0, 0, 939, 235], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 939, 235] ], "transform": 1 }, @@ -75,12 +67,8 @@ "bounds": [400, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling Contents Layer", - "rect": [0, 0, 400, 600], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 400, 600] ] } ] @@ -92,62 +80,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [400, 0, 400, 600], - "reason": "incremental" - }, - { - "object": "InlineTextBox 'AAAA BBBB CCCC'", - "rect": [439, 8, 352, 562], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'DDDD EEEE FFFF'", - "rect": [439, 8, 352, 562], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'GGGG HHHH IIII JJJJ'", - "rect": [439, 8, 352, 562], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'KKKK LLLL MMMM'", - "rect": [439, 8, 352, 562], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'NNNN'", - "rect": [439, 8, 352, 562], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'AAAA BBBB CCCC'", - "rect": [39, 8, 352, 562], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'DDDD EEEE FFFF'", - "rect": [39, 8, 352, 562], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'GGGG HHHH IIII JJJJ'", - "rect": [39, 8, 352, 562], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'KKKK LLLL MMMM'", - "rect": [39, 8, 352, 562], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'NNNN'", - "rect": [39, 8, 352, 562], - "reason": "geometry" - } + "invalidations": [ + [400, 0, 400, 600], + [39, 8, 352, 562] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/window-resize/window-resize-viewport-percent-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/window-resize/window-resize-viewport-percent-expected.txt deleted file mode 100644 index 47f8435..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/window-resize/window-resize-viewport-percent-expected.txt +++ /dev/null
@@ -1,77 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [600, 250], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV", - "rect": [0, 25, 50, 25], - "reason": "incremental" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [25, 0, 25, 50], - "reason": "incremental" - } - ] - } - ] -} -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [400, 250], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - } - ] -} -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [400, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 250, 400, 350], - "reason": "incremental" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [0, 25, 60, 35], - "reason": "incremental" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [25, 0, 35, 60], - "reason": "incremental" - } - ] - } - ] -} -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [400, 0, 400, 600], - "reason": "incremental" - } - ] - } - ] -} -
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 index e8ce3356..91eba6ac 100644 --- 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
@@ -5,12 +5,8 @@ "bounds": [785, 736], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 636, 785, 100], - "reason": "incremental" - } + "invalidations": [ + [0, 636, 785, 100] ] }, {
diff --git a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/background/background-misaligned-expected.txt b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/background/background-misaligned-expected.txt index 1c00065..95bd2ed 100644 --- a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/background/background-misaligned-expected.txt +++ b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/background/background-misaligned-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target'", - "rect": [238, 241, 40, 40], - "reason": "disappeared" - } + "invalidations": [ + [238, 241, 40, 40] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/block-layout-inline-children-replaced-expected.txt b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/block-layout-inline-children-replaced-expected.txt index 6110c31..d6116d3 100644 --- a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/block-layout-inline-children-replaced-expected.txt +++ b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/block-layout-inline-children-replaced-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutImage IMG", - "rect": [151, 117, 100, 100], - "reason": "appeared" - } + "invalidations": [ + [151, 117, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/block-no-inflow-children-expected.txt b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/block-no-inflow-children-expected.txt deleted file mode 100644 index ab2f9da1..0000000 --- a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/block-no-inflow-children-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'La la la la'", - "rect": [0, 0, 62, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'La la la'", - "rect": [0, 0, 47, 19], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/bugzilla-3509-expected.txt b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/bugzilla-3509-expected.txt deleted file mode 100644 index 2721063..0000000 --- a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/bugzilla-3509-expected.txt +++ /dev/null
@@ -1,28 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='im'", - "rect": [61, 131, 50, 100], - "reason": "incremental" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [11, 131, 4, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [11, 131, 4, 19], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/bugzilla-5699-expected.txt b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/bugzilla-5699-expected.txt deleted file mode 100644 index db3b268..0000000 --- a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/bugzilla-5699-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Hello'", - "rect": [8, 184, 35, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'Hello'", - "rect": [8, 156, 35, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [8, 150, 4, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [8, 136, 4, 19], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/bugzilla-6278-expected.txt b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/bugzilla-6278-expected.txt deleted file mode 100644 index c831262..0000000 --- a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/bugzilla-6278-expected.txt +++ /dev/null
@@ -1,133 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [10, 303, 292, 50], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Curabitur pretium, quam quis semper'", - "rect": [10, 138, 291, 159], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'Phasellus vehicula, sem at posuere vehicula,'", - "rect": [10, 138, 291, 159], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'augue nibh molestie nisl, nec ullamcorper'", - "rect": [10, 138, 291, 159], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'fringilla orci nibh sed neque. Quisque eu nulla'", - "rect": [10, 138, 291, 159], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'lacus ante vulputate pede.'", - "rect": [10, 138, 291, 159], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'laoreet ac, laoreet non, suscipit sed, sapien.'", - "rect": [10, 138, 291, 159], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'malesuada, est libero feugiat libero, vel'", - "rect": [10, 138, 291, 159], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'non nisi molestie accumsan. Etiam tellus urna,'", - "rect": [10, 138, 291, 159], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [10, 343, 242, 50], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD id='col1'", - "rect": [10, 353, 242, 40], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [10, 298, 242, 40], - "reason": "incremental" - }, - { - "object": "NGPhysicalTextFragment 'Curabitur pretium, quam quis semper'", - "rect": [10, 138, 235, 199], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'Phasellus vehicula, sem at posuere'", - "rect": [10, 138, 235, 199], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'Quisque eu nulla non nisi molestie'", - "rect": [10, 138, 235, 199], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'ac, laoreet non, suscipit sed, sapien.'", - "rect": [10, 138, 235, 199], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'accumsan. Etiam tellus urna, laoreet'", - "rect": [10, 138, 235, 199], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'malesuada, est libero feugiat libero,'", - "rect": [10, 138, 235, 199], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'nec ullamcorper lacus ante vulputate'", - "rect": [10, 138, 235, 199], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'pede.'", - "rect": [10, 138, 235, 199], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'vehicula, augue nibh molestie nisl,'", - "rect": [10, 138, 235, 199], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'vel fringilla orci nibh sed neque.'", - "rect": [10, 138, 235, 199], - "reason": "appeared" - }, - { - "object": "LayoutNGTableCell TD id='col1'", - "rect": [252, 138, 50, 215], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [252, 138, 50, 160], - "reason": "incremental" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/bugzilla-7235-expected.txt b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/bugzilla-7235-expected.txt deleted file mode 100644 index 3e470df6..0000000 --- a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/bugzilla-7235-expected.txt +++ /dev/null
@@ -1,28 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='t'", - "rect": [8, 176, 100, 100], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [8, 156, 4, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [8, 156, 4, 19], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/compositing/iframe-inside-squashed-layer-expected.txt b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/compositing/iframe-inside-squashed-layer-expected.txt deleted file mode 100644 index 82f8f4d..0000000 --- a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/compositing/iframe-inside-squashed-layer-expected.txt +++ /dev/null
@@ -1,58 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [785, 1016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutNGBlockFlow DIV id='foo'", - "bounds": [200, 1000], - "contentsOpaque": true, - "backgroundColor": "#D3D3D3", - "transform": 1 - }, - { - "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV)", - "position": [0, -8], - "bounds": [300, 655], - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'test1'", - "rect": [8, 508, 29, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'test1'", - "rect": [8, 508, 29, 19], - "reason": "disappeared" - }, - { - "object": "VerticalScrollbar", - "rect": [285, 500, 15, 150], - "reason": "chunk appeared" - } - ], - "transform": 1 - }, - { - "name": "ContentsLayer for Vertical Scrollbar Layer", - "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/layout-ng-fragment-item/paint/invalidation/flexbox/repaint-expected.txt b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/flexbox/repaint-expected.txt deleted file mode 100644 index e74ae033..0000000 --- a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/flexbox/repaint-expected.txt +++ /dev/null
@@ -1,163 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='content'", - "rect": [138, 128, 654, 100], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow DIV id='content'", - "rect": [148, 128, 644, 100], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean laoreet dolor id urna eleifend aliquet.'", - "rect": [138, 128, 636, 99], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'Nulla vel dolor ipsum. Aliquam ut turpis nisl, in vulputate sapien. Cum sociis natoque penatibus et'", - "rect": [138, 128, 636, 99], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'Sed volutpat, tellus vel varius vestibulum, purus quam mollis sapien, in condimentum leo neque sed'", - "rect": [138, 128, 636, 99], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'magnis dis parturient montes, nascetur ridiculus mus. Sed congue magna vitae dolor feugiat vehicula.'", - "rect": [138, 128, 636, 99], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'nulla. Nunc quis porta elit. Pellentesque erat lectus, ultricies a lobortis id, faucibus id quam.'", - "rect": [138, 128, 636, 99], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean laoreet dolor id urna eleifend aliquet.'", - "rect": [148, 128, 635, 99], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean laoreet dolor id urna eleifend aliquet.'", - "rect": [148, 128, 635, 99], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'Nulla vel dolor ipsum. Aliquam ut turpis nisl, in vulputate sapien. Cum sociis natoque penatibus et'", - "rect": [148, 128, 635, 99], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'Nulla vel dolor ipsum. Aliquam ut turpis nisl, in vulputate sapien. Cum sociis natoque penatibus et'", - "rect": [148, 128, 635, 99], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'Sed volutpat, tellus vel varius vestibulum, purus quam mollis sapien, in condimentum leo neque sed'", - "rect": [148, 128, 635, 99], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'Sed volutpat, tellus vel varius vestibulum, purus quam mollis sapien, in condimentum leo neque sed'", - "rect": [148, 128, 635, 99], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'magnis dis parturient montes, nascetur ridiculus mus. Sed congue magna vitae dolor feugiat vehicula.'", - "rect": [148, 128, 635, 99], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'magnis dis parturient montes, nascetur ridiculus mus. Sed congue magna vitae dolor feugiat vehicula.'", - "rect": [148, 128, 635, 99], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'nulla. Nunc quis porta elit. Pellentesque erat lectus, ultricies a lobortis id, faucibus id quam.'", - "rect": [148, 128, 635, 99], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'nulla. Nunc quis porta elit. Pellentesque erat lectus, ultricies a lobortis id, faucibus id quam.'", - "rect": [148, 128, 635, 99], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='content'", - "rect": [400, 128, 392, 180], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow DIV id='left'", - "rect": [8, 228, 392, 80], - "reason": "incremental" - }, - { - "object": "NGPhysicalTextFragment 'Aenean laoreet dolor id urna eleifend aliquet. Nulla vel dolor'", - "rect": [400, 128, 391, 179], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.'", - "rect": [400, 128, 391, 179], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'Sed volutpat, tellus vel varius vestibulum, purus quam mollis'", - "rect": [400, 128, 391, 179], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'elit. Pellentesque erat lectus, ultricies a lobortis id, faucibus id'", - "rect": [400, 128, 391, 179], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'ipsum. Aliquam ut turpis nisl, in vulputate sapien. Cum sociis'", - "rect": [400, 128, 391, 179], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'natoque penatibus et magnis dis parturient montes, nascetur'", - "rect": [400, 128, 391, 179], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'quam.'", - "rect": [400, 128, 391, 179], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'ridiculus mus. Sed congue magna vitae dolor feugiat vehicula.'", - "rect": [400, 128, 391, 179], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'sapien, in condimentum leo neque sed nulla. Nunc quis porta'", - "rect": [400, 128, 391, 179], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='left'", - "rect": [148, 128, 252, 180], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow DIV id='left'", - "rect": [8, 128, 140, 100], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/float-new-in-block-expected.txt b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/float-new-in-block-expected.txt index 2796879..e6987437 100644 --- a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/float-new-in-block-expected.txt +++ b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/float-new-in-block-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (floating) DIV id='target'", - "rect": [8, 8, 100, 100], - "reason": "appeared" - } + "invalidations": [ + [8, 8, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/gradients-em-stops-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/gradients-em-stops-repaint-expected.txt deleted file mode 100644 index 2477d55..0000000 --- a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/gradients-em-stops-repaint-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='box4' class='box'", - "rect": [344, 18, 302, 122], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow DIV class='indicator'", - "rect": [345, 19, 240, 20], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment ' '", - "rect": [330, 135, 4, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment ' '", - "rect": [330, 135, 4, 19], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/inline-reflow-expected.txt b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/inline-reflow-expected.txt deleted file mode 100644 index d203eeb..0000000 --- a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/inline-reflow-expected.txt +++ /dev/null
@@ -1,148 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'A A A A A AA AA'", - "rect": [0, 0, 300, 200], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'A A'", - "rect": [0, 0, 300, 200], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'AA AA AA A A A'", - "rect": [0, 0, 300, 200], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'AA AA AAA AAA'", - "rect": [0, 0, 300, 200], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'AAA AAA AAA AA'", - "rect": [0, 0, 300, 200], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'AAA AAAA AAAA'", - "rect": [0, 0, 300, 200], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'AAAAA AAAA AAAA'", - "rect": [0, 0, 300, 200], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'AAAAA AAAAA'", - "rect": [0, 0, 300, 200], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'AAAAAA AAAAA'", - "rect": [0, 0, 300, 200], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'AAAAAA AAAAAAA'", - "rect": [0, 0, 300, 200], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'A A A A A'", - "rect": [0, 0, 200, 300], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'A A A A'", - "rect": [0, 0, 200, 300], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'AA AA AA A'", - "rect": [0, 0, 200, 300], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'AA AA AA'", - "rect": [0, 0, 200, 300], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'AA AAA AAA'", - "rect": [0, 0, 200, 300], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'AAA AAA AA'", - "rect": [0, 0, 200, 300], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'AAA AAAA'", - "rect": [0, 0, 200, 300], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'AAAA AAA'", - "rect": [0, 0, 200, 300], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'AAAA AAAAA'", - "rect": [0, 0, 200, 300], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'AAAAA AAAA'", - "rect": [0, 0, 200, 300], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'AAAAA'", - "rect": [0, 0, 200, 300], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'AAAAA'", - "rect": [0, 0, 200, 300], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'AAAAAA'", - "rect": [0, 0, 200, 300], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'AAAAAA'", - "rect": [0, 0, 200, 300], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'AAAAAAA'", - "rect": [0, 0, 200, 300], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'A A A A A'", - "rect": [0, 300, 180, 20], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'A A A A A'", - "rect": [0, 300, 180, 20], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/line-flow-with-floats-1-expected.txt b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/line-flow-with-floats-1-expected.txt deleted file mode 100644 index e2798cf..0000000 --- a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/line-flow-with-floats-1-expected.txt +++ /dev/null
@@ -1,328 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet'", - "rect": [14, 520, 408, 80], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet'", - "rect": [14, 520, 408, 80], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'become of me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 520, 408, 80], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'become of me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 520, 408, 80], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 520, 408, 80], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 520, 408, 80], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 520, 408, 80], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 520, 408, 80], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'a ridge or furrow in the way wherever she wanted to send the'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'a ridge or furrow in the way wherever she wanted to send the'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'getting up and walking off to other parts of the ground, Alice'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'getting up and walking off to other parts of the ground, Alice'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog to, and, as the doubled-up soldiers were always'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog to, and, as the doubled-up soldiers were always'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'in the act of crawling away: besides all this, there was generally'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'in the act of crawling away: besides all this, there was generally'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'provoking to find that the hedgehog had unrolled itself, and was'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'provoking to find that the hedgehog had unrolled itself, and was'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'soon came to the conclusion that it was a very '", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'soon came to the conclusion that it was a very '", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and'", - "rect": [14, 180, 407, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and'", - "rect": [14, 180, 407, 79], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'could not help bursting out laughing: and when she had got its'", - "rect": [14, 180, 407, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'could not help bursting out laughing: and when she had got its'", - "rect": [14, 180, 407, 79], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'head down, and was going to '", - "rect": [14, 180, 407, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'head down, and was going to '", - "rect": [14, 180, 407, 79], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'look up in her face, with such a puzzled expression that she'", - "rect": [14, 180, 407, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'look up in her face, with such a puzzled expression that she'", - "rect": [14, 180, 407, 79], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in managing'", - "rect": [14, 80, 406, 119], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'away, comfortably enough, under her arm, with its legs'", - "rect": [14, 80, 406, 119], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'hanging down, but generally, just as she had got its'", - "rect": [14, 80, 406, 119], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog a blow with its head, it '", - "rect": [14, 80, 406, 119], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'her flamingo: she succeeded in getting its body tucked'", - "rect": [14, 80, 406, 119], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'neck nicely straightened out, and was going to give the'", - "rect": [14, 80, 406, 119], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'difficult'", - "rect": [65, 360, 356, 39], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'difficult'", - "rect": [65, 360, 356, 39], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'game indeed.'", - "rect": [65, 360, 356, 39], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'game indeed.'", - "rect": [65, 360, 356, 39], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in managing'", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'away, comfortably enough, under her arm, with its legs'", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'hanging down, but generally, just as she had got its'", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog a blow with its head, it '", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'her flamingo: she succeeded in getting its body tucked'", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'neck nicely straightened out, and was going to give the'", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'about once in a minute.'", - "rect": [14, 460, 355, 59], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'about once in a minute.'", - "rect": [14, 460, 355, 59], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'shouting \u2018Off with his head!\u2019 or \u2018Off with her head!\u2019'", - "rect": [14, 460, 355, 59], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'shouting \u2018Off with his head!\u2019 or \u2018Off with her head!\u2019'", - "rect": [14, 460, 355, 59], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'was in a furious passion, and went stamping about, and'", - "rect": [14, 460, 355, 59], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'was in a furious passion, and went stamping about, and'", - "rect": [14, 460, 355, 59], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'for the hedgehogs; and in a very short time '", - "rect": [14, 420, 355, 39], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'for the hedgehogs; and in a very short time '", - "rect": [14, 420, 355, 39], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'for turns, quarrelling all the while, and fighting'", - "rect": [14, 420, 355, 39], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'for turns, quarrelling all the while, and fighting'", - "rect": [14, 420, 355, 39], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting'", - "rect": [65, 400, 304, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting'", - "rect": [65, 400, 304, 19], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV id='pinkFloat'", - "rect": [378, 138, 70, 30], - "reason": "incremental" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [302, 440, 67, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [302, 440, 67, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [238, 180, 41, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [238, 180, 41, 19], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/line-flow-with-floats-10-expected.txt b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/line-flow-with-floats-10-expected.txt deleted file mode 100644 index eeaa1dfd..0000000 --- a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/line-flow-with-floats-10-expected.txt +++ /dev/null
@@ -1,338 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet'", - "rect": [14, 520, 408, 80], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet'", - "rect": [14, 520, 408, 80], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'become of me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 520, 408, 80], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'become of me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 520, 408, 80], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 520, 408, 80], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 520, 408, 80], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 520, 408, 80], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 520, 408, 80], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'a ridge or furrow in the way wherever she wanted to send the'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'a ridge or furrow in the way wherever she wanted to send the'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'getting up and walking off to other parts of the ground, Alice'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'getting up and walking off to other parts of the ground, Alice'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog to, and, as the doubled-up soldiers were always'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog to, and, as the doubled-up soldiers were always'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'in the act of crawling away: besides all this, there was generally'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'in the act of crawling away: besides all this, there was generally'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'provoking to find that the hedgehog had unrolled itself, and was'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'provoking to find that the hedgehog had unrolled itself, and was'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'soon came to the conclusion that it was a very '", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'soon came to the conclusion that it was a very '", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and'", - "rect": [14, 180, 407, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and'", - "rect": [14, 180, 407, 79], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'could not help bursting out laughing: and when she had got its'", - "rect": [14, 180, 407, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'could not help bursting out laughing: and when she had got its'", - "rect": [14, 180, 407, 79], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'head down, and was going to '", - "rect": [14, 180, 407, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'head down, and was going to '", - "rect": [14, 180, 407, 79], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'look up in her face, with such a puzzled expression that she'", - "rect": [14, 180, 407, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'look up in her face, with such a puzzled expression that she'", - "rect": [14, 180, 407, 79], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'difficult'", - "rect": [65, 360, 356, 39], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'difficult'", - "rect": [65, 360, 356, 39], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'game indeed.'", - "rect": [65, 360, 356, 39], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'game indeed.'", - "rect": [65, 360, 356, 39], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in managing'", - "rect": [14, 80, 355, 119], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in managing'", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'away, comfortably enough, under her arm, with its legs'", - "rect": [14, 80, 355, 119], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'away, comfortably enough, under her arm, with its legs'", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'hanging down, but generally, just as she had got its'", - "rect": [14, 80, 355, 119], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'hanging down, but generally, just as she had got its'", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog a blow with its head, it '", - "rect": [14, 80, 355, 119], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog a blow with its head, it '", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'her flamingo: she succeeded in getting its body tucked'", - "rect": [14, 80, 355, 119], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'her flamingo: she succeeded in getting its body tucked'", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'neck nicely straightened out, and was going to give the'", - "rect": [14, 80, 355, 119], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'neck nicely straightened out, and was going to give the'", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment ' was in a furious passion, and went stamping'", - "rect": [14, 460, 355, 59], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'about once in a minute.'", - "rect": [14, 460, 355, 59], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'about, and shouting \u2018Off with his head!\u2019 or \u2018Off with'", - "rect": [14, 460, 355, 59], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'her head!\u2019 about once in a minute.'", - "rect": [14, 460, 355, 59], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'shouting \u2018Off with his head!\u2019 or \u2018Off with her head!\u2019'", - "rect": [14, 460, 355, 59], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'was in a furious passion, and went stamping about, and'", - "rect": [14, 460, 355, 59], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'Queen'", - "rect": [14, 440, 355, 39], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'the'", - "rect": [14, 440, 355, 39], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'for the hedgehogs; and in a very short time '", - "rect": [14, 420, 355, 39], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'for turns, quarrelling all the while, and fighting'", - "rect": [14, 420, 355, 39], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'for the hedgehogs; and in a very short time '", - "rect": [65, 420, 304, 39], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'for turns, quarrelling all the while, and fighting'", - "rect": [65, 420, 304, 39], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting'", - "rect": [65, 400, 304, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting'", - "rect": [65, 400, 304, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [302, 440, 67, 19], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 363, 48, 65], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 374, 48, 64], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [238, 180, 41, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [238, 180, 41, 19], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/line-flow-with-floats-2-expected.txt b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/line-flow-with-floats-2-expected.txt deleted file mode 100644 index e33d485..0000000 --- a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/line-flow-with-floats-2-expected.txt +++ /dev/null
@@ -1,353 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow P", - "rect": [8, 74, 418, 526], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet'", - "rect": [14, 520, 408, 80], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'become of me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 520, 408, 80], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 520, 408, 80], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 520, 408, 80], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet'", - "rect": [14, 521, 408, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'become of me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 521, 408, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 521, 408, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 521, 408, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'a ridge or furrow in the way wherever she wanted to send the'", - "rect": [14, 241, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very'", - "rect": [14, 241, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'getting up and walking off to other parts of the ground, Alice'", - "rect": [14, 241, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog to, and, as the doubled-up soldiers were always'", - "rect": [14, 241, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'in the act of crawling away: besides all this, there was generally'", - "rect": [14, 241, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'provoking to find that the hedgehog had unrolled itself, and was'", - "rect": [14, 241, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'soon came to the conclusion that it was a very '", - "rect": [14, 241, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'a ridge or furrow in the way wherever she wanted to send the'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'getting up and walking off to other parts of the ground, Alice'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog to, and, as the doubled-up soldiers were always'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'in the act of crawling away: besides all this, there was generally'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'provoking to find that the hedgehog had unrolled itself, and was'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'soon came to the conclusion that it was a very '", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and'", - "rect": [14, 181, 407, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'could not help bursting out laughing: and when she had got its'", - "rect": [14, 181, 407, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'head down, and was going to '", - "rect": [14, 181, 407, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'look up in her face, with such a puzzled expression that she'", - "rect": [14, 181, 407, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and'", - "rect": [14, 180, 407, 79], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'could not help bursting out laughing: and when she had got its'", - "rect": [14, 180, 407, 79], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'head down, and was going to '", - "rect": [14, 180, 407, 79], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'look up in her face, with such a puzzled expression that she'", - "rect": [14, 180, 407, 79], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'difficult'", - "rect": [65, 361, 356, 39], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'game indeed.'", - "rect": [65, 361, 356, 39], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'difficult'", - "rect": [65, 360, 356, 39], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'game indeed.'", - "rect": [65, 360, 356, 39], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in managing'", - "rect": [14, 80, 355, 120], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'away, comfortably enough, under her arm, with its legs'", - "rect": [14, 80, 355, 120], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'hanging down, but generally, just as she had got its'", - "rect": [14, 80, 355, 120], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog a blow with its head, it '", - "rect": [14, 80, 355, 120], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'her flamingo: she succeeded in getting its body tucked'", - "rect": [14, 80, 355, 120], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'neck nicely straightened out, and was going to give the'", - "rect": [14, 80, 355, 120], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in managing'", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'away, comfortably enough, under her arm, with its legs'", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'hanging down, but generally, just as she had got its'", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog a blow with its head, it '", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'her flamingo: she succeeded in getting its body tucked'", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'neck nicely straightened out, and was going to give the'", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'about once in a minute.'", - "rect": [14, 461, 355, 59], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'shouting \u2018Off with his head!\u2019 or \u2018Off with her head!\u2019'", - "rect": [14, 461, 355, 59], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'was in a furious passion, and went stamping about, and'", - "rect": [14, 461, 355, 59], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'about once in a minute.'", - "rect": [14, 460, 355, 59], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'shouting \u2018Off with his head!\u2019 or \u2018Off with her head!\u2019'", - "rect": [14, 460, 355, 59], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'was in a furious passion, and went stamping about, and'", - "rect": [14, 460, 355, 59], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'for the hedgehogs; and in a very short time '", - "rect": [14, 421, 355, 39], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'for turns, quarrelling all the while, and fighting'", - "rect": [14, 421, 355, 39], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'for the hedgehogs; and in a very short time '", - "rect": [14, 420, 355, 39], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'for turns, quarrelling all the while, and fighting'", - "rect": [14, 420, 355, 39], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting'", - "rect": [65, 401, 304, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting'", - "rect": [65, 400, 304, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [302, 441, 67, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [302, 440, 67, 19], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='greenFloat'", - "rect": [372, 404, 48, 81], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='greenFloat'", - "rect": [372, 403, 48, 81], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 364, 48, 65], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 363, 48, 65], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [235, 180, 46, 20], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [238, 180, 41, 19], - "reason": "disappeared" - }, - { - "object": "VerticalScrollbar", - "rect": [485, 0, 15, 600], - "reason": "scroll control" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/line-flow-with-floats-3-expected.txt b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/line-flow-with-floats-3-expected.txt deleted file mode 100644 index ec0c4be..0000000 --- a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/line-flow-with-floats-3-expected.txt +++ /dev/null
@@ -1,343 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet'", - "rect": [14, 520, 408, 80], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet'", - "rect": [14, 520, 408, 80], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'become of me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 520, 408, 80], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'become of me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 520, 408, 80], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 520, 408, 80], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 520, 408, 80], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 520, 408, 80], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 520, 408, 80], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'a ridge or furrow in the way wherever she wanted to send the'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'a ridge or furrow in the way wherever she wanted to send the'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'getting up and walking off to other parts of the ground, Alice'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'getting up and walking off to other parts of the ground, Alice'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog to, and, as the doubled-up soldiers were always'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog to, and, as the doubled-up soldiers were always'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'in the act of crawling away: besides all this, there was generally'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'in the act of crawling away: besides all this, there was generally'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'provoking to find that the hedgehog had unrolled itself, and was'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'provoking to find that the hedgehog had unrolled itself, and was'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'soon came to the conclusion that it was a very '", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'soon came to the conclusion that it was a very '", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and'", - "rect": [14, 180, 407, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and'", - "rect": [14, 180, 407, 79], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'could not help bursting out laughing: and when she had got its'", - "rect": [14, 180, 407, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'could not help bursting out laughing: and when she had got its'", - "rect": [14, 180, 407, 79], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'head down, and was going to '", - "rect": [14, 180, 407, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'head down, and was going to '", - "rect": [14, 180, 407, 79], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'look up in her face, with such a puzzled expression that she'", - "rect": [14, 180, 407, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'look up in her face, with such a puzzled expression that she'", - "rect": [14, 180, 407, 79], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'for turns,'", - "rect": [14, 400, 406, 59], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'hedgehogs; and in a very short time '", - "rect": [14, 400, 406, 59], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'quarrelling all the while, and fighting for the'", - "rect": [14, 400, 406, 59], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'difficult'", - "rect": [65, 360, 356, 39], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'difficult'", - "rect": [65, 360, 356, 39], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'game indeed.'", - "rect": [65, 360, 356, 39], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'game indeed.'", - "rect": [65, 360, 356, 39], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in managing'", - "rect": [14, 80, 355, 119], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in managing'", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'away, comfortably enough, under her arm, with its legs'", - "rect": [14, 80, 355, 119], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'away, comfortably enough, under her arm, with its legs'", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'hanging down, but generally, just as she had got its'", - "rect": [14, 80, 355, 119], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'hanging down, but generally, just as she had got its'", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog a blow with its head, it '", - "rect": [14, 80, 355, 119], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog a blow with its head, it '", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'her flamingo: she succeeded in getting its body tucked'", - "rect": [14, 80, 355, 119], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'her flamingo: she succeeded in getting its body tucked'", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'neck nicely straightened out, and was going to give the'", - "rect": [14, 80, 355, 119], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'neck nicely straightened out, and was going to give the'", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'about once in a minute.'", - "rect": [14, 460, 355, 59], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'shouting \u2018Off with his head!\u2019 or \u2018Off with her head!\u2019'", - "rect": [14, 460, 355, 59], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'was in a furious passion, and went stamping about, and'", - "rect": [14, 460, 355, 59], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'for the hedgehogs; and in a very short time '", - "rect": [14, 420, 355, 39], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'for turns, quarrelling all the while, and fighting'", - "rect": [14, 420, 355, 39], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment ' was in'", - "rect": [14, 440, 339, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'a furious passion, and went stamping about, and'", - "rect": [14, 440, 339, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'about once in a minute.'", - "rect": [14, 440, 339, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'shouting \u2018Off with his head!\u2019 or \u2018Off with her head!\u2019'", - "rect": [14, 440, 339, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting'", - "rect": [65, 400, 304, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting '", - "rect": [65, 400, 298, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [302, 440, 67, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [242, 440, 66, 19], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='greenFloat'", - "rect": [356, 423, 64, 81], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='greenFloat'", - "rect": [372, 403, 48, 81], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [238, 180, 41, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [238, 180, 41, 19], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/line-flow-with-floats-4-expected.txt b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/line-flow-with-floats-4-expected.txt deleted file mode 100644 index 1414d30..0000000 --- a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/line-flow-with-floats-4-expected.txt +++ /dev/null
@@ -1,328 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet'", - "rect": [14, 520, 408, 80], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet'", - "rect": [14, 520, 408, 80], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'become of me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 520, 408, 80], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'become of me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 520, 408, 80], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 520, 408, 80], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 520, 408, 80], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 520, 408, 80], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 520, 408, 80], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'a ridge or furrow in the way wherever she wanted to send the'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'a ridge or furrow in the way wherever she wanted to send the'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'getting up and walking off to other parts of the ground, Alice'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'getting up and walking off to other parts of the ground, Alice'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog to, and, as the doubled-up soldiers were always'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog to, and, as the doubled-up soldiers were always'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'in the act of crawling away: besides all this, there was generally'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'in the act of crawling away: besides all this, there was generally'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'provoking to find that the hedgehog had unrolled itself, and was'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'provoking to find that the hedgehog had unrolled itself, and was'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'soon came to the conclusion that it was a very '", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'soon came to the conclusion that it was a very '", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and'", - "rect": [14, 180, 407, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and'", - "rect": [14, 180, 407, 79], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'could not help bursting out laughing: and when she had got its'", - "rect": [14, 180, 407, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'could not help bursting out laughing: and when she had got its'", - "rect": [14, 180, 407, 79], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'head down, and was going to '", - "rect": [14, 180, 407, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'head down, and was going to '", - "rect": [14, 180, 407, 79], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'look up in her face, with such a puzzled expression that she'", - "rect": [14, 180, 407, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'look up in her face, with such a puzzled expression that she'", - "rect": [14, 180, 407, 79], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'in a minute.'", - "rect": [14, 460, 407, 59], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'shouting \u2018Off with his head!\u2019 or \u2018Off with her head!\u2019 about once'", - "rect": [14, 460, 407, 59], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'was in a furious passion, and went stamping about, and'", - "rect": [14, 460, 407, 59], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'difficult'", - "rect": [65, 360, 356, 39], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'difficult'", - "rect": [65, 360, 356, 39], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'game indeed.'", - "rect": [65, 360, 356, 39], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'game indeed.'", - "rect": [65, 360, 356, 39], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in managing'", - "rect": [14, 80, 355, 119], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in managing'", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'away, comfortably enough, under her arm, with its legs'", - "rect": [14, 80, 355, 119], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'away, comfortably enough, under her arm, with its legs'", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'hanging down, but generally, just as she had got its'", - "rect": [14, 80, 355, 119], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'hanging down, but generally, just as she had got its'", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog a blow with its head, it '", - "rect": [14, 80, 355, 119], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog a blow with its head, it '", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'her flamingo: she succeeded in getting its body tucked'", - "rect": [14, 80, 355, 119], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'her flamingo: she succeeded in getting its body tucked'", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'neck nicely straightened out, and was going to give the'", - "rect": [14, 80, 355, 119], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'neck nicely straightened out, and was going to give the'", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'about once in a minute.'", - "rect": [14, 460, 355, 59], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'shouting \u2018Off with his head!\u2019 or \u2018Off with her head!\u2019'", - "rect": [14, 460, 355, 59], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'was in a furious passion, and went stamping about, and'", - "rect": [14, 460, 355, 59], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'for the hedgehogs; and in a very short time '", - "rect": [14, 420, 355, 39], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'for the hedgehogs; and in a very short time '", - "rect": [14, 420, 355, 39], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'for turns, quarrelling all the while, and fighting'", - "rect": [14, 420, 355, 39], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'for turns, quarrelling all the while, and fighting'", - "rect": [14, 420, 355, 39], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting'", - "rect": [65, 400, 304, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting'", - "rect": [65, 400, 304, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [302, 440, 67, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [302, 440, 67, 19], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='greenFloat'", - "rect": [372, 403, 48, 81], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [238, 180, 41, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [238, 180, 41, 19], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/line-flow-with-floats-5-expected.txt b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/line-flow-with-floats-5-expected.txt deleted file mode 100644 index 3fd6c5a..0000000 --- a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/line-flow-with-floats-5-expected.txt +++ /dev/null
@@ -1,338 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet'", - "rect": [14, 520, 408, 80], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet'", - "rect": [14, 520, 408, 80], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'become of me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 520, 408, 80], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'become of me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 520, 408, 80], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 520, 408, 80], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 520, 408, 80], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 520, 408, 80], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 520, 408, 80], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'a ridge or furrow in the way wherever she wanted to send the'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'a ridge or furrow in the way wherever she wanted to send the'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'getting up and walking off to other parts of the ground, Alice'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'getting up and walking off to other parts of the ground, Alice'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog to, and, as the doubled-up soldiers were always'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog to, and, as the doubled-up soldiers were always'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'in the act of crawling away: besides all this, there was generally'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'in the act of crawling away: besides all this, there was generally'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'provoking to find that the hedgehog had unrolled itself, and was'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'provoking to find that the hedgehog had unrolled itself, and was'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'soon came to the conclusion that it was a very '", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'soon came to the conclusion that it was a very '", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and'", - "rect": [14, 180, 407, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and'", - "rect": [14, 180, 407, 79], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'could not help bursting out laughing: and when she had got its'", - "rect": [14, 180, 407, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'could not help bursting out laughing: and when she had got its'", - "rect": [14, 180, 407, 79], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'head down, and was going to '", - "rect": [14, 180, 407, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'head down, and was going to '", - "rect": [14, 180, 407, 79], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'look up in her face, with such a puzzled expression that she'", - "rect": [14, 180, 407, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'look up in her face, with such a puzzled expression that she'", - "rect": [14, 180, 407, 79], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'difficult'", - "rect": [49, 360, 372, 39], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'game indeed.'", - "rect": [49, 360, 372, 39], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'for'", - "rect": [14, 400, 356, 59], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'hedgehogs; and in a very short time '", - "rect": [14, 400, 356, 59], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'turns, quarrelling all the while, and fighting for the'", - "rect": [14, 400, 356, 59], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'difficult'", - "rect": [65, 360, 356, 39], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'game indeed.'", - "rect": [65, 360, 356, 39], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in managing'", - "rect": [14, 80, 355, 119], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in managing'", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'away, comfortably enough, under her arm, with its legs'", - "rect": [14, 80, 355, 119], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'away, comfortably enough, under her arm, with its legs'", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'hanging down, but generally, just as she had got its'", - "rect": [14, 80, 355, 119], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'hanging down, but generally, just as she had got its'", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog a blow with its head, it '", - "rect": [14, 80, 355, 119], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog a blow with its head, it '", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'her flamingo: she succeeded in getting its body tucked'", - "rect": [14, 80, 355, 119], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'her flamingo: she succeeded in getting its body tucked'", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'neck nicely straightened out, and was going to give the'", - "rect": [14, 80, 355, 119], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'neck nicely straightened out, and was going to give the'", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment ' was in a'", - "rect": [14, 440, 355, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'furious passion, and went stamping about, and shouting'", - "rect": [14, 440, 355, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'in a minute.'", - "rect": [14, 440, 355, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment '\u2018Off with his head!\u2019 or \u2018Off with her head!\u2019 about once'", - "rect": [14, 440, 355, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'about once in a minute.'", - "rect": [14, 460, 355, 59], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'shouting \u2018Off with his head!\u2019 or \u2018Off with her head!\u2019'", - "rect": [14, 460, 355, 59], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'was in a furious passion, and went stamping about, and'", - "rect": [14, 460, 355, 59], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'for the hedgehogs; and in a very short time '", - "rect": [14, 420, 355, 39], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'for turns, quarrelling all the while, and fighting'", - "rect": [14, 420, 355, 39], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting'", - "rect": [65, 400, 304, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting '", - "rect": [49, 400, 302, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [302, 440, 67, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [245, 440, 67, 19], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 363, 48, 65], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [238, 180, 41, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [238, 180, 41, 19], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/line-flow-with-floats-6-expected.txt b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/line-flow-with-floats-6-expected.txt index 906c8e4..d24ce86 100644 --- a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/line-flow-with-floats-6-expected.txt +++ b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/line-flow-with-floats-6-expected.txt
@@ -5,322 +5,16 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet'", - "rect": [14, 520, 408, 80], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet'", - "rect": [14, 520, 408, 80], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'become of me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 520, 408, 80], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'become of me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 520, 408, 80], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 520, 408, 80], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 520, 408, 80], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 520, 408, 80], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 520, 408, 80], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'a ridge or furrow in the way wherever she wanted to send the'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'a ridge or furrow in the way wherever she wanted to send the'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'getting up and walking off to other parts of the ground, Alice'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'getting up and walking off to other parts of the ground, Alice'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog to, and, as the doubled-up soldiers were always'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog to, and, as the doubled-up soldiers were always'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'in the act of crawling away: besides all this, there was generally'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'in the act of crawling away: besides all this, there was generally'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'provoking to find that the hedgehog had unrolled itself, and was'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'provoking to find that the hedgehog had unrolled itself, and was'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'soon came to the conclusion that it was a very '", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'soon came to the conclusion that it was a very '", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and'", - "rect": [14, 180, 407, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and'", - "rect": [14, 180, 407, 79], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'could not help bursting out laughing: and when she had got its'", - "rect": [14, 180, 407, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'could not help bursting out laughing: and when she had got its'", - "rect": [14, 180, 407, 79], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'head down, and was going to '", - "rect": [14, 180, 407, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'head down, and was going to '", - "rect": [14, 180, 407, 79], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'look up in her face, with such a puzzled expression that she'", - "rect": [14, 180, 407, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'look up in her face, with such a puzzled expression that she'", - "rect": [14, 180, 407, 79], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'difficult'", - "rect": [65, 360, 356, 39], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'difficult'", - "rect": [65, 360, 356, 39], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'game indeed.'", - "rect": [65, 360, 356, 39], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'game indeed.'", - "rect": [65, 360, 356, 39], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in managing'", - "rect": [14, 80, 355, 119], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in managing'", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'away, comfortably enough, under her arm, with its legs'", - "rect": [14, 80, 355, 119], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'away, comfortably enough, under her arm, with its legs'", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'hanging down, but generally, just as she had got its'", - "rect": [14, 80, 355, 119], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'hanging down, but generally, just as she had got its'", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog a blow with its head, it '", - "rect": [14, 80, 355, 119], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog a blow with its head, it '", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'her flamingo: she succeeded in getting its body tucked'", - "rect": [14, 80, 355, 119], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'her flamingo: she succeeded in getting its body tucked'", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'neck nicely straightened out, and was going to give the'", - "rect": [14, 80, 355, 119], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'neck nicely straightened out, and was going to give the'", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'about once in a minute.'", - "rect": [14, 460, 355, 59], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'about once in a minute.'", - "rect": [14, 460, 355, 59], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'shouting \u2018Off with his head!\u2019 or \u2018Off with her head!\u2019'", - "rect": [14, 460, 355, 59], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'shouting \u2018Off with his head!\u2019 or \u2018Off with her head!\u2019'", - "rect": [14, 460, 355, 59], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'was in a furious passion, and went stamping about, and'", - "rect": [14, 460, 355, 59], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'was in a furious passion, and went stamping about, and'", - "rect": [14, 460, 355, 59], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'for the hedgehogs; and in a very short time '", - "rect": [14, 420, 355, 39], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'for the hedgehogs; and in a very short time '", - "rect": [14, 420, 355, 39], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'for turns, quarrelling all the while, and fighting'", - "rect": [14, 420, 355, 39], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'for turns, quarrelling all the while, and fighting'", - "rect": [14, 420, 355, 39], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting'", - "rect": [65, 400, 304, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting'", - "rect": [65, 400, 304, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [302, 440, 67, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [302, 440, 67, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [238, 180, 41, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [238, 180, 41, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'foo'", - "rect": [27, 363, 22, 20], - "reason": "appeared" - } + "invalidations": [ + [14, 520, 408, 80], + [14, 240, 407, 139], + [14, 180, 407, 79], + [65, 360, 356, 39], + [14, 80, 355, 119], + [14, 460, 355, 59], + [14, 420, 355, 39], + [65, 400, 304, 19], + [27, 363, 22, 20] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/line-flow-with-floats-7-expected.txt b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/line-flow-with-floats-7-expected.txt deleted file mode 100644 index 6547217..0000000 --- a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/line-flow-with-floats-7-expected.txt +++ /dev/null
@@ -1,323 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet'", - "rect": [14, 520, 408, 80], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet'", - "rect": [14, 520, 408, 80], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'become of me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 520, 408, 80], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'become of me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 520, 408, 80], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 520, 408, 80], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 520, 408, 80], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 520, 408, 80], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 520, 408, 80], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'a ridge or furrow in the way wherever she wanted to send the'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'a ridge or furrow in the way wherever she wanted to send the'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'getting up and walking off to other parts of the ground, Alice'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'getting up and walking off to other parts of the ground, Alice'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog to, and, as the doubled-up soldiers were always'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog to, and, as the doubled-up soldiers were always'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'in the act of crawling away: besides all this, there was generally'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'in the act of crawling away: besides all this, there was generally'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'provoking to find that the hedgehog had unrolled itself, and was'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'provoking to find that the hedgehog had unrolled itself, and was'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'soon came to the conclusion that it was a very '", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'soon came to the conclusion that it was a very '", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and'", - "rect": [14, 180, 407, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and'", - "rect": [14, 180, 407, 79], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'could not help bursting out laughing: and when she had got its'", - "rect": [14, 180, 407, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'could not help bursting out laughing: and when she had got its'", - "rect": [14, 180, 407, 79], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'head down, and was going to '", - "rect": [14, 180, 407, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'head down, and was going to '", - "rect": [14, 180, 407, 79], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'look up in her face, with such a puzzled expression that she'", - "rect": [14, 180, 407, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'look up in her face, with such a puzzled expression that she'", - "rect": [14, 180, 407, 79], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'difficult'", - "rect": [65, 360, 356, 39], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'difficult'", - "rect": [65, 360, 356, 39], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'game indeed.'", - "rect": [65, 360, 356, 39], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'game indeed.'", - "rect": [65, 360, 356, 39], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in managing'", - "rect": [14, 80, 355, 119], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in managing'", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'away, comfortably enough, under her arm, with its legs'", - "rect": [14, 80, 355, 119], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'away, comfortably enough, under her arm, with its legs'", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'hanging down, but generally, just as she had got its'", - "rect": [14, 80, 355, 119], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'hanging down, but generally, just as she had got its'", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog a blow with its head, it '", - "rect": [14, 80, 355, 119], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog a blow with its head, it '", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'her flamingo: she succeeded in getting its body tucked'", - "rect": [14, 80, 355, 119], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'her flamingo: she succeeded in getting its body tucked'", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'neck nicely straightened out, and was going to give the'", - "rect": [14, 80, 355, 119], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'neck nicely straightened out, and was going to give the'", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'about once in a minute.'", - "rect": [14, 460, 355, 59], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'about once in a minute.'", - "rect": [14, 460, 355, 59], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'shouting \u2018Off with his head!\u2019 or \u2018Off with her head!\u2019'", - "rect": [14, 460, 355, 59], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'shouting \u2018Off with his head!\u2019 or \u2018Off with her head!\u2019'", - "rect": [14, 460, 355, 59], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'was in a furious passion, and went stamping about, and'", - "rect": [14, 460, 355, 59], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'was in a furious passion, and went stamping about, and'", - "rect": [14, 460, 355, 59], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'for the hedgehogs; and in a very short time '", - "rect": [14, 420, 355, 39], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'for the hedgehogs; and in a very short time '", - "rect": [14, 420, 355, 39], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'for turns, quarrelling all the while, and fighting'", - "rect": [14, 420, 355, 39], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'for turns, quarrelling all the while, and fighting'", - "rect": [14, 420, 355, 39], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting'", - "rect": [65, 400, 304, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting'", - "rect": [65, 400, 304, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [298, 440, 71, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [302, 440, 67, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [238, 180, 41, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [238, 180, 41, 19], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/line-flow-with-floats-8-expected.txt b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/line-flow-with-floats-8-expected.txt deleted file mode 100644 index 017b15c..0000000 --- a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/line-flow-with-floats-8-expected.txt +++ /dev/null
@@ -1,338 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet'", - "rect": [14, 520, 408, 80], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet'", - "rect": [14, 520, 408, 80], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'become of me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 520, 408, 80], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'become of me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 520, 408, 80], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 520, 408, 80], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 520, 408, 80], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 520, 408, 80], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 520, 408, 80], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'a ridge or furrow in the way wherever she wanted to send the'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'a ridge or furrow in the way wherever she wanted to send the'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'getting up and walking off to other parts of the ground, Alice'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'getting up and walking off to other parts of the ground, Alice'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog to, and, as the doubled-up soldiers were always'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog to, and, as the doubled-up soldiers were always'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'in the act of crawling away: besides all this, there was generally'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'in the act of crawling away: besides all this, there was generally'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'provoking to find that the hedgehog had unrolled itself, and was'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'provoking to find that the hedgehog had unrolled itself, and was'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'soon came to the conclusion that it was a very '", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'soon came to the conclusion that it was a very '", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and'", - "rect": [14, 180, 407, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and'", - "rect": [14, 180, 407, 79], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'could not help bursting out laughing: and when she had got its'", - "rect": [14, 180, 407, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'could not help bursting out laughing: and when she had got its'", - "rect": [14, 180, 407, 79], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'head down, and was going to '", - "rect": [14, 180, 407, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'head down, and was going to '", - "rect": [14, 180, 407, 79], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'look up in her face, with such a puzzled expression that she'", - "rect": [14, 180, 407, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'look up in her face, with such a puzzled expression that she'", - "rect": [14, 180, 407, 79], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'difficult game'", - "rect": [14, 360, 407, 39], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'indeed.'", - "rect": [14, 360, 407, 39], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment ' was in a furious'", - "rect": [14, 440, 356, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'minute.'", - "rect": [14, 440, 356, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'passion, and went stamping about, and shouting \u2018Off'", - "rect": [14, 440, 356, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'with his head!\u2019 or \u2018Off with her head!\u2019 about once in a'", - "rect": [14, 440, 356, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'difficult'", - "rect": [65, 360, 356, 39], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'game indeed.'", - "rect": [65, 360, 356, 39], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in managing'", - "rect": [14, 80, 355, 119], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in managing'", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'away, comfortably enough, under her arm, with its legs'", - "rect": [14, 80, 355, 119], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'away, comfortably enough, under her arm, with its legs'", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'hanging down, but generally, just as she had got its'", - "rect": [14, 80, 355, 119], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'hanging down, but generally, just as she had got its'", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog a blow with its head, it '", - "rect": [14, 80, 355, 119], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog a blow with its head, it '", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'her flamingo: she succeeded in getting its body tucked'", - "rect": [14, 80, 355, 119], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'her flamingo: she succeeded in getting its body tucked'", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'neck nicely straightened out, and was going to give the'", - "rect": [14, 80, 355, 119], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'neck nicely straightened out, and was going to give the'", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'about once in a minute.'", - "rect": [14, 460, 355, 59], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'shouting \u2018Off with his head!\u2019 or \u2018Off with her head!\u2019'", - "rect": [14, 460, 355, 59], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'was in a furious passion, and went stamping about, and'", - "rect": [14, 460, 355, 59], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'and in a very short time '", - "rect": [14, 400, 355, 59], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'for turns,'", - "rect": [14, 400, 355, 59], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'quarrelling all the while, and fighting for the hedgehogs;'", - "rect": [14, 400, 355, 59], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'for the hedgehogs; and in a very short time '", - "rect": [14, 420, 355, 39], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'for turns, quarrelling all the while, and fighting'", - "rect": [14, 420, 355, 39], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting'", - "rect": [65, 400, 304, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting '", - "rect": [14, 400, 298, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [184, 440, 69, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [302, 440, 67, 19], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 363, 48, 65], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [238, 180, 41, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [238, 180, 41, 19], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/line-flow-with-floats-9-expected.txt b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/line-flow-with-floats-9-expected.txt deleted file mode 100644 index a988a34..0000000 --- a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/line-flow-with-floats-9-expected.txt +++ /dev/null
@@ -1,338 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet'", - "rect": [14, 520, 408, 80], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet'", - "rect": [14, 520, 408, 80], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'become of me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 520, 408, 80], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'become of me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 520, 408, 80], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 520, 408, 80], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 520, 408, 80], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 520, 408, 80], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 520, 408, 80], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'a ridge or furrow in the way wherever she wanted to send the'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'and was in the act of crawling away: besides all this,'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'getting up and walking off to other parts of the ground, Alice'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'ground, Alice soon came to the conclusion that it was a very'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog to, and, as the doubled-up soldiers were always'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'in the act of crawling away: besides all this, there was generally'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'provoking to find that the hedgehog had unrolled itself, and was'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'provoking to find that the hedgehog had unrolled itself,'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'soon came to the conclusion that it was a very '", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'there was generally a ridge or furrow in the way wherever she'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'wanted to send the hedgehog to, and, as the doubled-up soldiers'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'were always getting up and walking off to other parts of the'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and'", - "rect": [14, 180, 407, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and'", - "rect": [14, 180, 407, 79], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'could not help bursting out laughing: and when she had got its'", - "rect": [14, 180, 407, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'could not help bursting out laughing: and when she had got its'", - "rect": [14, 180, 407, 79], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'head down, and was going to '", - "rect": [14, 180, 407, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'head down, and was going to '", - "rect": [14, 180, 407, 79], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'look up in her face, with such a puzzled expression that she'", - "rect": [14, 180, 407, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'look up in her face, with such a puzzled expression that she'", - "rect": [14, 180, 407, 79], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'difficult'", - "rect": [65, 360, 356, 39], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'game indeed.'", - "rect": [65, 360, 356, 39], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in managing'", - "rect": [14, 80, 355, 119], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in managing'", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'away, comfortably enough, under her arm, with its legs'", - "rect": [14, 80, 355, 119], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'away, comfortably enough, under her arm, with its legs'", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'hanging down, but generally, just as she had got its'", - "rect": [14, 80, 355, 119], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'hanging down, but generally, just as she had got its'", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog a blow with its head, it '", - "rect": [14, 80, 355, 119], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog a blow with its head, it '", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'her flamingo: she succeeded in getting its body tucked'", - "rect": [14, 80, 355, 119], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'her flamingo: she succeeded in getting its body tucked'", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'neck nicely straightened out, and was going to give the'", - "rect": [14, 80, 355, 119], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'neck nicely straightened out, and was going to give the'", - "rect": [14, 80, 355, 119], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment ' was in a furious passion, and went stamping'", - "rect": [14, 460, 355, 59], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'about once in a minute.'", - "rect": [14, 460, 355, 59], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'about, and shouting \u2018Off with his head!\u2019 or \u2018Off with'", - "rect": [14, 460, 355, 59], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'her head!\u2019 about once in a minute.'", - "rect": [14, 460, 355, 59], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'shouting \u2018Off with his head!\u2019 or \u2018Off with her head!\u2019'", - "rect": [14, 460, 355, 59], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'was in a furious passion, and went stamping about, and'", - "rect": [14, 460, 355, 59], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'Queen'", - "rect": [14, 440, 355, 39], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'the'", - "rect": [14, 440, 355, 39], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'for the hedgehogs; and in a very short time '", - "rect": [14, 420, 355, 39], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'for turns, quarrelling all the while, and fighting'", - "rect": [14, 420, 355, 39], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'for the hedgehogs; and in a very short time '", - "rect": [65, 420, 304, 39], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'for turns, quarrelling all the while, and fighting'", - "rect": [65, 420, 304, 39], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting'", - "rect": [65, 400, 304, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting'", - "rect": [65, 400, 304, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'difficult game indeed.'", - "rect": [65, 380, 138, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [302, 440, 67, 19], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 383, 48, 65], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 363, 48, 65], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='yellowFloat'", - "rect": [372, 243, 48, 49], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [238, 180, 41, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [238, 180, 41, 19], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/lines-with-layout-delta-expected.txt b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/lines-with-layout-delta-expected.txt deleted file mode 100644 index b495143d..0000000 --- a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/lines-with-layout-delta-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'PASS'", - "rect": [8, 58, 38, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'FAIL'", - "rect": [8, 58, 35, 19], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/multi-layout-one-frame-expected.txt b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/multi-layout-one-frame-expected.txt index e47d546..154c338 100644 --- a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/multi-layout-one-frame-expected.txt +++ b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/multi-layout-one-frame-expected.txt
@@ -5,37 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment ' '", - "rect": [193, 8, 189, 22], - "reason": "chunk appeared" - }, - { - "object": "NGPhysicalTextFragment ' '", - "rect": [193, 8, 189, 22], - "reason": "chunk disappeared" - }, - { - "object": "InlineTextBox 'PASSED'", - "rect": [201, 11, 53, 16], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'PASSED'", - "rect": [12, 11, 53, 16], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'FAILED'", - "rect": [201, 11, 45, 16], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'FAILED'", - "rect": [12, 11, 45, 16], - "reason": "disappeared" - } + "invalidations": [ + [193, 8, 189, 22], + [12, 11, 53, 16] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/paint/invalidation/outline/focus-ring-on-child-move-expected.txt b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/outline/focus-ring-on-child-move-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/paint/invalidation/outline/focus-ring-on-child-move-expected.txt rename to third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/outline/focus-ring-on-child-move-expected.txt
diff --git a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/outline/outline-containing-image-in-non-standard-mode-expected.txt b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/outline/outline-containing-image-in-non-standard-mode-expected.txt deleted file mode 100644 index ac95c61..0000000 --- a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/outline/outline-containing-image-in-non-standard-mode-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalBoxFragment LayoutInline SPAN id='target'", - "rect": [6, 6, 204, 58], - "reason": "appeared" - }, - { - "object": "NGPhysicalBoxFragment LayoutInline SPAN id='target'", - "rect": [6, 6, 204, 58], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/overflow/line-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/overflow/line-overflow-expected.txt deleted file mode 100644 index c31bd2e..0000000 --- a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/overflow/line-overflow-expected.txt +++ /dev/null
@@ -1,103 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment ' eleifend'", - "rect": [8, 122, 195, 99], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'convallis.'", - "rect": [8, 122, 195, 99], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'lacus, at sagittis eros leo'", - "rect": [8, 122, 195, 99], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'pulvinar velit. Integer'", - "rect": [8, 122, 195, 99], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'sollicitudin nisi ut urna blandit'", - "rect": [8, 122, 195, 99], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment ' eleifend lacus,'", - "rect": [8, 142, 195, 79], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'at sagittis eros leo pulvinar'", - "rect": [8, 142, 195, 79], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'urna blandit convallis.'", - "rect": [8, 142, 195, 79], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'velit. Integer sollicitudin nisi ut'", - "rect": [8, 142, 195, 79], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'Cras faucibus. Nunc'", - "rect": [8, 82, 192, 59], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'Cras faucibus. Nunc'", - "rect": [8, 82, 192, 59], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'adipiscing, enim in scelerisque'", - "rect": [8, 82, 192, 59], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'adipiscing, enim in scelerisque'", - "rect": [8, 82, 192, 59], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'convallis, augue '", - "rect": [8, 82, 192, 59], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'convallis, augue'", - "rect": [8, 82, 192, 59], - "reason": "disappeared" - }, - { - "object": "NGPhysicalBoxFragment LayoutInline SPAN id='t'", - "rect": [114, 92, 35, 49], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'purus'", - "rect": [114, 122, 35, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'purus'", - "rect": [38, 142, 35, 19], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/position/absolute-display-block-to-none-expected.txt b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/position/absolute-display-block-to-none-expected.txt deleted file mode 100644 index b97d4b2..0000000 --- a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/position/absolute-display-block-to-none-expected.txt +++ /dev/null
@@ -1,28 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'When an absolute positioned element is set display:none, we should not invalidate the whole body.'", - "rect": [8, 8, 621, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'When an absolute positioned element is set display:none, we should not invalidate the whole body.'", - "rect": [8, 8, 621, 19], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='absolute'", - "rect": [100, 100, 100, 100], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/position/absolute-position-moved-expected.txt b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/position/absolute-position-moved-expected.txt index f58c9a0..cdfb1ba 100644 --- a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/position/absolute-position-moved-expected.txt +++ b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/position/absolute-position-moved-expected.txt
@@ -5,12 +5,8 @@ "bounds": [785, 2016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='absoluteDiv' class='absolute green'", - "rect": [100, 100, 100, 100], - "reason": "appeared" - } + "invalidations": [ + [100, 100, 100, 100] ] }, { @@ -18,12 +14,8 @@ "bounds": [100, 100], "contentsOpaque": true, "backgroundColor": "#FF0000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='absoluteDiv' class='absolute green'", - "rect": [100, 100, 100, 100], - "reason": "chunk disappeared" - } + "invalidations": [ + [100, 100, 100, 100] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/position/block-layout-inline-children-float-positioned-expected.txt b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/position/block-layout-inline-children-float-positioned-expected.txt index c5414b9..1cbf9a67 100644 --- a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/position/block-layout-inline-children-float-positioned-expected.txt +++ b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/position/block-layout-inline-children-float-positioned-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'the quick brown fox jumped over the lazy dog'", - "rect": [309, 37, 292, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'the quick brown fox jumped over the lazy dog'", - "rect": [155, 37, 292, 19], - "reason": "appeared" - } + "invalidations": [ + [309, 37, 292, 19], + [155, 37, 292, 19] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/position/inline-relative-positioned-expected.txt b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/position/inline-relative-positioned-expected.txt deleted file mode 100644 index 05b18e2..0000000 --- a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/position/inline-relative-positioned-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'a'", - "rect": [8, 88, 100, 100], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'p'", - "rect": [8, 88, 100, 100], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/position/layout-state-relative-expected.txt b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/position/layout-state-relative-expected.txt deleted file mode 100644 index 4feec47..0000000 --- a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/position/layout-state-relative-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'PASS'", - "rect": [8, 152, 38, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'FAIL'", - "rect": [8, 152, 35, 19], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/position/positioned-document-element-expected.txt b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/position/positioned-document-element-expected.txt deleted file mode 100644 index 27b35347..0000000 --- a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/position/positioned-document-element-expected.txt +++ /dev/null
@@ -1,28 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 800, 600], - "reason": "background" - }, - { - "object": "NGPhysicalTextFragment 'Tests that the entire viewport is painted with a floated html element.'", - "rect": [108, 116, 424, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'Tests that the entire viewport is painted with a floated html element.'", - "rect": [8, 16, 424, 19], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/quotes-expected.txt b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/quotes-expected.txt deleted file mode 100644 index 02a24489..0000000 --- a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/quotes-expected.txt +++ /dev/null
@@ -1,43 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'quote 2'", - "rect": [17, 28, 47, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'quote 2'", - "rect": [16, 28, 47, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment '\u003E'", - "rect": [64, 28, 9, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment '\u003C'", - "rect": [8, 28, 9, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment '}'", - "rect": [63, 28, 8, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment '{'", - "rect": [8, 28, 8, 19], - "reason": "appeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/reflection/reflection-with-rotation-expected.txt b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/reflection/reflection-with-rotation-expected.txt deleted file mode 100644 index 5d793d7..0000000 --- a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/reflection/reflection-with-rotation-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'PASS'", - "rect": [23, 51, 72, 110], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'FAIL'", - "rect": [23, 51, 69, 109], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/remove-inline-after-layout-expected.txt b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/remove-inline-after-layout-expected.txt deleted file mode 100644 index e1418c3c..0000000 --- a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/remove-inline-after-layout-expected.txt +++ /dev/null
@@ -1,38 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'This span should disappear. '", - "rect": [112, 193, 178, 19], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [290, 108, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [112, 108, 100, 100], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' '", - "rect": [108, 193, 4, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment ' '", - "rect": [108, 193, 4, 19], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/remove-inline-layer-after-layout-expected.txt b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/remove-inline-layer-after-layout-expected.txt deleted file mode 100644 index 5fad129..0000000 --- a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/remove-inline-layer-after-layout-expected.txt +++ /dev/null
@@ -1,38 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutInline SPAN id='target'", - "rect": [112, 193, 178, 19], - "reason": "chunk disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [290, 108, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [112, 108, 100, 100], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' '", - "rect": [108, 193, 4, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment ' '", - "rect": [108, 193, 4, 19], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/scroll/layout-state-scrolloffset-expected.txt b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/scroll/layout-state-scrolloffset-expected.txt deleted file mode 100644 index f6d8f13..0000000 --- a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/scroll/layout-state-scrolloffset-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'before'", - "rect": [100, 120, 40, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'after'", - "rect": [100, 120, 29, 19], - "reason": "appeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/scroll/layout-state-scrolloffset2-expected.txt b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/scroll/layout-state-scrolloffset2-expected.txt deleted file mode 100644 index d49cc8c..0000000 --- a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/scroll/layout-state-scrolloffset2-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'before'", - "rect": [102, 122, 40, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'after'", - "rect": [102, 122, 29, 19], - "reason": "appeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/scroll/layout-state-scrolloffset3-expected.txt b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/scroll/layout-state-scrolloffset3-expected.txt deleted file mode 100644 index dd8a76d..0000000 --- a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/scroll/layout-state-scrolloffset3-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'before'", - "rect": [100, 120, 34, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'after'", - "rect": [100, 120, 29, 19], - "reason": "appeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/scroll/line-in-scrolled-clipped-block-expected.txt b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/scroll/line-in-scrolled-clipped-block-expected.txt deleted file mode 100644 index 2f9e0a28..0000000 --- a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/scroll/line-in-scrolled-clipped-block-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment ' FAIL .'", - "rect": [8, 8, 100, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment ' PASS .'", - "rect": [8, 8, 100, 19], - "reason": "appeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/scroll/overflow-scroll-body-appear-expected.txt b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/scroll/overflow-scroll-body-appear-expected.txt deleted file mode 100644 index 94b2c20..0000000 --- a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/scroll/overflow-scroll-body-appear-expected.txt +++ /dev/null
@@ -1,82 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [2008, 2096], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 2008, 2096], - "reason": "background" - }, - { - "object": "NGPhysicalTextFragment 'Bug 36461 - No vertical scrollbar after the CSS class change'", - "rect": [124, 52, 383, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'Bug 36461 - No vertical scrollbar after the CSS class change'", - "rect": [124, 52, 383, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'You should see both vertical and horizontal scrollbars.'", - "rect": [8, 16, 340, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'You should see both vertical and horizontal scrollbars.'", - "rect": [8, 16, 340, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'This is the test for '", - "rect": [8, 52, 116, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'This is the test for '", - "rect": [8, 52, 116, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment '.'", - "rect": [507, 52, 4, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment '.'", - "rect": [507, 52, 4, 19], - "reason": "disappeared" - } - ] - }, - { - "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], - "paintInvalidations": [ - { - "object": "Scroll Corner Layer", - "rect": [0, 0, 15, 15], - "reason": "full layer" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/scroll/overflow-scroll-delete-expected.txt b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/scroll/overflow-scroll-delete-expected.txt deleted file mode 100644 index ecec59f..0000000 --- a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/scroll/overflow-scroll-delete-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Passed'", - "rect": [8, 136, 43, 17], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'Failed'", - "rect": [8, 136, 39, 17], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/scroll/scrolled-iframe-scrollbar-change-expected.txt b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/scroll/scrolled-iframe-scrollbar-change-expected.txt deleted file mode 100644 index 844c04ab..0000000 --- a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/scroll/scrolled-iframe-scrollbar-change-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [804, 604], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='overlay'", - "rect": [2, 2, 800, 600], - "reason": "chunk appeared" - }, - { - "object": "VerticalScrollbar", - "rect": [787, 2, 15, 600], - "reason": "chunk disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='container'", - "rect": [779, 2, 15, 592], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow HTML", - "rect": [779, 2, 15, 592], - "reason": "incremental" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/selection/selection-clear-expected.txt b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/selection/selection-clear-expected.txt index 237b783..3df65789 100644 --- a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/selection/selection-clear-expected.txt +++ b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/selection/selection-clear-expected.txt
@@ -5,27 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='firstLine'", - "rect": [8, 108, 100, 100], - "reason": "incremental" - }, - { - "object": "NGPhysicalTextFragment 'FAIL: Test did'", - "rect": [8, 8, 97, 200], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'not run'", - "rect": [8, 8, 97, 200], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [8, 8, 8, 100], - "reason": "appeared" - } + "invalidations": [ + [8, 108, 100, 100], + [8, 8, 97, 200] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.txt b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.txt deleted file mode 100644 index 43f14fe..0000000 --- a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/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": "NGPhysicalTextFragment 'pservers-pattern-01-b \u2190'", - "rect": [208, 972, 173, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'pservers-pattern-01-b \u2190'", - "rect": [208, 972, 173, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment '\u2192 script-handle-01-b'", - "rect": [427, 972, 150, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment '\u2192 script-handle-01-b'", - "rect": [427, 972, 150, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalBoxFragment LayoutInline A", - "rect": [381, 969, 46, 25], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'index'", - "rect": [384, 972, 40, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'index'", - "rect": [384, 972, 40, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment ' '", - "rect": [423, 972, 5, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment ' '", - "rect": [423, 972, 5, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment ' '", - "rect": [380, 972, 5, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment ' '", - "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/layout-ng-fragment-item/paint/invalidation/svg/svg-background-partial-redraw-expected.txt b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/svg/svg-background-partial-redraw-expected.txt index 390e8ad..6f4ea4d9 100644 --- a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/svg/svg-background-partial-redraw-expected.txt +++ b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/svg/svg-background-partial-redraw-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='revealer'", - "rect": [9, 153, 200, 100], - "reason": "disappeared" - } + "invalidations": [ + [9, 153, 200, 100] ] } ]
diff --git a/third_party/blink/web_tests/flag-specific/paint/invalidation/svg/transform-focus-ring-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/svg/transform-focus-ring-repaint-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/paint/invalidation/svg/transform-focus-ring-repaint-expected.txt rename to third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/svg/transform-focus-ring-repaint-expected.txt
diff --git a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/table/cached-change-cell-sl-border-color-expected.txt b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/table/cached-change-cell-sl-border-color-expected.txt deleted file mode 100644 index 6b17fe0..0000000 --- a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/table/cached-change-cell-sl-border-color-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR", - "rect": [8, 8, 114, 54], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'A'", - "rect": [90, 30, 12, 19], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/table/resize-table-repaint-percent-size-cell-expected.txt b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/table/resize-table-repaint-percent-size-cell-expected.txt deleted file mode 100644 index cf7eb46..0000000 --- a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/table/resize-table-repaint-percent-size-cell-expected.txt +++ /dev/null
@@ -1,48 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR", - "rect": [0, 52, 106, 238], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [0, 292, 106, 236], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [0, 102, 106, 46], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'ROW2'", - "rect": [3, 400, 46, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'ROW1'", - "rect": [3, 161, 46, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'ROW2'", - "rect": [3, 115, 46, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'ROW1'", - "rect": [3, 66, 46, 19], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/table/resize-table-repaint-vertical-align-cell-expected.txt b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/table/resize-table-repaint-vertical-align-cell-expected.txt deleted file mode 100644 index ca6be98..0000000 --- a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/table/resize-table-repaint-vertical-align-cell-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'MIDDLE'", - "rect": [3, 280, 63, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'MIDDLE'", - "rect": [3, 90, 63, 19], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/table/resize-table-row-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/table/resize-table-row-repaint-expected.txt deleted file mode 100644 index 855ec598..0000000 --- a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/table/resize-table-row-repaint-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'MIDDLE'", - "rect": [3, 192, 63, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'MIDDLE'", - "rect": [3, 142, 63, 19], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/table/table-collapsed-border-expected.txt b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/table/table-collapsed-border-expected.txt deleted file mode 100644 index b28a5e9db..0000000 --- a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/table/table-collapsed-border-expected.txt +++ /dev/null
@@ -1,138 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR id='r2'", - "rect": [8, 224, 108, 22], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 338, 99, 30], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 286, 99, 30], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 154, 99, 30], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 102, 99, 30], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 316, 99, 22], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR id='r'", - "rect": [8, 132, 99, 22], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 62, 95, 30], - "reason": "style change" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 10, 95, 30], - "reason": "style change" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 40, 95, 22], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'ipsum dolor'", - "rect": [23, 317, 76, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'ipsum dolor'", - "rect": [23, 133, 76, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'sit amet'", - "rect": [23, 339, 49, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'sit amet'", - "rect": [23, 339, 49, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'sit amet'", - "rect": [23, 155, 49, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'sit amet'", - "rect": [23, 155, 49, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'Lorem'", - "rect": [23, 295, 43, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'Lorem'", - "rect": [23, 295, 43, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'Lorem'", - "rect": [23, 111, 43, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'Lorem'", - "rect": [23, 111, 43, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'dolor'", - "rect": [23, 225, 34, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [17, 225, 4, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [17, 225, 4, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [17, 133, 4, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [17, 133, 4, 19], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/text-append-dirty-lines-expected.txt b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/text-append-dirty-lines-expected.txt deleted file mode 100644 index 4148c20..0000000 --- a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/text-append-dirty-lines-expected.txt +++ /dev/null
@@ -1,83 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Curabitur a velit'", - "rect": [8, 44, 756, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'Curabitur a velit.'", - "rect": [8, 44, 756, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse placerat. Morbi tristique. Mauris eu lacus sed felis'", - "rect": [8, 44, 756, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse placerat. Morbi tristique. Mauris eu lacus sed felis'", - "rect": [8, 44, 756, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'fermentum ut, tortor. Sed rhoncus. Quisque enim metus, luctus tincidunt, vestibulum eu, vestibulum eu, libero. Mauris'", - "rect": [8, 44, 756, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'fermentum ut, tortor. Sed rhoncus. Quisque enim metus, luctus tincidunt, vestibulum eu, vestibulum eu, libero. Mauris'", - "rect": [8, 44, 756, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'feugiat molestie, mi lorem bibendum leo, ac gravida orci nunc nec nulla. Nunc nunc lorem, rhoncus et, rutrum ac,'", - "rect": [8, 44, 756, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'feugiat molestie, mi lorem bibendum leo, ac gravida orci nunc nec nulla. Nunc nunc lorem, rhoncus et, rutrum ac,'", - "rect": [8, 44, 756, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'laoreet feugiat. Phasellus mollis pulvinar mi. Etiam ut neque sed eros egestas laoreet. Vestibulum ullamcorper, nulla non'", - "rect": [8, 44, 756, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'laoreet feugiat. Phasellus mollis pulvinar mi. Etiam ut neque sed eros egestas laoreet. Vestibulum ullamcorper, nulla non'", - "rect": [8, 44, 756, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'pellentesque cursus. Proin vitae nulla. Vivamus in ipsum. Etiam mi. Nam malesuada purus in sem. Sed eget elit vel erat'", - "rect": [8, 44, 756, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'pellentesque cursus. Proin vitae nulla. Vivamus in ipsum. Etiam mi. Nam malesuada purus in sem. Sed eget elit vel erat'", - "rect": [8, 44, 756, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'sagittis aliquam nunc. Nullam pharetra molestie eros. Donec tempus purus ut ligula. Phasellus non nisl. Etiam eu mauris.'", - "rect": [8, 44, 756, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'sagittis aliquam nunc. Nullam pharetra molestie eros. Donec tempus purus ut ligula. Phasellus non nisl. Etiam eu mauris.'", - "rect": [8, 44, 756, 139], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/transform/transform-layout-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/transform/transform-layout-repaint-expected.txt deleted file mode 100644 index 0a6c0de..0000000 --- a/third_party/blink/web_tests/flag-specific/layout-ng-fragment-item/paint/invalidation/transform/transform-layout-repaint-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'PASS'", - "rect": [52, 51, 43, 32], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'FAIL'", - "rect": [52, 51, 40, 31], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/http/tests/csspaint/resources/test-runner-invalidation-logging.js b/third_party/blink/web_tests/http/tests/csspaint/resources/test-runner-invalidation-logging.js index cea64138..4558987a 100644 --- a/third_party/blink/web_tests/http/tests/csspaint/resources/test-runner-invalidation-logging.js +++ b/third_party/blink/web_tests/http/tests/csspaint/resources/test-runner-invalidation-logging.js
@@ -76,24 +76,19 @@ runAfterLayoutAndPaint(function() { // Check that the we got the correct paint invalidation. if (window.internals) { - const layers = JSON.parse(internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS)); + const layers = JSON.parse(internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_INVALIDATIONS)); // Collect paint invalidations from all layers. - var paintInvalidations = []; - for (var layer_index in layers['layers']) { - var layer = layers['layers'][layer_index]; - if (layer['paintInvalidations']) { - for (var invalidation_index in layer['paintInvalidations']) - paintInvalidations.push(layer['paintInvalidations'][invalidation_index]); - } - } - var hasNoInvalidations = paintInvalidations.length === 0; + var invalidations = []; + layers.layers.forEach(layer => { + if (layer.invalidations) + invalidations.push.apply(invalidations, layer.invalidations); + }); + var hasNoInvalidations = invalidations.length === 0; assert_equals(hasNoInvalidations, !!test.noInvalidation); if (!hasNoInvalidations) { - assert_equals(paintInvalidations.length, 1, 'There should be only one paint invalidation.'); - assert_array_equals( - paintInvalidations[0]['rect'], - [rect.left, rect.top, rect.width, rect.height], - 'The paint invalidation should cover the entire element.'); + assert_equals(invalidations.length, 1, 'There should be only one invalidation.'); + assert_array_equals(invalidations[0], [rect.left, rect.top, rect.width, rect.height], + 'The paint invalidation should cover the entire element.'); } internals.stopTrackingRepaints(document); }
diff --git a/third_party/blink/web_tests/paint/float/float-under-inline-self-painting-change-expected.txt b/third_party/blink/web_tests/paint/float/float-under-inline-self-painting-change-expected.txt index 28b43da..107c763 100644 --- a/third_party/blink/web_tests/paint/float/float-under-inline-self-painting-change-expected.txt +++ b/third_party/blink/web_tests/paint/float/float-under-inline-self-painting-change-expected.txt
@@ -5,32 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTextControl (floating) TEXTAREA id='target'", - "rect": [8, 8, 306, 306], - "reason": "appeared" - }, - { - "object": "LayoutTextControl (floating) TEXTAREA id='target'", - "rect": [8, 8, 306, 306], - "reason": "chunk disappeared" - }, - { - "object": "LayoutTextControl (floating) TEXTAREA id='target'", - "rect": [11, 10, 285, 303], - "reason": "chunk disappeared" - }, - { - "object": "VerticalScrollbar", - "rect": [298, 9, 15, 304], - "reason": "chunk disappeared" - }, - { - "object": "LayoutTextControl (floating) TEXTAREA id='target'", - "rect": [298, 298, 15, 15], - "reason": "chunk appeared" - } + "invalidations": [ + [8, 8, 306, 306] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/background/background-currentColor-repaint-expected.txt b/third_party/blink/web_tests/paint/invalidation/background/background-currentColor-repaint-expected.txt index ca921b08..f2bf3a8b 100644 --- a/third_party/blink/web_tests/paint/invalidation/background/background-currentColor-repaint-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/background/background-currentColor-repaint-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='div2'", - "rect": [8, 108, 100, 100], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='div1'", - "rect": [8, 8, 100, 100], - "reason": "disappeared" - } + "invalidations": [ + [8, 108, 100, 100], + [8, 8, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/background/background-generated-expected.txt b/third_party/blink/web_tests/paint/invalidation/background/background-generated-expected.txt index c9a935a..9da9649 100644 --- a/third_party/blink/web_tests/paint/invalidation/background/background-generated-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/background/background-generated-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [8, 8, 100, 300], - "reason": "background" - } + "invalidations": [ + [8, 8, 100, 300] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/background/background-image-paint-invalidation-expected.txt b/third_party/blink/web_tests/paint/invalidation/background/background-image-paint-invalidation-expected.txt index 35a1213d..abe5fd0c 100644 --- a/third_party/blink/web_tests/paint/invalidation/background/background-image-paint-invalidation-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/background/background-image-paint-invalidation-expected.txt
@@ -5,12 +5,8 @@ "bounds": [808, 2016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 808, 2016], - "reason": "background" - } + "invalidations": [ + [0, 0, 808, 2016] ] }, {
diff --git a/third_party/blink/web_tests/paint/invalidation/background/background-misaligned-expected.txt b/third_party/blink/web_tests/paint/invalidation/background/background-misaligned-expected.txt index 3ffdf71b..896989e 100644 --- a/third_party/blink/web_tests/paint/invalidation/background/background-misaligned-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/background/background-misaligned-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV", - "rect": [8, 8, 273, 276], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV", - "rect": [8, 8, 273, 276], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target'", - "rect": [238, 241, 40, 40], - "reason": "disappeared" - } + "invalidations": [ + [8, 8, 273, 276] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/background/background-resize-height-expected.txt b/third_party/blink/web_tests/paint/invalidation/background/background-resize-height-expected.txt index b75a93d..1adeacd 100644 --- a/third_party/blink/web_tests/paint/invalidation/background/background-resize-height-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/background/background-resize-height-expected.txt
@@ -11,12 +11,8 @@ "bounds": [60, 44], "contentsOpaque": true, "backfaceVisibility": "hidden", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='test image'", - "rect": [0, 40, 60, 4], - "reason": "incremental" - } + "invalidations": [ + [0, 40, 60, 4] ], "transform": 1 }, @@ -25,12 +21,8 @@ "bounds": [60, 44], "contentsOpaque": true, "backfaceVisibility": "hidden", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='test image size-cover'", - "rect": [0, 0, 60, 44], - "reason": "background" - } + "invalidations": [ + [0, 0, 60, 44] ], "transform": 2 }, @@ -39,12 +31,8 @@ "bounds": [60, 44], "contentsOpaque": true, "backfaceVisibility": "hidden", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='test image size-contain'", - "rect": [0, 0, 60, 44], - "reason": "background" - } + "invalidations": [ + [0, 0, 60, 44] ], "transform": 3 }, @@ -53,12 +41,8 @@ "bounds": [60, 44], "contentsOpaque": true, "backfaceVisibility": "hidden", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='test image fixed-height'", - "rect": [0, 40, 60, 4], - "reason": "incremental" - } + "invalidations": [ + [0, 40, 60, 4] ], "transform": 4 }, @@ -67,12 +51,8 @@ "bounds": [60, 44], "contentsOpaque": true, "backfaceVisibility": "hidden", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='test image percent-height'", - "rect": [0, 0, 60, 44], - "reason": "background" - } + "invalidations": [ + [0, 0, 60, 44] ], "transform": 5 }, @@ -81,12 +61,8 @@ "bounds": [60, 44], "contentsOpaque": true, "backfaceVisibility": "hidden", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='test image top'", - "rect": [0, 40, 60, 4], - "reason": "incremental" - } + "invalidations": [ + [0, 40, 60, 4] ], "transform": 6 }, @@ -95,12 +71,8 @@ "bounds": [60, 44], "contentsOpaque": true, "backfaceVisibility": "hidden", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='test image bottom'", - "rect": [0, 0, 60, 44], - "reason": "background" - } + "invalidations": [ + [0, 0, 60, 44] ], "transform": 7 }, @@ -109,12 +81,8 @@ "bounds": [60, 44], "contentsOpaque": true, "backfaceVisibility": "hidden", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='test image center'", - "rect": [0, 0, 60, 44], - "reason": "background" - } + "invalidations": [ + [0, 0, 60, 44] ], "transform": 8 }, @@ -122,12 +90,8 @@ "name": "LayoutNGBlockFlow (positioned) DIV class='test image no-repeat'", "bounds": [60, 44], "backfaceVisibility": "hidden", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='test image no-repeat'", - "rect": [0, 40, 60, 4], - "reason": "incremental" - } + "invalidations": [ + [0, 40, 60, 4] ], "transform": 9 }, @@ -135,12 +99,8 @@ "name": "LayoutNGBlockFlow (positioned) DIV class='test image repeat-space'", "bounds": [60, 44], "backfaceVisibility": "hidden", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='test image repeat-space'", - "rect": [0, 0, 60, 44], - "reason": "background" - } + "invalidations": [ + [0, 0, 60, 44] ], "transform": 10 }, @@ -149,12 +109,8 @@ "bounds": [60, 44], "contentsOpaque": true, "backfaceVisibility": "hidden", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='test image repeat-round'", - "rect": [0, 0, 60, 44], - "reason": "background" - } + "invalidations": [ + [0, 0, 60, 44] ], "transform": 11 }, @@ -163,12 +119,8 @@ "bounds": [60, 44], "contentsOpaque": true, "backfaceVisibility": "hidden", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='test generated'", - "rect": [0, 0, 60, 44], - "reason": "background" - } + "invalidations": [ + [0, 0, 60, 44] ], "transform": 12 }, @@ -177,12 +129,8 @@ "bounds": [60, 44], "contentsOpaque": true, "backfaceVisibility": "hidden", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='test generated size-cover'", - "rect": [0, 0, 60, 44], - "reason": "background" - } + "invalidations": [ + [0, 0, 60, 44] ], "transform": 13 }, @@ -191,12 +139,8 @@ "bounds": [60, 44], "contentsOpaque": true, "backfaceVisibility": "hidden", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='test generated size-contain'", - "rect": [0, 0, 60, 44], - "reason": "background" - } + "invalidations": [ + [0, 0, 60, 44] ], "transform": 14 }, @@ -205,12 +149,8 @@ "bounds": [60, 44], "contentsOpaque": true, "backfaceVisibility": "hidden", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='test generated percent-height'", - "rect": [0, 0, 60, 44], - "reason": "background" - } + "invalidations": [ + [0, 0, 60, 44] ], "transform": 15 }, @@ -219,12 +159,8 @@ "bounds": [60, 44], "contentsOpaque": true, "backfaceVisibility": "hidden", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='test generated top'", - "rect": [0, 0, 60, 44], - "reason": "background" - } + "invalidations": [ + [0, 0, 60, 44] ], "transform": 16 }, @@ -233,12 +169,8 @@ "bounds": [60, 44], "contentsOpaque": true, "backfaceVisibility": "hidden", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='test generated bottom'", - "rect": [0, 0, 60, 44], - "reason": "background" - } + "invalidations": [ + [0, 0, 60, 44] ], "transform": 17 }, @@ -247,12 +179,8 @@ "bounds": [60, 44], "contentsOpaque": true, "backfaceVisibility": "hidden", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='test generated center'", - "rect": [0, 0, 60, 44], - "reason": "background" - } + "invalidations": [ + [0, 0, 60, 44] ], "transform": 18 }, @@ -260,12 +188,8 @@ "name": "LayoutNGBlockFlow (positioned) DIV class='test generated no-repeat'", "bounds": [60, 44], "backfaceVisibility": "hidden", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='test generated no-repeat'", - "rect": [0, 0, 60, 44], - "reason": "background" - } + "invalidations": [ + [0, 0, 60, 44] ], "transform": 19 }, @@ -273,12 +197,8 @@ "name": "LayoutNGBlockFlow (positioned) DIV class='test generated repeat-space'", "bounds": [60, 44], "backfaceVisibility": "hidden", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='test generated repeat-space'", - "rect": [0, 0, 60, 44], - "reason": "background" - } + "invalidations": [ + [0, 0, 60, 44] ], "transform": 20 }, @@ -287,12 +207,8 @@ "bounds": [60, 44], "contentsOpaque": true, "backfaceVisibility": "hidden", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='test generated repeat-round'", - "rect": [0, 0, 60, 44], - "reason": "background" - } + "invalidations": [ + [0, 0, 60, 44] ], "transform": 21 }
diff --git a/third_party/blink/web_tests/paint/invalidation/background/background-shorthand-with-gradient-and-height-changes-expected.txt b/third_party/blink/web_tests/paint/invalidation/background/background-shorthand-with-gradient-and-height-changes-expected.txt index 6828962..0e98e6f 100644 --- a/third_party/blink/web_tests/paint/invalidation/background/background-shorthand-with-gradient-and-height-changes-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/background/background-shorthand-with-gradient-and-height-changes-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='outer'", - "rect": [8, 8, 784, 500], - "reason": "background" - } + "invalidations": [ + [8, 8, 784, 500] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/background/background-size-auto-with-gradient-and-height-changes-expected.txt b/third_party/blink/web_tests/paint/invalidation/background/background-size-auto-with-gradient-and-height-changes-expected.txt index 6828962..0e98e6f 100644 --- a/third_party/blink/web_tests/paint/invalidation/background/background-size-auto-with-gradient-and-height-changes-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/background/background-size-auto-with-gradient-and-height-changes-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='outer'", - "rect": [8, 8, 784, 500], - "reason": "background" - } + "invalidations": [ + [8, 8, 784, 500] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/background/composited-background-on-both-layers-expected.txt b/third_party/blink/web_tests/paint/invalidation/background/composited-background-on-both-layers-expected.txt index 1e780d6..d45d7c4 100644 --- a/third_party/blink/web_tests/paint/invalidation/background/composited-background-on-both-layers-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/background/composited-background-on-both-layers-expected.txt
@@ -11,12 +11,8 @@ "bounds": [240, 240], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [0, 0, 240, 240], - "reason": "background" - } + "invalidations": [ + [0, 0, 240, 240] ], "transform": 1 }, @@ -26,12 +22,8 @@ "bounds": [185, 3000], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutNGBlockFlow DIV id='target'", - "rect": [0, 0, 185, 3000], - "reason": "background" - } + "invalidations": [ + [0, 0, 185, 3000] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/paint/invalidation/background/full-viewport-repaint-for-background-attachment-fixed-expected.txt b/third_party/blink/web_tests/paint/invalidation/background/full-viewport-repaint-for-background-attachment-fixed-expected.txt index e224e0c..d3701d8 100644 --- a/third_party/blink/web_tests/paint/invalidation/background/full-viewport-repaint-for-background-attachment-fixed-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/background/full-viewport-repaint-for-background-attachment-fixed-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 5016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 800, 5016], - "reason": "background" - } + "invalidations": [ + [0, 0, 800, 5016] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/paint/invalidation/background/obscured-background-no-repaint.html b/third_party/blink/web_tests/paint/invalidation/background/obscured-background-no-repaint.html index 399fd65..81392ef 100644 --- a/third_party/blink/web_tests/paint/invalidation/background/obscured-background-no-repaint.html +++ b/third_party/blink/web_tests/paint/invalidation/background/obscured-background-no-repaint.html
@@ -51,11 +51,11 @@ } function finish() { - var layerTree = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS); + var layerTree = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_DETAILED_INVALIDATIONS); var invalidatedObjects = {}; for (var layer of JSON.parse(layerTree).layers) { - if (layer.paintInvalidations) { - for (var invalidation of layer.paintInvalidations) + if (layer.invalidations) { + for (var invalidation of layer.invalidations) invalidatedObjects[invalidation.object] = true; } }
diff --git a/third_party/blink/web_tests/paint/invalidation/background/viewport-gradient-background-html-move-overflow-expected.txt b/third_party/blink/web_tests/paint/invalidation/background/viewport-gradient-background-html-move-overflow-expected.txt index 4b57c02..196c637 100644 --- a/third_party/blink/web_tests/paint/invalidation/background/viewport-gradient-background-html-move-overflow-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/background/viewport-gradient-background-html-move-overflow-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 800, 600], - "reason": "background" - }, - { - "object": "LayoutNGBlockFlow HTML", - "rect": [0, 0, 800, 170], - "reason": "style change" - } + "invalidations": [ + [0, 0, 800, 600] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/background/viewport-gradient-background-html-resize-expected.txt b/third_party/blink/web_tests/paint/invalidation/background/viewport-gradient-background-html-resize-expected.txt index 9069ee1..196c637 100644 --- a/third_party/blink/web_tests/paint/invalidation/background/viewport-gradient-background-html-resize-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/background/viewport-gradient-background-html-resize-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 800, 600], - "reason": "background" - } + "invalidations": [ + [0, 0, 800, 600] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/background/viewport-gradient-background-html-resize-overflow-expected.txt b/third_party/blink/web_tests/paint/invalidation/background/viewport-gradient-background-html-resize-overflow-expected.txt index c7ecabb..196c637 100644 --- a/third_party/blink/web_tests/paint/invalidation/background/viewport-gradient-background-html-resize-overflow-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/background/viewport-gradient-background-html-resize-overflow-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 800, 600], - "reason": "background" - }, - { - "object": "LayoutNGBlockFlow HTML", - "rect": [0, 0, 800, 200], - "reason": "disappeared" - } + "invalidations": [ + [0, 0, 800, 600] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/block-layout-inline-children-replaced-expected.txt b/third_party/blink/web_tests/paint/invalidation/block-layout-inline-children-replaced-expected.txt index fd71da9..6efb8318 100644 --- a/third_party/blink/web_tests/paint/invalidation/block-layout-inline-children-replaced-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/block-layout-inline-children-replaced-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target' class='target'", - "rect": [0, 116, 402, 152], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='target' class='target'", - "rect": [0, 116, 402, 152], - "reason": "disappeared" - }, - { - "object": "LayoutImage IMG", - "rect": [151, 117, 100, 100], - "reason": "appeared" - } + "invalidations": [ + [0, 116, 402, 152] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/block-shift-repaint-expected.txt b/third_party/blink/web_tests/paint/invalidation/block-shift-repaint-expected.txt index 8ed5db1..2490b0f7 100644 --- a/third_party/blink/web_tests/paint/invalidation/block-shift-repaint-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/block-shift-repaint-expected.txt
@@ -5,87 +5,18 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='half'", - "rect": [8, 353, 60, 38], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='half'", - "rect": [8, 338, 60, 38], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='red half'", - "rect": [8, 248, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='green half'", - "rect": [8, 218, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='red half'", - "rect": [8, 218, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='green half'", - "rect": [8, 188, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='green half'", - "rect": [8, 158, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='green half'", - "rect": [8, 128, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='red half'", - "rect": [8, 128, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='red half'", - "rect": [8, 98, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV id='top' class='blue half'", - "rect": [8, 98, 60, 30], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV class='green half'", - "rect": [8, 68, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='green half'", - "rect": [8, 38, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='red half'", - "rect": [8, 38, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='red half'", - "rect": [8, 8, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV id='div1' class='blue half'", - "rect": [8, 8, 60, 30], - "reason": "disappeared" - } + "invalidations": [ + [8, 353, 60, 38], + [8, 338, 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/paint/invalidation/box/border-current-color-expected.txt b/third_party/blink/web_tests/paint/invalidation/box/border-current-color-expected.txt index 55e53c1..34ebfbce 100644 --- a/third_party/blink/web_tests/paint/invalidation/box/border-current-color-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/box/border-current-color-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='currentColor'", - "rect": [58, 220, 120, 120], - "reason": "style change" - } + "invalidations": [ + [58, 220, 120, 120] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/box/border-image-outset-add-repaint-expected.txt b/third_party/blink/web_tests/paint/invalidation/box/border-image-outset-add-repaint-expected.txt index fdfd8ef..5c54e82 100644 --- a/third_party/blink/web_tests/paint/invalidation/box/border-image-outset-add-repaint-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/box/border-image-outset-add-repaint-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='test'", - "rect": [8, 8, 75, 75], - "reason": "style change" - } + "invalidations": [ + [8, 8, 75, 75] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/box/border-image-outset-change-repaint-expected.txt b/third_party/blink/web_tests/paint/invalidation/box/border-image-outset-change-repaint-expected.txt index fdfd8ef..5c54e82 100644 --- a/third_party/blink/web_tests/paint/invalidation/box/border-image-outset-change-repaint-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/box/border-image-outset-change-repaint-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='test'", - "rect": [8, 8, 75, 75], - "reason": "style change" - } + "invalidations": [ + [8, 8, 75, 75] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/box/border-radius-repaint-2-expected.txt b/third_party/blink/web_tests/paint/invalidation/box/border-radius-repaint-2-expected.txt index 9461556..647ebdcb 100644 --- a/third_party/blink/web_tests/paint/invalidation/box/border-radius-repaint-2-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/box/border-radius-repaint-2-expected.txt
@@ -5,17 +5,8 @@ "bounds": [874, 600], "contentsOpaque": true, "backgroundColor": "#3F3F3F", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [8, 8, 866, 592], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [137, 88, 607, 512], - "reason": "geometry" - } + "invalidations": [ + [8, 8, 866, 592] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/box/border-radius-without-border-expected.txt b/third_party/blink/web_tests/paint/invalidation/box/border-radius-without-border-expected.txt index e5401cb..ce22594 100644 --- a/third_party/blink/web_tests/paint/invalidation/box/border-radius-without-border-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/box/border-radius-without-border-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target1'", - "rect": [0, 0, 200, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target2'", - "rect": [0, 200, 100, 200], - "reason": "geometry" - } + "invalidations": [ + [0, 0, 200, 100], + [0, 200, 100, 200] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/box/box-shadow-add-repaint-expected.txt b/third_party/blink/web_tests/paint/invalidation/box/box-shadow-add-repaint-expected.txt index 989792c..6547f517 100644 --- a/third_party/blink/web_tests/paint/invalidation/box/box-shadow-add-repaint-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/box/box-shadow-add-repaint-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='test'", - "rect": [5, 5, 116, 116], - "reason": "style change" - } + "invalidations": [ + [5, 5, 116, 116] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/box/box-shadow-change-repaint-expected.txt b/third_party/blink/web_tests/paint/invalidation/box/box-shadow-change-repaint-expected.txt index ab1bb30..1b94e7c 100644 --- a/third_party/blink/web_tests/paint/invalidation/box/box-shadow-change-repaint-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/box/box-shadow-change-repaint-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='test'", - "rect": [3, 3, 130, 130], - "reason": "style change" - } + "invalidations": [ + [3, 3, 130, 130] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/box/box-shadow-inset-repaint-expected.txt b/third_party/blink/web_tests/paint/invalidation/box/box-shadow-inset-repaint-expected.txt index 55f7a96..c701b23c 100644 --- a/third_party/blink/web_tests/paint/invalidation/box/box-shadow-inset-repaint-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/box/box-shadow-inset-repaint-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='container'", - "rect": [8, 8, 230, 130], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [23, 23, 100, 100], - "reason": "appeared" - } + "invalidations": [ + [8, 8, 230, 130] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/box/box-sizing-border-keeping-size-expected.txt b/third_party/blink/web_tests/paint/invalidation/box/box-sizing-border-keeping-size-expected.txt index eb89d42..87b5a2a 100644 --- a/third_party/blink/web_tests/paint/invalidation/box/box-sizing-border-keeping-size-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/box/box-sizing-border-keeping-size-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target2' class='border-box'", - "rect": [0, 200, 100, 100], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target1' class='content-box'", - "rect": [0, 0, 100, 100], - "reason": "style change" - } + "invalidations": [ + [0, 200, 100, 100], + [0, 0, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/box/box-sizing-expected.txt b/third_party/blink/web_tests/paint/invalidation/box/box-sizing-expected.txt index 026acf16..ac7e120a 100644 --- a/third_party/blink/web_tests/paint/invalidation/box/box-sizing-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/box/box-sizing-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target2' class='border-box'", - "rect": [0, 200, 440, 140], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target1' class='content-box'", - "rect": [0, 0, 440, 140], - "reason": "geometry" - } + "invalidations": [ + [0, 200, 440, 140], + [0, 0, 440, 140] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/box/box-sizing-padding-keeping-size-expected.txt b/third_party/blink/web_tests/paint/invalidation/box/box-sizing-padding-keeping-size-expected.txt index eb89d42..87b5a2a 100644 --- a/third_party/blink/web_tests/paint/invalidation/box/box-sizing-padding-keeping-size-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/box/box-sizing-padding-keeping-size-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target2' class='border-box'", - "rect": [0, 200, 100, 100], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target1' class='content-box'", - "rect": [0, 0, 100, 100], - "reason": "style change" - } + "invalidations": [ + [0, 200, 100, 100], + [0, 0, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/box/hover-pseudo-borders-whitespace-expected.txt b/third_party/blink/web_tests/paint/invalidation/box/hover-pseudo-borders-whitespace-expected.txt index 2084022e..4052767 100644 --- a/third_party/blink/web_tests/paint/invalidation/box/hover-pseudo-borders-whitespace-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/box/hover-pseudo-borders-whitespace-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='div_outline'", - "rect": [8, 138, 120, 120], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow DIV id='div_border'", - "rect": [8, 8, 120, 120], - "reason": "style change" - } + "invalidations": [ + [8, 138, 120, 120], + [8, 8, 120, 120] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/box/margin-expected.txt b/third_party/blink/web_tests/paint/invalidation/box/margin-expected.txt index 64a5fca..08cbb36 100644 --- a/third_party/blink/web_tests/paint/invalidation/box/margin-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/box/margin-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target'", - "rect": [20, 20, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target'", - "rect": [0, 0, 100, 100], - "reason": "geometry" - } + "invalidations": [ + [20, 20, 100, 100], + [0, 0, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/box/negative-shadow-box-expand-expected.txt b/third_party/blink/web_tests/paint/invalidation/box/negative-shadow-box-expand-expected.txt index 6e37c6c..2b6bc3e 100644 --- a/third_party/blink/web_tests/paint/invalidation/box/negative-shadow-box-expand-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/box/negative-shadow-box-expand-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='outer'", - "rect": [100, 60, 640, 240], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV id='inner2'", - "rect": [100, 200, 600, 100], - "reason": "appeared" - } + "invalidations": [ + [100, 60, 640, 240] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/box/negative-shadow-box-shrink-expected.txt b/third_party/blink/web_tests/paint/invalidation/box/negative-shadow-box-shrink-expected.txt index 23ade914..2b6bc3e 100644 --- a/third_party/blink/web_tests/paint/invalidation/box/negative-shadow-box-shrink-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/box/negative-shadow-box-shrink-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='outer'", - "rect": [100, 60, 640, 240], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV id='inner2'", - "rect": [100, 200, 600, 100], - "reason": "disappeared" - } + "invalidations": [ + [100, 60, 640, 240] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/box/padding-border-keeping-border-box-and-content-box-expected.txt b/third_party/blink/web_tests/paint/invalidation/box/padding-border-keeping-border-box-and-content-box-expected.txt index 9f9c56e7..a8736488 100644 --- a/third_party/blink/web_tests/paint/invalidation/box/padding-border-keeping-border-box-and-content-box-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/box/padding-border-keeping-border-box-and-content-box-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target'", - "rect": [0, 0, 180, 180], - "reason": "style change" - } + "invalidations": [ + [0, 0, 180, 180] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/box/padding-keeping-content-size-expected.txt b/third_party/blink/web_tests/paint/invalidation/box/padding-keeping-content-size-expected.txt index 36c4483..5da3f5ce 100644 --- a/third_party/blink/web_tests/paint/invalidation/box/padding-keeping-content-size-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/box/padding-keeping-content-size-expected.txt
@@ -5,27 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target2' class='outer'", - "rect": [0, 200, 140, 140], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target1' class='outer'", - "rect": [0, 0, 140, 140], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow DIV class='inner'", - "rect": [20, 220, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='inner'", - "rect": [0, 200, 100, 100], - "reason": "geometry" - } + "invalidations": [ + [0, 200, 140, 140], + [0, 0, 140, 140] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/box/padding-keeping-visual-size-expected.txt b/third_party/blink/web_tests/paint/invalidation/box/padding-keeping-visual-size-expected.txt index e6243e0..87b5a2a 100644 --- a/third_party/blink/web_tests/paint/invalidation/box/padding-keeping-visual-size-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/box/padding-keeping-visual-size-expected.txt
@@ -5,22 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target2' class='outer'", - "rect": [0, 200, 100, 100], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow DIV class='inner'", - "rect": [0, 200, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target1' class='outer'", - "rect": [0, 0, 100, 100], - "reason": "style change" - } + "invalidations": [ + [0, 200, 100, 100], + [0, 0, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/box/resize-with-border-expected.txt b/third_party/blink/web_tests/paint/invalidation/box/resize-with-border-expected.txt index e5578ee..b0ff175 100644 --- a/third_party/blink/web_tests/paint/invalidation/box/resize-with-border-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/box/resize-with-border-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='div'", - "rect": [100, 100, 420, 220], - "reason": "geometry" - } + "invalidations": [ + [100, 100, 420, 220] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/box/shadow-box-resize-expected.txt b/third_party/blink/web_tests/paint/invalidation/box/shadow-box-resize-expected.txt index a35d647..a013c38 100644 --- a/third_party/blink/web_tests/paint/invalidation/box/shadow-box-resize-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/box/shadow-box-resize-expected.txt
@@ -5,27 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target1'", - "rect": [100, 100, 190, 120], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target3'", - "rect": [100, 300, 140, 170], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target4'", - "rect": [300, 300, 140, 120], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target2'", - "rect": [300, 100, 140, 120], - "reason": "geometry" - } + "invalidations": [ + [100, 100, 190, 120], + [100, 300, 140, 170], + [300, 300, 140, 120], + [300, 100, 140, 120] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/box/shadow-box-resize-writing-mode-expected.txt b/third_party/blink/web_tests/paint/invalidation/box/shadow-box-resize-writing-mode-expected.txt index a35d647..a013c38 100644 --- a/third_party/blink/web_tests/paint/invalidation/box/shadow-box-resize-writing-mode-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/box/shadow-box-resize-writing-mode-expected.txt
@@ -5,27 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target1'", - "rect": [100, 100, 190, 120], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target3'", - "rect": [100, 300, 140, 170], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target4'", - "rect": [300, 300, 140, 120], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target2'", - "rect": [300, 100, 140, 120], - "reason": "geometry" - } + "invalidations": [ + [100, 100, 190, 120], + [100, 300, 140, 170], + [300, 300, 140, 120], + [300, 100, 140, 120] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/bugzilla-6388-expected.txt b/third_party/blink/web_tests/paint/invalidation/bugzilla-6388-expected.txt index 2ce67270..27ba2256 100644 --- a/third_party/blink/web_tests/paint/invalidation/bugzilla-6388-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/bugzilla-6388-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [8, 136, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [8, 136, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [8, 136, 100, 100], - "reason": "disappeared" - } + "invalidations": [ + [8, 136, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/button-spurious-layout-hint-expected.txt b/third_party/blink/web_tests/paint/invalidation/button-spurious-layout-hint-expected.txt index de1c633..e6987437 100644 --- a/third_party/blink/web_tests/paint/invalidation/button-spurious-layout-hint-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/button-spurious-layout-hint-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutButton BUTTON id='target'", - "rect": [8, 8, 100, 100], - "reason": "background" - } + "invalidations": [ + [8, 8, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/canvas-putImageData-expected.txt b/third_party/blink/web_tests/paint/invalidation/canvas-putImageData-expected.txt index 3096591..3f0d30b 100644 --- a/third_party/blink/web_tests/paint/invalidation/canvas-putImageData-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/canvas-putImageData-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutHTMLCanvas CANVAS id='canvas'", - "rect": [8, 8, 90, 90], - "reason": "invalidate paint rectangle" - } + "invalidations": [ + [8, 8, 90, 90] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/canvas-resize-expected.txt b/third_party/blink/web_tests/paint/invalidation/canvas-resize-expected.txt index f4ffe19..c572f5f 100644 --- a/third_party/blink/web_tests/paint/invalidation/canvas-resize-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/canvas-resize-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutHTMLCanvas (positioned) CANVAS id='canvas'", - "rect": [50, 50, 500, 500], - "reason": "geometry" - }, - { - "object": "LayoutHTMLCanvas (positioned) CANVAS id='canvas'", - "rect": [550, 50, 100, 500], - "reason": "incremental" - } + "invalidations": [ + [50, 50, 500, 500], + [550, 50, 100, 500] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/canvas-resize-no-full-invalidation-expected.txt b/third_party/blink/web_tests/paint/invalidation/canvas-resize-no-full-invalidation-expected.txt index 3d875be73..261d27a 100644 --- a/third_party/blink/web_tests/paint/invalidation/canvas-resize-no-full-invalidation-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/canvas-resize-no-full-invalidation-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutHTMLCanvas (positioned) CANVAS id='canvas'", - "rect": [550, 50, 100, 500], - "reason": "incremental" - }, - { - "object": "LayoutHTMLCanvas (positioned) CANVAS id='canvas'", - "rect": [550, 50, 100, 500], - "reason": "incremental" - } + "invalidations": [ + [550, 50, 100, 500] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/change-clip-composited-layer-expected.txt b/third_party/blink/web_tests/paint/invalidation/change-clip-composited-layer-expected.txt index ccf9c4a..c180aec 100644 --- a/third_party/blink/web_tests/paint/invalidation/change-clip-composited-layer-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/change-clip-composited-layer-expected.txt
@@ -9,12 +9,8 @@ { "name": "LayoutNGBlockFlow DIV id='target'", "bounds": [100, 10], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [0, 0, 50, 10], - "reason": "chunk disappeared" - } + "invalidations": [ + [0, 0, 50, 10] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/paint/invalidation/clip/caret-ancestor-clip-change-expected.txt b/third_party/blink/web_tests/paint/invalidation/clip/caret-ancestor-clip-change-expected.txt index 8271fcf..c7c6208 100644 --- a/third_party/blink/web_tests/paint/invalidation/clip/caret-ancestor-clip-change-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/clip/caret-ancestor-clip-change-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [8, 58, 110, 63], - "reason": "incremental" - }, - { - "object": "LayoutTextControl INPUT id='target'", - "rect": [8, 58, 110, 63], - "reason": "incremental" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [12, 58, 1, 57], - "reason": "incremental" - } + "invalidations": [ + [8, 58, 110, 63] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/clip/clip-path-in-mask-layer-expected.txt b/third_party/blink/web_tests/paint/invalidation/clip/clip-path-in-mask-layer-expected.txt index c0bd139..1f1d520 100644 --- a/third_party/blink/web_tests/paint/invalidation/clip/clip-path-in-mask-layer-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/clip/clip-path-in-mask-layer-expected.txt
@@ -10,24 +10,16 @@ "name": "LayoutNGBlockFlow DIV", "bounds": [200, 200], "backgroundColor": "#0000FF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [0, 0, 200, 200], - "reason": "full" - } + "invalidations": [ + [0, 0, 200, 200] ], "transform": 1 }, { "name": "Mask Layer", "bounds": [200, 200], - "paintInvalidations": [ - { - "object": "Mask Layer", - "rect": [0, 0, 200, 200], - "reason": "paint property change" - } + "invalidations": [ + [0, 0, 200, 200] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/paint/invalidation/clip/clip-path-resize-expected.txt b/third_party/blink/web_tests/paint/invalidation/clip/clip-path-resize-expected.txt index 59dc4e5b..522f535 100644 --- a/third_party/blink/web_tests/paint/invalidation/clip/clip-path-resize-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/clip/clip-path-resize-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [8, 8, 200, 100], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [8, 8, 100, 100], - "reason": "paint property change" - } + "invalidations": [ + [8, 8, 200, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/clip/clip-unclip-and-change-expected.txt b/third_party/blink/web_tests/paint/invalidation/clip/clip-unclip-and-change-expected.txt index 984a4fc7..5832bba 100644 --- a/third_party/blink/web_tests/paint/invalidation/clip/clip-unclip-and-change-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/clip/clip-unclip-and-change-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='content'", - "rect": [8, 120, 100, 300], - "reason": "background" - } + "invalidations": [ + [8, 120, 100, 300] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/clip/clip-with-layout-delta-expected.txt b/third_party/blink/web_tests/paint/invalidation/clip/clip-with-layout-delta-expected.txt new file mode 100644 index 0000000..4d23757 --- /dev/null +++ b/third_party/blink/web_tests/paint/invalidation/clip/clip-with-layout-delta-expected.txt
@@ -0,0 +1,15 @@ +{ + "layers": [ + { + "name": "Scrolling Contents Layer", + "bounds": [800, 600], + "contentsOpaque": true, + "backgroundColor": "#FFFFFF", + "invalidations": [ + [108, 8, 100, 100], + [8, 8, 100, 100] + ] + } + ] +} +
diff --git a/third_party/blink/web_tests/paint/invalidation/clip/css-clip-change-stacking-child-expected.txt b/third_party/blink/web_tests/paint/invalidation/clip/css-clip-change-stacking-child-expected.txt index 3b95fde..3438063 100644 --- a/third_party/blink/web_tests/paint/invalidation/clip/css-clip-change-stacking-child-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/clip/css-clip-change-stacking-child-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [8, 8, 300, 200], - "reason": "subtree" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [8, 208, 300, 100], - "reason": "incremental" - } + "invalidations": [ + [8, 8, 300, 200], + [8, 208, 300, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/clip/intermediate-layout-position-clip-expected.txt b/third_party/blink/web_tests/paint/invalidation/clip/intermediate-layout-position-clip-expected.txt index ff922eb6..ee1f320 100644 --- a/third_party/blink/web_tests/paint/invalidation/clip/intermediate-layout-position-clip-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/clip/intermediate-layout-position-clip-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [8, 8, 40, 20], - "reason": "incremental" - } + "invalidations": [ + [8, 8, 40, 20] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/clip/mask-clip-change-stacking-child-expected.txt b/third_party/blink/web_tests/paint/invalidation/clip/mask-clip-change-stacking-child-expected.txt index 2a395b7..b64298d 100644 --- a/third_party/blink/web_tests/paint/invalidation/clip/mask-clip-change-stacking-child-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/clip/mask-clip-change-stacking-child-expected.txt
@@ -5,27 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target'", - "rect": [8, 8, 300, 300], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [8, 8, 300, 300], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target'", - "rect": [8, 8, 300, 200], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [8, 8, 300, 200], - "reason": "paint property change" - } + "invalidations": [ + [8, 8, 300, 300] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/clip/replaced-clipped-positioned-not-wrong-incremental-repainting-expected.txt b/third_party/blink/web_tests/paint/invalidation/clip/replaced-clipped-positioned-not-wrong-incremental-repainting-expected.txt index 5705614..9711139 100644 --- a/third_party/blink/web_tests/paint/invalidation/clip/replaced-clipped-positioned-not-wrong-incremental-repainting-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/clip/replaced-clipped-positioned-not-wrong-incremental-repainting-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutImage IMG", - "rect": [8, 8, 194, 232], - "reason": "geometry" - }, - { - "object": "LayoutImage IMG", - "rect": [8, 8, 114, 232], - "reason": "geometry" - } + "invalidations": [ + [8, 8, 194, 232] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/clip/resize-with-border-clipped-expected.txt b/third_party/blink/web_tests/paint/invalidation/clip/resize-with-border-clipped-expected.txt index 73671bb3..2c12342d 100644 --- a/third_party/blink/web_tests/paint/invalidation/clip/resize-with-border-clipped-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/clip/resize-with-border-clipped-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='container'", - "rect": [100, 100, 200, 200], - "reason": "chunk appeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [100, 100, 120, 120], - "reason": "disappeared" - } + "invalidations": [ + [100, 100, 200, 200] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/clip/subtree-root-clip-2-expected.txt b/third_party/blink/web_tests/paint/invalidation/clip/subtree-root-clip-2-expected.txt index b392891..e6987437 100644 --- a/third_party/blink/web_tests/paint/invalidation/clip/subtree-root-clip-2-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/clip/subtree-root-clip-2-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [8, 8, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [8, 8, 100, 100], - "reason": "appeared" - } + "invalidations": [ + [8, 8, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/clip/subtree-root-clip-3-expected.txt b/third_party/blink/web_tests/paint/invalidation/clip/subtree-root-clip-3-expected.txt index 4b5ea15..a2b457d 100644 --- a/third_party/blink/web_tests/paint/invalidation/clip/subtree-root-clip-3-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/clip/subtree-root-clip-3-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [15, 60, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [15, 60, 100, 100], - "reason": "appeared" - } + "invalidations": [ + [15, 60, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/clip/subtree-root-clip-expected.txt b/third_party/blink/web_tests/paint/invalidation/clip/subtree-root-clip-expected.txt index 9020c6f..e6987437 100644 --- a/third_party/blink/web_tests/paint/invalidation/clip/subtree-root-clip-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/clip/subtree-root-clip-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [8, 8, 100, 100], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='inner'", - "rect": [8, 8, 100, 100], - "reason": "disappeared" - } + "invalidations": [ + [8, 8, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/compositing/background-attachment-local-composited-expected.txt b/third_party/blink/web_tests/paint/invalidation/compositing/background-attachment-local-composited-expected.txt index db8c4146..56c80f0 100644 --- a/third_party/blink/web_tests/paint/invalidation/compositing/background-attachment-local-composited-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/compositing/background-attachment-local-composited-expected.txt
@@ -17,12 +17,8 @@ "bounds": [400, 2000], "contentsOpaque": true, "backgroundColor": "#0000FF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutNGBlockFlow DIV id='container'", - "rect": [0, 500, 400, 1500], - "reason": "incremental" - } + "invalidations": [ + [0, 500, 400, 1500] ], "transform": 2 },
diff --git a/third_party/blink/web_tests/paint/invalidation/compositing/background-attachment-local-equivalent-expected.txt b/third_party/blink/web_tests/paint/invalidation/compositing/background-attachment-local-equivalent-expected.txt index db8c4146..56c80f0 100644 --- a/third_party/blink/web_tests/paint/invalidation/compositing/background-attachment-local-equivalent-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/compositing/background-attachment-local-equivalent-expected.txt
@@ -17,12 +17,8 @@ "bounds": [400, 2000], "contentsOpaque": true, "backgroundColor": "#0000FF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutNGBlockFlow DIV id='container'", - "rect": [0, 500, 400, 1500], - "reason": "incremental" - } + "invalidations": [ + [0, 500, 400, 1500] ], "transform": 2 },
diff --git a/third_party/blink/web_tests/paint/invalidation/compositing/child-of-sub-pixel-offset-composited-layer-expected.txt b/third_party/blink/web_tests/paint/invalidation/compositing/child-of-sub-pixel-offset-composited-layer-expected.txt index b31a875..6f27e50a 100644 --- a/third_party/blink/web_tests/paint/invalidation/compositing/child-of-sub-pixel-offset-composited-layer-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/compositing/child-of-sub-pixel-offset-composited-layer-expected.txt
@@ -10,12 +10,8 @@ "name": "LayoutNGBlockFlow (positioned) DIV class='container'", "bounds": [14, 14], "backgroundColor": "#FF0000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target' class='green'", - "rect": [0, 0, 14, 14], - "reason": "style change" - } + "invalidations": [ + [0, 0, 14, 14] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/paint/invalidation/compositing/chunk-reorder-expected.txt b/third_party/blink/web_tests/paint/invalidation/compositing/chunk-reorder-expected.txt index 07c6f1c..7e7ec73 100644 --- a/third_party/blink/web_tests/paint/invalidation/compositing/chunk-reorder-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/compositing/chunk-reorder-expected.txt
@@ -9,17 +9,9 @@ { "name": "LayoutNGBlockFlow DIV", "bounds": [784, 550], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='chunk3'", - "rect": [400, 400, 100, 100], - "reason": "chunk reordered" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='chunk2'", - "rect": [0, 0, 1, 1], - "reason": "chunk reordered" - } + "invalidations": [ + [400, 400, 100, 100], + [0, 0, 1, 1] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/paint/invalidation/compositing/column-span-under-composited-column-child-expected.txt b/third_party/blink/web_tests/paint/invalidation/compositing/column-span-under-composited-column-child-expected.txt index a1af2f7..44d441c 100644 --- a/third_party/blink/web_tests/paint/invalidation/compositing/column-span-under-composited-column-child-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/compositing/column-span-under-composited-column-child-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (column spanner) DIV id='target'", - "rect": [8, 8, 100, 100], - "reason": "background" - } + "invalidations": [ + [8, 8, 100, 100] ] }, {
diff --git a/third_party/blink/web_tests/paint/invalidation/compositing/composited-float-under-composited-inline-expected.txt b/third_party/blink/web_tests/paint/invalidation/compositing/composited-float-under-composited-inline-expected.txt index 25b8e03..728f98e 100644 --- a/third_party/blink/web_tests/paint/invalidation/compositing/composited-float-under-composited-inline-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/compositing/composited-float-under-composited-inline-expected.txt
@@ -16,12 +16,8 @@ "bounds": [100, 100], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) (floating) DIV id='float'", - "rect": [0, 0, 100, 100], - "reason": "background" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/paint/invalidation/compositing/composited-float-under-composited-inline-individual-expected.txt b/third_party/blink/web_tests/paint/invalidation/compositing/composited-float-under-composited-inline-individual-expected.txt index 25b8e03..728f98e 100644 --- a/third_party/blink/web_tests/paint/invalidation/compositing/composited-float-under-composited-inline-individual-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/compositing/composited-float-under-composited-inline-individual-expected.txt
@@ -16,12 +16,8 @@ "bounds": [100, 100], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) (floating) DIV id='float'", - "rect": [0, 0, 100, 100], - "reason": "background" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/paint/invalidation/compositing/compositing-reason-removed-expected.txt b/third_party/blink/web_tests/paint/invalidation/compositing/compositing-reason-removed-expected.txt index 0033855..dc80d04 100644 --- a/third_party/blink/web_tests/paint/invalidation/compositing/compositing-reason-removed-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/compositing/compositing-reason-removed-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='square'", - "rect": [8, 8, 30, 30], - "reason": "appeared" - } + "invalidations": [ + [8, 8, 30, 30] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/compositing/containing-block-added-expected.txt b/third_party/blink/web_tests/paint/invalidation/compositing/containing-block-added-expected.txt index 64e8215c..26e9564f 100644 --- a/third_party/blink/web_tests/paint/invalidation/compositing/containing-block-added-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/compositing/containing-block-added-expected.txt
@@ -5,29 +5,17 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='fixed'", - "rect": [50, 50, 75, 75], - "reason": "chunk disappeared" - } + "invalidations": [ + [50, 50, 75, 75] ] }, { "name": "LayoutNGBlockFlow (positioned) DIV id='container'", "bounds": [125, 125], "backgroundColor": "#0000FF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='container'", - "rect": [0, 0, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV class='fixed'", - "rect": [50, 50, 75, 75], - "reason": "chunk appeared" - } + "invalidations": [ + [0, 0, 100, 100], + [50, 50, 75, 75] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/paint/invalidation/compositing/containing-block-added-individual-expected.txt b/third_party/blink/web_tests/paint/invalidation/compositing/containing-block-added-individual-expected.txt index 64e8215c..26e9564f 100644 --- a/third_party/blink/web_tests/paint/invalidation/compositing/containing-block-added-individual-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/compositing/containing-block-added-individual-expected.txt
@@ -5,29 +5,17 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='fixed'", - "rect": [50, 50, 75, 75], - "reason": "chunk disappeared" - } + "invalidations": [ + [50, 50, 75, 75] ] }, { "name": "LayoutNGBlockFlow (positioned) DIV id='container'", "bounds": [125, 125], "backgroundColor": "#0000FF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='container'", - "rect": [0, 0, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV class='fixed'", - "rect": [50, 50, 75, 75], - "reason": "chunk appeared" - } + "invalidations": [ + [0, 0, 100, 100], + [50, 50, 75, 75] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/paint/invalidation/compositing/containing-block-removed-expected.txt b/third_party/blink/web_tests/paint/invalidation/compositing/containing-block-removed-expected.txt index f5c53b23b..461a156 100644 --- a/third_party/blink/web_tests/paint/invalidation/compositing/containing-block-removed-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/compositing/containing-block-removed-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='fixed'", - "rect": [50, 50, 75, 75], - "reason": "chunk appeared" - } + "invalidations": [ + [50, 50, 75, 75] ] }, { @@ -18,17 +14,9 @@ "bounds": [100, 100], "contentsOpaque": true, "backgroundColor": "#0000FF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='container'", - "rect": [0, 0, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV class='fixed'", - "rect": [50, 50, 75, 75], - "reason": "chunk disappeared" - } + "invalidations": [ + [0, 0, 100, 100], + [50, 50, 75, 75] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/paint/invalidation/compositing/containing-block-removed-individual-expected.txt b/third_party/blink/web_tests/paint/invalidation/compositing/containing-block-removed-individual-expected.txt index 0feb32a..1ae92441 100644 --- a/third_party/blink/web_tests/paint/invalidation/compositing/containing-block-removed-individual-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/compositing/containing-block-removed-individual-expected.txt
@@ -6,12 +6,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='fixed'", - "rect": [50, 50, 75, 75], - "reason": "chunk appeared" - } + "invalidations": [ + [50, 50, 75, 75] ] }, { @@ -19,17 +15,9 @@ "bounds": [100, 100], "contentsOpaque": true, "backgroundColor": "#0000FF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='container'", - "rect": [0, 0, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV class='fixed'", - "rect": [50, 50, 75, 75], - "reason": "chunk disappeared" - } + "invalidations": [ + [0, 0, 100, 100], + [50, 50, 75, 75] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/paint/invalidation/compositing/fixed-pos-with-abs-pos-child-scroll.html b/third_party/blink/web_tests/paint/invalidation/compositing/fixed-pos-with-abs-pos-child-scroll.html index 9dabb27..e63efd093 100644 --- a/third_party/blink/web_tests/paint/invalidation/compositing/fixed-pos-with-abs-pos-child-scroll.html +++ b/third_party/blink/web_tests/paint/invalidation/compositing/fixed-pos-with-abs-pos-child-scroll.html
@@ -43,7 +43,7 @@ runAfterLayoutAndPaint(function() { if (window.internals) document.getElementById('layers').textContent = - internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS); + internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_INVALIDATIONS); if (window.testRunner) testRunner.notifyDone();
diff --git a/third_party/blink/web_tests/paint/invalidation/compositing/float-under-composited-inline-expected.txt b/third_party/blink/web_tests/paint/invalidation/compositing/float-under-composited-inline-expected.txt index 991dd77..952b8fe 100644 --- a/third_party/blink/web_tests/paint/invalidation/compositing/float-under-composited-inline-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/compositing/float-under-composited-inline-expected.txt
@@ -10,12 +10,8 @@ "name": "LayoutInline (relative positioned) SPAN", "position": [108, 108], "bounds": [100, 100], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (floating) DIV id='float'", - "rect": [0, 0, 100, 100], - "reason": "background" - } + "invalidations": [ + [0, 0, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/compositing/invalidate-paint-in-iframe-in-composited-layer-expected.txt b/third_party/blink/web_tests/paint/invalidation/compositing/invalidate-paint-in-iframe-in-composited-layer-expected.txt index a096f0bc..819b4b3 100644 --- a/third_party/blink/web_tests/paint/invalidation/compositing/invalidate-paint-in-iframe-in-composited-layer-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/compositing/invalidate-paint-in-iframe-in-composited-layer-expected.txt
@@ -9,12 +9,8 @@ { "name": "LayoutNGBlockFlow DIV", "bounds": [304, 200], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [10, 10, 50, 50], - "reason": "background" - } + "invalidations": [ + [10, 10, 50, 50] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/paint/invalidation/compositing/invalidate-when-leaving-squashed-layer-expected.txt b/third_party/blink/web_tests/paint/invalidation/compositing/invalidate-when-leaving-squashed-layer-expected.txt index 7e4b43b7..c421690 100644 --- a/third_party/blink/web_tests/paint/invalidation/compositing/invalidate-when-leaving-squashed-layer-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/compositing/invalidate-when-leaving-squashed-layer-expected.txt
@@ -17,12 +17,8 @@ "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV)", "position": [42, 42], "bounds": [200, 200], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target'", - "rect": [0, 0, 200, 200], - "reason": "disappeared" - } + "invalidations": [ + [0, 0, 200, 200] ], "transform": 1 }, @@ -31,12 +27,8 @@ "bounds": [200, 200], "contentsOpaque": true, "backgroundColor": "#ADD8E6", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target'", - "rect": [0, 0, 200, 200], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 200, 200] ], "transform": 2 }
diff --git a/third_party/blink/web_tests/paint/invalidation/compositing/invalidation-for-subpixel-offset-of-squashed-layer-expected.txt b/third_party/blink/web_tests/paint/invalidation/compositing/invalidation-for-subpixel-offset-of-squashed-layer-expected.txt index c405f6c..bc106d1 100644 --- a/third_party/blink/web_tests/paint/invalidation/compositing/invalidation-for-subpixel-offset-of-squashed-layer-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/compositing/invalidation-for-subpixel-offset-of-squashed-layer-expected.txt
@@ -17,12 +17,8 @@ "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV)", "position": [42, 42], "bounds": [251, 251], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target'", - "rect": [50, 50, 201, 201], - "reason": "background" - } + "invalidations": [ + [50, 50, 201, 201] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/paint/invalidation/compositing/invalidations-on-composited-layers-expected.txt b/third_party/blink/web_tests/paint/invalidation/compositing/invalidations-on-composited-layers-expected.txt index ec344b86..e440332 100644 --- a/third_party/blink/web_tests/paint/invalidation/compositing/invalidations-on-composited-layers-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/compositing/invalidations-on-composited-layers-expected.txt
@@ -11,12 +11,8 @@ "bounds": [400, 400], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='parent'", - "rect": [0, 0, 400, 400], - "reason": "background" - } + "invalidations": [ + [0, 0, 400, 400] ], "transform": 1 }, @@ -25,12 +21,8 @@ "bounds": [75, 75], "contentsOpaque": true, "backgroundColor": "#0000FF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='child'", - "rect": [0, 0, 75, 75], - "reason": "background" - } + "invalidations": [ + [0, 0, 75, 75] ], "transform": 2 }
diff --git a/third_party/blink/web_tests/paint/invalidation/compositing/invalidations-with-large-negative-margin-expected.txt b/third_party/blink/web_tests/paint/invalidation/compositing/invalidations-with-large-negative-margin-expected.txt index 52b5dde..81d99918 100644 --- a/third_party/blink/web_tests/paint/invalidation/compositing/invalidations-with-large-negative-margin-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/compositing/invalidations-with-large-negative-margin-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='chip'", - "rect": [408, 8, 50, 50], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='chip'", - "rect": [8, 8, 50, 50], - "reason": "geometry" - } + "invalidations": [ + [408, 8, 50, 50], + [8, 8, 50, 50] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/compositing/new-stacking-context-expected.txt b/third_party/blink/web_tests/paint/invalidation/compositing/new-stacking-context-expected.txt index 433a9042..9cca444 100644 --- a/third_party/blink/web_tests/paint/invalidation/compositing/new-stacking-context-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/compositing/new-stacking-context-expected.txt
@@ -14,12 +14,8 @@ { "name": "Scrolling Contents Layer", "bounds": [200, 200], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [0, 0, 200, 200], - "reason": "chunk disappeared" - } + "invalidations": [ + [0, 0, 200, 200] ], "transform": 1 }, @@ -40,12 +36,8 @@ "bounds": [200, 200], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [0, 0, 200, 200], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 200, 200] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/paint/invalidation/compositing/pointer-events-composited-scrolling-expected.txt b/third_party/blink/web_tests/paint/invalidation/compositing/pointer-events-composited-scrolling-expected.txt index e3d2d33..be2d2647 100644 --- a/third_party/blink/web_tests/paint/invalidation/compositing/pointer-events-composited-scrolling-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/compositing/pointer-events-composited-scrolling-expected.txt
@@ -9,12 +9,8 @@ { "name": "LayoutNGBlockFlow DIV id='target'", "bounds": [100, 100], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [0, 0, 100, 100], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/paint/invalidation/compositing/repaint-overflow-scrolled-squashed-content-expected.txt b/third_party/blink/web_tests/paint/invalidation/compositing/repaint-overflow-scrolled-squashed-content-expected.txt index bc38b85..9d86bbc3 100644 --- a/third_party/blink/web_tests/paint/invalidation/compositing/repaint-overflow-scrolled-squashed-content-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/compositing/repaint-overflow-scrolled-squashed-content-expected.txt
@@ -16,12 +16,8 @@ { "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV id='foo')", "bounds": [100, 1000], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='foo'", - "rect": [0, 0, 100, 1000], - "reason": "background" - } + "invalidations": [ + [0, 0, 100, 1000] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/paint/invalidation/compositing/repaint-squashed-layer-in-rect-expected.txt b/third_party/blink/web_tests/paint/invalidation/compositing/repaint-squashed-layer-in-rect-expected.txt index d4d464a..ece5778 100644 --- a/third_party/blink/web_tests/paint/invalidation/compositing/repaint-squashed-layer-in-rect-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/compositing/repaint-squashed-layer-in-rect-expected.txt
@@ -17,12 +17,8 @@ "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV)", "position": [0, -8], "bounds": [592, 600], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='imgElement'", - "rect": [392, 400, 200, 200], - "reason": "background" - } + "invalidations": [ + [392, 400, 200, 200] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/paint/invalidation/compositing/repaint-via-layout-offset-expected.txt b/third_party/blink/web_tests/paint/invalidation/compositing/repaint-via-layout-offset-expected.txt index 9a731c3..86a609c3 100644 --- a/third_party/blink/web_tests/paint/invalidation/compositing/repaint-via-layout-offset-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/compositing/repaint-via-layout-offset-expected.txt
@@ -17,17 +17,8 @@ "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) SPAN class='child')", "position": [42, 42], "bounds": [50, 50], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) SPAN class='child embiggen'", - "rect": [0, 0, 50, 50], - "reason": "chunk appeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) SPAN class='child'", - "rect": [0, 0, 40, 40], - "reason": "disappeared" - } + "invalidations": [ + [0, 0, 50, 50] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/paint/invalidation/compositing/resize-repaint-expected.txt b/third_party/blink/web_tests/paint/invalidation/compositing/resize-repaint-expected.txt index 237ea6e..35ee431 100644 --- a/third_party/blink/web_tests/paint/invalidation/compositing/resize-repaint-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/compositing/resize-repaint-expected.txt
@@ -9,22 +9,8 @@ { "name": "LayoutNGBlockFlow DIV id='resizing'", "bounds": [402, 207], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='resizing'", - "rect": [0, 0, 402, 207], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [2, 155, 398, 50], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [2, 104, 398, 50], - "reason": "appeared" - } + "invalidations": [ + [0, 0, 402, 207] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/paint/invalidation/compositing/resize-squashing-layer-that-needs-full-repaint-expected.txt b/third_party/blink/web_tests/paint/invalidation/compositing/resize-squashing-layer-that-needs-full-repaint-expected.txt index 55ccb47..f207c0e 100644 --- a/third_party/blink/web_tests/paint/invalidation/compositing/resize-squashing-layer-that-needs-full-repaint-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/compositing/resize-squashing-layer-that-needs-full-repaint-expected.txt
@@ -16,22 +16,8 @@ "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV)", "position": [47, 47], "bounds": [500, 500], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [0, 0, 500, 500], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [55, 55, 445, 445], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='to-be-removed'", - "rect": [0, 0, 50, 50], - "reason": "chunk disappeared" - } + "invalidations": [ + [0, 0, 500, 500] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/paint/invalidation/compositing/should-invoke-deferred-compositing-expected.txt b/third_party/blink/web_tests/paint/invalidation/compositing/should-invoke-deferred-compositing-expected.txt index 018ab72..b00f2f1 100644 --- a/third_party/blink/web_tests/paint/invalidation/compositing/should-invoke-deferred-compositing-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/compositing/should-invoke-deferred-compositing-expected.txt
@@ -14,12 +14,8 @@ { "name": "LayoutHTMLCanvas (positioned) CANVAS", "bounds": [200, 200], - "paintInvalidations": [ - { - "object": "LayoutHTMLCanvas (positioned) CANVAS", - "rect": [0, 0, 200, 200], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 200, 200] ] }, {
diff --git a/third_party/blink/web_tests/paint/invalidation/compositing/should-not-clip-composited-overflow-scrolling-layer-expected.txt b/third_party/blink/web_tests/paint/invalidation/compositing/should-not-clip-composited-overflow-scrolling-layer-expected.txt index 866d309..7317db9 100644 --- a/third_party/blink/web_tests/paint/invalidation/compositing/should-not-clip-composited-overflow-scrolling-layer-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/compositing/should-not-clip-composited-overflow-scrolling-layer-expected.txt
@@ -14,12 +14,8 @@ { "name": "Scrolling Contents Layer", "bounds": [1000, 1000], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='content'", - "rect": [0, 0, 1000, 1000], - "reason": "background" - } + "invalidations": [ + [0, 0, 1000, 1000] ], "transform": 2 },
diff --git a/third_party/blink/web_tests/paint/invalidation/compositing/should-not-clip-composited-viewport-scrolling-layer-expected.txt b/third_party/blink/web_tests/paint/invalidation/compositing/should-not-clip-composited-viewport-scrolling-layer-expected.txt index b16ea0a..8f6fa5ac 100644 --- a/third_party/blink/web_tests/paint/invalidation/compositing/should-not-clip-composited-viewport-scrolling-layer-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/compositing/should-not-clip-composited-viewport-scrolling-layer-expected.txt
@@ -5,12 +5,8 @@ "bounds": [2008, 1516], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='content'", - "rect": [8, 8, 2000, 1500], - "reason": "background" - } + "invalidations": [ + [8, 8, 2000, 1500] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/paint/invalidation/compositing/should-not-repaint-composited-descendants-expected.txt b/third_party/blink/web_tests/paint/invalidation/compositing/should-not-repaint-composited-descendants-expected.txt index 42461ad..0514dff 100644 --- a/third_party/blink/web_tests/paint/invalidation/compositing/should-not-repaint-composited-descendants-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/compositing/should-not-repaint-composited-descendants-expected.txt
@@ -13,17 +13,8 @@ "contentsOpaque": true, "backfaceVisibility": "hidden", "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='composited-box'", - "rect": [0, 0, 20, 70], - "reason": "full layer" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='composited-box'", - "rect": [0, 0, 10, 60], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 20, 70] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/paint/invalidation/compositing/should-not-repaint-scrolling-contents-outline-change-expected.txt b/third_party/blink/web_tests/paint/invalidation/compositing/should-not-repaint-scrolling-contents-outline-change-expected.txt index 793d8f13..14ce6bf 100644 --- a/third_party/blink/web_tests/paint/invalidation/compositing/should-not-repaint-scrolling-contents-outline-change-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/compositing/should-not-repaint-scrolling-contents-outline-change-expected.txt
@@ -11,12 +11,8 @@ "position": [-10, -10], "bounds": [220, 220], "backgroundColor": "#0000FF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [0, 0, 220, 220], - "reason": "style change" - } + "invalidations": [ + [0, 0, 220, 220] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/paint/invalidation/compositing/squash-partial-repaint-inside-squashed-layer-expected.txt b/third_party/blink/web_tests/paint/invalidation/compositing/squash-partial-repaint-inside-squashed-layer-expected.txt index 52b4a19..fa9c08c 100644 --- a/third_party/blink/web_tests/paint/invalidation/compositing/squash-partial-repaint-inside-squashed-layer-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/compositing/squash-partial-repaint-inside-squashed-layer-expected.txt
@@ -17,12 +17,8 @@ "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV class='box middle')", "position": [80, 80], "bounds": [262, 200], - "paintInvalidations": [ - { - "object": "LayoutImage (positioned) IMG id='repaintdiv' class='repaintdiv'", - "rect": [80, 80, 182, 29], - "reason": "background" - } + "invalidations": [ + [80, 80, 182, 29] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/paint/invalidation/compositing/squashing-inside-preserve-3d-element-expected.txt b/third_party/blink/web_tests/paint/invalidation/compositing/squashing-inside-preserve-3d-element-expected.txt index c9767c85..8e4eaae 100644 --- a/third_party/blink/web_tests/paint/invalidation/compositing/squashing-inside-preserve-3d-element-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/compositing/squashing-inside-preserve-3d-element-expected.txt
@@ -17,12 +17,8 @@ "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV id='target')", "position": [20, 20], "bounds": [100, 100], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target'", - "rect": [0, 0, 100, 100], - "reason": "background" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 2 }
diff --git a/third_party/blink/web_tests/paint/invalidation/compositing/stacked-float-under-composited-inline-expected.txt b/third_party/blink/web_tests/paint/invalidation/compositing/stacked-float-under-composited-inline-expected.txt index e69dec6a..63f5ebc 100644 --- a/third_party/blink/web_tests/paint/invalidation/compositing/stacked-float-under-composited-inline-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/compositing/stacked-float-under-composited-inline-expected.txt
@@ -11,12 +11,8 @@ "position": [158, 158], "bounds": [100, 100], "contentsOpaque": true, - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) (floating) DIV id='float'", - "rect": [0, 0, 100, 100], - "reason": "background" - } + "invalidations": [ + [0, 0, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/compositing/updating-scrolling-container-expected.txt b/third_party/blink/web_tests/paint/invalidation/compositing/updating-scrolling-container-expected.txt index d437e8b..fa3bc8e 100644 --- a/third_party/blink/web_tests/paint/invalidation/compositing/updating-scrolling-container-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/compositing/updating-scrolling-container-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='container'", - "rect": [8, 108, 210, 210], - "reason": "style change" - } + "invalidations": [ + [8, 108, 210, 210] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/compositing/updating-scrolling-content-expected.txt b/third_party/blink/web_tests/paint/invalidation/compositing/updating-scrolling-content-expected.txt index 6723c0e3a..004d024 100644 --- a/third_party/blink/web_tests/paint/invalidation/compositing/updating-scrolling-content-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/compositing/updating-scrolling-content-expected.txt
@@ -14,12 +14,8 @@ { "name": "Scrolling Contents Layer", "bounds": [185, 1200], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='indicator'", - "rect": [0, 0, 185, 200], - "reason": "background" - } + "invalidations": [ + [0, 0, 185, 200] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/paint/invalidation/crbug-371640-2-expected.txt b/third_party/blink/web_tests/paint/invalidation/crbug-371640-2-expected.txt index 50a8f061..59fed2ea 100644 --- a/third_party/blink/web_tests/paint/invalidation/crbug-371640-2-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/crbug-371640-2-expected.txt
@@ -5,22 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='keep' class='item'", - "rect": [348, 88, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV id='to_remove' class='item'", - "rect": [348, 88, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='keep' class='item'", - "rect": [88, 88, 100, 100], - "reason": "geometry" - } + "invalidations": [ + [348, 88, 100, 100], + [88, 88, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/css-grid-layout/align-items-change-from-baseline-expected.txt b/third_party/blink/web_tests/paint/invalidation/css-grid-layout/align-items-change-from-baseline-expected.txt index 7b575b1..78b1bf80 100644 --- a/third_party/blink/web_tests/paint/invalidation/css-grid-layout/align-items-change-from-baseline-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/css-grid-layout/align-items-change-from-baseline-expected.txt
@@ -5,27 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='item2'", - "rect": [50, 77, 50, 50], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item2'", - "rect": [50, 52, 50, 50], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item1'", - "rect": [0, 77, 50, 25], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item1'", - "rect": [0, 52, 50, 25], - "reason": "geometry" - } + "invalidations": [ + [50, 77, 50, 50], + [50, 52, 50, 50], + [0, 77, 50, 25], + [0, 52, 50, 25] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/css-grid-layout/align-items-change-to-baseline-expected.txt b/third_party/blink/web_tests/paint/invalidation/css-grid-layout/align-items-change-to-baseline-expected.txt index 7b575b1..78b1bf80 100644 --- a/third_party/blink/web_tests/paint/invalidation/css-grid-layout/align-items-change-to-baseline-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/css-grid-layout/align-items-change-to-baseline-expected.txt
@@ -5,27 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='item2'", - "rect": [50, 77, 50, 50], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item2'", - "rect": [50, 52, 50, 50], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item1'", - "rect": [0, 77, 50, 25], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item1'", - "rect": [0, 52, 50, 25], - "reason": "geometry" - } + "invalidations": [ + [50, 77, 50, 50], + [50, 52, 50, 50], + [0, 77, 50, 25], + [0, 52, 50, 25] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/css-grid-layout/align-self-change-from-baseline-expected.txt b/third_party/blink/web_tests/paint/invalidation/css-grid-layout/align-self-change-from-baseline-expected.txt index c9c2f6ee..7590338 100644 --- a/third_party/blink/web_tests/paint/invalidation/css-grid-layout/align-self-change-from-baseline-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/css-grid-layout/align-self-change-from-baseline-expected.txt
@@ -5,27 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='item2'", - "rect": [50, 77, 50, 50], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item2'", - "rect": [50, 52, 50, 50], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item1'", - "rect": [0, 127, 50, 25], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item1'", - "rect": [0, 77, 50, 25], - "reason": "geometry" - } + "invalidations": [ + [50, 77, 50, 50], + [50, 52, 50, 50], + [0, 127, 50, 25], + [0, 77, 50, 25] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/css-grid-layout/align-self-change-to-baseline-expected.txt b/third_party/blink/web_tests/paint/invalidation/css-grid-layout/align-self-change-to-baseline-expected.txt index c9c2f6ee..7590338 100644 --- a/third_party/blink/web_tests/paint/invalidation/css-grid-layout/align-self-change-to-baseline-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/css-grid-layout/align-self-change-to-baseline-expected.txt
@@ -5,27 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='item2'", - "rect": [50, 77, 50, 50], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item2'", - "rect": [50, 52, 50, 50], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item1'", - "rect": [0, 127, 50, 25], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item1'", - "rect": [0, 77, 50, 25], - "reason": "geometry" - } + "invalidations": [ + [50, 77, 50, 50], + [50, 52, 50, 50], + [0, 127, 50, 25], + [0, 77, 50, 25] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/css-grid-layout/grid-element-change-columns-repaint-expected.txt b/third_party/blink/web_tests/paint/invalidation/css-grid-layout/grid-element-change-columns-repaint-expected.txt index 7e08789..2de000ed 100644 --- a/third_party/blink/web_tests/paint/invalidation/css-grid-layout/grid-element-change-columns-repaint-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/css-grid-layout/grid-element-change-columns-repaint-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutGrid DIV class='grid min-content'", - "rect": [8, 48, 250, 50], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow DIV class='sizedToGridArea'", - "rect": [58, 48, 50, 50], - "reason": "incremental" - } + "invalidations": [ + [8, 48, 250, 50] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/css-grid-layout/grid-element-change-rows-repaint-expected.txt b/third_party/blink/web_tests/paint/invalidation/css-grid-layout/grid-element-change-rows-repaint-expected.txt index 7db9cddd..7a914021 100644 --- a/third_party/blink/web_tests/paint/invalidation/css-grid-layout/grid-element-change-rows-repaint-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/css-grid-layout/grid-element-change-rows-repaint-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutGrid DIV class='grid fit-content'", - "rect": [8, 48, 100, 150], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow DIV class='sizedToGridArea'", - "rect": [8, 98, 100, 50], - "reason": "incremental" - } + "invalidations": [ + [8, 48, 100, 150] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/css-grid-layout/grid-item-change-column-repaint-expected.txt b/third_party/blink/web_tests/paint/invalidation/css-grid-layout/grid-item-change-column-repaint-expected.txt index 327d15a..409713a 100644 --- a/third_party/blink/web_tests/paint/invalidation/css-grid-layout/grid-item-change-column-repaint-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/css-grid-layout/grid-item-change-column-repaint-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='sizedToGridArea'", - "rect": [8, 38, 100, 50], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow DIV class='sizedToGridArea'", - "rect": [208, 38, 50, 50], - "reason": "style change" - } + "invalidations": [ + [8, 38, 100, 50], + [208, 38, 50, 50] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/css-grid-layout/grid-item-change-row-repaint-expected.txt b/third_party/blink/web_tests/paint/invalidation/css-grid-layout/grid-item-change-row-repaint-expected.txt index 3354ba7..cfdfc66c 100644 --- a/third_party/blink/web_tests/paint/invalidation/css-grid-layout/grid-item-change-row-repaint-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/css-grid-layout/grid-item-change-row-repaint-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='sizedToGridArea'", - "rect": [8, 88, 100, 100], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow DIV class='sizedToGridArea'", - "rect": [8, 38, 100, 50], - "reason": "style change" - } + "invalidations": [ + [8, 88, 100, 100], + [8, 38, 100, 50] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/css-grid-layout/grid-item-z-index-change-repaint-expected.txt b/third_party/blink/web_tests/paint/invalidation/css-grid-layout/grid-item-z-index-change-repaint-expected.txt deleted file mode 100644 index c5e9425..0000000 --- a/third_party/blink/web_tests/paint/invalidation/css-grid-layout/grid-item-z-index-change-repaint-expected.txt +++ /dev/null
@@ -1,53 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow HTML", - "rect": [8, 16, 454, 320], - "reason": "chunk disappeared" - }, - { - "object": "NGPhysicalTextFragment 'This test checks that grid items correctly repaint when 'z-index' changes.'", - "rect": [8, 16, 454, 19], - "reason": "appeared" - }, - { - "object": "LayoutGrid DIV class='grid fit-content'", - "rect": [8, 236, 400, 100], - "reason": "appeared" - }, - { - "object": "LayoutGrid DIV class='grid fit-content'", - "rect": [8, 126, 400, 100], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'For this test to pass, there should be no red below.'", - "rect": [8, 52, 314, 19], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow DIV class='sizedToGridArea red'", - "rect": [208, 236, 200, 100], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow DIV class='sizedToGridArea red'", - "rect": [208, 126, 200, 100], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='item2' class='sizedToGridArea green'", - "rect": [8, 236, 200, 100], - "reason": "chunk appeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/paint/invalidation/cull-rect-change-crash-expected.txt b/third_party/blink/web_tests/paint/invalidation/cull-rect-change-crash-expected.txt index b37a8153..b7a73f5 100644 --- a/third_party/blink/web_tests/paint/invalidation/cull-rect-change-crash-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/cull-rect-change-crash-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGForeignObject foreignObject", - "rect": [0, 8, 1, 1], - "reason": "paint property change" - } + "invalidations": [ + [0, 8, 1, 1] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-composite-1-expected.txt b/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-composite-1-expected.txt index 9c280bd..4b99bc8 100644 --- a/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-composite-1-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-composite-1-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='box'", - "rect": [128, 120, 100, 100], - "reason": "background" - } + "invalidations": [ + [128, 120, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-composite-2-expected.txt b/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-composite-2-expected.txt index 5d07afe..8731663 100644 --- a/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-composite-2-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-composite-2-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='box'", - "rect": [128, 120, 200, 200], - "reason": "background" - } + "invalidations": [ + [128, 120, 200, 200] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-composite-3-expected.txt b/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-composite-3-expected.txt index 5693eb5c..9af590c 100644 --- a/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-composite-3-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-composite-3-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='box'", - "rect": [0, 0, 328, 320], - "reason": "background" - } + "invalidations": [ + [0, 0, 328, 320] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-composite-4-expected.txt b/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-composite-4-expected.txt index 5d07afe..8731663 100644 --- a/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-composite-4-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-composite-4-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='box'", - "rect": [128, 120, 200, 200], - "reason": "background" - } + "invalidations": [ + [128, 120, 200, 200] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-composite-5-expected.txt b/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-composite-5-expected.txt index 9c280bd..4b99bc8 100644 --- a/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-composite-5-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-composite-5-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='box'", - "rect": [128, 120, 100, 100], - "reason": "background" - } + "invalidations": [ + [128, 120, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-composite-6-expected.txt b/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-composite-6-expected.txt index f190dd2..19deccc6 100644 --- a/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-composite-6-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-composite-6-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='box'", - "rect": [28, 20, 300, 300], - "reason": "background" - } + "invalidations": [ + [28, 20, 300, 300] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-displacement-expected.txt b/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-displacement-expected.txt index f669631..4c263f0f 100644 --- a/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-displacement-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-displacement-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='box'", - "rect": [8, 0, 240, 240], - "reason": "background" - } + "invalidations": [ + [8, 0, 240, 240] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-gaussianblur-expected.txt b/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-gaussianblur-expected.txt index aae91959..559a942 100644 --- a/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-gaussianblur-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-gaussianblur-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='box'", - "rect": [0, 0, 318, 310], - "reason": "background" - } + "invalidations": [ + [0, 0, 318, 310] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-gaussianblur-xonly-expected.txt b/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-gaussianblur-xonly-expected.txt index 71fc83bb..38b287a 100644 --- a/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-gaussianblur-xonly-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-gaussianblur-xonly-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='box'", - "rect": [0, 50, 318, 200], - "reason": "background" - } + "invalidations": [ + [0, 50, 318, 200] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-gaussianblur-yonly-expected.txt b/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-gaussianblur-yonly-expected.txt index 06d148e2..c1a3451 100644 --- a/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-gaussianblur-yonly-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-gaussianblur-yonly-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='box'", - "rect": [58, 0, 200, 310], - "reason": "background" - } + "invalidations": [ + [58, 0, 200, 310] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-lighting-expected.txt b/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-lighting-expected.txt index 4eccd8f..5eb64e2 100644 --- a/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-lighting-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-lighting-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='box'", - "rect": [78, 70, 100, 100], - "reason": "appeared" - } + "invalidations": [ + [78, 70, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-merge-expected.txt b/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-merge-expected.txt index f190dd2..19deccc6 100644 --- a/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-merge-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-merge-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='box'", - "rect": [28, 20, 300, 300], - "reason": "background" - } + "invalidations": [ + [28, 20, 300, 300] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-morphology-expected.txt b/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-morphology-expected.txt index 9d7bcbca..ac77182 100644 --- a/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-morphology-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-morphology-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='box'", - "rect": [33, 25, 250, 250], - "reason": "background" - } + "invalidations": [ + [33, 25, 250, 250] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-morphology-xonly-expected.txt b/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-morphology-xonly-expected.txt index f50c9ce..93b777c 100644 --- a/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-morphology-xonly-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-morphology-xonly-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='box'", - "rect": [33, 50, 250, 200], - "reason": "background" - } + "invalidations": [ + [33, 50, 250, 200] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-morphology-yonly-expected.txt b/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-morphology-yonly-expected.txt index b06722c..58e929d 100644 --- a/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-morphology-yonly-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-morphology-yonly-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='box'", - "rect": [58, 25, 200, 250], - "reason": "background" - } + "invalidations": [ + [58, 25, 200, 250] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-offset-expected.txt b/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-offset-expected.txt index b3e36be..bc3ff8b 100644 --- a/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-offset-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-offset-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='box'", - "rect": [198, 198, 110, 110], - "reason": "background" - } + "invalidations": [ + [198, 198, 110, 110] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-primitive-attr-mutation-expected.txt b/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-primitive-attr-mutation-expected.txt index 3da56d4b..e6987437 100644 --- a/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-primitive-attr-mutation-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-primitive-attr-mutation-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='target'", - "rect": [8, 8, 100, 100], - "reason": "paint property change" - } + "invalidations": [ + [8, 8, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-primitive-attr-removal-expected.txt b/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-primitive-attr-removal-expected.txt index 3da56d4b..e6987437 100644 --- a/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-primitive-attr-removal-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-primitive-attr-removal-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='target'", - "rect": [8, 8, 100, 100], - "reason": "paint property change" - } + "invalidations": [ + [8, 8, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-primitive-removed-expected.txt b/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-primitive-removed-expected.txt index 3da56d4b..e6987437 100644 --- a/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-primitive-removed-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/filters/effect-reference-repaint-primitive-removed-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='target'", - "rect": [8, 8, 100, 100], - "reason": "paint property change" - } + "invalidations": [ + [8, 8, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/filters/filter-invalidation-after-display-expected.txt b/third_party/blink/web_tests/paint/invalidation/filters/filter-invalidation-after-display-expected.txt index 6f1ac56..f835ac6f 100644 --- a/third_party/blink/web_tests/paint/invalidation/filters/filter-invalidation-after-display-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/filters/filter-invalidation-after-display-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='box' class='green drop-shadowed box'", - "rect": [300, 8, 330, 330], - "reason": "chunk disappeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='box' class='green box'", - "rect": [300, 8, 200, 200], - "reason": "appeared" - } + "invalidations": [ + [300, 8, 330, 330] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/filters/filter-invalidation-positioned-child-expected.txt b/third_party/blink/web_tests/paint/invalidation/filters/filter-invalidation-positioned-child-expected.txt index 97776e7..d6cc18f1 100644 --- a/third_party/blink/web_tests/paint/invalidation/filters/filter-invalidation-positioned-child-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/filters/filter-invalidation-positioned-child-expected.txt
@@ -5,27 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='box'", - "rect": [8, 8, 430, 230], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='positioned'", - "rect": [408, 408, 380, 180], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow DIV id='box'", - "rect": [8, 8, 380, 180], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='positioned'", - "rect": [408, 408, 330, 130], - "reason": "paint property change" - } + "invalidations": [ + [8, 8, 430, 230], + [408, 408, 380, 180] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/filters/filter-invalidation-with-composited-container-change-expected.txt b/third_party/blink/web_tests/paint/invalidation/filters/filter-invalidation-with-composited-container-change-expected.txt index 8f3bb30..2fe6318 100644 --- a/third_party/blink/web_tests/paint/invalidation/filters/filter-invalidation-with-composited-container-change-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/filters/filter-invalidation-with-composited-container-change-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='box' class='green drop-shadowed box'", - "rect": [8, 8, 330, 330], - "reason": "chunk disappeared" - } + "invalidations": [ + [8, 8, 330, 330] ] }, { @@ -18,12 +14,8 @@ "bounds": [200, 200], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='box' class='green box blurry'", - "rect": [0, 0, 200, 200], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 200, 200] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/paint/invalidation/filters/filter-repaint-accelerated-on-accelerated-filter-expected.txt b/third_party/blink/web_tests/paint/invalidation/filters/filter-repaint-accelerated-on-accelerated-filter-expected.txt index 823fba7..ca7d7c4 100644 --- a/third_party/blink/web_tests/paint/invalidation/filters/filter-repaint-accelerated-on-accelerated-filter-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/filters/filter-repaint-accelerated-on-accelerated-filter-expected.txt
@@ -16,12 +16,8 @@ "bounds": [100, 200], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='resize' class='drop-shadow accelerated'", - "rect": [0, 0, 100, 200], - "reason": "geometry" - } + "invalidations": [ + [0, 0, 100, 200] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/paint/invalidation/flexbox/align-content-change-expected.txt b/third_party/blink/web_tests/paint/invalidation/flexbox/align-content-change-expected.txt index dcd0a71..53ac702 100644 --- a/third_party/blink/web_tests/paint/invalidation/flexbox/align-content-change-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/flexbox/align-content-change-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [0, 202, 200, 150], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [0, 52, 200, 150], - "reason": "geometry" - } + "invalidations": [ + [0, 202, 200, 150], + [0, 52, 200, 150] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/flexbox/align-content-distribution-change-grid-expected.txt b/third_party/blink/web_tests/paint/invalidation/flexbox/align-content-distribution-change-grid-expected.txt index 39d626e..f3620fa9 100644 --- a/third_party/blink/web_tests/paint/invalidation/flexbox/align-content-distribution-change-grid-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/flexbox/align-content-distribution-change-grid-expected.txt
@@ -5,22 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [0, 252, 200, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [0, 152, 200, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [0, 52, 200, 100], - "reason": "geometry" - } + "invalidations": [ + [0, 252, 200, 100], + [0, 152, 200, 100], + [0, 52, 200, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/flexbox/align-items-change-expected.txt b/third_party/blink/web_tests/paint/invalidation/flexbox/align-items-change-expected.txt index bdb134e..e13aac3 100644 --- a/third_party/blink/web_tests/paint/invalidation/flexbox/align-items-change-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/flexbox/align-items-change-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [100, 52, 100, 300], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [0, 52, 100, 300], - "reason": "geometry" - } + "invalidations": [ + [100, 52, 100, 300], + [0, 52, 100, 300] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/flexbox/align-self-change-expected.txt b/third_party/blink/web_tests/paint/invalidation/flexbox/align-self-change-expected.txt index bdb134e..e13aac3 100644 --- a/third_party/blink/web_tests/paint/invalidation/flexbox/align-self-change-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/flexbox/align-self-change-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [100, 52, 100, 300], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [0, 52, 100, 300], - "reason": "geometry" - } + "invalidations": [ + [100, 52, 100, 300], + [0, 52, 100, 300] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/flexbox/align-self-change-grid-expected.txt b/third_party/blink/web_tests/paint/invalidation/flexbox/align-self-change-grid-expected.txt index 8de09fbd..3e75c877 100644 --- a/third_party/blink/web_tests/paint/invalidation/flexbox/align-self-change-grid-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/flexbox/align-self-change-grid-expected.txt
@@ -5,32 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='item1'", - "rect": [0, 52, 100, 300], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item3'", - "rect": [100, 202, 100, 150], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item2'", - "rect": [100, 127, 100, 150], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item3'", - "rect": [100, 127, 100, 150], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item2'", - "rect": [100, 52, 100, 150], - "reason": "geometry" - } + "invalidations": [ + [0, 52, 100, 300], + [100, 202, 100, 150], + [100, 127, 100, 150], + [100, 52, 100, 150] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/flexbox/justify-content-change-expected.txt b/third_party/blink/web_tests/paint/invalidation/flexbox/justify-content-change-expected.txt index f8890ba2..31003c3 100644 --- a/third_party/blink/web_tests/paint/invalidation/flexbox/justify-content-change-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/flexbox/justify-content-change-expected.txt
@@ -5,27 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [148, 52, 52, 300], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [124, 52, 52, 300], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [24, 52, 52, 300], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [0, 52, 52, 300], - "reason": "geometry" - } + "invalidations": [ + [148, 52, 52, 300], + [124, 52, 52, 300], + [24, 52, 52, 300], + [0, 52, 52, 300] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/flexbox/justify-content-distribution-change-grid-expected.txt b/third_party/blink/web_tests/paint/invalidation/flexbox/justify-content-distribution-change-grid-expected.txt index 2794dc83..c6aedac 100644 --- a/third_party/blink/web_tests/paint/invalidation/flexbox/justify-content-distribution-change-grid-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/flexbox/justify-content-distribution-change-grid-expected.txt
@@ -5,22 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [200, 52, 100, 200], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [100, 52, 100, 200], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [0, 52, 100, 200], - "reason": "geometry" - } + "invalidations": [ + [200, 52, 100, 200], + [100, 52, 100, 200], + [0, 52, 100, 200] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/flexbox/justify-items-change-expected.txt b/third_party/blink/web_tests/paint/invalidation/flexbox/justify-items-change-expected.txt index b55b3b4c..a481a20 100644 --- a/third_party/blink/web_tests/paint/invalidation/flexbox/justify-items-change-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/flexbox/justify-items-change-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [150, 52, 50, 300], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [0, 52, 50, 300], - "reason": "geometry" - } + "invalidations": [ + [150, 52, 50, 300], + [0, 52, 50, 300] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/flexbox/justify-items-legacy-change-expected.txt b/third_party/blink/web_tests/paint/invalidation/flexbox/justify-items-legacy-change-expected.txt index cb127f2..fa5692c 100644 --- a/third_party/blink/web_tests/paint/invalidation/flexbox/justify-items-legacy-change-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/flexbox/justify-items-legacy-change-expected.txt
@@ -5,27 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='item2'", - "rect": [124, 52, 52, 150], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item2'", - "rect": [100, 52, 52, 150], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item1'", - "rect": [24, 52, 52, 150], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item1'", - "rect": [0, 52, 52, 150], - "reason": "geometry" - } + "invalidations": [ + [124, 52, 52, 150], + [100, 52, 52, 150], + [24, 52, 52, 150], + [0, 52, 52, 150] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/flexbox/justify-self-change-expected.txt b/third_party/blink/web_tests/paint/invalidation/flexbox/justify-self-change-expected.txt index 7b58faea..c10f8f8 100644 --- a/third_party/blink/web_tests/paint/invalidation/flexbox/justify-self-change-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/flexbox/justify-self-change-expected.txt
@@ -5,32 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='item1'", - "rect": [0, 52, 100, 300], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item3'", - "rect": [150, 52, 50, 300], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item2'", - "rect": [125, 52, 50, 300], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item3'", - "rect": [125, 52, 50, 300], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item2'", - "rect": [100, 52, 50, 300], - "reason": "geometry" - } + "invalidations": [ + [0, 52, 100, 300], + [150, 52, 50, 300], + [125, 52, 50, 300], + [100, 52, 50, 300] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/flexbox/repaint-column-reverse-expected.txt b/third_party/blink/web_tests/paint/invalidation/flexbox/repaint-column-reverse-expected.txt index 370c362..b57a3c3f 100644 --- a/third_party/blink/web_tests/paint/invalidation/flexbox/repaint-column-reverse-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/flexbox/repaint-column-reverse-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='blue' class='flex-item'", - "rect": [8, 68, 200, 30], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV id='blue' class='flex-item'", - "rect": [9, 69, 198, 30], - "reason": "geometry" - } + "invalidations": [ + [8, 68, 200, 30], + [9, 69, 198, 30] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/flexbox/repaint-during-resize-no-flex-expected.txt b/third_party/blink/web_tests/paint/invalidation/flexbox/repaint-during-resize-no-flex-expected.txt index 60329f7..a2ca8d25 100644 --- a/third_party/blink/web_tests/paint/invalidation/flexbox/repaint-during-resize-no-flex-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/flexbox/repaint-during-resize-no-flex-expected.txt
@@ -5,32 +5,12 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='flex-item-1' class='flex-item width'", - "rect": [30, 20, 40, 50], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow DIV class='flex-item'", - "rect": [160, 20, 10, 50], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='flex-item'", - "rect": [120, 20, 10, 50], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='flex-item'", - "rect": [110, 20, 10, 50], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='flex-item'", - "rect": [70, 20, 10, 50], - "reason": "geometry" - } + "invalidations": [ + [30, 20, 40, 50], + [160, 20, 10, 50], + [120, 20, 10, 50], + [110, 20, 10, 50], + [70, 20, 10, 50] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/flexbox/repaint-on-layout-expected.txt b/third_party/blink/web_tests/paint/invalidation/flexbox/repaint-on-layout-expected.txt index 294cf83..18eba58 100644 --- a/third_party/blink/web_tests/paint/invalidation/flexbox/repaint-on-layout-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/flexbox/repaint-on-layout-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='badge'", - "rect": [712, 8, 80, 20], - "reason": "disappeared" - } + "invalidations": [ + [712, 8, 80, 20] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/flexbox/repaint-on-margin-change-expected.txt b/third_party/blink/web_tests/paint/invalidation/flexbox/repaint-on-margin-change-expected.txt index c35d2d3..7e57e8f6 100644 --- a/third_party/blink/web_tests/paint/invalidation/flexbox/repaint-on-margin-change-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/flexbox/repaint-on-margin-change-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='child-to-grow' class='child'", - "rect": [48, 28, 20, 20], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV id='child-to-grow' class='child'", - "rect": [8, 28, 20, 20], - "reason": "geometry" - } + "invalidations": [ + [48, 28, 20, 20], + [8, 28, 20, 20] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/flexbox/repaint-opacity-change-expected.txt b/third_party/blink/web_tests/paint/invalidation/flexbox/repaint-opacity-change-expected.txt index 88672d47..9e44c67 100644 --- a/third_party/blink/web_tests/paint/invalidation/flexbox/repaint-opacity-change-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/flexbox/repaint-opacity-change-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target' class='item'", - "rect": [18, 18, 764, 20], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='target' class='item'", - "rect": [18, 18, 764, 20], - "reason": "chunk disappeared" - } + "invalidations": [ + [18, 18, 764, 20] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/flexbox/repaint-rtl-column-expected.txt b/third_party/blink/web_tests/paint/invalidation/flexbox/repaint-rtl-column-expected.txt index 30aea37..28dfb65 100644 --- a/third_party/blink/web_tests/paint/invalidation/flexbox/repaint-rtl-column-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/flexbox/repaint-rtl-column-expected.txt
@@ -5,47 +5,12 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='content'", - "rect": [8, 116, 200, 252], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow DIV id='content'", - "rect": [8, 119, 200, 249], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow DIV id='left'", - "rect": [8, 68, 200, 145], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV id='left'", - "rect": [8, 68, 200, 52], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [13, 124, 190, 351], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [13, 124, 190, 351], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [13, 121, 190, 351], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [13, 218, 190, 350], - "reason": "geometry" - } + "invalidations": [ + [8, 116, 200, 252], + [8, 68, 200, 145], + [13, 124, 190, 351], + [13, 121, 190, 351], + [13, 218, 190, 350] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/flexbox/scrollbars-changed-expected.txt b/third_party/blink/web_tests/paint/invalidation/flexbox/scrollbars-changed-expected.txt index 5c92a9d..320ac66 100644 --- a/third_party/blink/web_tests/paint/invalidation/flexbox/scrollbars-changed-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/flexbox/scrollbars-changed-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'a'", - "rect": [0, 5, 15, 15], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'z'", - "rect": [0, 5, 15, 15], - "reason": "appeared" - } + "invalidations": [ + [0, 5, 15, 15] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/float-in-new-block-with-layout-delta-expected.txt b/third_party/blink/web_tests/paint/invalidation/float-in-new-block-with-layout-delta-expected.txt index b49b356..ed615e7 100644 --- a/third_party/blink/web_tests/paint/invalidation/float-in-new-block-with-layout-delta-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/float-in-new-block-with-layout-delta-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [8, 108, 100, 100], - "reason": "appeared" - } + "invalidations": [ + [8, 108, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/float-new-in-block-expected.txt b/third_party/blink/web_tests/paint/invalidation/float-new-in-block-expected.txt index 6b52e0b..b8a5912 100644 --- a/third_party/blink/web_tests/paint/invalidation/float-new-in-block-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/float-new-in-block-expected.txt
@@ -5,22 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [8, 8, 784, 20], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [8, 8, 784, 20], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV id='target'", - "rect": [8, 8, 100, 100], - "reason": "appeared" - } + "invalidations": [ + [8, 8, 784, 20], + [8, 8, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/forms/button-checkbox-click-method-repaint-expected.txt b/third_party/blink/web_tests/paint/invalidation/forms/button-checkbox-click-method-repaint-expected.txt new file mode 100644 index 0000000..6cf9a5c7 --- /dev/null +++ b/third_party/blink/web_tests/paint/invalidation/forms/button-checkbox-click-method-repaint-expected.txt
@@ -0,0 +1,14 @@ +{ + "layers": [ + { + "name": "Scrolling Contents Layer", + "bounds": [800, 600], + "contentsOpaque": true, + "backgroundColor": "#FFFFFF", + "invalidations": [ + [12, 61, 30, 30] + ] + } + ] +} +
diff --git a/third_party/blink/web_tests/paint/invalidation/forms/checkbox-focus-by-mouse-then-keydown-expected.txt b/third_party/blink/web_tests/paint/invalidation/forms/checkbox-focus-by-mouse-then-keydown-expected.txt index 6da8e59..2110415 100644 --- a/third_party/blink/web_tests/paint/invalidation/forms/checkbox-focus-by-mouse-then-keydown-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/forms/checkbox-focus-by-mouse-then-keydown-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow INPUT", - "rect": [8, 7, 21, 21], - "reason": "subtree" - } + "invalidations": [ + [8, 7, 21, 21] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/forms/radio-focus-by-mouse-then-keydown-expected.txt b/third_party/blink/web_tests/paint/invalidation/forms/radio-focus-by-mouse-then-keydown-expected.txt index 392b19fa..9846119 100644 --- a/third_party/blink/web_tests/paint/invalidation/forms/radio-focus-by-mouse-then-keydown-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/forms/radio-focus-by-mouse-then-keydown-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow INPUT", - "rect": [9, 7, 21, 21], - "reason": "subtree" - } + "invalidations": [ + [9, 7, 21, 21] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/forms/range-focus-by-mouse-then-keydown-expected.txt b/third_party/blink/web_tests/paint/invalidation/forms/range-focus-by-mouse-then-keydown-expected.txt index e03a6504..2bb0639ca 100644 --- a/third_party/blink/web_tests/paint/invalidation/forms/range-focus-by-mouse-then-keydown-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/forms/range-focus-by-mouse-then-keydown-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSlider INPUT", - "rect": [8, 8, 133, 20], - "reason": "subtree" - }, - { - "object": "LayoutBlockFlow DIV id='thumb'", - "rect": [66, 10, 17, 16], - "reason": "subtree" - } + "invalidations": [ + [8, 8, 133, 20] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/forms/textarea-appearance-none-resize-handle-expected.txt b/third_party/blink/web_tests/paint/invalidation/forms/textarea-appearance-none-resize-handle-expected.txt index f70d3a06..f3d4d337a 100644 --- a/third_party/blink/web_tests/paint/invalidation/forms/textarea-appearance-none-resize-handle-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/forms/textarea-appearance-none-resize-handle-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTextControl (positioned) TEXTAREA id='textarea'", - "rect": [0, 50, 106, 206], - "reason": "geometry" - }, - { - "object": "Scroll corner of LayoutTextControl (positioned) TEXTAREA id='textarea'", - "rect": [90, 240, 15, 15], - "reason": "geometry" - }, - { - "object": "Scroll corner of LayoutTextControl (positioned) TEXTAREA id='textarea'", - "rect": [90, 140, 15, 15], - "reason": "geometry" - } + "invalidations": [ + [0, 50, 106, 206] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/forms/textarea-resize-property-change-expected.txt b/third_party/blink/web_tests/paint/invalidation/forms/textarea-resize-property-change-expected.txt index 57f8ac3a..8f64356 100644 --- a/third_party/blink/web_tests/paint/invalidation/forms/textarea-resize-property-change-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/forms/textarea-resize-property-change-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTextControl (positioned) TEXTAREA id='textarea'", - "rect": [0, 50, 106, 106], - "reason": "style change" - }, - { - "object": "LayoutTextControl (positioned) TEXTAREA id='textarea'", - "rect": [90, 140, 15, 15], - "reason": "chunk appeared" - } + "invalidations": [ + [0, 50, 106, 106] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/forms/textarea-set-disabled-expected.txt b/third_party/blink/web_tests/paint/invalidation/forms/textarea-set-disabled-expected.txt index 5742093..5c2fa64 100644 --- a/third_party/blink/web_tests/paint/invalidation/forms/textarea-set-disabled-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/forms/textarea-set-disabled-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTextControl TEXTAREA", - "rect": [8, 8, 106, 106], - "reason": "subtree" - } + "invalidations": [ + [8, 8, 106, 106] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/iframe-rounding-expected.txt b/third_party/blink/web_tests/paint/invalidation/iframe-rounding-expected.txt index 9e989b9..76dcc793 100644 --- a/third_party/blink/web_tests/paint/invalidation/iframe-rounding-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/iframe-rounding-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='target'", - "rect": [19, 18, 101, 100], - "reason": "background" - } + "invalidations": [ + [19, 18, 101, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/image/do-not-paint-below-image-baseline-expected.txt b/third_party/blink/web_tests/paint/invalidation/image/do-not-paint-below-image-baseline-expected.txt index 52e7f8e4..70b841b5 100644 --- a/third_party/blink/web_tests/paint/invalidation/image/do-not-paint-below-image-baseline-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/image/do-not-paint-below-image-baseline-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutImage IMG", - "rect": [50, 50, 259, 194], - "reason": "background" - } + "invalidations": [ + [50, 50, 259, 194] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/image/image-resize-expected.txt b/third_party/blink/web_tests/paint/invalidation/image/image-resize-expected.txt index 71ce137a..7a916762 100644 --- a/third_party/blink/web_tests/paint/invalidation/image/image-resize-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/image/image-resize-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutImage (positioned) IMG", - "rect": [0, 50, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutImage (positioned) IMG", - "rect": [0, 50, 100, 200], - "reason": "geometry" - } + "invalidations": [ + [0, 50, 150, 150], + [0, 50, 100, 200] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/image/percent-size-image-resize-container-expected.txt b/third_party/blink/web_tests/paint/invalidation/image/percent-size-image-resize-container-expected.txt index 71ce137a..7a916762 100644 --- a/third_party/blink/web_tests/paint/invalidation/image/percent-size-image-resize-container-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/image/percent-size-image-resize-container-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutImage (positioned) IMG", - "rect": [0, 50, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutImage (positioned) IMG", - "rect": [0, 50, 100, 200], - "reason": "geometry" - } + "invalidations": [ + [0, 50, 150, 150], + [0, 50, 100, 200] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/inline-block-resize-expected.txt b/third_party/blink/web_tests/paint/invalidation/inline-block-resize-expected.txt index 8c10284..e6987437 100644 --- a/third_party/blink/web_tests/paint/invalidation/inline-block-resize-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/inline-block-resize-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [8, 8, 100, 100], - "reason": "appeared" - } + "invalidations": [ + [8, 8, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/inline-reflow-expected.txt b/third_party/blink/web_tests/paint/invalidation/inline-reflow-expected.txt index 096a98085..6a92ef1 100644 --- a/third_party/blink/web_tests/paint/invalidation/inline-reflow-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/inline-reflow-expected.txt
@@ -5,137 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'A A A A A AA AA'", - "rect": [0, 0, 300, 200], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'A A'", - "rect": [0, 0, 300, 200], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'AA AA AA A A A'", - "rect": [0, 0, 300, 200], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'AA AA AAA AAA'", - "rect": [0, 0, 300, 200], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'AAA AAA AAA AA'", - "rect": [0, 0, 300, 200], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'AAA AAAA AAAA'", - "rect": [0, 0, 300, 200], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'AAAAA AAAA AAAA'", - "rect": [0, 0, 300, 200], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'AAAAA AAAAA'", - "rect": [0, 0, 300, 200], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'AAAAAA AAAAA'", - "rect": [0, 0, 300, 200], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'AAAAAA AAAAAAA'", - "rect": [0, 0, 300, 200], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'A A A A A AA AA'", - "rect": [0, 0, 200, 300], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'A A A A'", - "rect": [0, 0, 200, 300], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'A A'", - "rect": [0, 0, 200, 300], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'AA AA AA A A A'", - "rect": [0, 0, 200, 300], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'AA AA AA A'", - "rect": [0, 0, 200, 300], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'AA AA AAA AAA'", - "rect": [0, 0, 200, 300], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'AAA AAA AA'", - "rect": [0, 0, 200, 300], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'AAA AAA AAA AA'", - "rect": [0, 0, 200, 300], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'AAA AAAA AAAA'", - "rect": [0, 0, 200, 300], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'AAAA AAA'", - "rect": [0, 0, 200, 300], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'AAAAA AAAA AAAA'", - "rect": [0, 0, 200, 300], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'AAAAA AAAA'", - "rect": [0, 0, 200, 300], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'AAAAA AAAAA'", - "rect": [0, 0, 200, 300], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'AAAAAA AAAAA'", - "rect": [0, 0, 200, 300], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'AAAAAA AAAAAAA'", - "rect": [0, 0, 200, 300], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'A A A A A'", - "rect": [0, 300, 180, 20], - "reason": "geometry" - } + "invalidations": [ + [0, 0, 300, 200], + [0, 0, 200, 300], + [0, 300, 180, 20] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/insert-frame-expected.txt b/third_party/blink/web_tests/paint/invalidation/insert-frame-expected.txt index a3f23a3..2b4e0b6 100644 --- a/third_party/blink/web_tests/paint/invalidation/insert-frame-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/insert-frame-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutIFrame IFRAME", - "rect": [0, 0, 104, 104], - "reason": "appeared" - } + "invalidations": [ + [0, 0, 104, 104] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/invalidate-caret-before-text-node-update-expected.txt b/third_party/blink/web_tests/paint/invalidation/invalidate-caret-before-text-node-update-expected.txt new file mode 100644 index 0000000..3c2f1b9 --- /dev/null +++ b/third_party/blink/web_tests/paint/invalidation/invalidate-caret-before-text-node-update-expected.txt
@@ -0,0 +1,14 @@ +{ + "layers": [ + { + "name": "Scrolling Contents Layer", + "bounds": [800, 600], + "contentsOpaque": true, + "backgroundColor": "#FFFFFF", + "invalidations": [ + [6, 6, 788, 22] + ] + } + ] +} +
diff --git a/third_party/blink/web_tests/paint/invalidation/invalidate-descendants-when-receiving-paint-layer-expected.txt b/third_party/blink/web_tests/paint/invalidation/invalidate-descendants-when-receiving-paint-layer-expected.txt index 093c68c..f5337eb 100644 --- a/third_party/blink/web_tests/paint/invalidation/invalidate-descendants-when-receiving-paint-layer-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/invalidate-descendants-when-receiving-paint-layer-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='child'", - "rect": [9, 9, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [9, 9, 100, 100], - "reason": "chunk appeared" - } + "invalidations": [ + [9, 9, 100, 100] ] }, {
diff --git a/third_party/blink/web_tests/paint/invalidation/invalidate-invisible-element-expected.txt b/third_party/blink/web_tests/paint/invalidation/invalidate-invisible-element-expected.txt index 0f2be5dd..a74530a 100644 --- a/third_party/blink/web_tests/paint/invalidation/invalidate-invisible-element-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/invalidate-invisible-element-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target'", - "rect": [200, 300, 200, 200], - "reason": "appeared" - } + "invalidations": [ + [200, 300, 200, 200] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/invalidation-on-foreground-graphics-layer-expected.txt b/third_party/blink/web_tests/paint/invalidation/invalidation-on-foreground-graphics-layer-expected.txt index 468d394..f2d23b73 100644 --- a/third_party/blink/web_tests/paint/invalidation/invalidation-on-foreground-graphics-layer-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/invalidation-on-foreground-graphics-layer-expected.txt
@@ -29,12 +29,8 @@ { "name": "LayoutNGBlockFlow DIV (foreground) Layer", "bounds": [300, 300], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [100, 100, 200, 200], - "reason": "background" - } + "invalidations": [ + [100, 100, 200, 200] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/paint/invalidation/invalidation-with-zero-size-object-expected.txt b/third_party/blink/web_tests/paint/invalidation/invalidation-with-zero-size-object-expected.txt index e888114..d79c3a8 100644 --- a/third_party/blink/web_tests/paint/invalidation/invalidation-with-zero-size-object-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/invalidation-with-zero-size-object-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='element'", - "rect": [8, 8, 200, 200], - "reason": "disappeared" - } + "invalidations": [ + [8, 8, 200, 200] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/layer-full-repaint-expected.txt b/third_party/blink/web_tests/paint/invalidation/layer-full-repaint-expected.txt index 28d2fbb..e6987437 100644 --- a/third_party/blink/web_tests/paint/invalidation/layer-full-repaint-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/layer-full-repaint-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='test' class='selected'", - "rect": [8, 8, 100, 100], - "reason": "background" - } + "invalidations": [ + [8, 8, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/layer-hide-when-needs-layout-expected.txt b/third_party/blink/web_tests/paint/invalidation/layer-hide-when-needs-layout-expected.txt index 65d33f5..e6987437 100644 --- a/third_party/blink/web_tests/paint/invalidation/layer-hide-when-needs-layout-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/layer-hide-when-needs-layout-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target'", - "rect": [8, 8, 100, 100], - "reason": "disappeared" - } + "invalidations": [ + [8, 8, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/layer-visibility-expected.txt b/third_party/blink/web_tests/paint/invalidation/layer-visibility-expected.txt index a5fb747..5f0614e 100644 --- a/third_party/blink/web_tests/paint/invalidation/layer-visibility-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/layer-visibility-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target'", - "rect": [100, 0, 100, 100], - "reason": "background" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target'", - "rect": [0, 0, 100, 100], - "reason": "background" - } + "invalidations": [ + [100, 0, 100, 100], + [0, 0, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/media-audio-no-spurious-repaints.html b/third_party/blink/web_tests/paint/invalidation/media-audio-no-spurious-repaints.html index 0ade09b..a5c033ed 100644 --- a/third_party/blink/web_tests/paint/invalidation/media-audio-no-spurious-repaints.html +++ b/third_party/blink/web_tests/paint/invalidation/media-audio-no-spurious-repaints.html
@@ -17,10 +17,10 @@ video.addEventListener('ended', t.step_func(function() { var layerTree = internals.layerTreeAsText( - document, internals.LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS); + document, internals.LAYER_TREE_INCLUDES_DETAILED_INVALIDATIONS); var layers = JSON.parse(layerTree)['layers']; var scrollingContentsLayer = layers[0]; - var paintInvalidations = scrollingContentsLayer.paintInvalidations; + var invalidations = scrollingContentsLayer.invalidations; internals.stopTrackingRepaints(document); // Manually verify the number of repaints instead of using a repaint @@ -36,8 +36,8 @@ '. Actual layer tree: ' + layerTree); }); - for (var i = 0; i < paintInvalidations.length; ++i) { - if (paintInvalidations[i].object.includes('InlineTextBox')) + for (var i = 0; i < invalidations.length; ++i) { + if (invalidations[i].object.includes('InlineTextBox')) actual++; } assert_between_inclusive(actual, minExpected, maxExpected);
diff --git a/third_party/blink/web_tests/paint/invalidation/mix-blend-mode-separate-stacking-context-expected.txt b/third_party/blink/web_tests/paint/invalidation/mix-blend-mode-separate-stacking-context-expected.txt index 81bf180..196c637 100644 --- a/third_party/blink/web_tests/paint/invalidation/mix-blend-mode-separate-stacking-context-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/mix-blend-mode-separate-stacking-context-expected.txt
@@ -5,72 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 800, 600], - "reason": "chunk appeared" - }, - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 800, 600], - "reason": "chunk disappeared" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) (floating) DIV", - "rect": [128, 28, 80, 80], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) (floating) DIV", - "rect": [28, 28, 80, 80], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [348, 48, 60, 60], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) (floating) DIV id='fourth'", - "rect": [328, 28, 60, 60], - "reason": "chunk appeared" - }, - { - "object": "LayoutNGBlockFlow HTML", - "rect": [328, 28, 60, 60], - "reason": "chunk disappeared" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV id='third'", - "rect": [248, 48, 60, 60], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) (floating) DIV", - "rect": [228, 28, 60, 60], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV id='second'", - "rect": [148, 48, 60, 60], - "reason": "chunk disappeared" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) (floating) DIV", - "rect": [128, 28, 60, 60], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV id='first'", - "rect": [48, 48, 60, 60], - "reason": "chunk appeared" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) (floating) DIV", - "rect": [28, 28, 60, 60], - "reason": "paint property change" - } + "invalidations": [ + [0, 0, 800, 600] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/multicol/multicol-as-paint-container-expected.txt b/third_party/blink/web_tests/paint/invalidation/multicol/multicol-as-paint-container-expected.txt index f910699..046e4c35b 100644 --- a/third_party/blink/web_tests/paint/invalidation/multicol/multicol-as-paint-container-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/multicol/multicol-as-paint-container-expected.txt
@@ -10,92 +10,8 @@ "name": "LayoutBlockFlow DIV id='target'", "bounds": [630, 180], "backfaceVisibility": "hidden", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Lorem ipsum'", - "rect": [0, 0, 625, 180], - "reason": "style change" - }, - { - "object": "InlineTextBox 'adipiscing'", - "rect": [0, 0, 625, 180], - "reason": "style change" - }, - { - "object": "InlineTextBox 'consectetur'", - "rect": [0, 0, 625, 180], - "reason": "style change" - }, - { - "object": "InlineTextBox 'dolor sit amet,'", - "rect": [0, 0, 625, 180], - "reason": "style change" - }, - { - "object": "InlineTextBox 'eget, dapibus'", - "rect": [0, 0, 625, 180], - "reason": "style change" - }, - { - "object": "InlineTextBox 'elit. Fusce'", - "rect": [0, 0, 625, 180], - "reason": "style change" - }, - { - "object": "InlineTextBox 'eu fringilla'", - "rect": [0, 0, 625, 180], - "reason": "style change" - }, - { - "object": "InlineTextBox 'libero,'", - "rect": [0, 0, 625, 180], - "reason": "style change" - }, - { - "object": "InlineTextBox 'non condimentum'", - "rect": [0, 0, 625, 180], - "reason": "style change" - }, - { - "object": "InlineTextBox 'pulvinar, ipsum'", - "rect": [0, 0, 625, 180], - "reason": "style change" - }, - { - "object": "InlineTextBox 'purus. Ut nisl'", - "rect": [0, 0, 625, 180], - "reason": "style change" - }, - { - "object": "InlineTextBox 'quam est eu'", - "rect": [0, 0, 625, 180], - "reason": "style change" - }, - { - "object": "InlineTextBox 'sapien'", - "rect": [0, 0, 625, 180], - "reason": "style change" - }, - { - "object": "InlineTextBox 'suscipit ut leo'", - "rect": [0, 0, 625, 180], - "reason": "style change" - }, - { - "object": "InlineTextBox 'ultrices dolor.'", - "rect": [0, 0, 625, 180], - "reason": "style change" - }, - { - "object": "InlineTextBox 'ultricies arcu,'", - "rect": [0, 0, 625, 180], - "reason": "style change" - }, - { - "object": "InlineTextBox 'varius, metus'", - "rect": [0, 0, 625, 180], - "reason": "style change" - } + "invalidations": [ + [0, 0, 625, 180] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/paint/invalidation/multicol/multicol-relpos-with-abspos-expected.txt b/third_party/blink/web_tests/paint/invalidation/multicol/multicol-relpos-with-abspos-expected.txt index 6391df82..01cc3f60 100644 --- a/third_party/blink/web_tests/paint/invalidation/multicol/multicol-relpos-with-abspos-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/multicol/multicol-relpos-with-abspos-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='target'", - "rect": [618, 28, 20, 20], - "reason": "appeared" - } + "invalidations": [ + [618, 28, 20, 20] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/multicol/multicol-resize-with-rule-expected.txt b/third_party/blink/web_tests/paint/invalidation/multicol/multicol-resize-with-rule-expected.txt index b159c7e..c4d556f 100644 --- a/third_party/blink/web_tests/paint/invalidation/multicol/multicol-resize-with-rule-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/multicol/multicol-resize-with-rule-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutMultiColumnSet (anonymous)", - "rect": [8, 8, 600, 200], - "reason": "geometry" - } + "invalidations": [ + [8, 8, 600, 200] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/multicol/multicol-with-abspos-in-relpos-expected.txt b/third_party/blink/web_tests/paint/invalidation/multicol/multicol-with-abspos-in-relpos-expected.txt index 36045ca..436992e 100644 --- a/third_party/blink/web_tests/paint/invalidation/multicol/multicol-with-abspos-in-relpos-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/multicol/multicol-with-abspos-in-relpos-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='target'", - "rect": [508, 28, 80, 20], - "reason": "chunk appeared" - } + "invalidations": [ + [508, 28, 80, 20] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/multicol/multicol-with-block-expected.txt b/third_party/blink/web_tests/paint/invalidation/multicol/multicol-with-block-expected.txt index 36ea1e6..1c10046 100644 --- a/third_party/blink/web_tests/paint/invalidation/multicol/multicol-with-block-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/multicol/multicol-with-block-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutMultiColumnFlowThread (anonymous)", - "rect": [488, 8, 80, 20], - "reason": "chunk appeared" - } + "invalidations": [ + [488, 8, 80, 20] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/multicol/multicol-with-inline-expected.txt b/third_party/blink/web_tests/paint/invalidation/multicol/multicol-with-inline-expected.txt index 36ea1e6..1c10046 100644 --- a/third_party/blink/web_tests/paint/invalidation/multicol/multicol-with-inline-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/multicol/multicol-with-inline-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutMultiColumnFlowThread (anonymous)", - "rect": [488, 8, 80, 20], - "reason": "chunk appeared" - } + "invalidations": [ + [488, 8, 80, 20] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/multicol/multicol-with-overflowing-block-rl-expected.txt b/third_party/blink/web_tests/paint/invalidation/multicol/multicol-with-overflowing-block-rl-expected.txt index 9380ba2..7b6afb4 100644 --- a/third_party/blink/web_tests/paint/invalidation/multicol/multicol-with-overflowing-block-rl-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/multicol/multicol-with-overflowing-block-rl-expected.txt
@@ -5,22 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='elm'", - "rect": [8, 8, 792, 500], - "reason": "background" - }, - { - "object": "LayoutBlockFlow DIV id='elm'", - "rect": [0, 8, 508, 500], - "reason": "background" - }, - { - "object": "LayoutBlockFlow DIV id='elm'", - "rect": [8, 8, 500, 500], - "reason": "background" - } + "invalidations": [ + [8, 8, 792, 500], + [0, 8, 508, 500] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/multicol/multicol-with-relpos-expected.txt b/third_party/blink/web_tests/paint/invalidation/multicol/multicol-with-relpos-expected.txt index fcb9304..ec250c3 100644 --- a/third_party/blink/web_tests/paint/invalidation/multicol/multicol-with-relpos-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/multicol/multicol-with-relpos-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (relative positioned) DIV id='target'", - "rect": [508, 28, 150, 20], - "reason": "chunk appeared" - } + "invalidations": [ + [508, 28, 150, 20] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/opacity-from-zero-to-non-zero-expected.txt b/third_party/blink/web_tests/paint/invalidation/opacity-from-zero-to-non-zero-expected.txt index 3f26fac..e6987437 100644 --- a/third_party/blink/web_tests/paint/invalidation/opacity-from-zero-to-non-zero-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/opacity-from-zero-to-non-zero-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [8, 8, 100, 100], - "reason": "chunk appeared" - } + "invalidations": [ + [8, 8, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/outline/border-outline-0-expected.txt b/third_party/blink/web_tests/paint/invalidation/outline/border-outline-0-expected.txt index 5d1a105..502130d 100644 --- a/third_party/blink/web_tests/paint/invalidation/outline/border-outline-0-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/outline/border-outline-0-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='border-image'", - "rect": [10, 10, 200, 200], - "reason": "disappeared" - } + "invalidations": [ + [10, 10, 200, 200] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/outline/border-radius-with-outline-expected.txt b/third_party/blink/web_tests/paint/invalidation/outline/border-radius-with-outline-expected.txt index 3dde97ca..7fe3281 100644 --- a/third_party/blink/web_tests/paint/invalidation/outline/border-radius-with-outline-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/outline/border-radius-with-outline-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target'", - "rect": [45, 45, 310, 310], - "reason": "geometry" - } + "invalidations": [ + [45, 45, 310, 310] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/outline/focus-ring-on-child-move-expected.txt b/third_party/blink/web_tests/paint/invalidation/outline/focus-ring-on-child-move-expected.txt index 0d91cc4..4959aa2 100644 --- a/third_party/blink/web_tests/paint/invalidation/outline/focus-ring-on-child-move-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/outline/focus-ring-on-child-move-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='child'", - "rect": [300, 50, 20, 300], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='child'", - "rect": [150, 50, 20, 300], - "reason": "geometry" - } + "invalidations": [ + [300, 50, 20, 300], + [150, 50, 20, 300] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/outline/focus-ring-on-continuation-move-expected.txt b/third_party/blink/web_tests/paint/invalidation/outline/focus-ring-on-continuation-move-expected.txt index 7d086c3..d1fa465 100644 --- a/third_party/blink/web_tests/paint/invalidation/outline/focus-ring-on-continuation-move-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/outline/focus-ring-on-continuation-move-expected.txt
@@ -5,27 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalBoxFragment LayoutInline SPAN", - "rect": [206, 230, 104, 104], - "reason": "outline" - }, - { - "object": "NGPhysicalBoxFragment LayoutInline SPAN", - "rect": [6, 230, 104, 104], - "reason": "outline" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='block'", - "rect": [208, 232, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='block'", - "rect": [8, 232, 100, 100], - "reason": "geometry" - } + "invalidations": [ + [206, 230, 104, 104], + [6, 230, 104, 104] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/outline/focus-ring-on-inline-continuation-move-expected.txt b/third_party/blink/web_tests/paint/invalidation/outline/focus-ring-on-inline-continuation-move-expected.txt index 1b6207f..c78822e 100644 --- a/third_party/blink/web_tests/paint/invalidation/outline/focus-ring-on-inline-continuation-move-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/outline/focus-ring-on-inline-continuation-move-expected.txt
@@ -5,27 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalBoxFragment LayoutInline SPAN", - "rect": [6, 6, 104, 108], - "reason": "outline" - }, - { - "object": "NGPhysicalBoxFragment LayoutInline SPAN", - "rect": [6, 86, 104, 104], - "reason": "outline" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='block'", - "rect": [8, 88, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='block'", - "rect": [8, 8, 100, 100], - "reason": "geometry" - } + "invalidations": [ + [6, 6, 104, 108], + [6, 86, 104, 104] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/outline/inline-outline-repaint-2-expected.txt b/third_party/blink/web_tests/paint/invalidation/outline/inline-outline-repaint-2-expected.txt index 91417ab..66e0455 100644 --- a/third_party/blink/web_tests/paint/invalidation/outline/inline-outline-repaint-2-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/outline/inline-outline-repaint-2-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalBoxFragment LayoutInline SPAN", - "rect": [210, 0, 50, 15], - "reason": "outline" - }, - { - "object": "NGPhysicalTextFragment 'Test'", - "rect": [215, 0, 40, 10], - "reason": "style change" - } + "invalidations": [ + [210, 0, 50, 15] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/outline/outline-add-repaint-expected.txt b/third_party/blink/web_tests/paint/invalidation/outline/outline-add-repaint-expected.txt index 42ca896a..637c4ce7 100644 --- a/third_party/blink/web_tests/paint/invalidation/outline/outline-add-repaint-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/outline/outline-add-repaint-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='test'", - "rect": [0, 0, 110, 110], - "reason": "style change" - } + "invalidations": [ + [0, 0, 110, 110] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/outline/outline-become-affected-by-descendant-expected.txt b/third_party/blink/web_tests/paint/invalidation/outline/outline-become-affected-by-descendant-expected.txt index 41d42faf..abececab 100644 --- a/third_party/blink/web_tests/paint/invalidation/outline/outline-become-affected-by-descendant-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/outline/outline-become-affected-by-descendant-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='outline'", - "rect": [6, 6, 154, 104], - "reason": "outline" - }, - { - "object": "LayoutNGBlockFlow DIV id='child'", - "rect": [58, 8, 100, 50], - "reason": "incremental" - } + "invalidations": [ + [6, 6, 154, 104] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/outline/outline-become-not-affected-by-descendant-expected.txt b/third_party/blink/web_tests/paint/invalidation/outline/outline-become-not-affected-by-descendant-expected.txt index 6427e9ee..abececab 100644 --- a/third_party/blink/web_tests/paint/invalidation/outline/outline-become-not-affected-by-descendant-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/outline/outline-become-not-affected-by-descendant-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='outline'", - "rect": [6, 6, 154, 104], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV id='child'", - "rect": [58, 8, 100, 50], - "reason": "incremental" - } + "invalidations": [ + [6, 6, 154, 104] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/outline/outline-change-offset-expected.txt b/third_party/blink/web_tests/paint/invalidation/outline/outline-change-offset-expected.txt index 26c94a7..1f3a289 100644 --- a/third_party/blink/web_tests/paint/invalidation/outline/outline-change-offset-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/outline/outline-change-offset-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target'", - "rect": [35, 35, 130, 130], - "reason": "style change" - } + "invalidations": [ + [35, 35, 130, 130] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/outline/outline-change-repaint-expected.txt b/third_party/blink/web_tests/paint/invalidation/outline/outline-change-repaint-expected.txt index 42ca896a..637c4ce7 100644 --- a/third_party/blink/web_tests/paint/invalidation/outline/outline-change-repaint-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/outline/outline-change-repaint-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='test'", - "rect": [0, 0, 110, 110], - "reason": "style change" - } + "invalidations": [ + [0, 0, 110, 110] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/outline/outline-change-vertical-rl-expected.txt b/third_party/blink/web_tests/paint/invalidation/outline/outline-change-vertical-rl-expected.txt index b2c8d001..a9ac317 100644 --- a/third_party/blink/web_tests/paint/invalidation/outline/outline-change-vertical-rl-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/outline/outline-change-vertical-rl-expected.txt
@@ -5,12 +5,8 @@ "bounds": [1016, 585], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [0, 0, 1016, 128], - "reason": "style change" - } + "invalidations": [ + [0, 0, 1016, 128] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/paint/invalidation/outline/outline-child-repaint-expected.txt b/third_party/blink/web_tests/paint/invalidation/outline/outline-child-repaint-expected.txt index 7a447b1..4225145 100644 --- a/third_party/blink/web_tests/paint/invalidation/outline/outline-child-repaint-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/outline/outline-child-repaint-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='outlined'", - "rect": [0, 240, 220, 50], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outlined'", - "rect": [0, 140, 220, 50], - "reason": "geometry" - } + "invalidations": [ + [0, 240, 220, 50], + [0, 140, 220, 50] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/outline/outline-containing-image-in-non-standard-mode-expected.txt b/third_party/blink/web_tests/paint/invalidation/outline/outline-containing-image-in-non-standard-mode-expected.txt index 678e42e..d95627a 100644 --- a/third_party/blink/web_tests/paint/invalidation/outline/outline-containing-image-in-non-standard-mode-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/outline/outline-containing-image-in-non-standard-mode-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalBoxFragment LayoutInline SPAN id='target'", - "rect": [6, 6, 204, 58], - "reason": "style change" - } + "invalidations": [ + [6, 6, 204, 58] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/outline/outline-current-color-expected.txt b/third_party/blink/web_tests/paint/invalidation/outline/outline-current-color-expected.txt index 4897b5e5..06fe610 100644 --- a/third_party/blink/web_tests/paint/invalidation/outline/outline-current-color-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/outline/outline-current-color-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='currentColor'", - "rect": [48, 190, 120, 120], - "reason": "style change" - } + "invalidations": [ + [48, 190, 120, 120] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/outline/outline-inset-expected.txt b/third_party/blink/web_tests/paint/invalidation/outline/outline-inset-expected.txt index 0a56fc7..7c13d43d 100644 --- a/third_party/blink/web_tests/paint/invalidation/outline/outline-inset-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/outline/outline-inset-expected.txt
@@ -5,27 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [19, 191, 200, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [19, 29, 200, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV id='b'", - "rect": [29, 231, 180, 20], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow DIV id='a'", - "rect": [29, 69, 180, 20], - "reason": "incremental" - } + "invalidations": [ + [19, 191, 200, 60], + [19, 29, 200, 60] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/outline/outline-not-affected-by-descendant-expected.txt b/third_party/blink/web_tests/paint/invalidation/outline/outline-not-affected-by-descendant-expected.txt index 55340c9..f352e0a 100644 --- a/third_party/blink/web_tests/paint/invalidation/outline/outline-not-affected-by-descendant-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/outline/outline-not-affected-by-descendant-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='child'", - "rect": [8, 8, 50, 50], - "reason": "background" - } + "invalidations": [ + [8, 8, 50, 50] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/outline/outline-repaint-glitch-expected.txt b/third_party/blink/web_tests/paint/invalidation/outline/outline-repaint-glitch-expected.txt index d0d5a17..87b286b 100644 --- a/third_party/blink/web_tests/paint/invalidation/outline/outline-repaint-glitch-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/outline/outline-repaint-glitch-expected.txt
@@ -5,27 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [15, 391, 208, 68], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [15, 229, 208, 68], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV id='b'", - "rect": [29, 435, 180, 20], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow DIV id='a'", - "rect": [29, 273, 180, 20], - "reason": "incremental" - } + "invalidations": [ + [15, 391, 208, 68], + [15, 229, 208, 68] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/outline/outline-shrinking-expected.txt b/third_party/blink/web_tests/paint/invalidation/outline/outline-shrinking-expected.txt index 6bb57df..25d0db5 100644 --- a/third_party/blink/web_tests/paint/invalidation/outline/outline-shrinking-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/outline/outline-shrinking-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='t'", - "rect": [4, 114, 108, 108], - "reason": "style change" - } + "invalidations": [ + [4, 114, 108, 108] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/overflow/align-items-overflow-change-expected.txt b/third_party/blink/web_tests/paint/invalidation/overflow/align-items-overflow-change-expected.txt index f6bcb5c..6528411e 100644 --- a/third_party/blink/web_tests/paint/invalidation/overflow/align-items-overflow-change-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/overflow/align-items-overflow-change-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='item1'", - "rect": [0, 52, 200, 200], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item1'", - "rect": [0, 2, 200, 200], - "reason": "geometry" - } + "invalidations": [ + [0, 52, 200, 200], + [0, 2, 200, 200] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/overflow/align-self-overflow-change-expected.txt b/third_party/blink/web_tests/paint/invalidation/overflow/align-self-overflow-change-expected.txt index f6bcb5c..6528411e 100644 --- a/third_party/blink/web_tests/paint/invalidation/overflow/align-self-overflow-change-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/overflow/align-self-overflow-change-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='item1'", - "rect": [0, 52, 200, 200], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item1'", - "rect": [0, 2, 200, 200], - "reason": "geometry" - } + "invalidations": [ + [0, 52, 200, 200], + [0, 2, 200, 200] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/overflow/clipped-overflow-visible-subtree-expected.txt b/third_party/blink/web_tests/paint/invalidation/overflow/clipped-overflow-visible-subtree-expected.txt index 38fb0a2c..8c984588 100644 --- a/third_party/blink/web_tests/paint/invalidation/overflow/clipped-overflow-visible-subtree-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/overflow/clipped-overflow-visible-subtree-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [308, 8, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [8, 8, 100, 100], - "reason": "geometry" - } + "invalidations": [ + [308, 8, 100, 100], + [8, 8, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/overflow/composited-overflow-local-background-removed-expected.txt b/third_party/blink/web_tests/paint/invalidation/overflow/composited-overflow-local-background-removed-expected.txt index fb0bf60..93e198c 100644 --- a/third_party/blink/web_tests/paint/invalidation/overflow/composited-overflow-local-background-removed-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/overflow/composited-overflow-local-background-removed-expected.txt
@@ -9,24 +9,16 @@ { "name": "LayoutNGBlockFlow DIV id='scroller'", "bounds": [200, 200], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='scroller'", - "rect": [0, 0, 200, 200], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 200, 200] ], "transform": 1 }, { "name": "Scrolling Contents Layer", "bounds": [185, 352], - "paintInvalidations": [ - { - "object": "Scrolling Contents Layer", - "rect": [0, 0, 185, 352], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 185, 352] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/paint/invalidation/overflow/composited-overflow-with-borderbox-background-expected.txt b/third_party/blink/web_tests/paint/invalidation/overflow/composited-overflow-with-borderbox-background-expected.txt index 3c50188..40eb718 100644 --- a/third_party/blink/web_tests/paint/invalidation/overflow/composited-overflow-with-borderbox-background-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/overflow/composited-overflow-with-borderbox-background-expected.txt
@@ -11,12 +11,8 @@ "bounds": [220, 220], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='scroller'", - "rect": [0, 0, 220, 220], - "reason": "background" - } + "invalidations": [ + [0, 0, 220, 220] ], "transform": 1 }, @@ -26,12 +22,8 @@ "bounds": [185, 300], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutNGBlockFlow DIV id='scroller'", - "rect": [0, 0, 185, 300], - "reason": "background" - } + "invalidations": [ + [0, 0, 185, 300] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/paint/invalidation/overflow/composited-overflow-with-local-background-expected.txt b/third_party/blink/web_tests/paint/invalidation/overflow/composited-overflow-with-local-background-expected.txt index a897da74..43e6f80d 100644 --- a/third_party/blink/web_tests/paint/invalidation/overflow/composited-overflow-with-local-background-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/overflow/composited-overflow-with-local-background-expected.txt
@@ -17,12 +17,8 @@ "bounds": [185, 300], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutNGBlockFlow DIV id='scroller'", - "rect": [0, 0, 185, 300], - "reason": "background" - } + "invalidations": [ + [0, 0, 185, 300] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/paint/invalidation/overflow/composited-overflow-with-negative-offset-outline-expected.txt b/third_party/blink/web_tests/paint/invalidation/overflow/composited-overflow-with-negative-offset-outline-expected.txt index d80867a..a045089 100644 --- a/third_party/blink/web_tests/paint/invalidation/overflow/composited-overflow-with-negative-offset-outline-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/overflow/composited-overflow-with-negative-offset-outline-expected.txt
@@ -37,12 +37,8 @@ { "name": "Decoration Layer", "bounds": [200, 200], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='scroller'", - "rect": [0, 0, 200, 200], - "reason": "style change" - } + "invalidations": [ + [0, 0, 200, 200] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/paint/invalidation/overflow/composited-vertical-rl-overflow-expected.txt b/third_party/blink/web_tests/paint/invalidation/overflow/composited-vertical-rl-overflow-expected.txt index c15c8ba9..de7738d 100644 --- a/third_party/blink/web_tests/paint/invalidation/overflow/composited-vertical-rl-overflow-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/overflow/composited-vertical-rl-overflow-expected.txt
@@ -11,12 +11,8 @@ "position": [-50, 0], "bounds": [150, 100], "backgroundColor": "#0000FF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='div'", - "rect": [0, 0, 150, 100], - "reason": "style change" - } + "invalidations": [ + [0, 0, 150, 100] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/paint/invalidation/overflow/content-into-overflow-expected.txt b/third_party/blink/web_tests/paint/invalidation/overflow/content-into-overflow-expected.txt index 7e64d03..669bdd7 100644 --- a/third_party/blink/web_tests/paint/invalidation/overflow/content-into-overflow-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/overflow/content-into-overflow-expected.txt
@@ -5,27 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [8, 158, 106, 106], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [8, 8, 106, 106], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [8, 308, 100, 100], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='target3'", - "rect": [8, 388, 100, 20], - "reason": "appeared" - } + "invalidations": [ + [8, 158, 106, 106], + [8, 8, 106, 106], + [8, 308, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/overflow/erase-overflow-expected.txt b/third_party/blink/web_tests/paint/invalidation/overflow/erase-overflow-expected.txt index a4544c5..f2bf3a8b 100644 --- a/third_party/blink/web_tests/paint/invalidation/overflow/erase-overflow-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/overflow/erase-overflow-expected.txt
@@ -5,22 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='square'", - "rect": [8, 108, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV class='square'", - "rect": [8, 8, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='target' class='square'", - "rect": [8, 8, 100, 100], - "reason": "chunk appeared" - } + "invalidations": [ + [8, 108, 100, 100], + [8, 8, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/overflow/fixed-position-transparency-with-overflow-expected.txt b/third_party/blink/web_tests/paint/invalidation/overflow/fixed-position-transparency-with-overflow-expected.txt index 70bd30cf..41a60860 100644 --- a/third_party/blink/web_tests/paint/invalidation/overflow/fixed-position-transparency-with-overflow-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/overflow/fixed-position-transparency-with-overflow-expected.txt
@@ -5,27 +5,9 @@ "bounds": [785, 2016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='absolute green'", - "rect": [108, 308, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV class='absolute green'", - "rect": [108, 308, 100, 100], - "reason": "chunk appeared" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='container' class='relative blue'", - "rect": [8, 208, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='container' class='relative blue'", - "rect": [8, 208, 100, 100], - "reason": "chunk appeared" - } + "invalidations": [ + [108, 308, 100, 100], + [8, 208, 100, 100] ] }, {
diff --git a/third_party/blink/web_tests/paint/invalidation/overflow/inline-overflow-expected.txt b/third_party/blink/web_tests/paint/invalidation/overflow/inline-overflow-expected.txt index b1ed156..4fa791c8 100644 --- a/third_party/blink/web_tests/paint/invalidation/overflow/inline-overflow-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/overflow/inline-overflow-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'A\u00A0\u00A0B'", - "rect": [33, 33, 250, 100], - "reason": "style change" - } + "invalidations": [ + [33, 33, 250, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/overflow/inline-vertical-lr-overflow-expected.txt b/third_party/blink/web_tests/paint/invalidation/overflow/inline-vertical-lr-overflow-expected.txt index 32015de9..770bf54 100644 --- a/third_party/blink/web_tests/paint/invalidation/overflow/inline-vertical-lr-overflow-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/overflow/inline-vertical-lr-overflow-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'A\u00A0\u00A0B'", - "rect": [33, 33, 100, 250], - "reason": "style change" - } + "invalidations": [ + [33, 33, 100, 250] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/overflow/inline-vertical-rl-overflow-expected.txt b/third_party/blink/web_tests/paint/invalidation/overflow/inline-vertical-rl-overflow-expected.txt index 7a61205..3a8ba23 100644 --- a/third_party/blink/web_tests/paint/invalidation/overflow/inline-vertical-rl-overflow-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/overflow/inline-vertical-rl-overflow-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'A\u00A0\u00A0B'", - "rect": [667, 33, 100, 250], - "reason": "style change" - } + "invalidations": [ + [667, 33, 100, 250] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/overflow/justify-items-overflow-change-expected.txt b/third_party/blink/web_tests/paint/invalidation/overflow/justify-items-overflow-change-expected.txt index f1b42fe..e0c328a3 100644 --- a/third_party/blink/web_tests/paint/invalidation/overflow/justify-items-overflow-change-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/overflow/justify-items-overflow-change-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='item1'", - "rect": [0, 52, 160, 300], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item1'", - "rect": [0, 52, 100, 300], - "reason": "geometry" - } + "invalidations": [ + [0, 52, 160, 300] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/overflow/justify-self-overflow-change-expected.txt b/third_party/blink/web_tests/paint/invalidation/overflow/justify-self-overflow-change-expected.txt index 3a4c2bd..0f998abd 100644 --- a/third_party/blink/web_tests/paint/invalidation/overflow/justify-self-overflow-change-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/overflow/justify-self-overflow-change-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='item1'", - "rect": [0, 52, 150, 300], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item1'", - "rect": [0, 52, 100, 300], - "reason": "geometry" - } + "invalidations": [ + [0, 52, 150, 300] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/overflow/negative-text-indent-with-overflow-hidden-expected.txt b/third_party/blink/web_tests/paint/invalidation/overflow/negative-text-indent-with-overflow-hidden-expected.txt index 258e760..7736cb96 100644 --- a/third_party/blink/web_tests/paint/invalidation/overflow/negative-text-indent-with-overflow-hidden-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/overflow/negative-text-indent-with-overflow-hidden-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target' class='changed'", - "rect": [550, 8, 200, 50], - "reason": "background" - } + "invalidations": [ + [550, 8, 200, 50] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/overflow/overflow-changed-on-child-of-composited-layer-expected.txt b/third_party/blink/web_tests/paint/invalidation/overflow/overflow-changed-on-child-of-composited-layer-expected.txt index fd0743e..bce679a5 100644 --- a/third_party/blink/web_tests/paint/invalidation/overflow/overflow-changed-on-child-of-composited-layer-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/overflow/overflow-changed-on-child-of-composited-layer-expected.txt
@@ -10,17 +10,8 @@ "name": "LayoutNGBlockFlow DIV id='parent'", "position": [-1, -1], "bounds": [745, 102], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='parent'", - "rect": [0, 0, 745, 102], - "reason": "full layer" - }, - { - "object": "LayoutNGBlockFlow DIV id='parent'", - "rect": [0, 0, 744, 100], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 745, 102] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/paint/invalidation/overflow/overflow-hide-expected.txt b/third_party/blink/web_tests/paint/invalidation/overflow/overflow-hide-expected.txt index ba53906..1925824 100644 --- a/third_party/blink/web_tests/paint/invalidation/overflow/overflow-hide-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/overflow/overflow-hide-expected.txt
@@ -5,17 +5,9 @@ "bounds": [785, 2016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV class='relative red'", - "rect": [108, 108, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='overflowParent' class='absolute green'", - "rect": [8, 8, 100, 100], - "reason": "style change" - } + "invalidations": [ + [108, 108, 100, 100], + [8, 8, 100, 100] ] }, {
diff --git a/third_party/blink/web_tests/paint/invalidation/overflow/overflow-into-content-expected.txt b/third_party/blink/web_tests/paint/invalidation/overflow/overflow-into-content-expected.txt index 235b7ea..669bdd7 100644 --- a/third_party/blink/web_tests/paint/invalidation/overflow/overflow-into-content-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/overflow/overflow-into-content-expected.txt
@@ -5,27 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [8, 158, 106, 106], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [8, 8, 106, 106], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [8, 308, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='target3'", - "rect": [8, 388, 100, 20], - "reason": "disappeared" - } + "invalidations": [ + [8, 158, 106, 106], + [8, 8, 106, 106], + [8, 308, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/overflow/overflow-show-expected.txt b/third_party/blink/web_tests/paint/invalidation/overflow/overflow-show-expected.txt index f7e6aae..1925824 100644 --- a/third_party/blink/web_tests/paint/invalidation/overflow/overflow-show-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/overflow/overflow-show-expected.txt
@@ -5,17 +5,9 @@ "bounds": [785, 2016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV class='relative green'", - "rect": [108, 108, 100, 100], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='overflowParent' class='absolute green'", - "rect": [8, 8, 100, 100], - "reason": "style change" - } + "invalidations": [ + [108, 108, 100, 100], + [8, 8, 100, 100] ] }, {
diff --git a/third_party/blink/web_tests/paint/invalidation/overflow/resize-child-within-overflow-expected.txt b/third_party/blink/web_tests/paint/invalidation/overflow/resize-child-within-overflow-expected.txt index d57b585..1b1c80f 100644 --- a/third_party/blink/web_tests/paint/invalidation/overflow/resize-child-within-overflow-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/overflow/resize-child-within-overflow-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 1000], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='container'", - "rect": [400, 0, 200, 1000], - "reason": "incremental" - } + "invalidations": [ + [400, 0, 200, 1000] ] }, {
diff --git a/third_party/blink/web_tests/paint/invalidation/overflow/trailing-floats-root-line-box-overflow-expected.txt b/third_party/blink/web_tests/paint/invalidation/overflow/trailing-floats-root-line-box-overflow-expected.txt index b993364b..87648cb 100644 --- a/third_party/blink/web_tests/paint/invalidation/overflow/trailing-floats-root-line-box-overflow-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/overflow/trailing-floats-root-line-box-overflow-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target'", - "rect": [8, 58, 100, 100], - "reason": "disappeared" - } + "invalidations": [ + [8, 58, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/overflow/vertical-overflow-child-expected.txt b/third_party/blink/web_tests/paint/invalidation/overflow/vertical-overflow-child-expected.txt index b4fc2a7..3855101 100644 --- a/third_party/blink/web_tests/paint/invalidation/overflow/vertical-overflow-child-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/overflow/vertical-overflow-child-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='container'", - "rect": [214, 21, 100, 100], - "reason": "chunk appeared" - } + "invalidations": [ + [214, 21, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/overflow/vertical-overflow-parent-expected.txt b/third_party/blink/web_tests/paint/invalidation/overflow/vertical-overflow-parent-expected.txt index 01258eb8..4217422 100644 --- a/third_party/blink/web_tests/paint/invalidation/overflow/vertical-overflow-parent-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/overflow/vertical-overflow-parent-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='container'", - "rect": [29, 29, 100, 100], - "reason": "chunk appeared" - } + "invalidations": [ + [29, 29, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/overflow/vertical-overflow-same-expected.txt b/third_party/blink/web_tests/paint/invalidation/overflow/vertical-overflow-same-expected.txt index 24f83205..1500b04 100644 --- a/third_party/blink/web_tests/paint/invalidation/overflow/vertical-overflow-same-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/overflow/vertical-overflow-same-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='vertical-rl container'", - "rect": [29, 21, 100, 100], - "reason": "chunk appeared" - } + "invalidations": [ + [29, 21, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/overflow/vertical-rl-overflow-expected.txt b/third_party/blink/web_tests/paint/invalidation/overflow/vertical-rl-overflow-expected.txt index cfaebf5..2063e5d 100644 --- a/third_party/blink/web_tests/paint/invalidation/overflow/vertical-rl-overflow-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/overflow/vertical-rl-overflow-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='div'", - "rect": [50, 100, 150, 100], - "reason": "style change" - } + "invalidations": [ + [50, 100, 150, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/paint-caret-in-div-with-negative-indent-expected.txt b/third_party/blink/web_tests/paint/invalidation/paint-caret-in-div-with-negative-indent-expected.txt index 2583644..077e89b 100644 --- a/third_party/blink/web_tests/paint/invalidation/paint-caret-in-div-with-negative-indent-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/paint-caret-in-div-with-negative-indent-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Caret", - "rect": [358, 200, 1, 20], - "reason": "appeared" - } + "invalidations": [ + [358, 200, 1, 20] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/paint-invalidation-with-opacity-expected.txt b/third_party/blink/web_tests/paint/invalidation/paint-invalidation-with-opacity-expected.txt index 1de5b6d..e6987437 100644 --- a/third_party/blink/web_tests/paint/invalidation/paint-invalidation-with-opacity-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/paint-invalidation-with-opacity-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [8, 8, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [8, 8, 100, 100], - "reason": "chunk appeared" - } + "invalidations": [ + [8, 8, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/position/absolute-layer-specified-left-or-right-auto-width-moved-vertically.html b/third_party/blink/web_tests/paint/invalidation/position/absolute-layer-specified-left-or-right-auto-width-moved-vertically.html index 07954c5..0d6984a 100644 --- a/third_party/blink/web_tests/paint/invalidation/position/absolute-layer-specified-left-or-right-auto-width-moved-vertically.html +++ b/third_party/blink/web_tests/paint/invalidation/position/absolute-layer-specified-left-or-right-auto-width-moved-vertically.html
@@ -13,7 +13,7 @@ document.getElementById('right').style.top = '400px'; document.body.offsetTop; - var layerTree = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS); + var layerTree = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_INVALIDATIONS); internals.stopTrackingRepaints(document); document.getElementById('result').textContent = layerTree.indexOf('repaint') == -1 ? 'SUCCESS' : 'FAIL'; }
diff --git a/third_party/blink/web_tests/paint/invalidation/position/absolute-margin-change-repaint-expected.txt b/third_party/blink/web_tests/paint/invalidation/position/absolute-margin-change-repaint-expected.txt index 1897f07..cbffd9c 100644 --- a/third_party/blink/web_tests/paint/invalidation/position/absolute-margin-change-repaint-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/position/absolute-margin-change-repaint-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='test'", - "rect": [0, 60, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='test'", - "rect": [0, 40, 100, 100], - "reason": "geometry" - } + "invalidations": [ + [0, 60, 100, 100], + [0, 40, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/position/absolute-position-change-containing-block-expected.txt b/third_party/blink/web_tests/paint/invalidation/position/absolute-position-change-containing-block-expected.txt index 4e6824d..a3384b5 100644 --- a/third_party/blink/web_tests/paint/invalidation/position/absolute-position-change-containing-block-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/position/absolute-position-change-containing-block-expected.txt
@@ -5,17 +5,9 @@ "bounds": [785, 2016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='absolute green'", - "rect": [100, 100, 100, 100], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='container' class='fixed blue'", - "rect": [8, 8, 100, 100], - "reason": "appeared" - } + "invalidations": [ + [100, 100, 100, 100], + [8, 8, 100, 100] ] }, {
diff --git a/third_party/blink/web_tests/paint/invalidation/position/absolute-position-changed-expected.txt b/third_party/blink/web_tests/paint/invalidation/position/absolute-position-changed-expected.txt index ded8b8a..2c69a3b 100644 --- a/third_party/blink/web_tests/paint/invalidation/position/absolute-position-changed-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/position/absolute-position-changed-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 2016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='absoluteDiv' class='absolute green'", - "rect": [100, 500, 100, 100], - "reason": "disappeared" - } + "invalidations": [ + [100, 500, 100, 100] ], "transform": 1 }, @@ -27,12 +23,8 @@ "bounds": [100, 100], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='absoluteDiv' class='absolute green'", - "rect": [0, 0, 100, 100], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/paint/invalidation/position/absolute-position-moved-expected.txt b/third_party/blink/web_tests/paint/invalidation/position/absolute-position-moved-expected.txt index 107fce1..bc809ee2 100644 --- a/third_party/blink/web_tests/paint/invalidation/position/absolute-position-moved-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/position/absolute-position-moved-expected.txt
@@ -5,12 +5,8 @@ "bounds": [785, 2016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='absoluteDiv' class='absolute green'", - "rect": [100, 100, 100, 100], - "reason": "appeared" - } + "invalidations": [ + [100, 100, 100, 100] ] }, { @@ -18,22 +14,9 @@ "bounds": [100, 100], "contentsOpaque": true, "backgroundColor": "#FF0000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='absoluteDiv' class='absolute green'", - "rect": [100, 100, 100, 100], - "reason": "chunk disappeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV class='fixed red'", - "rect": [0, 0, 100, 100], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV class='fixed red'", - "rect": [0, 0, 100, 100], - "reason": "disappeared" - } + "invalidations": [ + [100, 100, 100, 100], + [0, 0, 100, 100] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/paint/invalidation/position/align-content-position-change-grid-expected.txt b/third_party/blink/web_tests/paint/invalidation/position/align-content-position-change-grid-expected.txt index cb191d1..53d775e 100644 --- a/third_party/blink/web_tests/paint/invalidation/position/align-content-position-change-grid-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/position/align-content-position-change-grid-expected.txt
@@ -5,37 +5,13 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [0, 302, 200, 50], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [0, 252, 200, 50], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [0, 202, 200, 50], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [0, 152, 200, 50], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [0, 102, 200, 50], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [0, 52, 200, 50], - "reason": "geometry" - } + "invalidations": [ + [0, 302, 200, 50], + [0, 252, 200, 50], + [0, 202, 200, 50], + [0, 152, 200, 50], + [0, 102, 200, 50], + [0, 52, 200, 50] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/position/fixed-margin-change-repaint-expected.txt b/third_party/blink/web_tests/paint/invalidation/position/fixed-margin-change-repaint-expected.txt index 1897f07..cbffd9c 100644 --- a/third_party/blink/web_tests/paint/invalidation/position/fixed-margin-change-repaint-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/position/fixed-margin-change-repaint-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='test'", - "rect": [0, 60, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='test'", - "rect": [0, 40, 100, 100], - "reason": "geometry" - } + "invalidations": [ + [0, 60, 100, 100], + [0, 40, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/position/fixed-position-layer-moved.html b/third_party/blink/web_tests/paint/invalidation/position/fixed-position-layer-moved.html index c6da18a..4bcad6d 100644 --- a/third_party/blink/web_tests/paint/invalidation/position/fixed-position-layer-moved.html +++ b/third_party/blink/web_tests/paint/invalidation/position/fixed-position-layer-moved.html
@@ -13,7 +13,7 @@ document.getElementById('b').style.left = '400px'; document.body.offsetTop; - var layerTree = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS); + var layerTree = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_INVALIDATIONS); internals.stopTrackingRepaints(document); document.getElementById('result').textContent = layerTree.indexOf('repaint') == -1 ? 'SUCCESS' : 'FAIL'; };
diff --git a/third_party/blink/web_tests/paint/invalidation/position/fixed-to-relative-position-with-absolute-child-expected.txt b/third_party/blink/web_tests/paint/invalidation/position/fixed-to-relative-position-with-absolute-child-expected.txt index 99f6d2ec..41a60860 100644 --- a/third_party/blink/web_tests/paint/invalidation/position/fixed-to-relative-position-with-absolute-child-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/position/fixed-to-relative-position-with-absolute-child-expected.txt
@@ -5,17 +5,9 @@ "bounds": [785, 2016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='absolute green'", - "rect": [108, 308, 100, 100], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='container' class='fixed blue'", - "rect": [8, 208, 100, 100], - "reason": "appeared" - } + "invalidations": [ + [108, 308, 100, 100], + [8, 208, 100, 100] ] }, {
diff --git a/third_party/blink/web_tests/paint/invalidation/position/fixed-tranformed-expected.txt b/third_party/blink/web_tests/paint/invalidation/position/fixed-tranformed-expected.txt index 40594fc..b37c8244 100644 --- a/third_party/blink/web_tests/paint/invalidation/position/fixed-tranformed-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/position/fixed-tranformed-expected.txt
@@ -13,12 +13,8 @@ "bounds": [100, 100], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='test'", - "rect": [0, 0, 100, 100], - "reason": "background" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 2 },
diff --git a/third_party/blink/web_tests/paint/invalidation/position/inline-relative-positioned-expected.txt b/third_party/blink/web_tests/paint/invalidation/position/inline-relative-positioned-expected.txt index 76728a0..fc97120 100644 --- a/third_party/blink/web_tests/paint/invalidation/position/inline-relative-positioned-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/position/inline-relative-positioned-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'a'", - "rect": [8, 88, 100, 100], - "reason": "full" - } + "invalidations": [ + [8, 88, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/position/intermediate-layout-position-expected.txt b/third_party/blink/web_tests/paint/invalidation/position/intermediate-layout-position-expected.txt index 38f98e4..f748aa1e 100644 --- a/third_party/blink/web_tests/paint/invalidation/position/intermediate-layout-position-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/position/intermediate-layout-position-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTable TABLE", - "rect": [8, 172, 46, 20], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [8, 74, 46, 20], - "reason": "incremental" - } + "invalidations": [ + [8, 172, 46, 20], + [8, 74, 46, 20] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/position/invalidate-paint-for-fixed-pos-inside-iframe-expected.txt b/third_party/blink/web_tests/paint/invalidation/position/invalidate-paint-for-fixed-pos-inside-iframe-expected.txt index 6f190c46..2f398803 100644 --- a/third_party/blink/web_tests/paint/invalidation/position/invalidate-paint-for-fixed-pos-inside-iframe-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/position/invalidate-paint-for-fixed-pos-inside-iframe-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [18, 418, 50, 50], - "reason": "background" - } + "invalidations": [ + [18, 418, 50, 50] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/position/justify-content-position-change-expected.txt b/third_party/blink/web_tests/paint/invalidation/position/justify-content-position-change-expected.txt index 8ce52c3..28e69dc 100644 --- a/third_party/blink/web_tests/paint/invalidation/position/justify-content-position-change-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/position/justify-content-position-change-expected.txt
@@ -5,27 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [100, 52, 52, 300], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [52, 52, 52, 300], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [48, 52, 52, 300], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [0, 52, 52, 300], - "reason": "geometry" - } + "invalidations": [ + [100, 52, 52, 300], + [52, 52, 52, 300], + [48, 52, 52, 300], + [0, 52, 52, 300] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/position/justify-content-position-change-grid-expected.txt b/third_party/blink/web_tests/paint/invalidation/position/justify-content-position-change-grid-expected.txt index 3c5e419..58f300c 100644 --- a/third_party/blink/web_tests/paint/invalidation/position/justify-content-position-change-grid-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/position/justify-content-position-change-grid-expected.txt
@@ -5,37 +5,13 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [250, 52, 50, 200], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [200, 52, 50, 200], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [150, 52, 50, 200], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [100, 52, 50, 200], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [50, 52, 50, 200], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='item'", - "rect": [0, 52, 50, 200], - "reason": "geometry" - } + "invalidations": [ + [250, 52, 50, 200], + [200, 52, 50, 200], + [150, 52, 50, 200], + [100, 52, 50, 200], + [50, 52, 50, 200], + [0, 52, 50, 200] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/position/layout-state-only-positioned-expected.txt b/third_party/blink/web_tests/paint/invalidation/position/layout-state-only-positioned-expected.txt index 806c995..8f64356 100644 --- a/third_party/blink/web_tests/paint/invalidation/position/layout-state-only-positioned-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/position/layout-state-only-positioned-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [0, 50, 106, 106], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [0, 50, 106, 106], - "reason": "chunk appeared" - }, - { - "object": "VerticalScrollbar", - "rect": [88, 53, 15, 100], - "reason": "chunk appeared" - } + "invalidations": [ + [0, 50, 106, 106] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/position/layoutstate-invalid-invalidation-inline-relative-positioned-expected.txt b/third_party/blink/web_tests/paint/invalidation/position/layoutstate-invalid-invalidation-inline-relative-positioned-expected.txt index 1769b314..d713eb8 100644 --- a/third_party/blink/web_tests/paint/invalidation/position/layoutstate-invalid-invalidation-inline-relative-positioned-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/position/layoutstate-invalid-invalidation-inline-relative-positioned-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [8, 220, 100, 100], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [8, 200, 100, 100], - "reason": "geometry" - } + "invalidations": [ + [8, 220, 100, 100], + [8, 200, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/position/positioned-document-element-expected.txt b/third_party/blink/web_tests/paint/invalidation/position/positioned-document-element-expected.txt new file mode 100644 index 0000000..cce1ce6 --- /dev/null +++ b/third_party/blink/web_tests/paint/invalidation/position/positioned-document-element-expected.txt
@@ -0,0 +1,14 @@ +{ + "layers": [ + { + "name": "Scrolling Contents Layer", + "bounds": [800, 600], + "contentsOpaque": true, + "backgroundColor": "#008000", + "invalidations": [ + [0, 0, 800, 600] + ] + } + ] +} +
diff --git a/third_party/blink/web_tests/paint/invalidation/position/positioned-great-grandparent-change-location-expected.txt b/third_party/blink/web_tests/paint/invalidation/position/positioned-great-grandparent-change-location-expected.txt new file mode 100644 index 0000000..8d46077 --- /dev/null +++ b/third_party/blink/web_tests/paint/invalidation/position/positioned-great-grandparent-change-location-expected.txt
@@ -0,0 +1,15 @@ +{ + "layers": [ + { + "name": "Scrolling Contents Layer", + "bounds": [800, 600], + "contentsOpaque": true, + "backgroundColor": "#FFFFFF", + "invalidations": [ + [100, 200, 100, 100], + [100, 100, 100, 100] + ] + } + ] +} +
diff --git a/third_party/blink/web_tests/paint/invalidation/position/relative-margin-change-repaint-expected.txt b/third_party/blink/web_tests/paint/invalidation/position/relative-margin-change-repaint-expected.txt index e6cd714..cbffd9c 100644 --- a/third_party/blink/web_tests/paint/invalidation/position/relative-margin-change-repaint-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/position/relative-margin-change-repaint-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='test'", - "rect": [0, 60, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='test'", - "rect": [0, 40, 100, 100], - "reason": "geometry" - } + "invalidations": [ + [0, 60, 100, 100], + [0, 40, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/position/shift-relative-positioned-container-with-image-addition-expected.txt b/third_party/blink/web_tests/paint/invalidation/position/shift-relative-positioned-container-with-image-addition-expected.txt index 4f78d3c..0ea3236 100644 --- a/third_party/blink/web_tests/paint/invalidation/position/shift-relative-positioned-container-with-image-addition-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/position/shift-relative-positioned-container-with-image-addition-expected.txt
@@ -5,27 +5,11 @@ "bounds": [785, 836], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 742, 785, 94], - "reason": "incremental" - }, - { - "object": "LayoutIFrame IFRAME id='iframe'", - "rect": [8, 92, 732, 94], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV class='relative paddingTop'", - "rect": [58, 236, 489, 537], - "reason": "chunk appeared" - }, - { - "object": "LayoutImage IMG", - "rect": [58, 142, 489, 537], - "reason": "disappeared" - } + "invalidations": [ + [0, 742, 785, 94], + [8, 92, 732, 94], + [58, 236, 489, 537], + [58, 142, 489, 537] ] }, {
diff --git a/third_party/blink/web_tests/paint/invalidation/position/shift-relative-positioned-container-with-image-removal-expected.txt b/third_party/blink/web_tests/paint/invalidation/position/shift-relative-positioned-container-with-image-removal-expected.txt index 769ca90b..ca3b157 100644 --- a/third_party/blink/web_tests/paint/invalidation/position/shift-relative-positioned-container-with-image-removal-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/position/shift-relative-positioned-container-with-image-removal-expected.txt
@@ -5,22 +5,10 @@ "bounds": [785, 742], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutIFrame IFRAME id='iframe'", - "rect": [8, 92, 732, 94], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV class='relative paddingTop'", - "rect": [58, 241, 489, 537], - "reason": "chunk disappeared" - }, - { - "object": "LayoutImage IMG", - "rect": [58, 142, 489, 537], - "reason": "appeared" - } + "invalidations": [ + [8, 92, 732, 94], + [58, 241, 489, 537], + [58, 142, 489, 537] ] }, {
diff --git a/third_party/blink/web_tests/paint/invalidation/position/static-to-positioned-expected.txt b/third_party/blink/web_tests/paint/invalidation/position/static-to-positioned-expected.txt index 092e083..c96a353 100644 --- a/third_party/blink/web_tests/paint/invalidation/position/static-to-positioned-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/position/static-to-positioned-expected.txt
@@ -5,27 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='t'", - "rect": [8, 332, 100, 100], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='t'", - "rect": [8, 282, 100, 100], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='a'", - "rect": [8, 132, 100, 100], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='a'", - "rect": [8, 82, 100, 100], - "reason": "style change" - } + "invalidations": [ + [8, 332, 100, 100], + [8, 282, 100, 100], + [8, 132, 100, 100], + [8, 82, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/position/text-in-relative-positioned-inline-expected.txt b/third_party/blink/web_tests/paint/invalidation/position/text-in-relative-positioned-inline-expected.txt index 4869a3a..522f535 100644 --- a/third_party/blink/web_tests/paint/invalidation/position/text-in-relative-positioned-inline-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/position/text-in-relative-positioned-inline-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'ab'", - "rect": [8, 8, 200, 100], - "reason": "disappeared" - } + "invalidations": [ + [8, 8, 200, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/position/transform-absolute-child-expected.txt b/third_party/blink/web_tests/paint/invalidation/position/transform-absolute-child-expected.txt index a0ba799..20e7edde 100644 --- a/third_party/blink/web_tests/paint/invalidation/position/transform-absolute-child-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/position/transform-absolute-child-expected.txt
@@ -5,27 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='child'", - "rect": [135, 127, 400, 50], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='child'", - "rect": [124, 116, 340, 297], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='box' class='rotated'", - "rect": [16, 8, 288, 288], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='box' class='rotated'", - "rect": [58, 50, 204, 204], - "reason": "paint property change" - } + "invalidations": [ + [135, 127, 400, 50], + [124, 116, 340, 297], + [16, 8, 288, 288] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/position/transform-absolute-in-positioned-container-expected.txt b/third_party/blink/web_tests/paint/invalidation/position/transform-absolute-in-positioned-container-expected.txt index 11e1e4b..a798648 100644 --- a/third_party/blink/web_tests/paint/invalidation/position/transform-absolute-in-positioned-container-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/position/transform-absolute-in-positioned-container-expected.txt
@@ -5,17 +5,8 @@ "bounds": [802, 585], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='box' class='rotated'", - "rect": [76, 190, 286, 286], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='box' class='rotated'", - "rect": [118, 232, 202, 202], - "reason": "paint property change" - } + "invalidations": [ + [76, 190, 286, 286] ] }, {
diff --git a/third_party/blink/web_tests/paint/invalidation/position/transform-relative-position-expected.txt b/third_party/blink/web_tests/paint/invalidation/position/transform-relative-position-expected.txt index 48735ee..10922b1 100644 --- a/third_party/blink/web_tests/paint/invalidation/position/transform-relative-position-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/position/transform-relative-position-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='box' class='rotated'", - "rect": [66, 110, 286, 286], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='box' class='rotated'", - "rect": [108, 152, 202, 202], - "reason": "paint property change" - } + "invalidations": [ + [66, 110, 286, 286] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/push-block-with-first-line-expected.txt b/third_party/blink/web_tests/paint/invalidation/push-block-with-first-line-expected.txt index ef3da81..78a1f0c 100644 --- a/third_party/blink/web_tests/paint/invalidation/push-block-with-first-line-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/push-block-with-first-line-expected.txt
@@ -5,27 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalLineBoxFragment", - "rect": [8, 68, 784, 20], - "reason": "geometry" - }, - { - "object": "NGPhysicalLineBoxFragment", - "rect": [8, 8, 784, 20], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'JOCULAR'", - "rect": [8, 68, 140, 20], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'JOCULAR'", - "rect": [8, 8, 140, 20], - "reason": "geometry" - } + "invalidations": [ + [8, 68, 784, 20], + [8, 8, 784, 20] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/raster-under-invalidation-checking-expected.txt b/third_party/blink/web_tests/paint/invalidation/raster-under-invalidation-checking-expected.txt index 5dee297..c3c55e8 100644 --- a/third_party/blink/web_tests/paint/invalidation/raster-under-invalidation-checking-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/raster-under-invalidation-checking-expected.txt
@@ -5,14 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target1'", - "rect": [18, 10, 60, 40], - "reason": "background" - } + "invalidations": [ + [18, 10, 60, 40] ], - "underPaintInvalidations": [ + "underInvalidations": [ { "x": 18, "y": 10, @@ -320,14 +316,10 @@ "bounds": [60, 40], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target2'", - "rect": [0, 0, 60, 40], - "reason": "background" - } + "invalidations": [ + [0, 0, 60, 40] ], - "underPaintInvalidations": [ + "underInvalidations": [ { "x": 0, "y": 0, @@ -636,14 +628,10 @@ "bounds": [150, 150], "contentsOpaque": true, "backgroundColor": "#FFFF00", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='target3'", - "rect": [40, 70, 60, 40], - "reason": "background" - } + "invalidations": [ + [40, 70, 60, 40] ], - "underPaintInvalidations": [ + "underInvalidations": [ { "x": 40, "y": 70, @@ -955,14 +943,10 @@ { "name": "Scrolling Contents Layer", "bounds": [4000, 20060], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='target4'", - "rect": [40, 10010, 60, 40], - "reason": "background" - } + "invalidations": [ + [40, 10010, 60, 40] ], - "underPaintInvalidations": [ + "underInvalidations": [ { "x": 40, "y": 10010,
diff --git a/third_party/blink/web_tests/paint/invalidation/reflection/reflection-invalidation-after-display-expected.txt b/third_party/blink/web_tests/paint/invalidation/reflection/reflection-invalidation-after-display-expected.txt index 7be510d..fb2d72c4 100644 --- a/third_party/blink/web_tests/paint/invalidation/reflection/reflection-invalidation-after-display-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/reflection/reflection-invalidation-after-display-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='box' class='green reflected box'", - "rect": [300, 8, 450, 200], - "reason": "chunk disappeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='box' class='green box'", - "rect": [300, 8, 200, 200], - "reason": "appeared" - } + "invalidations": [ + [300, 8, 450, 200] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/reflection/reflection-invalidation-positioned-child-expected.txt b/third_party/blink/web_tests/paint/invalidation/reflection/reflection-invalidation-positioned-child-expected.txt index 559c083..091499d 100644 --- a/third_party/blink/web_tests/paint/invalidation/reflection/reflection-invalidation-positioned-child-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/reflection/reflection-invalidation-positioned-child-expected.txt
@@ -5,27 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='box'", - "rect": [0, 0, 100, 220], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow DIV id='box'", - "rect": [0, 0, 100, 200], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='positioned'", - "rect": [400, 10, 50, 200], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='positioned'", - "rect": [400, 10, 50, 180], - "reason": "paint property change" - } + "invalidations": [ + [0, 0, 100, 220], + [400, 10, 50, 200] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/reflection/reflection-with-rotation-expected.txt b/third_party/blink/web_tests/paint/invalidation/reflection/reflection-with-rotation-expected.txt index c7d664fa..c41ad5e 100644 --- a/third_party/blink/web_tests/paint/invalidation/reflection/reflection-with-rotation-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/reflection/reflection-with-rotation-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'PASS'", - "rect": [23, 51, 71, 109], - "reason": "full" - } + "invalidations": [ + [23, 51, 71, 109] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/reflection/scroll-absolute-layer-with-reflection-expected.txt b/third_party/blink/web_tests/paint/invalidation/reflection/scroll-absolute-layer-with-reflection-expected.txt index 378452f..b7674182 100644 --- a/third_party/blink/web_tests/paint/invalidation/reflection/scroll-absolute-layer-with-reflection-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/reflection/scroll-absolute-layer-with-reflection-expected.txt
@@ -5,17 +5,8 @@ "bounds": [785, 2016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='absolute red'", - "rect": [250, 230, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV class='relative reflected'", - "rect": [250, 230, 100, 100], - "reason": "paint property change" - } + "invalidations": [ + [250, 230, 100, 100] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/paint/invalidation/reflection/scroll-fixed-layer-with-reflection-expected.txt b/third_party/blink/web_tests/paint/invalidation/reflection/scroll-fixed-layer-with-reflection-expected.txt index fd792e7..ae3baa49 100644 --- a/third_party/blink/web_tests/paint/invalidation/reflection/scroll-fixed-layer-with-reflection-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/reflection/scroll-fixed-layer-with-reflection-expected.txt
@@ -10,17 +10,8 @@ { "name": "LayoutNGBlockFlow (positioned) DIV id='moveMe' class='fixed clipped'", "bounds": [100, 100], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='absolute green reflected'", - "rect": [0, 0, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV class='absolute red'", - "rect": [0, 0, 100, 100], - "reason": "chunk disappeared" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 2 },
diff --git a/third_party/blink/web_tests/paint/invalidation/reflection/scroll-fixed-reflected-layer-expected.txt b/third_party/blink/web_tests/paint/invalidation/reflection/scroll-fixed-reflected-layer-expected.txt index 5f79fcc..37a55c4 100644 --- a/third_party/blink/web_tests/paint/invalidation/reflection/scroll-fixed-reflected-layer-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/reflection/scroll-fixed-reflected-layer-expected.txt
@@ -11,12 +11,8 @@ "name": "LayoutNGBlockFlow (positioned) DIV class='reflected fixed'", "bounds": [100, 100], "contentsOpaque": true, - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='absolute green reflected'", - "rect": [0, 0, 100, 100], - "reason": "chunk reordered" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 2 },
diff --git a/third_party/blink/web_tests/paint/invalidation/remove-block-after-layout-expected.txt b/third_party/blink/web_tests/paint/invalidation/remove-block-after-layout-expected.txt new file mode 100644 index 0000000..ed615e7 --- /dev/null +++ b/third_party/blink/web_tests/paint/invalidation/remove-block-after-layout-expected.txt
@@ -0,0 +1,14 @@ +{ + "layers": [ + { + "name": "Scrolling Contents Layer", + "bounds": [800, 600], + "contentsOpaque": true, + "backgroundColor": "#FFFFFF", + "invalidations": [ + [8, 108, 100, 100] + ] + } + ] +} +
diff --git a/third_party/blink/web_tests/paint/invalidation/repaint-in-iframe-expected.txt b/third_party/blink/web_tests/paint/invalidation/repaint-in-iframe-expected.txt index 2188c51..2f398803 100644 --- a/third_party/blink/web_tests/paint/invalidation/repaint-in-iframe-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/repaint-in-iframe-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [18, 418, 50, 50], - "reason": "background" - } + "invalidations": [ + [18, 418, 50, 50] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/repaint-on-style-change-expected.txt b/third_party/blink/web_tests/paint/invalidation/repaint-on-style-change-expected.txt index ce88e77..8364637 100644 --- a/third_party/blink/web_tests/paint/invalidation/repaint-on-style-change-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/repaint-on-style-change-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='box'", - "rect": [260, 260, 100, 100], - "reason": "background" - } + "invalidations": [ + [260, 260, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/repaint-overlay/layers-expected.txt b/third_party/blink/web_tests/paint/invalidation/repaint-overlay/layers-expected.txt index 6c3a10dd..9db50de0 100644 --- a/third_party/blink/web_tests/paint/invalidation/repaint-overlay/layers-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/repaint-overlay/layers-expected.txt
@@ -11,12 +11,8 @@ "name": "LayoutNGBlockFlow (positioned) DIV id='container'", "bounds": [100, 100], "backgroundColor": "#0000FF80", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='child1'", - "rect": [20, 20, 10, 10], - "reason": "background" - } + "invalidations": [ + [20, 20, 10, 10] ], "transform": 2 }, @@ -30,12 +26,8 @@ "bounds": [200, 200], "contentsOpaque": true, "backgroundColor": "#FFFF00", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='child2'", - "rect": [20, 20, 10, 10], - "reason": "background" - } + "invalidations": [ + [20, 20, 10, 10] ], "transform": 6 },
diff --git a/third_party/blink/web_tests/paint/invalidation/repaint-overlay/layers-overlay.html b/third_party/blink/web_tests/paint/invalidation/repaint-overlay/layers-overlay.html index 6d86665..cdb9332 100644 --- a/third_party/blink/web_tests/paint/invalidation/repaint-overlay/layers-overlay.html +++ b/third_party/blink/web_tests/paint/invalidation/repaint-overlay/layers-overlay.html
@@ -66,12 +66,8 @@ "name": "LayoutNGBlockFlow (positioned) DIV id='container'", "bounds": [100, 100], "backgroundColor": "#0000FF80", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='child1'", - "rect": [20, 20, 10, 10], - "reason": "background" - } + "invalidations": [ + [20, 20, 10, 10] ], "transform": 2 }, @@ -85,12 +81,8 @@ "bounds": [200, 200], "contentsOpaque": true, "backgroundColor": "#FFFF00", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='child2'", - "rect": [20, 20, 10, 10], - "reason": "background" - } + "invalidations": [ + [20, 20, 10, 10] ], "transform": 6 }, @@ -189,12 +181,8 @@ "name": "LayoutNGBlockFlow (positioned) DIV id='container'", "bounds": [100, 100], "backgroundColor": "#0000FF80", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='child1'", - "rect": [20, 20, 10, 10], - "reason": "background" - } + "invalidations": [ + [20, 20, 10, 10] ], "transform": 2 }, @@ -208,12 +196,8 @@ "bounds": [200, 200], "contentsOpaque": true, "backgroundColor": "#FFFF00", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='child2'", - "rect": [20, 20, 10, 10], - "reason": "background" - } + "invalidations": [ + [20, 20, 10, 10] ], "transform": 6 }, @@ -326,15 +310,8 @@ } if (layer.position) context.translate(layer.position[0], layer.position[1]); - - if (layer.paintInvalidations) { - var rects = []; - for (var i = 0; i < layer.paintInvalidations.length; ++i) { - if (layer.paintInvalidations[i].rect) - rects.push(layer.paintInvalidations[i].rect); - } - draw_rects(context, rects); - } + if (layer.invalidations) + draw_rects(context, layer.invalidations); context.restore(); }
diff --git a/third_party/blink/web_tests/paint/invalidation/repaint-subrect-grid-expected.txt b/third_party/blink/web_tests/paint/invalidation/repaint-subrect-grid-expected.txt index bb63fe6..4338e6b 100644 --- a/third_party/blink/web_tests/paint/invalidation/repaint-subrect-grid-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/repaint-subrect-grid-expected.txt
@@ -5,107 +5,17 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='mask'", - "rect": [45, 18, 20, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='mask'", - "rect": [45, 18, 20, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='mask'", - "rect": [36, 36, 19, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='mask'", - "rect": [36, 36, 19, 19], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='mask'", - "rect": [36, 0, 19, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='mask'", - "rect": [36, 0, 19, 19], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='mask'", - "rect": [27, 18, 19, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='mask'", - "rect": [27, 18, 19, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='mask'", - "rect": [18, 36, 19, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='mask'", - "rect": [18, 36, 19, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='mask'", - "rect": [18, 0, 19, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='mask'", - "rect": [18, 0, 19, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='mask'", - "rect": [9, 18, 19, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='mask'", - "rect": [9, 18, 19, 19], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='mask'", - "rect": [0, 36, 19, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='mask'", - "rect": [0, 36, 19, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='mask'", - "rect": [0, 0, 19, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='mask'", - "rect": [0, 0, 19, 19], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='mask'", - "rect": [0, 18, 10, 19], - "reason": "chunk appeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='mask'", - "rect": [0, 18, 10, 19], - "reason": "chunk disappeared" - } + "invalidations": [ + [45, 18, 20, 19], + [36, 36, 19, 19], + [36, 0, 19, 19], + [27, 18, 19, 19], + [18, 36, 19, 19], + [18, 0, 19, 19], + [9, 18, 19, 19], + [0, 36, 19, 19], + [0, 0, 19, 19], + [0, 18, 10, 19] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/requestAnimation-translation-leave-traces-expected.txt b/third_party/blink/web_tests/paint/invalidation/requestAnimation-translation-leave-traces-expected.txt index a67cbd50e..5ffe2ae 100644 --- a/third_party/blink/web_tests/paint/invalidation/requestAnimation-translation-leave-traces-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/requestAnimation-translation-leave-traces-expected.txt
@@ -8,37 +8,10 @@ "bounds": [1600, 585], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [1300, 0, 300, 585], - "reason": "incremental" - }, - { - "object": "Scrolling background of LayoutView #document", - "rect": [1000, 0, 300, 585], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow DIV id='box'", - "rect": [1500, 0, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow DIV id='box'", - "rect": [1200, 0, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow DIV id='box'", - "rect": [1200, 0, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow DIV id='box'", - "rect": [900, 0, 100, 100], - "reason": "paint property change" - } + "invalidations": [ + [1300, 0, 300, 585], + [1000, 0, 300, 585], + [900, 0, 100, 100] ] }, {
diff --git a/third_party/blink/web_tests/paint/invalidation/requestAnimation-translation-leave-traces.html b/third_party/blink/web_tests/paint/invalidation/requestAnimation-translation-leave-traces.html index f234010..a708807 100644 --- a/third_party/blink/web_tests/paint/invalidation/requestAnimation-translation-leave-traces.html +++ b/third_party/blink/web_tests/paint/invalidation/requestAnimation-translation-leave-traces.html
@@ -34,7 +34,7 @@ requestAnimationFrame(tick); } else { if (window.internals) { - var layerTree = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS); + var layerTree = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_INVALIDATIONS); internals.stopTrackingRepaints(document); document.getElementById("result").textContent = "Tested locations: " + testedLocations + '\n' + layerTree; }
diff --git a/third_party/blink/web_tests/paint/invalidation/resize-iframe-text-expected.txt b/third_party/blink/web_tests/paint/invalidation/resize-iframe-text-expected.txt new file mode 100644 index 0000000..83ca7004 --- /dev/null +++ b/third_party/blink/web_tests/paint/invalidation/resize-iframe-text-expected.txt
@@ -0,0 +1,15 @@ +{ + "layers": [ + { + "name": "Scrolling Contents Layer", + "bounds": [500, 400], + "contentsOpaque": true, + "backgroundColor": "#FFFFFF", + "invalidations": [ + [0, 200, 500, 200], + [485, 0, 15, 200] + ] + } + ] +} +
diff --git a/third_party/blink/web_tests/paint/invalidation/resources/text-based-repaint.js b/third_party/blink/web_tests/paint/invalidation/resources/text-based-repaint.js index f55bd95..6a7931f 100644 --- a/third_party/blink/web_tests/paint/invalidation/resources/text-based-repaint.js +++ b/third_party/blink/web_tests/paint/invalidation/resources/text-based-repaint.js
@@ -52,7 +52,7 @@ if (!window.testRunner || !window.internals) return; - var flags = internals.LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS; + var flags = internals.LAYER_TREE_INCLUDES_INVALIDATIONS; if (window.layerTreeAsTextAdditionalFlags) flags |= layerTreeAsTextAdditionalFlags;
diff --git a/third_party/blink/web_tests/paint/invalidation/resources/window-resize-repaint.js b/third_party/blink/web_tests/paint/invalidation/resources/window-resize-repaint.js index c5ef19e..9462790 100644 --- a/third_party/blink/web_tests/paint/invalidation/resources/window-resize-repaint.js +++ b/third_party/blink/web_tests/paint/invalidation/resources/window-resize-repaint.js
@@ -14,7 +14,7 @@ function doTest() { if (sizeIndex) { - repaintRects += internals.layerTreeAsText(document, window.internals.LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS); + repaintRects += internals.layerTreeAsText(document, window.internals.LAYER_TREE_INCLUDES_INVALIDATIONS); internals.stopTrackingRepaints(document); } ++sizeIndex;
diff --git a/third_party/blink/web_tests/paint/invalidation/scroll/composited-add-resizer-expected.txt b/third_party/blink/web_tests/paint/invalidation/scroll/composited-add-resizer-expected.txt index 1ab7f0f..4cccbf8 100644 --- a/third_party/blink/web_tests/paint/invalidation/scroll/composited-add-resizer-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/scroll/composited-add-resizer-expected.txt
@@ -27,12 +27,8 @@ "name": "Scroll Corner Layer", "position": [85, 85], "bounds": [15, 15], - "paintInvalidations": [ - { - "object": "Scroll Corner Layer", - "rect": [0, 0, 15, 15], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 15, 15] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/paint/invalidation/scroll/destroy-composited-scrollbar-expected.txt b/third_party/blink/web_tests/paint/invalidation/scroll/destroy-composited-scrollbar-expected.txt index 4501ae9..0c79034 100644 --- a/third_party/blink/web_tests/paint/invalidation/scroll/destroy-composited-scrollbar-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/scroll/destroy-composited-scrollbar-expected.txt
@@ -11,17 +11,8 @@ "bounds": [200, 200], "contentsOpaque": true, "backgroundColor": "#0000FF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [0, 0, 200, 200], - "reason": "full layer" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [0, 0, 200, 200], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 200, 200] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/paint/invalidation/scroll/destroy-overlay-scrollbar-expected.txt b/third_party/blink/web_tests/paint/invalidation/scroll/destroy-overlay-scrollbar-expected.txt index 7532c5c1..2b8b7b59 100644 --- a/third_party/blink/web_tests/paint/invalidation/scroll/destroy-overlay-scrollbar-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/scroll/destroy-overlay-scrollbar-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [193, 100, 7, 200], - "reason": "chunk disappeared" - } + "invalidations": [ + [193, 100, 7, 200] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/scroll/destroy-scrollbar-expected.txt b/third_party/blink/web_tests/paint/invalidation/scroll/destroy-scrollbar-expected.txt index e101a3ea..2c96288a 100644 --- a/third_party/blink/web_tests/paint/invalidation/scroll/destroy-scrollbar-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/scroll/destroy-scrollbar-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "VerticalScrollbar", - "rect": [185, 100, 15, 200], - "reason": "chunk disappeared" - } + "invalidations": [ + [185, 100, 15, 200] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/scroll/fixed-after-scroll-expected.txt b/third_party/blink/web_tests/paint/invalidation/scroll/fixed-after-scroll-expected.txt index 5543e35..e5142ad 100644 --- a/third_party/blink/web_tests/paint/invalidation/scroll/fixed-after-scroll-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/scroll/fixed-after-scroll-expected.txt
@@ -5,12 +5,8 @@ "bounds": [785, 2016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='t' class='green absolute'", - "rect": [8, 200, 100, 100], - "reason": "disappeared" - } + "invalidations": [ + [8, 200, 100, 100] ], "transform": 1 }, @@ -26,12 +22,8 @@ "bounds": [100, 100], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='t' class='green absolute'", - "rect": [0, 0, 100, 100], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 3 },
diff --git a/third_party/blink/web_tests/paint/invalidation/scroll/fixed-and-absolute-position-scrolled-expected.txt b/third_party/blink/web_tests/paint/invalidation/scroll/fixed-and-absolute-position-scrolled-expected.txt index 8224596..5be1c43 100644 --- a/third_party/blink/web_tests/paint/invalidation/scroll/fixed-and-absolute-position-scrolled-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/scroll/fixed-and-absolute-position-scrolled-expected.txt
@@ -20,12 +20,8 @@ "bounds": [100, 100], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='absoluteDiv' class='absolute green'", - "rect": [0, 0, 100, 100], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/paint/invalidation/scroll/fixed-child-move-after-scroll-expected.txt b/third_party/blink/web_tests/paint/invalidation/scroll/fixed-child-move-after-scroll-expected.txt index 2d35e417..009038a8 100644 --- a/third_party/blink/web_tests/paint/invalidation/scroll/fixed-child-move-after-scroll-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/scroll/fixed-child-move-after-scroll-expected.txt
@@ -12,12 +12,8 @@ "bounds": [100, 100], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='toMove'", - "rect": [0, 0, 100, 100], - "reason": "background" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 2 },
diff --git a/third_party/blink/web_tests/paint/invalidation/scroll/fixed-child-of-fixed-move-after-scroll-expected.txt b/third_party/blink/web_tests/paint/invalidation/scroll/fixed-child-of-fixed-move-after-scroll-expected.txt index 2d35e417..009038a8 100644 --- a/third_party/blink/web_tests/paint/invalidation/scroll/fixed-child-of-fixed-move-after-scroll-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/scroll/fixed-child-of-fixed-move-after-scroll-expected.txt
@@ -12,12 +12,8 @@ "bounds": [100, 100], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='toMove'", - "rect": [0, 0, 100, 100], - "reason": "background" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 2 },
diff --git a/third_party/blink/web_tests/paint/invalidation/scroll/fixed-child-of-transformed-move-after-scroll-expected.txt b/third_party/blink/web_tests/paint/invalidation/scroll/fixed-child-of-transformed-move-after-scroll-expected.txt index e87bd122..1b083de8 100644 --- a/third_party/blink/web_tests/paint/invalidation/scroll/fixed-child-of-transformed-move-after-scroll-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/scroll/fixed-child-of-transformed-move-after-scroll-expected.txt
@@ -5,17 +5,9 @@ "bounds": [785, 3016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='toMove'", - "rect": [158, 278, 100, 100], - "reason": "background" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='toMove'", - "rect": [18, 278, 100, 100], - "reason": "background" - } + "invalidations": [ + [158, 278, 100, 100], + [18, 278, 100, 100] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/paint/invalidation/scroll/fixed-child-of-transformed-scrolled-expected.txt b/third_party/blink/web_tests/paint/invalidation/scroll/fixed-child-of-transformed-scrolled-expected.txt index f43c8f8..922d5c9 100644 --- a/third_party/blink/web_tests/paint/invalidation/scroll/fixed-child-of-transformed-scrolled-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/scroll/fixed-child-of-transformed-scrolled-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='fixed'", - "rect": [200, 150, 100, 100], - "reason": "background" - } + "invalidations": [ + [200, 150, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/scroll/fixed-descendant-of-transformed-scrolled-expected.txt b/third_party/blink/web_tests/paint/invalidation/scroll/fixed-descendant-of-transformed-scrolled-expected.txt index f43c8f8..922d5c9 100644 --- a/third_party/blink/web_tests/paint/invalidation/scroll/fixed-descendant-of-transformed-scrolled-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/scroll/fixed-descendant-of-transformed-scrolled-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='fixed'", - "rect": [200, 150, 100, 100], - "reason": "background" - } + "invalidations": [ + [200, 150, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/scroll/fixed-move-after-scroll-expected.txt b/third_party/blink/web_tests/paint/invalidation/scroll/fixed-move-after-scroll-expected.txt index 2d35e417..009038a8 100644 --- a/third_party/blink/web_tests/paint/invalidation/scroll/fixed-move-after-scroll-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/scroll/fixed-move-after-scroll-expected.txt
@@ -12,12 +12,8 @@ "bounds": [100, 100], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='toMove'", - "rect": [0, 0, 100, 100], - "reason": "background" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 2 },
diff --git a/third_party/blink/web_tests/paint/invalidation/scroll/fixed-scroll-viewport-scroll-hidden-expected.txt b/third_party/blink/web_tests/paint/invalidation/scroll/fixed-scroll-viewport-scroll-hidden-expected.txt index dc2de57e..2b89c39a 100644 --- a/third_party/blink/web_tests/paint/invalidation/scroll/fixed-scroll-viewport-scroll-hidden-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/scroll/fixed-scroll-viewport-scroll-hidden-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 2016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='fixed green'", - "rect": [8, 200, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV class='fixed green'", - "rect": [8, 100, 100, 100], - "reason": "paint property change" - } + "invalidations": [ + [8, 200, 100, 100], + [8, 100, 100, 100] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/paint/invalidation/scroll/fixed-under-composited-absolute-scrolled-expected.txt b/third_party/blink/web_tests/paint/invalidation/scroll/fixed-under-composited-absolute-scrolled-expected.txt index 21ec91a1..455cf41 100644 --- a/third_party/blink/web_tests/paint/invalidation/scroll/fixed-under-composited-absolute-scrolled-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/scroll/fixed-under-composited-absolute-scrolled-expected.txt
@@ -20,12 +20,8 @@ "bounds": [100, 200], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='fixed'", - "rect": [0, 100, 100, 100], - "reason": "incremental" - } + "invalidations": [ + [0, 100, 100, 100] ] }, {
diff --git a/third_party/blink/web_tests/paint/invalidation/scroll/fixed-with-border-under-composited-absolute-scrolled-expected.txt b/third_party/blink/web_tests/paint/invalidation/scroll/fixed-with-border-under-composited-absolute-scrolled-expected.txt index 827de99..e53e42e 100644 --- a/third_party/blink/web_tests/paint/invalidation/scroll/fixed-with-border-under-composited-absolute-scrolled-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/scroll/fixed-with-border-under-composited-absolute-scrolled-expected.txt
@@ -20,12 +20,8 @@ "bounds": [120, 220], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='fixed'", - "rect": [0, 0, 120, 220], - "reason": "geometry" - } + "invalidations": [ + [0, 0, 120, 220] ] }, {
diff --git a/third_party/blink/web_tests/paint/invalidation/scroll/flipped-blocks-writing-mode-scroll-expected.txt b/third_party/blink/web_tests/paint/invalidation/scroll/flipped-blocks-writing-mode-scroll-expected.txt index d23ac3b9..638e45e 100644 --- a/third_party/blink/web_tests/paint/invalidation/scroll/flipped-blocks-writing-mode-scroll-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/scroll/flipped-blocks-writing-mode-scroll-expected.txt
@@ -14,12 +14,8 @@ { "name": "Scrolling Contents Layer", "bounds": [10000, 385], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [0, 0, 10000, 200], - "reason": "background" - } + "invalidations": [ + [0, 0, 10000, 200] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/paint/invalidation/scroll/iframe-gradient-background-scroll-repaint-expected.txt b/third_party/blink/web_tests/paint/invalidation/scroll/iframe-gradient-background-scroll-repaint-expected.txt index a33e5df..e225ea0 100644 --- a/third_party/blink/web_tests/paint/invalidation/scroll/iframe-gradient-background-scroll-repaint-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/scroll/iframe-gradient-background-scroll-repaint-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutView #document", - "rect": [10, 10, 300, 150], - "reason": "background" - } + "invalidations": [ + [10, 10, 300, 150] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/scroll/iframe-scrollbar-hover-expected.txt b/third_party/blink/web_tests/paint/invalidation/scroll/iframe-scrollbar-hover-expected.txt index 2efa58a..0437fd0 100644 --- a/third_party/blink/web_tests/paint/invalidation/scroll/iframe-scrollbar-hover-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/scroll/iframe-scrollbar-hover-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "VerticalScrollbar", - "rect": [187, 102, 15, 200], - "reason": "scroll control" - } + "invalidations": [ + [187, 102, 15, 200] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/scroll/invalidate-after-composited-scroll-expected.txt b/third_party/blink/web_tests/paint/invalidation/scroll/invalidate-after-composited-scroll-expected.txt index 3b391aca..20683fc 100644 --- a/third_party/blink/web_tests/paint/invalidation/scroll/invalidate-after-composited-scroll-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/scroll/invalidate-after-composited-scroll-expected.txt
@@ -14,12 +14,8 @@ { "name": "Scrolling Contents Layer", "bounds": [185, 4900], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [0, 2400, 100, 100], - "reason": "background" - } + "invalidations": [ + [0, 2400, 100, 100] ], "transform": 2 },
diff --git a/third_party/blink/web_tests/paint/invalidation/scroll/nested-fixed-iframe-scrolled-expected.txt b/third_party/blink/web_tests/paint/invalidation/scroll/nested-fixed-iframe-scrolled-expected.txt index 9ac72ec7..b1b9266 100644 --- a/third_party/blink/web_tests/paint/invalidation/scroll/nested-fixed-iframe-scrolled-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/scroll/nested-fixed-iframe-scrolled-expected.txt
@@ -5,12 +5,8 @@ "bounds": [785, 2016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='div'", - "rect": [22, 522, 100, 100], - "reason": "background" - } + "invalidations": [ + [22, 522, 100, 100] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/paint/invalidation/scroll/outline-change-scrollable-expected.txt b/third_party/blink/web_tests/paint/invalidation/scroll/outline-change-scrollable-expected.txt index fa31122..fb0f759 100644 --- a/third_party/blink/web_tests/paint/invalidation/scroll/outline-change-scrollable-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/scroll/outline-change-scrollable-expected.txt
@@ -5,12 +5,8 @@ "bounds": [1008, 585], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [0, 0, 1008, 128], - "reason": "style change" - } + "invalidations": [ + [0, 0, 1008, 128] ] }, {
diff --git a/third_party/blink/web_tests/paint/invalidation/scroll/overflow-auto-in-overflow-auto-scrolled-expected.txt b/third_party/blink/web_tests/paint/invalidation/scroll/overflow-auto-in-overflow-auto-scrolled-expected.txt index ed5824ba..5f234433 100644 --- a/third_party/blink/web_tests/paint/invalidation/scroll/overflow-auto-in-overflow-auto-scrolled-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/scroll/overflow-auto-in-overflow-auto-scrolled-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='innerDiv'", - "rect": [8, 8, 300, 300], - "reason": "paint property change" - }, - { - "object": "VerticalScrollbar", - "rect": [762, 8, 15, 300], - "reason": "scroll control" - } + "invalidations": [ + [8, 8, 300, 300], + [762, 8, 15, 300] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/scroll/overflow-hidden-in-overflow-hidden-scrolled-expected.txt b/third_party/blink/web_tests/paint/invalidation/scroll/overflow-hidden-in-overflow-hidden-scrolled-expected.txt index 5144196..7acd837 100644 --- a/third_party/blink/web_tests/paint/invalidation/scroll/overflow-hidden-in-overflow-hidden-scrolled-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/scroll/overflow-hidden-in-overflow-hidden-scrolled-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='innerWrapper'", - "rect": [8, 18, 100, 190], - "reason": "paint property change" - } + "invalidations": [ + [8, 18, 100, 190] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/scroll/overflow-hidden-yet-scrolled-expected.txt b/third_party/blink/web_tests/paint/invalidation/scroll/overflow-hidden-yet-scrolled-expected.txt index b0202c5..ce167ce 100644 --- a/third_party/blink/web_tests/paint/invalidation/scroll/overflow-hidden-yet-scrolled-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/scroll/overflow-hidden-yet-scrolled-expected.txt
@@ -10,12 +10,8 @@ "name": "LayoutNGBlockFlow DIV id='scroller'", "bounds": [302, 302], "backfaceVisibility": "hidden", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='scroller'", - "rect": [1, 201, 100, 100], - "reason": "chunk appeared" - } + "invalidations": [ + [1, 201, 100, 100] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/paint/invalidation/scroll/overflow-hidden-yet-scrolled-with-custom-scrollbar-expected.txt b/third_party/blink/web_tests/paint/invalidation/scroll/overflow-hidden-yet-scrolled-with-custom-scrollbar-expected.txt index 8f014937..ce167ce 100644 --- a/third_party/blink/web_tests/paint/invalidation/scroll/overflow-hidden-yet-scrolled-with-custom-scrollbar-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/scroll/overflow-hidden-yet-scrolled-with-custom-scrollbar-expected.txt
@@ -10,12 +10,8 @@ "name": "LayoutNGBlockFlow DIV id='scroller'", "bounds": [302, 302], "backfaceVisibility": "hidden", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [1, 201, 100, 100], - "reason": "chunk appeared" - } + "invalidations": [ + [1, 201, 100, 100] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/paint/invalidation/scroll/overflow-move-after-scroll-expected.txt b/third_party/blink/web_tests/paint/invalidation/scroll/overflow-move-after-scroll-expected.txt index cbe2e91..f5ca7183 100644 --- a/third_party/blink/web_tests/paint/invalidation/scroll/overflow-move-after-scroll-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/scroll/overflow-move-after-scroll-expected.txt
@@ -14,17 +14,9 @@ { "name": "Scrolling Contents Layer", "bounds": [685, 600], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='block'", - "rect": [300, 200, 120, 50], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='block'", - "rect": [50, 200, 120, 50], - "reason": "geometry" - } + "invalidations": [ + [300, 200, 120, 50], + [50, 200, 120, 50] ], "transform": 2 },
diff --git a/third_party/blink/web_tests/paint/invalidation/scroll/overflow-scroll-after-move-expected.txt b/third_party/blink/web_tests/paint/invalidation/scroll/overflow-scroll-after-move-expected.txt index cdbaf8a..bee28d1 100644 --- a/third_party/blink/web_tests/paint/invalidation/scroll/overflow-scroll-after-move-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/scroll/overflow-scroll-after-move-expected.txt
@@ -14,17 +14,9 @@ { "name": "Scrolling Contents Layer", "bounds": [285, 900], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='block'", - "rect": [50, 310, 200, 50], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='block'", - "rect": [50, 200, 200, 50], - "reason": "geometry" - } + "invalidations": [ + [50, 310, 200, 50], + [50, 200, 200, 50] ], "transform": 2 },
diff --git a/third_party/blink/web_tests/paint/invalidation/scroll/overflow-scroll-composited-non-stacking-child-expected.txt b/third_party/blink/web_tests/paint/invalidation/scroll/overflow-scroll-composited-non-stacking-child-expected.txt index 2332792..459cd0c 100644 --- a/third_party/blink/web_tests/paint/invalidation/scroll/overflow-scroll-composited-non-stacking-child-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/scroll/overflow-scroll-composited-non-stacking-child-expected.txt
@@ -5,22 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='back'", - "rect": [93, 125, 180, 100], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV class='back'", - "rect": [93, 75, 180, 100], - "reason": "paint property change" - }, - { - "object": "VerticalScrollbar", - "rect": [308, 65, 15, 175], - "reason": "scroll control" - } + "invalidations": [ + [93, 125, 180, 100], + [93, 75, 180, 100], + [308, 65, 15, 175] ] }, {
diff --git a/third_party/blink/web_tests/paint/invalidation/scroll/overflow-scroll-in-overflow-scroll-scrolled-expected.txt b/third_party/blink/web_tests/paint/invalidation/scroll/overflow-scroll-in-overflow-scroll-scrolled-expected.txt index ed5824ba..5f234433 100644 --- a/third_party/blink/web_tests/paint/invalidation/scroll/overflow-scroll-in-overflow-scroll-scrolled-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/scroll/overflow-scroll-in-overflow-scroll-scrolled-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='innerDiv'", - "rect": [8, 8, 300, 300], - "reason": "paint property change" - }, - { - "object": "VerticalScrollbar", - "rect": [762, 8, 15, 300], - "reason": "scroll control" - } + "invalidations": [ + [8, 8, 300, 300], + [762, 8, 15, 300] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/scroll/repaint-composited-child-in-scrolled-container-expected.txt b/third_party/blink/web_tests/paint/invalidation/scroll/repaint-composited-child-in-scrolled-container-expected.txt index 3d1fd19..71b0103 100644 --- a/third_party/blink/web_tests/paint/invalidation/scroll/repaint-composited-child-in-scrolled-container-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/scroll/repaint-composited-child-in-scrolled-container-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "HorizontalScrollbar", - "rect": [8, 293, 285, 15], - "reason": "scroll control" - } + "invalidations": [ + [8, 293, 285, 15] ] }, { @@ -18,12 +14,8 @@ "bounds": [600, 600], "contentsOpaque": true, "backgroundColor": "#FF0000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='inner'", - "rect": [0, 0, 600, 600], - "reason": "appeared" - } + "invalidations": [ + [0, 0, 600, 600] ], "transform": 3 }
diff --git a/third_party/blink/web_tests/paint/invalidation/scroll/resize-scrollable-div-expected.txt b/third_party/blink/web_tests/paint/invalidation/scroll/resize-scrollable-div-expected.txt index 8bd0d6c..eb0ab0f1 100644 --- a/third_party/blink/web_tests/paint/invalidation/scroll/resize-scrollable-div-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/scroll/resize-scrollable-div-expected.txt
@@ -5,37 +5,13 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "HorizontalScrollbar", - "rect": [8, 393, 285, 15], - "reason": "scroll control" - }, - { - "object": "HorizontalScrollbar", - "rect": [8, 193, 85, 15], - "reason": "scroll control" - }, - { - "object": "VerticalScrollbar", - "rect": [293, 108, 15, 285], - "reason": "scroll control" - }, - { - "object": "VerticalScrollbar", - "rect": [93, 108, 15, 85], - "reason": "scroll control" - }, - { - "object": "Scroll corner of LayoutNGBlockFlow DIV id='div'", - "rect": [293, 393, 15, 15], - "reason": "geometry" - }, - { - "object": "Scroll corner of LayoutNGBlockFlow DIV id='div'", - "rect": [93, 193, 15, 15], - "reason": "geometry" - } + "invalidations": [ + [8, 393, 285, 15], + [8, 193, 85, 15], + [293, 108, 15, 285], + [93, 108, 15, 85], + [293, 393, 15, 15], + [93, 193, 15, 15] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/scroll/resize-scrollable-iframe-expected.txt b/third_party/blink/web_tests/paint/invalidation/scroll/resize-scrollable-iframe-expected.txt index 6845573..eb0ab0f1 100644 --- a/third_party/blink/web_tests/paint/invalidation/scroll/resize-scrollable-iframe-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/scroll/resize-scrollable-iframe-expected.txt
@@ -5,37 +5,13 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "HorizontalScrollbar", - "rect": [8, 393, 285, 15], - "reason": "scroll control" - }, - { - "object": "HorizontalScrollbar", - "rect": [8, 193, 85, 15], - "reason": "scroll control" - }, - { - "object": "VerticalScrollbar", - "rect": [293, 108, 15, 285], - "reason": "scroll control" - }, - { - "object": "VerticalScrollbar", - "rect": [93, 108, 15, 85], - "reason": "scroll control" - }, - { - "object": "Scroll corner of LayoutView #document", - "rect": [293, 393, 15, 15], - "reason": "geometry" - }, - { - "object": "Scroll corner of LayoutView #document", - "rect": [93, 193, 15, 15], - "reason": "geometry" - } + "invalidations": [ + [8, 393, 285, 15], + [8, 193, 85, 15], + [293, 108, 15, 285], + [93, 108, 15, 85], + [293, 393, 15, 15], + [93, 193, 15, 15] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/scroll/scroll-fixed-layer-with-no-visible-content-expected.txt b/third_party/blink/web_tests/paint/invalidation/scroll/scroll-fixed-layer-with-no-visible-content-expected.txt index 536f49c..ddf2c69 100644 --- a/third_party/blink/web_tests/paint/invalidation/scroll/scroll-fixed-layer-with-no-visible-content-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/scroll/scroll-fixed-layer-with-no-visible-content-expected.txt
@@ -10,12 +10,8 @@ { "name": "LayoutNGBlockFlow (positioned) DIV id='moveMe' class='fixed clipped'", "bounds": [100, 100], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='moveMe' class='fixed clipped'", - "rect": [0, 0, 100, 100], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 2 },
diff --git a/third_party/blink/web_tests/paint/invalidation/scroll/scroll-fixed-layer-with-transformed-parent-layer-expected.txt b/third_party/blink/web_tests/paint/invalidation/scroll/scroll-fixed-layer-with-transformed-parent-layer-expected.txt index 1bc48a6..226d2c8f 100644 --- a/third_party/blink/web_tests/paint/invalidation/scroll/scroll-fixed-layer-with-transformed-parent-layer-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/scroll/scroll-fixed-layer-with-transformed-parent-layer-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='absolute green'", - "rect": [93, 234, 142, 143], - "reason": "chunk appeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV class='absolute red'", - "rect": [93, 234, 142, 143], - "reason": "paint property change" - } + "invalidations": [ + [93, 234, 142, 143] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/scroll/scroll-in-clipped-layer-expected.txt b/third_party/blink/web_tests/paint/invalidation/scroll/scroll-in-clipped-layer-expected.txt index ce75624..93e3c12 100644 --- a/third_party/blink/web_tests/paint/invalidation/scroll/scroll-in-clipped-layer-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/scroll/scroll-in-clipped-layer-expected.txt
@@ -5,17 +5,8 @@ "bounds": [785, 2016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='absolute red'", - "rect": [100, 150, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV class='relative green'", - "rect": [100, 150, 100, 100], - "reason": "chunk appeared" - } + "invalidations": [ + [100, 150, 100, 100] ] }, {
diff --git a/third_party/blink/web_tests/paint/invalidation/scroll/scroll-in-fixed-layer-expected.txt b/third_party/blink/web_tests/paint/invalidation/scroll/scroll-in-fixed-layer-expected.txt index 1abc8ff..ddf2c69 100644 --- a/third_party/blink/web_tests/paint/invalidation/scroll/scroll-in-fixed-layer-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/scroll/scroll-in-fixed-layer-expected.txt
@@ -10,17 +10,8 @@ { "name": "LayoutNGBlockFlow (positioned) DIV id='moveMe' class='fixed clipped'", "bounds": [100, 100], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='absolute green'", - "rect": [0, 0, 100, 100], - "reason": "chunk appeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV class='absolute red'", - "rect": [0, 0, 100, 100], - "reason": "chunk disappeared" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 2 },
diff --git a/third_party/blink/web_tests/paint/invalidation/scroll/scroll-in-transformed-layer-expected.txt b/third_party/blink/web_tests/paint/invalidation/scroll/scroll-in-transformed-layer-expected.txt index eda371a..e40cec8 100644 --- a/third_party/blink/web_tests/paint/invalidation/scroll/scroll-in-transformed-layer-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/scroll/scroll-in-transformed-layer-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='absolute green'", - "rect": [79, 129, 142, 142], - "reason": "chunk appeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV class='absolute red'", - "rect": [114, 129, 107, 36], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV class='absolute red'", - "rect": [100, 150, 100, 100], - "reason": "paint property change" - } + "invalidations": [ + [79, 129, 142, 142] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/scroll/scroll-with-transformed-parent-layer-expected.txt b/third_party/blink/web_tests/paint/invalidation/scroll/scroll-with-transformed-parent-layer-expected.txt index 3ddea31..e40cec8 100644 --- a/third_party/blink/web_tests/paint/invalidation/scroll/scroll-with-transformed-parent-layer-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/scroll/scroll-with-transformed-parent-layer-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='absolute green'", - "rect": [79, 129, 142, 142], - "reason": "chunk appeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV class='absolute red'", - "rect": [79, 129, 142, 142], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV class='absolute red'", - "rect": [114, 129, 107, 36], - "reason": "paint property change" - } + "invalidations": [ + [79, 129, 142, 142] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/scroll/scrollbar-ancestor-clip-change-expected.txt b/third_party/blink/web_tests/paint/invalidation/scroll/scrollbar-ancestor-clip-change-expected.txt index af1e7b5..ed615e7 100644 --- a/third_party/blink/web_tests/paint/invalidation/scroll/scrollbar-ancestor-clip-change-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/scroll/scrollbar-ancestor-clip-change-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "HorizontalScrollbar", - "rect": [8, 108, 100, 100], - "reason": "incremental" - } + "invalidations": [ + [8, 108, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/scroll/scrollbar-damage-and-full-viewport-repaint-expected.txt b/third_party/blink/web_tests/paint/invalidation/scroll/scrollbar-damage-and-full-viewport-repaint-expected.txt index ca02262..b465bdb 100644 --- a/third_party/blink/web_tests/paint/invalidation/scroll/scrollbar-damage-and-full-viewport-repaint-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/scroll/scrollbar-damage-and-full-viewport-repaint-expected.txt
@@ -5,12 +5,8 @@ "bounds": [1000, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "HorizontalScrollbar", - "rect": [1, 236, 185, 15], - "reason": "scroll control" - } + "invalidations": [ + [1, 236, 185, 15] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/scroll/scrollbar-invalidation-on-resize-expected.txt b/third_party/blink/web_tests/paint/invalidation/scroll/scrollbar-invalidation-on-resize-expected.txt index aa63f76f..9c34dd8 100644 --- a/third_party/blink/web_tests/paint/invalidation/scroll/scrollbar-invalidation-on-resize-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/scroll/scrollbar-invalidation-on-resize-expected.txt
@@ -5,32 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "HorizontalScrollbar", - "rect": [8, 135, 285, 15], - "reason": "scroll control" - }, - { - "object": "VerticalScrollbar", - "rect": [293, 50, 15, 85], - "reason": "scroll control" - }, - { - "object": "VerticalScrollbar", - "rect": [93, 50, 15, 85], - "reason": "scroll control" - }, - { - "object": "Scroll corner of LayoutNGBlockFlow (positioned) DIV id='scrollable'", - "rect": [293, 135, 15, 15], - "reason": "geometry" - }, - { - "object": "Scroll corner of LayoutNGBlockFlow (positioned) DIV id='scrollable'", - "rect": [93, 135, 15, 15], - "reason": "geometry" - } + "invalidations": [ + [8, 135, 285, 15], + [293, 50, 15, 85], + [93, 50, 15, 85], + [293, 135, 15, 15] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/scroll/scrollbar-invalidation-on-resize-with-border-expected.txt b/third_party/blink/web_tests/paint/invalidation/scroll/scrollbar-invalidation-on-resize-with-border-expected.txt index bcd620e..2d1e08ce 100644 --- a/third_party/blink/web_tests/paint/invalidation/scroll/scrollbar-invalidation-on-resize-with-border-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/scroll/scrollbar-invalidation-on-resize-with-border-expected.txt
@@ -5,37 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='scrollable'", - "rect": [8, 50, 320, 120], - "reason": "geometry" - }, - { - "object": "HorizontalScrollbar", - "rect": [18, 145, 285, 15], - "reason": "scroll control" - }, - { - "object": "VerticalScrollbar", - "rect": [303, 60, 15, 85], - "reason": "scroll control" - }, - { - "object": "VerticalScrollbar", - "rect": [103, 60, 15, 85], - "reason": "scroll control" - }, - { - "object": "Scroll corner of LayoutNGBlockFlow (positioned) DIV id='scrollable'", - "rect": [303, 145, 15, 15], - "reason": "geometry" - }, - { - "object": "Scroll corner of LayoutNGBlockFlow (positioned) DIV id='scrollable'", - "rect": [103, 145, 15, 15], - "reason": "geometry" - } + "invalidations": [ + [8, 50, 320, 120] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/scroll/scrollbar-parts-expected.txt b/third_party/blink/web_tests/paint/invalidation/scroll/scrollbar-parts-expected.txt index 45d569f..0565838a 100644 --- a/third_party/blink/web_tests/paint/invalidation/scroll/scrollbar-parts-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/scroll/scrollbar-parts-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "HorizontalScrollbar", - "rect": [8, 93, 85, 15], - "reason": "scroll control" - }, - { - "object": "VerticalScrollbar", - "rect": [93, 8, 15, 85], - "reason": "scroll control" - } + "invalidations": [ + [8, 93, 85, 15], + [93, 8, 15, 85] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/scroll/scrolled-iframe-scrollbar-change-expected.txt b/third_party/blink/web_tests/paint/invalidation/scroll/scrolled-iframe-scrollbar-change-expected.txt index 489c40b..a29056a 100644 --- a/third_party/blink/web_tests/paint/invalidation/scroll/scrolled-iframe-scrollbar-change-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/scroll/scrolled-iframe-scrollbar-change-expected.txt
@@ -5,32 +5,8 @@ "bounds": [804, 604], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='overlay'", - "rect": [2, 2, 800, 600], - "reason": "chunk appeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='container'", - "rect": [10, 2, 784, 592], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='container'", - "rect": [10, 2, 769, 592], - "reason": "disappeared" - }, - { - "object": "VerticalScrollbar", - "rect": [787, 2, 15, 600], - "reason": "chunk disappeared" - }, - { - "object": "LayoutNGBlockFlow HTML", - "rect": [779, 2, 15, 592], - "reason": "incremental" - } + "invalidations": [ + [2, 2, 800, 600] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/scroll/sticky/invalidate-after-composited-scroll-with-sticky-expected.txt b/third_party/blink/web_tests/paint/invalidation/scroll/sticky/invalidate-after-composited-scroll-with-sticky-expected.txt deleted file mode 100644 index a017ef1..0000000 --- a/third_party/blink/web_tests/paint/invalidation/scroll/sticky/invalidate-after-composited-scroll-with-sticky-expected.txt +++ /dev/null
@@ -1,74 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [785, 656], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "VerticalScrollbar", - "rect": [353, 8, 15, 640], - "reason": "scroll control" - } - ] - }, - { - "name": "LayoutNGBlockFlow (sticky positioned) DIV id='sticky'", - "bounds": [345, 20], - "transform": 4 - }, - { - "name": "ContentsLayer for Vertical Scrollbar Layer", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, -0.1], - [0, 0, 0, 1] - ], - "origin": [188, 328] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ], - "flattenInheritedTransform": false - }, - { - "id": 3, - "parent": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -35, 0, 1] - ], - "flattenInheritedTransform": false - }, - { - "id": 4, - "parent": 3, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, 35, 0, 1] - ], - "flattenInheritedTransform": false - } - ] -} -
diff --git a/third_party/blink/web_tests/paint/invalidation/selection/invalidation-rect-with-br-includes-newline-expected.txt b/third_party/blink/web_tests/paint/invalidation/selection/invalidation-rect-with-br-includes-newline-expected.txt index 8c2a960..b5dd10c 100644 --- a/third_party/blink/web_tests/paint/invalidation/selection/invalidation-rect-with-br-includes-newline-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/selection/invalidation-rect-with-br-includes-newline-expected.txt
@@ -5,22 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment '\n'", - "rect": [24, 8, 16, 16], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'b'", - "rect": [8, 24, 16, 16], - "reason": "selection" - }, - { - "object": "NGPhysicalTextFragment 'a'", - "rect": [8, 8, 16, 16], - "reason": "selection" - } + "invalidations": [ + [24, 8, 16, 16], + [8, 24, 16, 16], + [8, 8, 16, 16] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/selection/selection-change-in-iframe-with-relative-parent-expected.txt b/third_party/blink/web_tests/paint/invalidation/selection/selection-change-in-iframe-with-relative-parent-expected.txt index 8054e3b..8882835b 100644 --- a/third_party/blink/web_tests/paint/invalidation/selection/selection-change-in-iframe-with-relative-parent-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/selection/selection-change-in-iframe-with-relative-parent-expected.txt
@@ -5,47 +5,15 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Bazz'", - "rect": [18, 238, 40, 10], - "reason": "selection" - }, - { - "object": "NGPhysicalTextFragment 'Bar'", - "rect": [18, 218, 30, 10], - "reason": "selection" - }, - { - "object": "NGPhysicalTextFragment 'Foo'", - "rect": [18, 198, 30, 10], - "reason": "selection" - }, - { - "object": "NGPhysicalTextFragment '\n'", - "rect": [58, 238, 10, 10], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment '\n'", - "rect": [48, 218, 10, 10], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment '\n'", - "rect": [48, 198, 10, 10], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment '\n'", - "rect": [18, 228, 10, 10], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment '\n'", - "rect": [18, 208, 10, 10], - "reason": "appeared" - } + "invalidations": [ + [18, 238, 40, 10], + [18, 218, 30, 10], + [18, 198, 30, 10], + [58, 238, 10, 10], + [48, 218, 10, 10], + [48, 198, 10, 10], + [18, 228, 10, 10], + [18, 208, 10, 10] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/selection/selection-clear-expected.txt b/third_party/blink/web_tests/paint/invalidation/selection/selection-clear-expected.txt new file mode 100644 index 0000000..6bb1bc9 --- /dev/null +++ b/third_party/blink/web_tests/paint/invalidation/selection/selection-clear-expected.txt
@@ -0,0 +1,14 @@ +{ + "layers": [ + { + "name": "Scrolling Contents Layer", + "bounds": [800, 600], + "contentsOpaque": true, + "backgroundColor": "#FFFFFF", + "invalidations": [ + [8, 8, 100, 200] + ] + } + ] +} +
diff --git a/third_party/blink/web_tests/paint/invalidation/stacking-context-lost-expected.txt b/third_party/blink/web_tests/paint/invalidation/stacking-context-lost-expected.txt index b15a466b..1ddbf93 100644 --- a/third_party/blink/web_tests/paint/invalidation/stacking-context-lost-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/stacking-context-lost-expected.txt
@@ -12,17 +12,8 @@ "contentsOpaque": true, "backfaceVisibility": "hidden", "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='inner'", - "rect": [0, 0, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='outer'", - "rect": [0, 0, 100, 100], - "reason": "appeared" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/paint/invalidation/subpixel-shadow-included-in-invalidation.html b/third_party/blink/web_tests/paint/invalidation/subpixel-shadow-included-in-invalidation.html index 588c416..d54aa10 100644 --- a/third_party/blink/web_tests/paint/invalidation/subpixel-shadow-included-in-invalidation.html +++ b/third_party/blink/web_tests/paint/invalidation/subpixel-shadow-included-in-invalidation.html
@@ -39,12 +39,12 @@ t.step(function() { if (!window.internals) return; - var layers_dump = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS); + var layers_dump = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_DETAILED_INVALIDATIONS); var layers = JSON.parse(layers_dump).layers; var scrollingContentsLayer = layers[0]; - var paintInvalidations = scrollingContentsLayer.paintInvalidations; + var invalidations = scrollingContentsLayer.invalidations; var shadowRect = [1.4, 1.4, 100, 100]; - assert_true(paintInvalidations.some(paintInvalidation => rectContainsRect(paintInvalidation.rect, shadowRect)), + assert_true(invalidations.some(paintInvalidation => rectContainsRect(paintInvalidation.rect, shadowRect)), 'Subpixel shadow ' + JSON.stringify(shadowRect) + ' should be repainted. ' + layers_dump); internals.stopTrackingRepaints(document); });
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/absolute-sized-document-no-scrollbars-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/absolute-sized-document-no-scrollbars-expected.txt index 2b85a689..196c637 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/absolute-sized-document-no-scrollbars-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/absolute-sized-document-no-scrollbars-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 800, 600], - "reason": "background" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [0, 0, 577, 433], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [0, 0, 481, 361], - "reason": "paint property change" - } + "invalidations": [ + [0, 0, 800, 600] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/add-background-property-on-root-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/add-background-property-on-root-expected.txt index e1d0de5..e6987437 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/add-background-property-on-root-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/add-background-property-on-root-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [8, 8, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [8, 8, 100, 100], - "reason": "chunk appeared" - } + "invalidations": [ + [8, 8, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/add-border-property-on-root-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/add-border-property-on-root-expected.txt index bd70d40..8531dd4 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/add-border-property-on-root-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/add-border-property-on-root-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRoot (positioned) svg", - "rect": [8, 8, 120, 120], - "reason": "chunk appeared" - } + "invalidations": [ + [8, 8, 120, 120] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/add-outline-property-on-root-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/add-outline-property-on-root-expected.txt index e3b9472..000bea8 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/add-outline-property-on-root-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/add-outline-property-on-root-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRoot svg", - "rect": [0, 0, 118, 118], - "reason": "chunk appeared" - } + "invalidations": [ + [0, 0, 118, 118] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/animate-fill-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/animate-fill-expected.txt index 4aa4f08..637c4ce7 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/animate-fill-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/animate-fill-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect id='rect'", - "rect": [0, 0, 110, 110], - "reason": "SVG resource change" - } + "invalidations": [ + [0, 0, 110, 110] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/animate-target-id-changed-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/animate-target-id-changed-expected.txt index 78f6363..86c58e2 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/animate-target-id-changed-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/animate-target-id-changed-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect id='newId'", - "rect": [0, 0, 100, 100], - "reason": "style change" - } + "invalidations": [ + [0, 0, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/animate-viewport-overflow-2-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/animate-viewport-overflow-2-expected.txt index 4de5740..31b24df1 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/animate-viewport-overflow-2-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/animate-viewport-overflow-2-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [8, 208, 100, 100], - "reason": "full" - }, - { - "object": "LayoutSVGRect rect", - "rect": [8, 158, 100, 100], - "reason": "full" - } + "invalidations": [ + [8, 208, 100, 100], + [8, 158, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/animate-viewport-overflow-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/animate-viewport-overflow-expected.txt index ad01603..7c20ae1 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/animate-viewport-overflow-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/animate-viewport-overflow-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [8, 208, 100, 100], - "reason": "style change" - } + "invalidations": [ + [8, 208, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/append-text-node-to-tspan-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/append-text-node-to-tspan-expected.txt index 90fefae..ed2d307 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/append-text-node-to-tspan-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/append-text-node-to-tspan-expected.txt
@@ -5,62 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox ' '", - "rect": [10, 60, 310, 380], - "reason": "appeared" - }, - { - "object": "InlineTextBox ' '", - "rect": [10, 60, 310, 380], - "reason": "appeared" - }, - { - "object": "InlineTextBox ' '", - "rect": [10, 60, 310, 380], - "reason": "disappeared" - }, - { - "object": "InlineTextBox ' '", - "rect": [10, 60, 310, 380], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'PASS'", - "rect": [10, 300, 280, 140], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'PASS'", - "rect": [10, 300, 280, 140], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'PASS'", - "rect": [10, 180, 280, 140], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'PASS'", - "rect": [10, 180, 280, 140], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'PA'", - "rect": [10, 60, 280, 140], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'SS'", - "rect": [10, 60, 280, 140], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'PA'", - "rect": [10, 60, 150, 140], - "reason": "disappeared" - } + "invalidations": [ + [10, 60, 310, 380] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/change-background-color-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/change-background-color-expected.txt index be517f8..522f535 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/change-background-color-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/change-background-color-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRoot svg", - "rect": [8, 8, 200, 100], - "reason": "background" - } + "invalidations": [ + [8, 8, 200, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/circle-move-invalidation-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/circle-move-invalidation-expected.txt index ca6350d..37e5acd8 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/circle-move-invalidation-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/circle-move-invalidation-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGEllipse circle id='c1'", - "rect": [196, 196, 76, 76], - "reason": "full" - }, - { - "object": "LayoutSVGEllipse circle id='c1'", - "rect": [46, 46, 76, 76], - "reason": "full" - } + "invalidations": [ + [196, 196, 76, 76], + [46, 46, 76, 76] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/clip-path-child-changes-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/clip-path-child-changes-expected.txt index f1fbc50..e70bfb5 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/clip-path-child-changes-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/clip-path-child-changes-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGContainer g", - "rect": [0, 0, 200, 200], - "reason": "paint property change" - }, - { - "object": "LayoutSVGContainer g", - "rect": [0, 0, 100, 100], - "reason": "paint property change" - } + "invalidations": [ + [0, 0, 200, 200] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/clip-path-href-changes-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/clip-path-href-changes-expected.txt index e58f977..e70bfb5 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/clip-path-href-changes-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/clip-path-href-changes-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRoot svg", - "rect": [0, 0, 200, 200], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGContainer g", - "rect": [0, 0, 100, 100], - "reason": "chunk appeared" - } + "invalidations": [ + [0, 0, 200, 200] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/clip-path-id-changes-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/clip-path-id-changes-expected.txt index e58f977..e70bfb5 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/clip-path-id-changes-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/clip-path-id-changes-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRoot svg", - "rect": [0, 0, 200, 200], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGContainer g", - "rect": [0, 0, 100, 100], - "reason": "chunk appeared" - } + "invalidations": [ + [0, 0, 200, 200] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/clip-path-units-changes-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/clip-path-units-changes-expected.txt index f1fbc50..e70bfb5 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/clip-path-units-changes-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/clip-path-units-changes-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGContainer g", - "rect": [0, 0, 200, 200], - "reason": "paint property change" - }, - { - "object": "LayoutSVGContainer g", - "rect": [0, 0, 100, 100], - "reason": "paint property change" - } + "invalidations": [ + [0, 0, 200, 200] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/color-fill-currentColor-and-css-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/color-fill-currentColor-and-css-expected.txt index cd15140..9e4d93e 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/color-fill-currentColor-and-css-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/color-fill-currentColor-and-css-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGEllipse circle", - "rect": [8, 8, 80, 80], - "reason": "style change" - }, - { - "object": "LayoutSVGEllipse circle", - "rect": [8, 8, 80, 80], - "reason": "style change" - } + "invalidations": [ + [8, 8, 80, 80] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/color-stop-properties-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/color-stop-properties-expected.txt index 2952d34..f31b2714 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/color-stop-properties-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/color-stop-properties-expected.txt
@@ -5,127 +5,31 @@ "bounds": [808, 621], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect id='r12'", - "rect": [608, 368, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r6'", - "rect": [608, 248, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r12'", - "rect": [608, 128, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r6'", - "rect": [608, 8, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r11'", - "rect": [488, 368, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r5'", - "rect": [488, 248, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r11'", - "rect": [488, 128, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r5'", - "rect": [488, 8, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r10'", - "rect": [368, 368, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r4'", - "rect": [368, 248, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r10'", - "rect": [368, 128, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r4'", - "rect": [368, 8, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r9'", - "rect": [248, 368, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r3'", - "rect": [248, 248, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r9'", - "rect": [248, 128, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r3'", - "rect": [248, 8, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r8'", - "rect": [128, 368, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r2'", - "rect": [128, 248, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r8'", - "rect": [128, 128, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r2'", - "rect": [128, 8, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r7'", - "rect": [8, 368, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r1'", - "rect": [8, 248, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r7'", - "rect": [8, 128, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r1'", - "rect": [8, 8, 100, 100], - "reason": "SVG resource change" - } + "invalidations": [ + [608, 368, 100, 100], + [608, 248, 100, 100], + [608, 128, 100, 100], + [608, 8, 100, 100], + [488, 368, 100, 100], + [488, 248, 100, 100], + [488, 128, 100, 100], + [488, 8, 100, 100], + [368, 368, 100, 100], + [368, 248, 100, 100], + [368, 128, 100, 100], + [368, 8, 100, 100], + [248, 368, 100, 100], + [248, 248, 100, 100], + [248, 128, 100, 100], + [248, 8, 100, 100], + [128, 368, 100, 100], + [128, 248, 100, 100], + [128, 128, 100, 100], + [128, 8, 100, 100], + [8, 368, 100, 100], + [8, 248, 100, 100], + [8, 128, 100, 100], + [8, 8, 100, 100] ] }, {
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/container-repaint-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/container-repaint-expected.txt index a3b46f5b..b747e4f 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/container-repaint-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/container-repaint-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGViewportContainer svg id='mover'", - "rect": [0, 100, 100, 50], - "reason": "paint property change" - }, - { - "object": "LayoutSVGViewportContainer svg id='mover'", - "rect": [0, 50, 100, 50], - "reason": "paint property change" - } + "invalidations": [ + [0, 100, 100, 50], + [0, 50, 100, 50] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/deep-dynamic-updates-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/deep-dynamic-updates-expected.txt index 8ca1152..1e30c1a 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/deep-dynamic-updates-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/deep-dynamic-updates-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [24, 24, 402, 402], - "reason": "SVG resource change" - } + "invalidations": [ + [24, 24, 402, 402] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/deep-nested-embedded-svg-size-changes-no-layout-triggers-1-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/deep-nested-embedded-svg-size-changes-no-layout-triggers-1-expected.txt index 05a8a4f..0656ead 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/deep-nested-embedded-svg-size-changes-no-layout-triggers-1-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/deep-nested-embedded-svg-size-changes-no-layout-triggers-1-expected.txt
@@ -5,37 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutEmbeddedObject OBJECT", - "rect": [1, 1, 402, 202], - "reason": "appeared" - }, - { - "object": "HorizontalScrollbar", - "rect": [1, 1, 300, 150], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGRect rect", - "rect": [212, 12, 180, 180], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [12, 12, 180, 180], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [11, 11, 180, 125], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRect rect", - "rect": [211, 11, 75, 125], - "reason": "paint property change" - } + "invalidations": [ + [1, 1, 402, 202] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/deep-nested-embedded-svg-size-changes-no-layout-triggers-2-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/deep-nested-embedded-svg-size-changes-no-layout-triggers-2-expected.txt index 05a8a4f..0656ead 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/deep-nested-embedded-svg-size-changes-no-layout-triggers-2-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/deep-nested-embedded-svg-size-changes-no-layout-triggers-2-expected.txt
@@ -5,37 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutEmbeddedObject OBJECT", - "rect": [1, 1, 402, 202], - "reason": "appeared" - }, - { - "object": "HorizontalScrollbar", - "rect": [1, 1, 300, 150], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGRect rect", - "rect": [212, 12, 180, 180], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [12, 12, 180, 180], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [11, 11, 180, 125], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRect rect", - "rect": [211, 11, 75, 125], - "reason": "paint property change" - } + "invalidations": [ + [1, 1, 402, 202] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/embedded-svg-size-changes-no-layout-triggers-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/embedded-svg-size-changes-no-layout-triggers-expected.txt index 6acc5ec..aa61b3c 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/embedded-svg-size-changes-no-layout-triggers-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/embedded-svg-size-changes-no-layout-triggers-expected.txt
@@ -5,32 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutEmbeddedObject OBJECT", - "rect": [0, 0, 402, 202], - "reason": "appeared" - }, - { - "object": "LayoutSVGRect rect", - "rect": [211, 11, 180, 180], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRect rect", - "rect": [210, 10, 180, 180], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [11, 11, 180, 180], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [10, 10, 180, 180], - "reason": "paint property change" - } + "invalidations": [ + [0, 0, 402, 202] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/feImage-change-target-id-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/feImage-change-target-id-expected.txt index 0dff2ef35..637c4ce7 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/feImage-change-target-id-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/feImage-change-target-id-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [0, 0, 110, 110], - "reason": "full" - } + "invalidations": [ + [0, 0, 110, 110] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/feImage-multiple-targets-id-change-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/feImage-multiple-targets-id-change-expected.txt index 2a33046..443d522 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/feImage-multiple-targets-id-change-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/feImage-multiple-targets-id-change-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [45, 0, 60, 110], - "reason": "full" - }, - { - "object": "LayoutSVGRect rect", - "rect": [0, 0, 55, 110], - "reason": "full" - } + "invalidations": [ + [45, 0, 60, 110], + [0, 0, 55, 110] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/feImage-reference-invalidation-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/feImage-reference-invalidation-expected.txt index 0dff2ef35..637c4ce7 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/feImage-reference-invalidation-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/feImage-reference-invalidation-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [0, 0, 110, 110], - "reason": "full" - } + "invalidations": [ + [0, 0, 110, 110] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/feImage-remove-target-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/feImage-remove-target-expected.txt index 0dff2ef35..637c4ce7 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/feImage-remove-target-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/feImage-remove-target-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [0, 0, 110, 110], - "reason": "full" - } + "invalidations": [ + [0, 0, 110, 110] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/feImage-target-add-to-document-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/feImage-target-add-to-document-expected.txt index 0dff2ef35..637c4ce7 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/feImage-target-add-to-document-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/feImage-target-add-to-document-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [0, 0, 110, 110], - "reason": "full" - } + "invalidations": [ + [0, 0, 110, 110] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/feImage-target-attribute-change-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/feImage-target-attribute-change-expected.txt index 0dff2ef35..637c4ce7 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/feImage-target-attribute-change-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/feImage-target-attribute-change-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [0, 0, 110, 110], - "reason": "full" - } + "invalidations": [ + [0, 0, 110, 110] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/feImage-target-attribute-change-with-use-indirection-2-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/feImage-target-attribute-change-with-use-indirection-2-expected.txt index 0dff2ef35..637c4ce7 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/feImage-target-attribute-change-with-use-indirection-2-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/feImage-target-attribute-change-with-use-indirection-2-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [0, 0, 110, 110], - "reason": "full" - } + "invalidations": [ + [0, 0, 110, 110] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/feImage-target-attribute-change-with-use-indirection-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/feImage-target-attribute-change-with-use-indirection-expected.txt index 0dff2ef35..637c4ce7 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/feImage-target-attribute-change-with-use-indirection-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/feImage-target-attribute-change-with-use-indirection-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [0, 0, 110, 110], - "reason": "full" - } + "invalidations": [ + [0, 0, 110, 110] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/feImage-target-changes-id-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/feImage-target-changes-id-expected.txt index 0dff2ef35..637c4ce7 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/feImage-target-changes-id-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/feImage-target-changes-id-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [0, 0, 110, 110], - "reason": "full" - } + "invalidations": [ + [0, 0, 110, 110] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/feImage-target-id-change-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/feImage-target-id-change-expected.txt index 0dff2ef35..637c4ce7 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/feImage-target-id-change-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/feImage-target-id-change-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [0, 0, 110, 110], - "reason": "full" - } + "invalidations": [ + [0, 0, 110, 110] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/feImage-target-inline-style-change-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/feImage-target-inline-style-change-expected.txt index a70f512b..637c4ce7 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/feImage-target-inline-style-change-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/feImage-target-inline-style-change-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [0, 0, 110, 110], - "reason": "style change" - } + "invalidations": [ + [0, 0, 110, 110] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/feImage-target-property-change-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/feImage-target-property-change-expected.txt index 0dff2ef35..637c4ce7 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/feImage-target-property-change-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/feImage-target-property-change-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [0, 0, 110, 110], - "reason": "full" - } + "invalidations": [ + [0, 0, 110, 110] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/feImage-target-reappend-to-document-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/feImage-target-reappend-to-document-expected.txt index 5f21143..637c4ce7 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/feImage-target-reappend-to-document-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/feImage-target-reappend-to-document-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [0, 0, 110, 110], - "reason": "full" - }, - { - "object": "LayoutSVGRect rect", - "rect": [0, 0, 110, 110], - "reason": "full" - } + "invalidations": [ + [0, 0, 110, 110] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/feImage-target-remove-from-document-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/feImage-target-remove-from-document-expected.txt index 0dff2ef35..637c4ce7 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/feImage-target-remove-from-document-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/feImage-target-remove-from-document-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [0, 0, 110, 110], - "reason": "full" - } + "invalidations": [ + [0, 0, 110, 110] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/feImage-target-style-change-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/feImage-target-style-change-expected.txt index a70f512b..637c4ce7 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/feImage-target-style-change-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/feImage-target-style-change-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [0, 0, 110, 110], - "reason": "style change" - } + "invalidations": [ + [0, 0, 110, 110] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/fecomponenttransfer-in1-change-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/fecomponenttransfer-in1-change-expected.txt index 2f70771e..86c58e2 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/fecomponenttransfer-in1-change-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/fecomponenttransfer-in1-change-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [0, 0, 100, 100], - "reason": "full" - } + "invalidations": [ + [0, 0, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/fill-opacity-update-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/fill-opacity-update-expected.txt index 9876de9..e70bfb5 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/fill-opacity-update-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/fill-opacity-update-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGEllipse circle", - "rect": [0, 0, 200, 200], - "reason": "style change" - } + "invalidations": [ + [0, 0, 200, 200] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/filter-child-repaint-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/filter-child-repaint-expected.txt index 9c32e91..5d22e0c 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/filter-child-repaint-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/filter-child-repaint-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGContainer g", - "rect": [0, 0, 106, 106], - "reason": "SVG resource change" - } + "invalidations": [ + [0, 0, 106, 106] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/filter-reference-change-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/filter-reference-change-expected.txt index 99f5a87a..9c3b983 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/filter-reference-change-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/filter-reference-change-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [8, 8, 110, 110], - "reason": "style change" - } + "invalidations": [ + [8, 8, 110, 110] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/filter-refresh-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/filter-refresh-expected.txt index 09f3ead2..07f2db2 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/filter-refresh-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/filter-refresh-expected.txt
@@ -5,62 +5,18 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGContainer g", - "rect": [10, 170, 132, 36], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGContainer g", - "rect": [10, 130, 132, 36], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='separate2'", - "rect": [140, 140, 36, 36], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='filtered'", - "rect": [140, 100, 36, 36], - "reason": "appeared" - }, - { - "object": "LayoutSVGContainer g", - "rect": [140, 60, 36, 36], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGContainer g", - "rect": [90, 90, 36, 36], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGContainer g", - "rect": [90, 50, 36, 36], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGContainer g", - "rect": [50, 90, 36, 36], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGContainer g", - "rect": [50, 50, 36, 36], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGContainer g", - "rect": [10, 90, 36, 36], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGContainer g", - "rect": [10, 50, 36, 36], - "reason": "SVG resource change" - } + "invalidations": [ + [10, 170, 132, 36], + [10, 130, 132, 36], + [140, 140, 36, 36], + [140, 100, 36, 36], + [140, 60, 36, 36], + [90, 90, 36, 36], + [90, 50, 36, 36], + [50, 90, 36, 36], + [50, 50, 36, 36], + [10, 90, 36, 36], + [10, 50, 36, 36] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/filter-width-update-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/filter-width-update-expected.txt index 67d2a174..59696fe 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/filter-width-update-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/filter-width-update-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [0, 0, 140, 140], - "reason": "full" - } + "invalidations": [ + [0, 0, 140, 140] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/focus-element-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/focus-element-expected.txt index 763aba7f..cbe44ed 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/focus-element-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/focus-element-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect id='rect'", - "rect": [56, 56, 54, 54], - "reason": "style change" - } + "invalidations": [ + [56, 56, 54, 54] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/foreign-object-repaint-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/foreign-object-repaint-expected.txt index 3f16910..4e280d7 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/foreign-object-repaint-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/foreign-object-repaint-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow div id='div2'", - "rect": [129, 200, 142, 142], - "reason": "background" - }, - { - "object": "LayoutBlockFlow div id='div1'", - "rect": [50, 50, 100, 100], - "reason": "background" - } + "invalidations": [ + [129, 200, 142, 142], + [50, 50, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/gradient-add-stops-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/gradient-add-stops-expected.txt index c9aab1f..86c58e2 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/gradient-add-stops-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/gradient-add-stops-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [0, 0, 100, 100], - "reason": "SVG resource change" - } + "invalidations": [ + [0, 0, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/gradient-stop-style-change-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/gradient-stop-style-change-expected.txt index c9aab1f..86c58e2 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/gradient-stop-style-change-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/gradient-stop-style-change-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [0, 0, 100, 100], - "reason": "SVG resource change" - } + "invalidations": [ + [0, 0, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/hairline-stroke-squarecap-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/hairline-stroke-squarecap-expected.txt index be45b1a..1ed6c68 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/hairline-stroke-squarecap-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/hairline-stroke-squarecap-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGPath path id='path'", - "rect": [197, 197, 107, 107], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [97, 97, 106, 106], - "reason": "chunk disappeared" - } + "invalidations": [ + [197, 197, 107, 107], + [97, 97, 106, 106] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/image-href-change-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/image-href-change-expected.txt index 15422e9c..e70bfb5 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/image-href-change-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/image-href-change-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGImage image id='image'", - "rect": [0, 0, 200, 200], - "reason": "image" - } + "invalidations": [ + [0, 0, 200, 200] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/image-with-clip-path-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/image-with-clip-path-expected.txt index 2f8c76e..5307452 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/image-with-clip-path-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/image-with-clip-path-expected.txt
@@ -5,22 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGImage image", - "rect": [20, 20, 60, 60], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGImage image", - "rect": [20, 20, 60, 60], - "reason": "paint property change" - }, - { - "object": "LayoutSVGImage image", - "rect": [175, 25, 50, 50], - "reason": "paint property change" - } + "invalidations": [ + [20, 20, 60, 60], + [175, 25, 50, 50] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/inner-svg-change-viewBox-contract-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/inner-svg-change-viewBox-contract-expected.txt index b817aebf..e70bfb5 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/inner-svg-change-viewBox-contract-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/inner-svg-change-viewBox-contract-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGViewportContainer svg id='inner'", - "rect": [0, 0, 200, 200], - "reason": "paint property change" - }, - { - "object": "LayoutSVGViewportContainer svg id='inner'", - "rect": [0, 0, 100, 100], - "reason": "paint property change" - } + "invalidations": [ + [0, 0, 200, 200] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/inner-svg-change-viewBox-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/inner-svg-change-viewBox-expected.txt index d41253d5..86c58e2 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/inner-svg-change-viewBox-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/inner-svg-change-viewBox-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGViewportContainer svg id='s'", - "rect": [0, 0, 100, 100], - "reason": "paint property change" - } + "invalidations": [ + [0, 0, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.txt new file mode 100644 index 0000000..e70bfb5 --- /dev/null +++ b/third_party/blink/web_tests/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.txt
@@ -0,0 +1,14 @@ +{ + "layers": [ + { + "name": "Scrolling Contents Layer", + "bounds": [800, 600], + "contentsOpaque": true, + "backgroundColor": "#FFFFFF", + "invalidations": [ + [0, 0, 200, 200] + ] + } + ] +} +
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/invalidate-on-child-layout-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/invalidate-on-child-layout-expected.txt index 0815c2b..5d02506 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/invalidate-on-child-layout-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/invalidate-on-child-layout-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGContainer g", - "rect": [40, 40, 120, 120], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGContainer g", - "rect": [0, 0, 110, 110], - "reason": "SVG resource change" - } + "invalidations": [ + [40, 40, 120, 120], + [0, 0, 110, 110] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/js-late-marker-and-object-creation-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/js-late-marker-and-object-creation-expected.txt index 9f0ed81..abc4157 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/js-late-marker-and-object-creation-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/js-late-marker-and-object-creation-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGPath path", - "rect": [189, 197, 139, 139], - "reason": "full" - }, - { - "object": "LayoutSVGRoot svg id='svg-root'", - "rect": [189, 197, 139, 139], - "reason": "chunk appeared" - } + "invalidations": [ + [189, 197, 139, 139] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/js-late-marker-creation-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/js-late-marker-creation-expected.txt index de5704ad..abc4157 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/js-late-marker-creation-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/js-late-marker-creation-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGPath path", - "rect": [189, 197, 139, 139], - "reason": "full" - } + "invalidations": [ + [189, 197, 139, 139] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/js-late-mask-and-object-creation-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/js-late-mask-and-object-creation-expected.txt index b1013a0..769ae10 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/js-late-mask-and-object-creation-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/js-late-mask-and-object-creation-expected.txt
@@ -5,27 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [0, 100, 800, 100], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGRect rect", - "rect": [0, 100, 800, 100], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGRoot svg id='svg-root'", - "rect": [0, 100, 800, 100], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGRoot svg id='svg-root'", - "rect": [0, 100, 800, 100], - "reason": "chunk disappeared" - } + "invalidations": [ + [0, 100, 800, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/js-late-mask-creation-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/js-late-mask-creation-expected.txt index 840468e..769ae10 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/js-late-mask-creation-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/js-late-mask-creation-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [0, 100, 800, 100], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGRect rect", - "rect": [0, 100, 800, 100], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGRoot svg id='svg-root'", - "rect": [0, 100, 800, 100], - "reason": "chunk disappeared" - } + "invalidations": [ + [0, 100, 800, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/js-repaint-rect-on-path-with-stroke-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/js-repaint-rect-on-path-with-stroke-expected.txt index f0f56e2..e4fe0b0 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/js-repaint-rect-on-path-with-stroke-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/js-repaint-rect-on-path-with-stroke-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGPath path id='path'", - "rect": [29, 29, 142, 92], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGPath path id='path'", - "rect": [179, 29, 122, 92], - "reason": "disappeared" - } + "invalidations": [ + [29, 29, 142, 92], + [179, 29, 122, 92] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/js-update-bounce-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/js-update-bounce-expected.txt index 3fd1f09..a88258af 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/js-update-bounce-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/js-update-bounce-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGEllipse circle id='bounce'", - "rect": [101, 101, 68, 68], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [1, 1, 68, 68], - "reason": "chunk disappeared" - } + "invalidations": [ + [101, 101, 68, 68], + [1, 1, 68, 68] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/js-update-container-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/js-update-container-expected.txt index 0d3c350d..9922aca4 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/js-update-container-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/js-update-container-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRoot svg", - "rect": [0, 0, 76, 76], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGContainer g id='group'", - "rect": [0, 0, 41, 41], - "reason": "chunk appeared" - } + "invalidations": [ + [0, 0, 76, 76] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/js-update-gradient-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/js-update-gradient-expected.txt index aa49498..0f6602f 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/js-update-gradient-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/js-update-gradient-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [10, 100, 430, 80], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect", - "rect": [10, 10, 430, 80], - "reason": "SVG resource change" - } + "invalidations": [ + [10, 100, 430, 80], + [10, 10, 430, 80] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/js-update-image-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/js-update-image-expected.txt index 70bc202..28104bef 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/js-update-image-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/js-update-image-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRoot svg", - "rect": [0, 0, 75, 75], - "reason": "chunk appeared" - } + "invalidations": [ + [0, 0, 75, 75] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/js-update-pattern-child-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/js-update-pattern-child-expected.txt index aa49498..0f6602f 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/js-update-pattern-child-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/js-update-pattern-child-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [10, 100, 430, 80], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect", - "rect": [10, 10, 430, 80], - "reason": "SVG resource change" - } + "invalidations": [ + [10, 100, 430, 80], + [10, 10, 430, 80] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/js-update-pattern-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/js-update-pattern-expected.txt index aa49498..0f6602f 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/js-update-pattern-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/js-update-pattern-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [10, 100, 430, 80], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect", - "rect": [10, 10, 430, 80], - "reason": "SVG resource change" - } + "invalidations": [ + [10, 100, 430, 80], + [10, 10, 430, 80] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/js-update-polygon-changes-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/js-update-polygon-changes-expected.txt index 0846c0ab..9c79568 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/js-update-polygon-changes-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/js-update-polygon-changes-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGPath polygon id='polygon'", - "rect": [253, 208, 184, 129], - "reason": "full" - }, - { - "object": "LayoutSVGPath polygon id='polygon'", - "rect": [253, 198, 184, 129], - "reason": "full" - } + "invalidations": [ + [253, 208, 184, 129], + [253, 198, 184, 129] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/js-update-polygon-removal-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/js-update-polygon-removal-expected.txt index 9cc9823..85f1911 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/js-update-polygon-removal-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/js-update-polygon-removal-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGPath polygon id='polygon'", - "rect": [253, 208, 184, 129], - "reason": "full" - } + "invalidations": [ + [253, 208, 184, 129] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/js-update-stop-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/js-update-stop-expected.txt index aa49498..0f6602f 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/js-update-stop-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/js-update-stop-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [10, 100, 430, 80], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect", - "rect": [10, 10, 430, 80], - "reason": "SVG resource change" - } + "invalidations": [ + [10, 100, 430, 80], + [10, 10, 430, 80] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/js-update-stop-linked-gradient-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/js-update-stop-linked-gradient-expected.txt index 2d6d6763..cc85e91 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/js-update-stop-linked-gradient-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/js-update-stop-linked-gradient-expected.txt
@@ -5,22 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [10, 210, 430, 80], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect", - "rect": [10, 110, 430, 80], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect", - "rect": [10, 10, 430, 80], - "reason": "SVG resource change" - } + "invalidations": [ + [10, 210, 430, 80], + [10, 110, 430, 80], + [10, 10, 430, 80] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/js-update-style-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/js-update-style-expected.txt index 76ec5fc..93f2e1a6 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/js-update-style-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/js-update-style-expected.txt
@@ -5,27 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [6, 186, 158, 58], - "reason": "style change" - }, - { - "object": "LayoutSVGRect rect", - "rect": [6, 126, 158, 58], - "reason": "style change" - }, - { - "object": "LayoutSVGRect rect", - "rect": [6, 66, 158, 58], - "reason": "style change" - }, - { - "object": "LayoutSVGRect rect", - "rect": [6, 6, 158, 58], - "reason": "style change" - } + "invalidations": [ + [6, 186, 158, 58], + [6, 126, 158, 58], + [6, 66, 158, 58], + [6, 6, 158, 58] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/js-update-transform-addition-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/js-update-transform-addition-expected.txt index 8659af3..85f1911 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/js-update-transform-addition-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/js-update-transform-addition-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRoot svg", - "rect": [253, 208, 184, 129], - "reason": "chunk appeared" - } + "invalidations": [ + [253, 208, 184, 129] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/js-update-transform-changes-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/js-update-transform-changes-expected.txt index 8659af3..85f1911 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/js-update-transform-changes-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/js-update-transform-changes-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRoot svg", - "rect": [253, 208, 184, 129], - "reason": "chunk appeared" - } + "invalidations": [ + [253, 208, 184, 129] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/marker-child-changes-css-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/marker-child-changes-css-expected.txt index d3c9704..5303fb6 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/marker-child-changes-css-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/marker-child-changes-css-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGPath path", - "rect": [113, 118, 84, 84], - "reason": "style change" - } + "invalidations": [ + [113, 118, 84, 84] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/marker-child-changes-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/marker-child-changes-expected.txt index d3c9704..5303fb6 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/marker-child-changes-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/marker-child-changes-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGPath path", - "rect": [113, 118, 84, 84], - "reason": "style change" - } + "invalidations": [ + [113, 118, 84, 84] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/marker-strokeWidth-changes-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/marker-strokeWidth-changes-expected.txt index 673a4b57..5303fb6 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/marker-strokeWidth-changes-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/marker-strokeWidth-changes-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGPath path id='path'", - "rect": [113, 118, 84, 84], - "reason": "style change" - } + "invalidations": [ + [113, 118, 84, 84] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/marker-viewBox-changes-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/marker-viewBox-changes-expected.txt index 8f32228..f628c201 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/marker-viewBox-changes-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/marker-viewBox-changes-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGPath path id='go'", - "rect": [89, 94, 108, 108], - "reason": "full" - } + "invalidations": [ + [89, 94, 108, 108] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/mask-child-changes-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/mask-child-changes-expected.txt index ee7406cf..769ae10 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/mask-child-changes-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/mask-child-changes-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [0, 100, 800, 100], - "reason": "style change" - }, - { - "object": "LayoutSVGRect rect", - "rect": [0, 100, 800, 100], - "reason": "style change" - } + "invalidations": [ + [0, 100, 800, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/mask-clip-target-transform-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/mask-clip-target-transform-expected.txt index 3951461..7245147 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/mask-clip-target-transform-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/mask-clip-target-transform-expected.txt
@@ -5,37 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGContainer g", - "rect": [150, 50, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRect rect id='masker'", - "rect": [150, 50, 100, 100], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGRect rect id='clipper'", - "rect": [50, 150, 100, 100], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer g", - "rect": [150, 50, 100, 50], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGContainer g", - "rect": [150, 50, 100, 50], - "reason": "paint property change" - }, - { - "object": "LayoutSVGContainer g", - "rect": [100, 150, 50, 100], - "reason": "chunk disappeared" - } + "invalidations": [ + [150, 50, 100, 100], + [50, 150, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/mask-invalidation-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/mask-invalidation-expected.txt index 4a01e3b..89af166 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/mask-invalidation-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/mask-invalidation-expected.txt
@@ -5,47 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [50, 50, 453, 299], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGRect rect", - "rect": [50, 50, 453, 299], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGRect rect", - "rect": [200, 100, 403, 249], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGRect rect", - "rect": [200, 100, 403, 249], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGRect rect", - "rect": [200, 100, 403, 249], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGRect rect", - "rect": [200, 100, 403, 249], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGRect rect", - "rect": [100, 100, 403, 249], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGRect rect", - "rect": [100, 100, 403, 249], - "reason": "chunk appeared" - } + "invalidations": [ + [50, 50, 453, 299], + [200, 100, 403, 249] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/modify-inserted-listitem-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/modify-inserted-listitem-expected.txt index 8e09520b..116617d 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/modify-inserted-listitem-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/modify-inserted-listitem-expected.txt
@@ -5,27 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect id='move'", - "rect": [28, 38, 10, 10], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRect rect id='move'", - "rect": [28, 18, 10, 10], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGRect rect id='move'", - "rect": [28, 18, 10, 10], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRect rect id='move'", - "rect": [18, 18, 10, 10], - "reason": "disappeared" - } + "invalidations": [ + [28, 38, 10, 10], + [28, 18, 10, 10], + [18, 18, 10, 10] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/modify-text-node-in-tspan-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/modify-text-node-in-tspan-expected.txt index d93be4b..ed2d307 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/modify-text-node-in-tspan-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/modify-text-node-in-tspan-expected.txt
@@ -5,57 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox ' '", - "rect": [10, 60, 310, 380], - "reason": "appeared" - }, - { - "object": "InlineTextBox ' '", - "rect": [10, 60, 310, 380], - "reason": "appeared" - }, - { - "object": "InlineTextBox ' '", - "rect": [10, 60, 310, 380], - "reason": "disappeared" - }, - { - "object": "InlineTextBox ' '", - "rect": [10, 60, 310, 380], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'PASS'", - "rect": [10, 300, 280, 140], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'PASS'", - "rect": [10, 300, 280, 140], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'PASS'", - "rect": [10, 180, 280, 140], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'PASS'", - "rect": [10, 180, 280, 140], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'PASS'", - "rect": [10, 60, 280, 140], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'PA'", - "rect": [10, 60, 150, 140], - "reason": "disappeared" - } + "invalidations": [ + [10, 60, 310, 380] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/modify-transferred-listitem-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/modify-transferred-listitem-expected.txt index d73855a..48685b12 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/modify-transferred-listitem-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/modify-transferred-listitem-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGPath polygon id='target'", - "rect": [18, 18, 30, 20], - "reason": "full" - }, - { - "object": "LayoutSVGPath polygon id='target'", - "rect": [18, 18, 20, 20], - "reason": "full" - } + "invalidations": [ + [18, 18, 30, 20] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/nested-embedded-svg-size-changes-no-layout-triggers-1-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/nested-embedded-svg-size-changes-no-layout-triggers-1-expected.txt index ba18243..aa61b3c 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/nested-embedded-svg-size-changes-no-layout-triggers-1-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/nested-embedded-svg-size-changes-no-layout-triggers-1-expected.txt
@@ -5,37 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutEmbeddedObject OBJECT", - "rect": [0, 0, 402, 202], - "reason": "appeared" - }, - { - "object": "HorizontalScrollbar", - "rect": [0, 0, 300, 150], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGRect rect", - "rect": [211, 11, 180, 180], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [11, 11, 180, 180], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [10, 10, 180, 125], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRect rect", - "rect": [210, 10, 75, 125], - "reason": "paint property change" - } + "invalidations": [ + [0, 0, 402, 202] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/nested-embedded-svg-size-changes-no-layout-triggers-2-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/nested-embedded-svg-size-changes-no-layout-triggers-2-expected.txt index ba18243..aa61b3c 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/nested-embedded-svg-size-changes-no-layout-triggers-2-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/nested-embedded-svg-size-changes-no-layout-triggers-2-expected.txt
@@ -5,37 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutEmbeddedObject OBJECT", - "rect": [0, 0, 402, 202], - "reason": "appeared" - }, - { - "object": "HorizontalScrollbar", - "rect": [0, 0, 300, 150], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGRect rect", - "rect": [211, 11, 180, 180], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [11, 11, 180, 180], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [10, 10, 180, 125], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRect rect", - "rect": [210, 10, 75, 125], - "reason": "paint property change" - } + "invalidations": [ + [0, 0, 402, 202] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/object-sizing-no-width-height-change-content-box-size-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/object-sizing-no-width-height-change-content-box-size-expected.txt index 0edfa4c..4d4c7a6 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/object-sizing-no-width-height-change-content-box-size-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/object-sizing-no-width-height-change-content-box-size-expected.txt
@@ -5,27 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow div id='contentBox'", - "rect": [8, 8, 402, 402], - "reason": "geometry" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [9, 9, 400, 400], - "reason": "paint property change" - }, - { - "object": "LayoutEmbeddedObject object", - "rect": [209, 9, 200, 400], - "reason": "incremental" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [9, 109, 200, 200], - "reason": "paint property change" - } + "invalidations": [ + [8, 8, 402, 402] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/outline-offset-shape-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/outline-offset-shape-expected.txt index 93c6168..df19013 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/outline-offset-shape-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/outline-offset-shape-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [133, 18, 130, 130], - "reason": "full" - }, - { - "object": "LayoutSVGRect rect", - "rect": [18, 18, 130, 130], - "reason": "full" - } + "invalidations": [ + [133, 18, 130, 130], + [18, 18, 130, 130] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/overflow-repaint-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/overflow-repaint-expected.txt index 915bb03..ed615e7 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/overflow-repaint-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/overflow-repaint-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRoot svg id='svg'", - "rect": [8, 108, 100, 100], - "reason": "chunk appeared" - } + "invalidations": [ + [8, 108, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/paintorder-filtered-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/paintorder-filtered-expected.txt index f2a45c1..ba3cfed 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/paintorder-filtered-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/paintorder-filtered-expected.txt
@@ -5,27 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGContainer use", - "rect": [451, 160, 140, 140], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGContainer use id='t2'", - "rect": [179, 160, 140, 140], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGContainer use id='t1'", - "rect": [42, 160, 140, 140], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGViewportContainer svg", - "rect": [318, 163, 137, 137], - "reason": "SVG resource change" - } + "invalidations": [ + [451, 160, 140, 140], + [179, 160, 140, 140], + [42, 160, 140, 140], + [318, 163, 137, 137] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/path-pathlength-change-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/path-pathlength-change-expected.txt index d18f091..bb53ede 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/path-pathlength-change-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/path-pathlength-change-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGPath path", - "rect": [67, 67, 182, 182], - "reason": "full" - } + "invalidations": [ + [67, 67, 182, 182] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/pending-resource-after-removal-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/pending-resource-after-removal-expected.txt index 458403d..e70bfb5 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/pending-resource-after-removal-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/pending-resource-after-removal-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect id='shape'", - "rect": [0, 0, 200, 200], - "reason": "style change" - }, - { - "object": "LayoutSVGRect rect id='shape'", - "rect": [0, 0, 200, 200], - "reason": "SVG resource change" - } + "invalidations": [ + [0, 0, 200, 200] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/rect-modify-rx-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/rect-modify-rx-expected.txt index 1d337230..86c58e2 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/rect-modify-rx-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/rect-modify-rx-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect id='r'", - "rect": [0, 0, 100, 100], - "reason": "full" - } + "invalidations": [ + [0, 0, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/relative-sized-document-scrollbars-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/relative-sized-document-scrollbars-expected.txt index f3a09f4..196c637 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/relative-sized-document-scrollbars-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/relative-sized-document-scrollbars-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 800, 600], - "reason": "background" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [6, 2, 788, 595], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [6, 4, 788, 592], - "reason": "paint property change" - } + "invalidations": [ + [0, 0, 800, 600] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/remove-background-property-on-root-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/remove-background-property-on-root-expected.txt index ee7b316..e6987437 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/remove-background-property-on-root-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/remove-background-property-on-root-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [8, 8, 100, 100], - "reason": "appeared" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [8, 8, 100, 100], - "reason": "chunk disappeared" - } + "invalidations": [ + [8, 8, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/remove-border-property-on-root-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/remove-border-property-on-root-expected.txt index b2e73770..8531dd4 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/remove-border-property-on-root-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/remove-border-property-on-root-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRoot (positioned) svg", - "rect": [8, 8, 120, 120], - "reason": "chunk disappeared" - } + "invalidations": [ + [8, 8, 120, 120] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/remove-outline-property-on-root-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/remove-outline-property-on-root-expected.txt index f7c52fd..000bea8 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/remove-outline-property-on-root-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/remove-outline-property-on-root-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRoot svg", - "rect": [0, 0, 118, 118], - "reason": "chunk disappeared" - } + "invalidations": [ + [0, 0, 118, 118] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/remove-text-node-from-tspan-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/remove-text-node-from-tspan-expected.txt index a93bc8b..ed2d307 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/remove-text-node-from-tspan-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/remove-text-node-from-tspan-expected.txt
@@ -5,47 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox ' '", - "rect": [10, 60, 310, 380], - "reason": "disappeared" - }, - { - "object": "InlineTextBox ' '", - "rect": [10, 60, 310, 380], - "reason": "disappeared" - }, - { - "object": "InlineTextBox ' '", - "rect": [10, 180, 310, 260], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'PASS'", - "rect": [10, 300, 280, 140], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'PASS'", - "rect": [10, 300, 280, 140], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'PASS'", - "rect": [10, 180, 280, 140], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'PASS'", - "rect": [10, 180, 280, 140], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'FAIL'", - "rect": [10, 60, 260, 140], - "reason": "disappeared" - } + "invalidations": [ + [10, 60, 310, 380] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/remove-tspan-from-text-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/remove-tspan-from-text-expected.txt index 2b75576..50a49ce 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/remove-tspan-from-text-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/remove-tspan-from-text-expected.txt
@@ -5,47 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox ' '", - "rect": [10, 60, 310, 260], - "reason": "appeared" - }, - { - "object": "InlineTextBox ' '", - "rect": [10, 60, 310, 260], - "reason": "disappeared" - }, - { - "object": "InlineTextBox ' '", - "rect": [10, 60, 310, 260], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'PASS'", - "rect": [10, 180, 280, 140], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'PASS'", - "rect": [10, 180, 280, 140], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'PASS'", - "rect": [10, 60, 280, 140], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'PASS'", - "rect": [10, 60, 280, 140], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'FAIL'", - "rect": [10, 60, 260, 140], - "reason": "disappeared" - } + "invalidations": [ + [10, 60, 310, 260] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/repaint-in-scrolled-view-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/repaint-in-scrolled-view-expected.txt index 4b33f7a..a3078bd 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/repaint-in-scrolled-view-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/repaint-in-scrolled-view-expected.txt
@@ -5,12 +5,8 @@ "bounds": [2000, 2000], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect id='rect'", - "rect": [400, 400, 100, 100], - "reason": "style change" - } + "invalidations": [ + [400, 400, 100, 100] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/repaint-moving-svg-and-div-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/repaint-moving-svg-and-div-expected.txt index b45e4d3..555d1294 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/repaint-moving-svg-and-div-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/repaint-moving-svg-and-div-expected.txt
@@ -5,407 +5,29 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [550, 350, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [535, 325, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [535, 325, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [520, 300, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [520, 300, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [505, 275, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [505, 275, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [490, 250, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [490, 250, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [475, 225, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [475, 225, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [460, 200, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [460, 200, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [445, 175, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [445, 175, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [430, 150, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [430, 150, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [415, 125, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [415, 125, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) div id='html' class='outerBox'", - "rect": [400, 100, 150, 150], - "reason": "geometry" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [250, 350, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [235, 325, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [235, 325, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [220, 300, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [220, 300, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [205, 275, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [205, 275, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [190, 250, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [190, 250, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [175, 225, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [175, 225, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [160, 200, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [160, 200, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [145, 175, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [145, 175, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [130, 150, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [130, 150, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [115, 125, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [115, 125, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [100, 100, 150, 150], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow div class='innerBox'", - "rect": [575, 375, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow div class='innerBox'", - "rect": [560, 350, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow div class='innerBox'", - "rect": [560, 350, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow div class='innerBox'", - "rect": [545, 325, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow div class='innerBox'", - "rect": [545, 325, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow div class='innerBox'", - "rect": [530, 300, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow div class='innerBox'", - "rect": [530, 300, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow div class='innerBox'", - "rect": [515, 275, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow div class='innerBox'", - "rect": [515, 275, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow div class='innerBox'", - "rect": [500, 250, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow div class='innerBox'", - "rect": [500, 250, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow div class='innerBox'", - "rect": [485, 225, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow div class='innerBox'", - "rect": [485, 225, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow div class='innerBox'", - "rect": [470, 200, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow div class='innerBox'", - "rect": [470, 200, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow div class='innerBox'", - "rect": [455, 175, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow div class='innerBox'", - "rect": [455, 175, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow div class='innerBox'", - "rect": [440, 150, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow div class='innerBox'", - "rect": [440, 150, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow div class='innerBox'", - "rect": [425, 125, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [275, 375, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [260, 350, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [260, 350, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [245, 325, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [245, 325, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [230, 300, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [230, 300, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [215, 275, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [215, 275, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [200, 250, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [200, 250, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [185, 225, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [185, 225, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [170, 200, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [170, 200, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [155, 175, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [155, 175, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [140, 150, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [140, 150, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot (positioned) svg id='svg'", - "rect": [125, 125, 100, 100], - "reason": "paint property change" - } + "invalidations": [ + [550, 350, 150, 150], + [535, 325, 150, 150], + [520, 300, 150, 150], + [505, 275, 150, 150], + [490, 250, 150, 150], + [475, 225, 150, 150], + [460, 200, 150, 150], + [445, 175, 150, 150], + [430, 150, 150, 150], + [415, 125, 150, 150], + [400, 100, 150, 150], + [250, 350, 150, 150], + [235, 325, 150, 150], + [220, 300, 150, 150], + [205, 275, 150, 150], + [190, 250, 150, 150], + [175, 225, 150, 150], + [160, 200, 150, 150], + [145, 175, 150, 150], + [130, 150, 150, 150], + [115, 125, 150, 150], + [100, 100, 150, 150] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/repaint-on-constant-size-change-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/repaint-on-constant-size-change-expected.txt index 39d8ef79..680f0900 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/repaint-on-constant-size-change-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/repaint-on-constant-size-change-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGImage image", - "rect": [0, 0, 200, 100], - "reason": "full" - } + "invalidations": [ + [0, 0, 200, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/repaint-on-image-bounds-change-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/repaint-on-image-bounds-change-expected.txt index c494067..86c58e2 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/repaint-on-image-bounds-change-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/repaint-on-image-bounds-change-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGImage image id='target'", - "rect": [0, 0, 100, 100], - "reason": "disappeared" - } + "invalidations": [ + [0, 0, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/repaint-paintorder-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/repaint-paintorder-expected.txt index 03b2336..8957158 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/repaint-paintorder-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/repaint-paintorder-expected.txt
@@ -5,27 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGPath polygon id='t3'", - "rect": [317, 163, 139, 138], - "reason": "style change" - }, - { - "object": "LayoutSVGPath polygon", - "rect": [44, 163, 139, 138], - "reason": "style change" - }, - { - "object": "LayoutSVGPath polygon", - "rect": [454, 163, 138, 138], - "reason": "style change" - }, - { - "object": "LayoutSVGPath polygon", - "rect": [181, 163, 138, 138], - "reason": "style change" - } + "invalidations": [ + [317, 163, 139, 138], + [44, 163, 139, 138], + [454, 163, 138, 138], + [181, 163, 138, 138] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/repaint-stroke-width-changes-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/repaint-stroke-width-changes-expected.txt index 8af99c8..d962579 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/repaint-stroke-width-changes-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/repaint-stroke-width-changes-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [9, 9, 462, 342], - "reason": "style change" - } + "invalidations": [ + [9, 9, 462, 342] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/resize-svg-invalidate-children-2-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/resize-svg-invalidate-children-2-expected.txt index 6455503..23a4878 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/resize-svg-invalidate-children-2-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/resize-svg-invalidate-children-2-expected.txt
@@ -9,17 +9,9 @@ { "name": "LayoutSVGRoot svg", "bounds": [600, 400], - "paintInvalidations": [ - { - "object": "LayoutSVGRoot svg", - "rect": [50, 0, 500, 400], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [0, 120, 200, 160], - "reason": "paint property change" - } + "invalidations": [ + [50, 0, 500, 400], + [0, 120, 200, 160] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/resize-svg-invalidate-children-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/resize-svg-invalidate-children-expected.txt index ac393c4..e9642e79 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/resize-svg-invalidate-children-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/resize-svg-invalidate-children-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRoot svg", - "rect": [58, 58, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [33, 33, 50, 50], - "reason": "paint property change" - } + "invalidations": [ + [58, 58, 100, 100], + [33, 33, 50, 50] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/resize-svg-root-with-child-stroke-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/resize-svg-root-with-child-stroke-expected.txt index 3834efb..55e6e65d 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/resize-svg-root-with-child-stroke-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/resize-svg-root-with-child-stroke-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRoot svg id='svg'", - "rect": [7, 7, 102, 115], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot svg id='svg'", - "rect": [7, 7, 3, 115], - "reason": "paint property change" - } + "invalidations": [ + [7, 7, 102, 115] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/resource-client-removal-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/resource-client-removal-expected.txt index 1d144cad..86c58e2 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/resource-client-removal-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/resource-client-removal-expected.txt
@@ -5,82 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGPath path id='hp'", - "rect": [0, 0, 100, 100], - "reason": "appeared" - }, - { - "object": "LayoutSVGPath path id='hp'", - "rect": [0, 0, 100, 100], - "reason": "appeared" - }, - { - "object": "LayoutSVGPath path id='hp'", - "rect": [0, 0, 100, 100], - "reason": "appeared" - }, - { - "object": "LayoutSVGPath path id='hp'", - "rect": [0, 0, 100, 100], - "reason": "appeared" - }, - { - "object": "LayoutSVGPath path id='hp'", - "rect": [0, 0, 100, 100], - "reason": "appeared" - }, - { - "object": "LayoutSVGPath path id='hp'", - "rect": [0, 0, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutSVGPath path id='hp'", - "rect": [0, 0, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutSVGPath path id='hp'", - "rect": [0, 0, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutSVGPath path id='hp'", - "rect": [0, 0, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutSVGPath path id='hp'", - "rect": [0, 0, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutSVGPath path id='hp'", - "rect": [0, 0, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGPath path id='hp'", - "rect": [0, 0, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGPath path id='hp'", - "rect": [0, 0, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGPath path id='hp'", - "rect": [0, 0, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGPath path id='hp'", - "rect": [0, 0, 100, 100], - "reason": "SVG resource change" - } + "invalidations": [ + [0, 0, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/resource-invalidate-on-target-update-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/resource-invalidate-on-target-update-expected.txt index c5c0aa3..0ef177a3 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/resource-invalidate-on-target-update-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/resource-invalidate-on-target-update-expected.txt
@@ -5,42 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect id='rect3'", - "rect": [0, 240, 230, 120], - "reason": "full" - }, - { - "object": "LayoutSVGRect rect id='rect2'", - "rect": [10, 130, 200, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRect rect id='rect1'", - "rect": [10, 10, 200, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRect rect id='rect1'", - "rect": [10, 10, 200, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRect rect id='rect2'", - "rect": [10, 130, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRect rect id='rect1'", - "rect": [10, 10, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRect rect id='rect1'", - "rect": [10, 10, 100, 100], - "reason": "paint property change" - } + "invalidations": [ + [0, 240, 230, 120], + [10, 130, 200, 100], + [10, 10, 200, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/rounded-rect-height-change-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/rounded-rect-height-change-expected.txt index 5c3eed1..6bb1bc9 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/rounded-rect-height-change-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/rounded-rect-height-change-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [8, 8, 100, 200], - "reason": "geometry" - } + "invalidations": [ + [8, 8, 100, 200] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/scale-change-huge-geometry-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/scale-change-huge-geometry-expected.txt index ebf498b..76799d7 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/scale-change-huge-geometry-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/scale-change-huge-geometry-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGViewportContainer svg id='huge-symbol'", - "rect": [8, 8, 25, 25], - "reason": "paint property change" - }, - { - "object": "LayoutSVGViewportContainer svg id='huge-symbol'", - "rect": [8, 8, 20, 20], - "reason": "paint property change" - } + "invalidations": [ + [8, 8, 25, 25] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/shape-transform-change-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/shape-transform-change-expected.txt index 5f4aa926..d79c3a8 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/shape-transform-change-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/shape-transform-change-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [8, 8, 200, 200], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGRect rect", - "rect": [8, 8, 100, 100], - "reason": "disappeared" - } + "invalidations": [ + [8, 8, 200, 200] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/shape-with-nested-outline-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/shape-with-nested-outline-expected.txt index 8bde657..e000a9e 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/shape-with-nested-outline-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/shape-with-nested-outline-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGContainer g", - "rect": [8, 8, 500, 500], - "reason": "outline" - }, - { - "object": "LayoutSVGRect rect id='r'", - "rect": [108, 108, 300, 300], - "reason": "style change" - } + "invalidations": [ + [8, 8, 500, 500] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/stroke-opacity-update-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/stroke-opacity-update-expected.txt index 5c36f22..ef18e58b 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/stroke-opacity-update-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/stroke-opacity-update-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGEllipse circle", - "rect": [0, 0, 204, 204], - "reason": "style change" - } + "invalidations": [ + [0, 0, 204, 204] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/svg-absolute-children-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/svg-absolute-children-expected.txt index fa71664..86c58e2 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/svg-absolute-children-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/svg-absolute-children-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect id='rect'", - "rect": [0, 0, 100, 100], - "reason": "full" - } + "invalidations": [ + [0, 0, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/svg-image-par-resize-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/svg-image-par-resize-expected.txt index d4eef67..d79c3a8 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/svg-image-par-resize-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/svg-image-par-resize-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGImage image", - "rect": [8, 8, 200, 200], - "reason": "full" - } + "invalidations": [ + [8, 8, 200, 200] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/svg-length-ch-unit-font-size-change-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/svg-length-ch-unit-font-size-change-expected.txt index 1c0a12e..d79c3a8 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/svg-length-ch-unit-font-size-change-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/svg-length-ch-unit-font-size-change-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [8, 8, 200, 200], - "reason": "style change" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [8, 108, 200, 100], - "reason": "incremental" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [108, 8, 100, 100], - "reason": "incremental" - } + "invalidations": [ + [8, 8, 200, 200] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/svg-length-rem-unit-font-size-change-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/svg-length-rem-unit-font-size-change-expected.txt index 835bd4f..81020e8 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/svg-length-rem-unit-font-size-change-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/svg-length-rem-unit-font-size-change-expected.txt
@@ -5,22 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRoot svg", - "rect": [8, 108, 200, 100], - "reason": "incremental" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [108, 8, 100, 100], - "reason": "incremental" - }, - { - "object": "LayoutSVGRect rect", - "rect": [8, 8, 100, 100], - "reason": "geometry" - } + "invalidations": [ + [8, 108, 200, 100], + [108, 8, 100, 100], + [8, 8, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/svgsvgelement-repaint-children-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/svgsvgelement-repaint-children-expected.txt index a2d1975..e6987437 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/svgsvgelement-repaint-children-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/svgsvgelement-repaint-children-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGPath path id='path'", - "rect": [8, 8, 100, 100], - "reason": "disappeared" - } + "invalidations": [ + [8, 8, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/tabgroup-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/tabgroup-expected.txt new file mode 100644 index 0000000..aa7990c --- /dev/null +++ b/third_party/blink/web_tests/paint/invalidation/svg/tabgroup-expected.txt
@@ -0,0 +1,18 @@ +{ + "layers": [ + { + "name": "Scrolling Contents Layer", + "bounds": [800, 600], + "contentsOpaque": true, + "backgroundColor": "#FFFFFF", + "invalidations": [ + [388, 37, 318, 83], + [261, 277, 305, 305], + [5, 255, 240, 162], + [505, 232, 240, 161], + [37, 5, 161, 240] + ] + } + ] +} +
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/text-pattern-update-2-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/text-pattern-update-2-expected.txt index bf66d5d0..56d07a3 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/text-pattern-update-2-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/text-pattern-update-2-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'X'", - "rect": [8, 8, 300, 100], - "reason": "subtree" - }, - { - "object": "InlineTextBox 'Z'", - "rect": [8, 8, 300, 100], - "reason": "subtree" - }, - { - "object": "InlineTextBox 'Y'", - "rect": [108, 8, 100, 100], - "reason": "subtree" - } + "invalidations": [ + [8, 8, 300, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/text-pattern-update-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/text-pattern-update-expected.txt index edc083d..e6987437 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/text-pattern-update-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/text-pattern-update-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'X'", - "rect": [8, 8, 100, 100], - "reason": "subtree" - } + "invalidations": [ + [8, 8, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/text-selection-text-05-t-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/text-selection-text-05-t-expected.txt new file mode 100644 index 0000000..196c637 --- /dev/null +++ b/third_party/blink/web_tests/paint/invalidation/svg/text-selection-text-05-t-expected.txt
@@ -0,0 +1,14 @@ +{ + "layers": [ + { + "name": "Scrolling Contents Layer", + "bounds": [800, 600], + "contentsOpaque": true, + "backgroundColor": "#FFFFFF", + "invalidations": [ + [0, 0, 800, 600] + ] + } + ] +} +
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/text-viewbox-rescale-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/text-viewbox-rescale-expected.txt index 2df69da..e70bfb5 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/text-viewbox-rescale-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/text-viewbox-rescale-expected.txt
@@ -5,32 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGViewportContainer svg id='inner1'", - "rect": [0, 0, 200, 200], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox 'PASS '", - "rect": [0, 100, 200, 100], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'PASS '", - "rect": [0, 100, 200, 100], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'PASS'", - "rect": [0, 100, 200, 100], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'PASS'", - "rect": [0, 100, 200, 100], - "reason": "disappeared" - } + "invalidations": [ + [0, 0, 200, 200] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/transform-changed-state-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/transform-changed-state-expected.txt index 648bbdd8..2a1e40d2 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/transform-changed-state-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/transform-changed-state-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [108, 108, 100, 100], - "reason": "full" - }, - { - "object": "LayoutSVGRect rect", - "rect": [108, 8, 100, 100], - "reason": "full" - } + "invalidations": [ + [108, 108, 100, 100], + [108, 8, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/transform-focus-ring-repaint-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/transform-focus-ring-repaint-expected.txt index fd365f4..3885b032 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/transform-focus-ring-repaint-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/transform-focus-ring-repaint-expected.txt
@@ -12,17 +12,8 @@ "bounds": [204, 204], "backfaceVisibility": "hidden", "backgroundColor": "#FFFF00", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target'", - "rect": [0, 0, 204, 204], - "reason": "full layer" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target'", - "rect": [0, 0, 200, 200], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 204, 204] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/transform-foreign-object-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/transform-foreign-object-expected.txt index 8b58509..4d23757 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/transform-foreign-object-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/transform-foreign-object-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGForeignObject foreignObject", - "rect": [108, 8, 100, 100], - "reason": "paint property change" - }, - { - "object": "LayoutSVGForeignObject foreignObject", - "rect": [8, 8, 100, 100], - "reason": "paint property change" - } + "invalidations": [ + [108, 8, 100, 100], + [8, 8, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/transform-text-element-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/transform-text-element-expected.txt index 264c900..024bbea 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/transform-text-element-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/transform-text-element-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGText text", - "rect": [8, 58, 400, 100], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [8, 8, 400, 100], - "reason": "chunk disappeared" - } + "invalidations": [ + [8, 58, 400, 100], + [8, 8, 400, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/tspan-pattern-update-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/tspan-pattern-update-expected.txt index cc90432..7fc8c61 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/tspan-pattern-update-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/tspan-pattern-update-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Y'", - "rect": [108, 8, 100, 100], - "reason": "subtree" - } + "invalidations": [ + [108, 8, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/use-detach-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/use-detach-expected.txt index 3fa6500d..bee460f 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/use-detach-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/use-detach-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGContainer g", - "rect": [209, 57, 46, 66], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer g", - "rect": [209, 57, 46, 66], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer g", - "rect": [209, 57, 46, 66], - "reason": "chunk disappeared" - } + "invalidations": [ + [209, 57, 46, 66] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/use-disappears-after-style-update-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/use-disappears-after-style-update-expected.txt index af2233c..e9b714b3 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/use-disappears-after-style-update-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/use-disappears-after-style-update-expected.txt
@@ -5,22 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGContainer use", - "rect": [50, 10, 36, 36], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='rect'", - "rect": [10, 10, 30, 30], - "reason": "appeared" - }, - { - "object": "LayoutSVGRect rect id='rect'", - "rect": [10, 10, 30, 30], - "reason": "disappeared" - } + "invalidations": [ + [50, 10, 36, 36], + [10, 10, 30, 30] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/use-inherit-style-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/use-inherit-style-expected.txt index 1330e894..82598ca 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/use-inherit-style-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/use-inherit-style-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect id='rect'", - "rect": [0, 0, 100, 60], - "reason": "style change" - } + "invalidations": [ + [0, 0, 100, 60] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/use-setAttribute-crash-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/use-setAttribute-crash-expected.txt index 40b251a0..33af244 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/use-setAttribute-crash-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/svg/use-setAttribute-crash-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGEllipse svg:circle id='circle'", - "rect": [27, 27, 62, 62], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGEllipse svg:circle id='circle'", - "rect": [51, 51, 14, 14], - "reason": "chunk disappeared" - } + "invalidations": [ + [27, 27, 62, 62] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/window-expected.txt b/third_party/blink/web_tests/paint/invalidation/svg/window-expected.txt new file mode 100644 index 0000000..46508ca --- /dev/null +++ b/third_party/blink/web_tests/paint/invalidation/svg/window-expected.txt
@@ -0,0 +1,17 @@ +{ + "layers": [ + { + "name": "Scrolling Contents Layer", + "bounds": [800, 600], + "contentsOpaque": true, + "backgroundColor": "#FFFFFF", + "invalidations": [ + [37, 142, 551, 394], + [612, 80, 187, 18], + [623, 91, 176, 160], + [612, 80, 18, 160] + ] + } + ] +} +
diff --git a/third_party/blink/web_tests/paint/invalidation/table/add-table-overpaint-expected.txt b/third_party/blink/web_tests/paint/invalidation/table/add-table-overpaint-expected.txt index 3977035..2fe4fb6b 100644 --- a/third_party/blink/web_tests/paint/invalidation/table/add-table-overpaint-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/table/add-table-overpaint-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGTableCell TD", - "rect": [2, 314, 152, 152], - "reason": "appeared" - } + "invalidations": [ + [2, 314, 152, 152] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/table/animated-row-background-expected.txt b/third_party/blink/web_tests/paint/invalidation/table/animated-row-background-expected.txt index c5d2d8e..29cfa4b2 100644 --- a/third_party/blink/web_tests/paint/invalidation/table/animated-row-background-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/table/animated-row-background-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR id='row'", - "rect": [8, 10, 210, 102], - "reason": "background" - }, - { - "object": "LayoutImage IMG id='image'", - "rect": [8, 114, 50, 50], - "reason": "image" - } + "invalidations": [ + [8, 10, 210, 102], + [8, 114, 50, 50] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/table/border-collapse-change-collapse-to-separate-expected.txt b/third_party/blink/web_tests/paint/invalidation/table/border-collapse-change-collapse-to-separate-expected.txt index e5e6cbc..282b46f 100644 --- a/third_party/blink/web_tests/paint/invalidation/table/border-collapse-change-collapse-to-separate-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/table/border-collapse-change-collapse-to-separate-expected.txt
@@ -5,22 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR", - "rect": [8, 8, 212, 108], - "reason": "disappeared" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [118, 10, 108, 108], - "reason": "appeared" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [10, 10, 106, 108], - "reason": "appeared" - } + "invalidations": [ + [8, 8, 212, 108], + [118, 10, 108, 108], + [10, 10, 106, 108] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/table/border-collapse-change-separate-to-collapse-expected.txt b/third_party/blink/web_tests/paint/invalidation/table/border-collapse-change-separate-to-collapse-expected.txt index 0360f88..282b46f 100644 --- a/third_party/blink/web_tests/paint/invalidation/table/border-collapse-change-separate-to-collapse-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/table/border-collapse-change-separate-to-collapse-expected.txt
@@ -5,22 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR", - "rect": [8, 8, 212, 108], - "reason": "appeared" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [118, 10, 108, 108], - "reason": "disappeared" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [10, 10, 106, 108], - "reason": "disappeared" - } + "invalidations": [ + [8, 8, 212, 108], + [118, 10, 108, 108], + [10, 10, 106, 108] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/table/cached-69296-expected.txt b/third_party/blink/web_tests/paint/invalidation/table/cached-69296-expected.txt index 41af7a2..5e717a8 100644 --- a/third_party/blink/web_tests/paint/invalidation/table/cached-69296-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/table/cached-69296-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR id='row1'", - "rect": [20, 20, 160, 51], - "reason": "background" - }, - { - "object": "LayoutTableRow TR id='row1' class='change'", - "rect": [20, 20, 160, 51], - "reason": "background" - } + "invalidations": [ + [20, 20, 160, 51] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/table/cached-cell-append-expected.txt b/third_party/blink/web_tests/paint/invalidation/table/cached-cell-append-expected.txt index b0e1b7b..42a63de 100644 --- a/third_party/blink/web_tests/paint/invalidation/table/cached-cell-append-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/table/cached-cell-append-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR id='row'", - "rect": [8, 8, 120, 56], - "reason": "style change" - } + "invalidations": [ + [8, 8, 120, 56] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/table/cached-cell-remove-expected.txt b/third_party/blink/web_tests/paint/invalidation/table/cached-cell-remove-expected.txt index 2444fc9..45fa701015 100644 --- a/third_party/blink/web_tests/paint/invalidation/table/cached-cell-remove-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/table/cached-cell-remove-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR id='row'", - "rect": [8, 8, 168, 54], - "reason": "style change" - } + "invalidations": [ + [8, 8, 168, 54] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/table/cached-change-cell-border-color-expected.txt b/third_party/blink/web_tests/paint/invalidation/table/cached-change-cell-border-color-expected.txt index aaa1810..1a980fd 100644 --- a/third_party/blink/web_tests/paint/invalidation/table/cached-change-cell-border-color-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/table/cached-change-cell-border-color-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR", - "rect": [8, 8, 114, 54], - "reason": "style change" - } + "invalidations": [ + [8, 8, 114, 54] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/table/cached-change-cell-border-width-expected.txt b/third_party/blink/web_tests/paint/invalidation/table/cached-change-cell-border-width-expected.txt index aaa1810..1a980fd 100644 --- a/third_party/blink/web_tests/paint/invalidation/table/cached-change-cell-border-width-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/table/cached-change-cell-border-width-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR", - "rect": [8, 8, 114, 54], - "reason": "style change" - } + "invalidations": [ + [8, 8, 114, 54] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/table/cached-change-cell-sl-border-color-expected.txt b/third_party/blink/web_tests/paint/invalidation/table/cached-change-cell-sl-border-color-expected.txt new file mode 100644 index 0000000..1a980fd --- /dev/null +++ b/third_party/blink/web_tests/paint/invalidation/table/cached-change-cell-sl-border-color-expected.txt
@@ -0,0 +1,14 @@ +{ + "layers": [ + { + "name": "Scrolling Contents Layer", + "bounds": [800, 600], + "contentsOpaque": true, + "backgroundColor": "#FFFFFF", + "invalidations": [ + [8, 8, 114, 54] + ] + } + ] +} +
diff --git a/third_party/blink/web_tests/paint/invalidation/table/cached-change-col-border-color-expected.txt b/third_party/blink/web_tests/paint/invalidation/table/cached-change-col-border-color-expected.txt index 8915bd2..48cbe784 100644 --- a/third_party/blink/web_tests/paint/invalidation/table/cached-change-col-border-color-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/table/cached-change-col-border-color-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR", - "rect": [8, 59, 113, 53], - "reason": "style change" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 8, 113, 53], - "reason": "style change" - } + "invalidations": [ + [8, 59, 113, 53], + [8, 8, 113, 53] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/table/cached-change-col-border-width-expected.txt b/third_party/blink/web_tests/paint/invalidation/table/cached-change-col-border-width-expected.txt index 44c32a1b..1a86f5c 100644 --- a/third_party/blink/web_tests/paint/invalidation/table/cached-change-col-border-width-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/table/cached-change-col-border-width-expected.txt
@@ -5,22 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR", - "rect": [8, 59, 113, 53], - "reason": "style change" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 8, 113, 53], - "reason": "style change" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 58, 109, 52], - "reason": "style change" - } + "invalidations": [ + [8, 59, 113, 53], + [8, 8, 113, 53], + [8, 58, 109, 52] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/table/cached-change-colgroup-border-color-expected.txt b/third_party/blink/web_tests/paint/invalidation/table/cached-change-colgroup-border-color-expected.txt index 17b3dff..3abd667 100644 --- a/third_party/blink/web_tests/paint/invalidation/table/cached-change-colgroup-border-color-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/table/cached-change-colgroup-border-color-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR", - "rect": [8, 59, 167, 53], - "reason": "style change" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 8, 167, 53], - "reason": "style change" - } + "invalidations": [ + [8, 59, 167, 53], + [8, 8, 167, 53] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/table/cached-change-colgroup-border-width-expected.txt b/third_party/blink/web_tests/paint/invalidation/table/cached-change-colgroup-border-width-expected.txt index 5bb33385..e616705 100644 --- a/third_party/blink/web_tests/paint/invalidation/table/cached-change-colgroup-border-width-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/table/cached-change-colgroup-border-width-expected.txt
@@ -5,22 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR", - "rect": [8, 59, 167, 53], - "reason": "style change" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 8, 167, 53], - "reason": "style change" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 58, 162, 52], - "reason": "style change" - } + "invalidations": [ + [8, 59, 167, 53], + [8, 8, 167, 53], + [8, 58, 162, 52] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/table/cached-change-row-border-color-expected.txt b/third_party/blink/web_tests/paint/invalidation/table/cached-change-row-border-color-expected.txt index 5562260..35a4e89 100644 --- a/third_party/blink/web_tests/paint/invalidation/table/cached-change-row-border-color-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/table/cached-change-row-border-color-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR id='row'", - "rect": [8, 8, 60, 54], - "reason": "style change" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 58, 60, 53], - "reason": "style change" - } + "invalidations": [ + [8, 8, 60, 54], + [8, 58, 60, 53] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/table/cached-change-row-border-width-expected.txt b/third_party/blink/web_tests/paint/invalidation/table/cached-change-row-border-width-expected.txt index 5562260..35a4e89 100644 --- a/third_party/blink/web_tests/paint/invalidation/table/cached-change-row-border-width-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/table/cached-change-row-border-width-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR id='row'", - "rect": [8, 8, 60, 54], - "reason": "style change" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 58, 60, 53], - "reason": "style change" - } + "invalidations": [ + [8, 8, 60, 54], + [8, 58, 60, 53] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/table/cached-change-table-border-color-expected.txt b/third_party/blink/web_tests/paint/invalidation/table/cached-change-table-border-color-expected.txt index 5e2901d..83ae971 100644 --- a/third_party/blink/web_tests/paint/invalidation/table/cached-change-table-border-color-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/table/cached-change-table-border-color-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR", - "rect": [8, 8, 60, 54], - "reason": "style change" - } + "invalidations": [ + [8, 8, 60, 54] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/table/cached-change-table-border-width-expected.txt b/third_party/blink/web_tests/paint/invalidation/table/cached-change-table-border-width-expected.txt index 5e2901d..83ae971 100644 --- a/third_party/blink/web_tests/paint/invalidation/table/cached-change-table-border-width-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/table/cached-change-table-border-width-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR", - "rect": [8, 8, 60, 54], - "reason": "style change" - } + "invalidations": [ + [8, 8, 60, 54] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/table/cached-change-tbody-border-color-expected.txt b/third_party/blink/web_tests/paint/invalidation/table/cached-change-tbody-border-color-expected.txt index 005e6cf..568923b 100644 --- a/third_party/blink/web_tests/paint/invalidation/table/cached-change-tbody-border-color-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/table/cached-change-tbody-border-color-expected.txt
@@ -5,22 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR", - "rect": [8, 108, 114, 53], - "reason": "style change" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 59, 114, 53], - "reason": "style change" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 8, 114, 53], - "reason": "style change" - } + "invalidations": [ + [8, 108, 114, 53], + [8, 59, 114, 53], + [8, 8, 114, 53] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/table/cached-change-tbody-border-width-expected.txt b/third_party/blink/web_tests/paint/invalidation/table/cached-change-tbody-border-width-expected.txt index 238eb4a..bf775133 100644 --- a/third_party/blink/web_tests/paint/invalidation/table/cached-change-tbody-border-width-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/table/cached-change-tbody-border-width-expected.txt
@@ -5,27 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR", - "rect": [8, 108, 114, 53], - "reason": "style change" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 59, 114, 53], - "reason": "style change" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 8, 114, 53], - "reason": "style change" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 58, 109, 52], - "reason": "style change" - } + "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/paint/invalidation/table/collapsed-border-cell-resize-expected.txt b/third_party/blink/web_tests/paint/invalidation/table/collapsed-border-cell-resize-expected.txt index b6d3c26..a3d6374 100644 --- a/third_party/blink/web_tests/paint/invalidation/table/collapsed-border-cell-resize-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/table/collapsed-border-cell-resize-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR", - "rect": [8, 8, 104, 204], - "reason": "geometry" - } + "invalidations": [ + [8, 8, 104, 204] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/table/collapsed-border-change-rowspan-expected.txt b/third_party/blink/web_tests/paint/invalidation/table/collapsed-border-change-rowspan-expected.txt index 6de31f3..8ef12f4 100644 --- a/third_party/blink/web_tests/paint/invalidation/table/collapsed-border-change-rowspan-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/table/collapsed-border-change-rowspan-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR id='row1'", - "rect": [8, 8, 200, 300], - "reason": "style change" - }, - { - "object": "LayoutTableRow TR id='row3'", - "rect": [8, 207, 200, 101], - "reason": "style change" - }, - { - "object": "LayoutTableRow TR id='row2'", - "rect": [8, 107, 200, 101], - "reason": "style change" - } + "invalidations": [ + [8, 8, 200, 300] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/table/dynamic-table-vertical-alignment-change-expected.txt b/third_party/blink/web_tests/paint/invalidation/table/dynamic-table-vertical-alignment-change-expected.txt index 3e32b76..12986976 100644 --- a/third_party/blink/web_tests/paint/invalidation/table/dynamic-table-vertical-alignment-change-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/table/dynamic-table-vertical-alignment-change-expected.txt
@@ -5,12 +5,8 @@ "bounds": [808, 585], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (floating) DIV id='target'", - "rect": [11, 75, 100, 100], - "reason": "appeared" - } + "invalidations": [ + [11, 75, 100, 100] ] }, {
diff --git a/third_party/blink/web_tests/paint/invalidation/table/fixed-table-cell-expected.txt b/third_party/blink/web_tests/paint/invalidation/table/fixed-table-cell-expected.txt index b101d8c..3399fa8c 100644 --- a/third_party/blink/web_tests/paint/invalidation/table/fixed-table-cell-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/table/fixed-table-cell-expected.txt
@@ -5,12 +5,8 @@ "bounds": [785, 2016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGTableCell TD id='moveMe'", - "rect": [200, 200, 100, 100], - "reason": "disappeared" - } + "invalidations": [ + [200, 200, 100, 100] ], "transform": 1 }, @@ -19,12 +15,8 @@ "bounds": [100, 100], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) TD id='moveMe' class='fixed'", - "rect": [0, 0, 100, 100], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 2 },
diff --git a/third_party/blink/web_tests/paint/invalidation/table/fixed-table-overflow-expected.txt b/third_party/blink/web_tests/paint/invalidation/table/fixed-table-overflow-expected.txt index 219de87d..791ca5d 100644 --- a/third_party/blink/web_tests/paint/invalidation/table/fixed-table-overflow-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/table/fixed-table-overflow-expected.txt
@@ -5,17 +5,9 @@ "bounds": [785, 2016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGTableCell TD id='moveMe'", - "rect": [100, 100, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV class='green'", - "rect": [0, 100, 100, 100], - "reason": "disappeared" - } + "invalidations": [ + [100, 100, 100, 100], + [0, 100, 100, 100] ], "transform": 1 }, @@ -24,12 +16,8 @@ "position": [-100, 0], "bounds": [200, 100], "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) TD id='moveMe' class='fixed'", - "rect": [0, 0, 200, 100], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 200, 100] ], "transform": 2 },
diff --git a/third_party/blink/web_tests/paint/invalidation/table/fixed-table-overflow-zindex-expected.txt b/third_party/blink/web_tests/paint/invalidation/table/fixed-table-overflow-zindex-expected.txt index 72f3f82bf..1ba7d0f 100644 --- a/third_party/blink/web_tests/paint/invalidation/table/fixed-table-overflow-zindex-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/table/fixed-table-overflow-zindex-expected.txt
@@ -5,12 +5,8 @@ "bounds": [785, 2016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGTableCell TD id='moveMe'", - "rect": [0, 100, 100, 100], - "reason": "disappeared" - } + "invalidations": [ + [0, 100, 100, 100] ], "transform": 1 }, @@ -19,12 +15,8 @@ "bounds": [100, 100], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) TD id='moveMe' class='fixed'", - "rect": [0, 0, 100, 100], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 2 },
diff --git a/third_party/blink/web_tests/paint/invalidation/table/input-overflow-in-table-expected.txt b/third_party/blink/web_tests/paint/invalidation/table/input-overflow-in-table-expected.txt index 022d6fe6f..1daf1d0 100644 --- a/third_party/blink/web_tests/paint/invalidation/table/input-overflow-in-table-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/table/input-overflow-in-table-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='test'", - "rect": [7, 7, 102, 22], - "reason": "appeared" - } + "invalidations": [ + [7, 7, 102, 22] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/table/invalidate-cell-in-row-with-offset-expected.txt b/third_party/blink/web_tests/paint/invalidation/table/invalidate-cell-in-row-with-offset-expected.txt index 9551e9da..3b0b40b 100644 --- a/third_party/blink/web_tests/paint/invalidation/table/invalidate-cell-in-row-with-offset-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/table/invalidate-cell-in-row-with-offset-expected.txt
@@ -23,12 +23,8 @@ "position": [8, 140], "bounds": [234, 102], "backgroundColor": "#0000FF", - "paintInvalidations": [ - { - "object": "LayoutNGTableCell TD id='target'", - "rect": [10, 0, 102, 102], - "reason": "background" - } + "invalidations": [ + [10, 0, 102, 102] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/table/invisible-col-visible-td-expected.txt b/third_party/blink/web_tests/paint/invalidation/table/invisible-col-visible-td-expected.txt index f9f4b3b..32afb69 100644 --- a/third_party/blink/web_tests/paint/invalidation/table/invisible-col-visible-td-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/table/invisible-col-visible-td-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY", - "rect": [9, 9, 198, 198], - "reason": "style change" - } + "invalidations": [ + [9, 9, 198, 198] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/table/invisible-tbody-visible-td-expected.txt b/third_party/blink/web_tests/paint/invalidation/table/invisible-tbody-visible-td-expected.txt index 8d29c7fc..32afb69 100644 --- a/third_party/blink/web_tests/paint/invalidation/table/invisible-tbody-visible-td-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/table/invisible-tbody-visible-td-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY id='tbody'", - "rect": [9, 9, 198, 198], - "reason": "background" - } + "invalidations": [ + [9, 9, 198, 198] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/table/invisible-tr-visible-td-expected.txt b/third_party/blink/web_tests/paint/invalidation/table/invisible-tr-visible-td-expected.txt index 63c7577..d79c3a8 100644 --- a/third_party/blink/web_tests/paint/invalidation/table/invisible-tr-visible-td-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/table/invisible-tr-visible-td-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR id='row'", - "rect": [8, 8, 200, 200], - "reason": "background" - } + "invalidations": [ + [8, 8, 200, 200] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/table/repaint-table-row-in-composited-document-expected.txt b/third_party/blink/web_tests/paint/invalidation/table/repaint-table-row-in-composited-document-expected.txt index ee09b30..9f4f098 100644 --- a/third_party/blink/web_tests/paint/invalidation/table/repaint-table-row-in-composited-document-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/table/repaint-table-row-in-composited-document-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGTableCell TD", - "rect": [256, 306, 204, 104], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [256, 156, 204, 104], - "reason": "geometry" - } + "invalidations": [ + [256, 306, 204, 104], + [256, 156, 204, 104] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/table/replace-col-expected.txt b/third_party/blink/web_tests/paint/invalidation/table/replace-col-expected.txt index 6bce2fc..18fbff9 100644 --- a/third_party/blink/web_tests/paint/invalidation/table/replace-col-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/table/replace-col-expected.txt
@@ -5,22 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableSection THEAD", - "rect": [8, 82, 56, 26], - "reason": "style change" - }, - { - "object": "LayoutTableSection TFOOT", - "rect": [8, 132, 56, 24], - "reason": "style change" - }, - { - "object": "LayoutTableSection TBODY", - "rect": [8, 108, 56, 24], - "reason": "style change" - } + "invalidations": [ + [8, 82, 56, 26], + [8, 132, 56, 24], + [8, 108, 56, 24] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/table/resize-table-repaint-percent-size-cell-expected.txt b/third_party/blink/web_tests/paint/invalidation/table/resize-table-repaint-percent-size-cell-expected.txt new file mode 100644 index 0000000..ffd7e21 --- /dev/null +++ b/third_party/blink/web_tests/paint/invalidation/table/resize-table-repaint-percent-size-cell-expected.txt
@@ -0,0 +1,15 @@ +{ + "layers": [ + { + "name": "Scrolling Contents Layer", + "bounds": [800, 600], + "contentsOpaque": true, + "backgroundColor": "#FFFFFF", + "invalidations": [ + [0, 52, 106, 238], + [0, 292, 106, 236] + ] + } + ] +} +
diff --git a/third_party/blink/web_tests/paint/invalidation/table/row-change-background-rowspan-cell-expected.txt b/third_party/blink/web_tests/paint/invalidation/table/row-change-background-rowspan-cell-expected.txt index b7db728..db8b43a6 100644 --- a/third_party/blink/web_tests/paint/invalidation/table/row-change-background-rowspan-cell-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/table/row-change-background-rowspan-cell-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR id='target'", - "rect": [8, 298, 110, 106], - "reason": "appeared" - } + "invalidations": [ + [8, 298, 110, 106] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/table/scroll-inside-table-cell-expected.txt b/third_party/blink/web_tests/paint/invalidation/table/scroll-inside-table-cell-expected.txt index 441d755..9137e22 100644 --- a/third_party/blink/web_tests/paint/invalidation/table/scroll-inside-table-cell-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/table/scroll-inside-table-cell-expected.txt
@@ -5,22 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='absolute green'", - "rect": [314, 114, 435, 450], - "reason": "chunk appeared" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV class='relative red'", - "rect": [314, 114, 435, 450], - "reason": "paint property change" - }, - { - "object": "HorizontalScrollbar", - "rect": [314, 564, 435, 15], - "reason": "scroll control" - } + "invalidations": [ + [314, 114, 435, 450], + [314, 564, 435, 15] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/table/scroll-relative-table-inside-table-cell-expected.txt b/third_party/blink/web_tests/paint/invalidation/table/scroll-relative-table-inside-table-cell-expected.txt index 9063ef1..414f86f 100644 --- a/third_party/blink/web_tests/paint/invalidation/table/scroll-relative-table-inside-table-cell-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/table/scroll-relative-table-inside-table-cell-expected.txt
@@ -5,22 +5,9 @@ "bounds": [1566, 1781], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='absolute green'", - "rect": [1114, 1314, 435, 450], - "reason": "chunk appeared" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV class='relative red'", - "rect": [1114, 1314, 435, 450], - "reason": "paint property change" - }, - { - "object": "HorizontalScrollbar", - "rect": [1114, 1764, 435, 15], - "reason": "scroll control" - } + "invalidations": [ + [1114, 1314, 435, 450], + [1114, 1764, 435, 15] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/paint/invalidation/table/table-cell-overflow-expected.txt b/third_party/blink/web_tests/paint/invalidation/table/table-cell-overflow-expected.txt index bc375ab..9a8d8e9 100644 --- a/third_party/blink/web_tests/paint/invalidation/table/table-cell-overflow-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/table/table-cell-overflow-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [111, 9, 100, 100], - "reason": "disappeared" - } + "invalidations": [ + [111, 9, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/table/table-col-background-expected.txt b/third_party/blink/web_tests/paint/invalidation/table/table-col-background-expected.txt index 3afc906..8309fc9 100644 --- a/third_party/blink/web_tests/paint/invalidation/table/table-col-background-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/table/table-col-background-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY", - "rect": [8, 108, 106, 104], - "reason": "style change" - } + "invalidations": [ + [8, 108, 106, 104] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/table/table-col-background-offset-expected.txt b/third_party/blink/web_tests/paint/invalidation/table/table-col-background-offset-expected.txt index 50d10662..bbe6ed0 100644 --- a/third_party/blink/web_tests/paint/invalidation/table/table-col-background-offset-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/table/table-col-background-offset-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY", - "rect": [8, 108, 210, 104], - "reason": "style change" - } + "invalidations": [ + [8, 108, 210, 104] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/table/table-outer-border-expected.txt b/third_party/blink/web_tests/paint/invalidation/table/table-outer-border-expected.txt index 3366f2df..2fd4bd6 100644 --- a/third_party/blink/web_tests/paint/invalidation/table/table-outer-border-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/table/table-outer-border-expected.txt
@@ -5,47 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR", - "rect": [8, 75, 132, 82], - "reason": "appeared" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 75, 132, 82], - "reason": "disappeared" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 8, 132, 82], - "reason": "appeared" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 8, 132, 82], - "reason": "disappeared" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [15, 82, 117, 67], - "reason": "appeared" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [15, 82, 117, 67], - "reason": "disappeared" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [15, 15, 117, 67], - "reason": "appeared" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [15, 15, 117, 67], - "reason": "disappeared" - } + "invalidations": [ + [8, 75, 132, 82], + [8, 8, 132, 82] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/table/table-overflow-auto-in-overflow-auto-scrolled-expected.txt b/third_party/blink/web_tests/paint/invalidation/table/table-overflow-auto-in-overflow-auto-scrolled-expected.txt index 457614c..94cfb5a9 100644 --- a/third_party/blink/web_tests/paint/invalidation/table/table-overflow-auto-in-overflow-auto-scrolled-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/table/table-overflow-auto-in-overflow-auto-scrolled-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='innerDiv'", - "rect": [10, 8, 302, 300], - "reason": "paint property change" - }, - { - "object": "VerticalScrollbar", - "rect": [762, 8, 15, 300], - "reason": "scroll control" - } + "invalidations": [ + [10, 8, 302, 300], + [762, 8, 15, 300] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/table/table-overflow-scroll-in-overflow-scroll-scrolled-expected.txt b/third_party/blink/web_tests/paint/invalidation/table/table-overflow-scroll-in-overflow-scroll-scrolled-expected.txt index 457614c..94cfb5a9 100644 --- a/third_party/blink/web_tests/paint/invalidation/table/table-overflow-scroll-in-overflow-scroll-scrolled-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/table/table-overflow-scroll-in-overflow-scroll-scrolled-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='innerDiv'", - "rect": [10, 8, 302, 300], - "reason": "paint property change" - }, - { - "object": "VerticalScrollbar", - "rect": [762, 8, 15, 300], - "reason": "scroll control" - } + "invalidations": [ + [10, 8, 302, 300], + [762, 8, 15, 300] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/table/table-row-bg-change-expected.txt b/third_party/blink/web_tests/paint/invalidation/table/table-row-bg-change-expected.txt index 5ac85ee..4858d1e4 100644 --- a/third_party/blink/web_tests/paint/invalidation/table/table-row-bg-change-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/table/table-row-bg-change-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR id='first'", - "rect": [8, 10, 200, 97], - "reason": "background" - } + "invalidations": [ + [8, 10, 200, 97] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/table/table-row-expected.txt b/third_party/blink/web_tests/paint/invalidation/table/table-row-expected.txt index e7c9107..5ac61c0 100644 --- a/third_party/blink/web_tests/paint/invalidation/table/table-row-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/table/table-row-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR id='target' class='green'", - "rect": [8, 10, 106, 100], - "reason": "background" - } + "invalidations": [ + [8, 10, 106, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/table/table-section-overflow-expected.txt b/third_party/blink/web_tests/paint/invalidation/table/table-section-overflow-expected.txt index dfb4cf9..3219950 100644 --- a/third_party/blink/web_tests/paint/invalidation/table/table-section-overflow-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/table/table-section-overflow-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [33, 58, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [33, 8, 100, 100], - "reason": "geometry" - } + "invalidations": [ + [33, 58, 100, 100], + [33, 8, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/table/table-section-repaint-expected.txt b/third_party/blink/web_tests/paint/invalidation/table/table-section-repaint-expected.txt index f839469e..a70d1489 100644 --- a/third_party/blink/web_tests/paint/invalidation/table/table-section-repaint-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/table/table-section-repaint-expected.txt
@@ -5,97 +5,20 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR", - "rect": [8, 353, 60, 38], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 338, 60, 38], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 323, 60, 38], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 308, 60, 38], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD class='red half'", - "rect": [8, 248, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD class='green half'", - "rect": [8, 218, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD class='red half'", - "rect": [8, 218, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD class='green half'", - "rect": [8, 188, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD class='green half'", - "rect": [8, 158, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD class='green half'", - "rect": [8, 128, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD class='red half'", - "rect": [8, 128, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV id='top' class='blue half'", - "rect": [8, 98, 60, 30], - "reason": "disappeared" - }, - { - "object": "LayoutNGTableCell TD class='red half'", - "rect": [8, 98, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD class='green half'", - "rect": [8, 68, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD class='green half'", - "rect": [8, 38, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD class='red half'", - "rect": [8, 38, 60, 30], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCaption CAPTION id='caption1' class='blue half'", - "rect": [8, 8, 60, 30], - "reason": "disappeared" - }, - { - "object": "LayoutNGTableCell TD class='red half'", - "rect": [8, 8, 60, 30], - "reason": "geometry" - } + "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/paint/invalidation/table/table-section-visual-overflow-expected.txt b/third_party/blink/web_tests/paint/invalidation/table/table-section-visual-overflow-expected.txt index b4c5cad..cead1885 100644 --- a/third_party/blink/web_tests/paint/invalidation/table/table-section-visual-overflow-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/table/table-section-visual-overflow-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableSection DIV id='test'", - "rect": [143, 0, 120, 118], - "reason": "geometry" - }, - { - "object": "LayoutTableSection DIV id='test'", - "rect": [0, 0, 118, 118], - "reason": "geometry" - } + "invalidations": [ + [143, 0, 120, 118], + [0, 0, 118, 118] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/table/table-two-pass-layout-overpaint-expected.txt b/third_party/blink/web_tests/paint/invalidation/table/table-two-pass-layout-overpaint-expected.txt index e6df63c..a1e15602 100644 --- a/third_party/blink/web_tests/paint/invalidation/table/table-two-pass-layout-overpaint-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/table/table-two-pass-layout-overpaint-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [61, 45, 50, 25], - "reason": "incremental" - } + "invalidations": [ + [61, 45, 50, 25] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/table/table-with-padding-row-invalidation-expected.txt b/third_party/blink/web_tests/paint/invalidation/table/table-with-padding-row-invalidation-expected.txt index ef79d85..67ad718 100644 --- a/third_party/blink/web_tests/paint/invalidation/table/table-with-padding-row-invalidation-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/table/table-with-padding-row-invalidation-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR", - "rect": [0, 0, 260, 50], - "reason": "background" - } + "invalidations": [ + [0, 0, 260, 50] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/transform/change-transform-expected.txt b/third_party/blink/web_tests/paint/invalidation/transform/change-transform-expected.txt index 8e51fe4..b2251cf 100644 --- a/third_party/blink/web_tests/paint/invalidation/transform/change-transform-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/transform/change-transform-expected.txt
@@ -5,27 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='square'", - "rect": [10, 10, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='overlay'", - "rect": [35, 35, 50, 50], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='overlay'", - "rect": [35, 35, 50, 50], - "reason": "chunk appeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='square'", - "rect": [35, 35, 50, 50], - "reason": "chunk appeared" - } + "invalidations": [ + [10, 10, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/transform/invalidation-with-scale-transform-expected.txt b/third_party/blink/web_tests/paint/invalidation/transform/invalidation-with-scale-transform-expected.txt index e3a234d..02a551d 100644 --- a/third_party/blink/web_tests/paint/invalidation/transform/invalidation-with-scale-transform-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/transform/invalidation-with-scale-transform-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target'", - "rect": [85, 70, 91, 92], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target'", - "rect": [84, 70, 91, 92], - "reason": "geometry" - } + "invalidations": [ + [85, 70, 91, 92], + [84, 70, 91, 92] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/transform/resize-skewed-expected.txt b/third_party/blink/web_tests/paint/invalidation/transform/resize-skewed-expected.txt index a6f7227..e14d4023b 100644 --- a/third_party/blink/web_tests/paint/invalidation/transform/resize-skewed-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/transform/resize-skewed-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='skewed'", - "rect": [100, 50, 600, 500], - "reason": "incremental" - } + "invalidations": [ + [100, 50, 600, 500] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/transform/subpixel-offset-scaled-transform-expected.txt b/third_party/blink/web_tests/paint/invalidation/transform/subpixel-offset-scaled-transform-expected.txt index c61ca3b..f6925ff7 100644 --- a/third_party/blink/web_tests/paint/invalidation/transform/subpixel-offset-scaled-transform-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/transform/subpixel-offset-scaled-transform-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV class='child scale'", - "rect": [9, 58, 40, 40], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV class='child scale'", - "rect": [8, 58, 40, 40], - "reason": "paint property change" - } + "invalidations": [ + [9, 58, 40, 40], + [8, 58, 40, 40] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/transform/transform-disable-layoutstate-expected.txt b/third_party/blink/web_tests/paint/invalidation/transform/transform-disable-layoutstate-expected.txt index d60a7d4..bd406258 100644 --- a/third_party/blink/web_tests/paint/invalidation/transform/transform-disable-layoutstate-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/transform/transform-disable-layoutstate-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [58, 138, 500, 63], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [58, 256, 500, 45], - "reason": "incremental" - } + "invalidations": [ + [58, 138, 500, 63], + [58, 256, 500, 45] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/transform/transform-replaced-shadows-expected.txt b/third_party/blink/web_tests/paint/invalidation/transform/transform-replaced-shadows-expected.txt index a71b5af..13bbb713 100644 --- a/third_party/blink/web_tests/paint/invalidation/transform/transform-replaced-shadows-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/transform/transform-replaced-shadows-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutImage IMG id='box' class='smaller'", - "rect": [0, 8, 288, 320], - "reason": "paint property change" - }, - { - "object": "LayoutImage IMG id='box' class='smaller'", - "rect": [0, 18, 158, 160], - "reason": "paint property change" - } + "invalidations": [ + [0, 8, 288, 320] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/transform/transform-rotate-and-remove-expected.txt b/third_party/blink/web_tests/paint/invalidation/transform/transform-rotate-and-remove-expected.txt index abd6b78..2801fc0 100644 --- a/third_party/blink/web_tests/paint/invalidation/transform/transform-rotate-and-remove-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/transform/transform-rotate-and-remove-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='rel'", - "rect": [8, 8, 220, 70], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='rel' class='rotated'", - "rect": [20, 0, 196, 150], - "reason": "chunk disappeared" - } + "invalidations": [ + [8, 8, 220, 70], + [20, 0, 196, 150] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/transform/transform-translate-expected.txt b/third_party/blink/web_tests/paint/invalidation/transform/transform-translate-expected.txt index a7f98bb..f03f148 100644 --- a/third_party/blink/web_tests/paint/invalidation/transform/transform-translate-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/transform/transform-translate-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [28, 66, 106, 107], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [8, 66, 106, 107], - "reason": "paint property change" - } + "invalidations": [ + [28, 66, 106, 107], + [8, 66, 106, 107] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/vertical-align-length1-expected.txt b/third_party/blink/web_tests/paint/invalidation/vertical-align-length1-expected.txt index 1b66136..9179ae2 100644 --- a/third_party/blink/web_tests/paint/invalidation/vertical-align-length1-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/vertical-align-length1-expected.txt
@@ -5,27 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='other'", - "rect": [120, 130, 20, 20], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='other'", - "rect": [120, 100, 20, 20], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='other'", - "rect": [0, 130, 20, 20], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='other'", - "rect": [0, 100, 20, 20], - "reason": "geometry" - } + "invalidations": [ + [120, 130, 20, 20], + [120, 100, 20, 20], + [0, 130, 20, 20], + [0, 100, 20, 20] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/vertical-align-length2-expected.txt b/third_party/blink/web_tests/paint/invalidation/vertical-align-length2-expected.txt index 60034d4..c715dd0 100644 --- a/third_party/blink/web_tests/paint/invalidation/vertical-align-length2-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/vertical-align-length2-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [200, 80, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [200, 50, 100, 100], - "reason": "geometry" - } + "invalidations": [ + [200, 80, 100, 100], + [200, 50, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/vertical-align1-expected.txt b/third_party/blink/web_tests/paint/invalidation/vertical-align1-expected.txt index 6fdfb9b..625b77f 100644 --- a/third_party/blink/web_tests/paint/invalidation/vertical-align1-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/vertical-align1-expected.txt
@@ -5,27 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='other'", - "rect": [120, 33, 20, 21], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='other'", - "rect": [0, 33, 20, 21], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='other'", - "rect": [120, 80, 20, 20], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='other'", - "rect": [0, 80, 20, 20], - "reason": "geometry" - } + "invalidations": [ + [120, 33, 20, 21], + [0, 33, 20, 21], + [120, 80, 20, 20], + [0, 80, 20, 20] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/vertical-align2-expected.txt b/third_party/blink/web_tests/paint/invalidation/vertical-align2-expected.txt index 56785c40e..279af1b 100644 --- a/third_party/blink/web_tests/paint/invalidation/vertical-align2-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/vertical-align2-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [200, 146, 100, 101], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [200, 100, 100, 100], - "reason": "geometry" - } + "invalidations": [ + [200, 146, 100, 101], + [200, 100, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/vertical-rl-as-paint-container-expected.txt b/third_party/blink/web_tests/paint/invalidation/vertical-rl-as-paint-container-expected.txt index 6977bec..7b9c683 100644 --- a/third_party/blink/web_tests/paint/invalidation/vertical-rl-as-paint-container-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/vertical-rl-as-paint-container-expected.txt
@@ -10,27 +10,8 @@ "name": "LayoutNGBlockFlow DIV id='target'", "bounds": [600, 400], "backfaceVisibility": "hidden", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Lorem ipsum dolor'", - "rect": [520, 0, 80, 340], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'adipiscing elit.'", - "rect": [520, 0, 80, 340], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'consectetur'", - "rect": [520, 0, 80, 340], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'sit amet,'", - "rect": [520, 0, 80, 340], - "reason": "style change" - } + "invalidations": [ + [520, 0, 80, 340] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-background-image-fixed-centered-composited-expected.txt b/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-background-image-fixed-centered-composited-expected.txt index a2256ac..9fcafcf3 100644 --- a/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-background-image-fixed-centered-composited-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-background-image-fixed-centered-composited-expected.txt
@@ -5,12 +5,8 @@ "bounds": [600, 250], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutView #document", - "rect": [0, 0, 600, 250], - "reason": "background" - } + "invalidations": [ + [0, 0, 600, 250] ] }, { @@ -27,12 +23,8 @@ "bounds": [400, 250], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutView #document", - "rect": [0, 0, 400, 250], - "reason": "background" - } + "invalidations": [ + [0, 0, 400, 250] ] }, { @@ -49,12 +41,8 @@ "bounds": [400, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutView #document", - "rect": [0, 0, 400, 600], - "reason": "background" - } + "invalidations": [ + [0, 0, 400, 600] ] }, { @@ -71,12 +59,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutView #document", - "rect": [0, 0, 800, 600], - "reason": "background" - } + "invalidations": [ + [0, 0, 800, 600] ] }, {
diff --git a/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-background-image-fixed-centered-expected.txt b/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-background-image-fixed-centered-expected.txt index 5661d372..53c75e82 100644 --- a/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-background-image-fixed-centered-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-background-image-fixed-centered-expected.txt
@@ -5,12 +5,8 @@ "bounds": [600, 250], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 600, 250], - "reason": "background" - } + "invalidations": [ + [0, 0, 600, 250] ] } ] @@ -22,12 +18,8 @@ "bounds": [400, 250], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 400, 250], - "reason": "background" - } + "invalidations": [ + [0, 0, 400, 250] ] } ] @@ -39,12 +31,8 @@ "bounds": [400, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 400, 600], - "reason": "background" - } + "invalidations": [ + [0, 0, 400, 600] ] } ] @@ -56,12 +44,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 800, 600], - "reason": "background" - } + "invalidations": [ + [0, 0, 800, 600] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-background-image-fixed-generated-expected.txt b/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-background-image-fixed-generated-expected.txt index 5661d372..53c75e82 100644 --- a/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-background-image-fixed-generated-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-background-image-fixed-generated-expected.txt
@@ -5,12 +5,8 @@ "bounds": [600, 250], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 600, 250], - "reason": "background" - } + "invalidations": [ + [0, 0, 600, 250] ] } ] @@ -22,12 +18,8 @@ "bounds": [400, 250], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 400, 250], - "reason": "background" - } + "invalidations": [ + [0, 0, 400, 250] ] } ] @@ -39,12 +31,8 @@ "bounds": [400, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 400, 600], - "reason": "background" - } + "invalidations": [ + [0, 0, 400, 600] ] } ] @@ -56,12 +44,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 800, 600], - "reason": "background" - } + "invalidations": [ + [0, 0, 800, 600] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-background-image-fixed-scrolling-contents-expected.txt b/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-background-image-fixed-scrolling-contents-expected.txt index fcc509c..2dfe16b 100644 --- a/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-background-image-fixed-scrolling-contents-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-background-image-fixed-scrolling-contents-expected.txt
@@ -5,12 +5,8 @@ "bounds": [585, 3016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 585, 3016], - "reason": "background" - } + "invalidations": [ + [0, 0, 585, 3016] ] }, { @@ -28,12 +24,8 @@ "bounds": [385, 3016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 385, 3016], - "reason": "background" - } + "invalidations": [ + [0, 0, 385, 3016] ] }, { @@ -51,12 +43,8 @@ "bounds": [385, 3016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 385, 3016], - "reason": "background" - } + "invalidations": [ + [0, 0, 385, 3016] ] }, { @@ -74,12 +62,8 @@ "bounds": [785, 3016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 785, 3016], - "reason": "background" - } + "invalidations": [ + [0, 0, 785, 3016] ] }, {
diff --git a/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-background-image-non-fixed-expected.txt b/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-background-image-non-fixed-expected.txt index 763b8e1..5fd143d 100644 --- a/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-background-image-non-fixed-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-background-image-non-fixed-expected.txt
@@ -25,12 +25,8 @@ "bounds": [400, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 250, 400, 350], - "reason": "incremental" - } + "invalidations": [ + [0, 250, 400, 350] ] } ] @@ -42,12 +38,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [400, 0, 400, 600], - "reason": "incremental" - } + "invalidations": [ + [400, 0, 400, 600] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-centered-inline-under-fixed-pos-expected.txt b/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-centered-inline-under-fixed-pos-expected.txt index 3ef1ffd..53c75e82 100644 --- a/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-centered-inline-under-fixed-pos-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-centered-inline-under-fixed-pos-expected.txt
@@ -5,17 +5,8 @@ "bounds": [600, 250], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='container'", - "rect": [0, 0, 600, 250], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV class='child'", - "rect": [0, 125, 6, 30], - "reason": "geometry" - } + "invalidations": [ + [0, 0, 600, 250] ] } ] @@ -27,12 +18,8 @@ "bounds": [400, 250], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='container'", - "rect": [0, 0, 400, 250], - "reason": "geometry" - } + "invalidations": [ + [0, 0, 400, 250] ] } ] @@ -44,32 +31,8 @@ "bounds": [400, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='container'", - "rect": [0, 0, 400, 600], - "reason": "geometry" - }, - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 250, 400, 350], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow DIV class='parent'", - "rect": [0, 250, 6, 350], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV class='child'", - "rect": [0, 300, 6, 30], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV class='child'", - "rect": [0, 125, 6, 30], - "reason": "geometry" - } + "invalidations": [ + [0, 0, 400, 600] ] } ] @@ -81,17 +44,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV class='container'", - "rect": [0, 0, 800, 600], - "reason": "geometry" - }, - { - "object": "Scrolling background of LayoutView #document", - "rect": [400, 0, 400, 600], - "reason": "incremental" - } + "invalidations": [ + [0, 0, 800, 600] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-child-background-image-fixed-centered-expected.txt b/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-child-background-image-fixed-centered-expected.txt index 67360d9..4da99e7 100644 --- a/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-child-background-image-fixed-centered-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-child-background-image-fixed-centered-expected.txt
@@ -5,12 +5,8 @@ "bounds": [1008, 1016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [8, 8, 1000, 1000], - "reason": "background" - } + "invalidations": [ + [8, 8, 1000, 1000] ] }, { @@ -29,12 +25,8 @@ "name": "Scroll Corner Layer", "position": [585, 235], "bounds": [15, 15], - "paintInvalidations": [ - { - "object": "Scroll Corner Layer", - "rect": [0, 0, 15, 15], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 15, 15] ] } ] @@ -46,12 +38,8 @@ "bounds": [1008, 1016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [8, 8, 1000, 1000], - "reason": "background" - } + "invalidations": [ + [8, 8, 1000, 1000] ] }, { @@ -70,12 +58,8 @@ "name": "Scroll Corner Layer", "position": [385, 235], "bounds": [15, 15], - "paintInvalidations": [ - { - "object": "Scroll Corner Layer", - "rect": [0, 0, 15, 15], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 15, 15] ] } ] @@ -87,12 +71,8 @@ "bounds": [1008, 1016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [8, 8, 1000, 1000], - "reason": "background" - } + "invalidations": [ + [8, 8, 1000, 1000] ] }, { @@ -111,12 +91,8 @@ "name": "Scroll Corner Layer", "position": [385, 585], "bounds": [15, 15], - "paintInvalidations": [ - { - "object": "Scroll Corner Layer", - "rect": [0, 0, 15, 15], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 15, 15] ] } ] @@ -128,12 +104,8 @@ "bounds": [1008, 1016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [8, 8, 1000, 1000], - "reason": "background" - } + "invalidations": [ + [8, 8, 1000, 1000] ] }, { @@ -152,12 +124,8 @@ "name": "Scroll Corner Layer", "position": [785, 585], "bounds": [15, 15], - "paintInvalidations": [ - { - "object": "Scroll Corner Layer", - "rect": [0, 0, 15, 15], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 15, 15] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-child-background-image-fixed-tiled-expected.txt b/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-child-background-image-fixed-tiled-expected.txt index 67360d9..4da99e7 100644 --- a/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-child-background-image-fixed-tiled-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-child-background-image-fixed-tiled-expected.txt
@@ -5,12 +5,8 @@ "bounds": [1008, 1016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [8, 8, 1000, 1000], - "reason": "background" - } + "invalidations": [ + [8, 8, 1000, 1000] ] }, { @@ -29,12 +25,8 @@ "name": "Scroll Corner Layer", "position": [585, 235], "bounds": [15, 15], - "paintInvalidations": [ - { - "object": "Scroll Corner Layer", - "rect": [0, 0, 15, 15], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 15, 15] ] } ] @@ -46,12 +38,8 @@ "bounds": [1008, 1016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [8, 8, 1000, 1000], - "reason": "background" - } + "invalidations": [ + [8, 8, 1000, 1000] ] }, { @@ -70,12 +58,8 @@ "name": "Scroll Corner Layer", "position": [385, 235], "bounds": [15, 15], - "paintInvalidations": [ - { - "object": "Scroll Corner Layer", - "rect": [0, 0, 15, 15], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 15, 15] ] } ] @@ -87,12 +71,8 @@ "bounds": [1008, 1016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [8, 8, 1000, 1000], - "reason": "background" - } + "invalidations": [ + [8, 8, 1000, 1000] ] }, { @@ -111,12 +91,8 @@ "name": "Scroll Corner Layer", "position": [385, 585], "bounds": [15, 15], - "paintInvalidations": [ - { - "object": "Scroll Corner Layer", - "rect": [0, 0, 15, 15], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 15, 15] ] } ] @@ -128,12 +104,8 @@ "bounds": [1008, 1016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [8, 8, 1000, 1000], - "reason": "background" - } + "invalidations": [ + [8, 8, 1000, 1000] ] }, { @@ -152,12 +124,8 @@ "name": "Scroll Corner Layer", "position": [785, 585], "bounds": [15, 15], - "paintInvalidations": [ - { - "object": "Scroll Corner Layer", - "rect": [0, 0, 15, 15], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 15, 15] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-frameset-expected.txt b/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-frameset-expected.txt index bf294ce..53c75e82 100644 --- a/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-frameset-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-frameset-expected.txt
@@ -5,12 +5,8 @@ "bounds": [600, 250], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutFrameSet FRAMESET", - "rect": [0, 0, 600, 250], - "reason": "geometry" - } + "invalidations": [ + [0, 0, 600, 250] ] } ] @@ -22,12 +18,8 @@ "bounds": [400, 250], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutFrameSet FRAMESET", - "rect": [0, 0, 400, 250], - "reason": "geometry" - } + "invalidations": [ + [0, 0, 400, 250] ] } ] @@ -39,17 +31,8 @@ "bounds": [400, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutFrameSet FRAMESET", - "rect": [0, 0, 400, 600], - "reason": "geometry" - }, - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 250, 400, 350], - "reason": "incremental" - } + "invalidations": [ + [0, 0, 400, 600] ] } ] @@ -61,17 +44,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutFrameSet FRAMESET", - "rect": [0, 0, 800, 600], - "reason": "geometry" - }, - { - "object": "Scrolling background of LayoutView #document", - "rect": [400, 0, 400, 600], - "reason": "incremental" - } + "invalidations": [ + [0, 0, 800, 600] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-media-query-expected.txt b/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-media-query-expected.txt index a5224d2..0a4e55a9 100644 --- a/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-media-query-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-media-query-expected.txt
@@ -25,12 +25,8 @@ "bounds": [400, 600], "contentsOpaque": true, "backgroundColor": "#0000FF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 250, 400, 350], - "reason": "incremental" - } + "invalidations": [ + [0, 250, 400, 350] ] } ] @@ -42,12 +38,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#0000FF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [400, 0, 400, 600], - "reason": "incremental" - } + "invalidations": [ + [400, 0, 400, 600] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-percent-html-expected.txt b/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-percent-html-expected.txt index 9443e72..887e200 100644 --- a/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-percent-html-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-percent-html-expected.txt
@@ -5,12 +5,8 @@ "bounds": [600, 250], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [0, 0, 300, 125], - "reason": "geometry" - } + "invalidations": [ + [0, 0, 300, 125] ] } ] @@ -22,12 +18,8 @@ "bounds": [400, 250], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [0, 0, 300, 63], - "reason": "geometry" - } + "invalidations": [ + [0, 0, 300, 63] ] } ] @@ -39,17 +31,9 @@ "bounds": [400, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 250, 400, 350], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [0, 0, 200, 150], - "reason": "geometry" - } + "invalidations": [ + [0, 250, 400, 350], + [0, 0, 200, 150] ] } ] @@ -61,17 +45,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [400, 0, 400, 600], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [200, 0, 200, 150], - "reason": "incremental" - } + "invalidations": [ + [400, 0, 400, 600], + [200, 0, 200, 150] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-percent-width-height-expected.txt b/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-percent-width-height-expected.txt index feac092..a78d76a 100644 --- a/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-percent-width-height-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-percent-width-height-expected.txt
@@ -5,12 +5,8 @@ "bounds": [600, 250], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [0, 125, 300, 125], - "reason": "incremental" - } + "invalidations": [ + [0, 125, 300, 125] ] } ] @@ -22,12 +18,8 @@ "bounds": [400, 250], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [200, 0, 100, 125], - "reason": "incremental" - } + "invalidations": [ + [200, 0, 100, 125] ] } ] @@ -39,17 +31,9 @@ "bounds": [400, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 250, 400, 350], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [0, 125, 200, 175], - "reason": "incremental" - } + "invalidations": [ + [0, 250, 400, 350], + [0, 125, 200, 175] ] } ] @@ -61,17 +45,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [400, 0, 400, 600], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [200, 0, 200, 300], - "reason": "incremental" - } + "invalidations": [ + [400, 0, 400, 600], + [200, 0, 200, 300] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-positioned-bottom-expected.txt b/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-positioned-bottom-expected.txt index 02de8fe..39a16fc 100644 --- a/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-positioned-bottom-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-positioned-bottom-expected.txt
@@ -5,12 +5,8 @@ "bounds": [600, 250], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [0, 210, 20, 20], - "reason": "geometry" - } + "invalidations": [ + [0, 210, 20, 20] ] } ] @@ -32,22 +28,9 @@ "bounds": [400, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 250, 400, 350], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [0, 560, 20, 20], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [0, 210, 20, 20], - "reason": "geometry" - } + "invalidations": [ + [0, 250, 400, 350], + [0, 210, 20, 20] ] } ] @@ -59,12 +42,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [400, 0, 400, 600], - "reason": "incremental" - } + "invalidations": [ + [400, 0, 400, 600] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-positioned-percent-top-expected.txt b/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-positioned-percent-top-expected.txt index 08799c37..5d9af3d 100644 --- a/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-positioned-percent-top-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-positioned-percent-top-expected.txt
@@ -5,12 +5,8 @@ "bounds": [600, 250], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [0, 125, 20, 20], - "reason": "geometry" - } + "invalidations": [ + [0, 125, 20, 20] ] } ] @@ -32,22 +28,9 @@ "bounds": [400, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 250, 400, 350], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [0, 300, 20, 20], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [0, 125, 20, 20], - "reason": "geometry" - } + "invalidations": [ + [0, 250, 400, 350], + [0, 125, 20, 20] ] } ] @@ -59,12 +42,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [400, 0, 400, 600], - "reason": "incremental" - } + "invalidations": [ + [400, 0, 400, 600] ] } ]
diff --git a/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-viewport-percent-expected.txt b/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-viewport-percent-expected.txt index 2617134..63a1c2c4 100644 --- a/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-viewport-percent-expected.txt +++ b/third_party/blink/web_tests/paint/invalidation/window-resize/window-resize-viewport-percent-expected.txt
@@ -5,17 +5,9 @@ "bounds": [600, 250], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [0, 25, 50, 25], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [25, 0, 25, 50], - "reason": "incremental" - } + "invalidations": [ + [0, 25, 50, 25], + [25, 0, 25, 50] ] } ] @@ -37,22 +29,10 @@ "bounds": [400, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 250, 400, 350], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [0, 25, 60, 35], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [25, 0, 35, 60], - "reason": "incremental" - } + "invalidations": [ + [0, 250, 400, 350], + [0, 25, 60, 35], + [25, 0, 35, 60] ] } ] @@ -64,12 +44,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [400, 0, 400, 600], - "reason": "incremental" - } + "invalidations": [ + [400, 0, 400, 600] ] } ]
diff --git a/third_party/blink/web_tests/platform/fuchsia/paint/invalidation/selection/selection-in-composited-scrolling-container-expected.txt b/third_party/blink/web_tests/platform/fuchsia/paint/invalidation/selection/selection-in-composited-scrolling-container-expected.txt index aa289e8d..3a84b12 100644 --- a/third_party/blink/web_tests/platform/fuchsia/paint/invalidation/selection/selection-in-composited-scrolling-container-expected.txt +++ b/third_party/blink/web_tests/platform/fuchsia/paint/invalidation/selection/selection-in-composited-scrolling-container-expected.txt
@@ -5,27 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTextControl INPUT id='target'", - "rect": [7, 7, 63, 24], - "reason": "subtree" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [10, 11, 57, 16], - "reason": "paint property change" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [10, 11, 56, 16], - "reason": "paint property change" - }, - { - "object": "InlineTextBox 'test test test'", - "rect": [18, 11, 26, 16], - "reason": "selection" - } + "invalidations": [ + [7, 7, 63, 24] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/compositing/squashing/selection-repaint-with-gaps-expected.txt b/third_party/blink/web_tests/platform/linux/compositing/squashing/selection-repaint-with-gaps-expected.txt index 647b5ac..07d5d63 100644 --- a/third_party/blink/web_tests/platform/linux/compositing/squashing/selection-repaint-with-gaps-expected.txt +++ b/third_party/blink/web_tests/platform/linux/compositing/squashing/selection-repaint-with-gaps-expected.txt
@@ -16,17 +16,8 @@ "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV class='item')", "position": [7, 27], "bounds": [100, 210], - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'ipsum'", - "rect": [0, 80, 40, 40], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'lorem'", - "rect": [0, 80, 40, 40], - "reason": "geometry" - } + "invalidations": [ + [0, 80, 40, 40] ], "transform": 1 } @@ -61,27 +52,9 @@ "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV class='item')", "position": [7, 27], "bounds": [100, 210], - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'ipsum'", - "rect": [0, 160, 40, 40], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'lorem'", - "rect": [0, 160, 40, 40], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'ipsum'", - "rect": [0, 80, 40, 40], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'lorem'", - "rect": [0, 80, 40, 40], - "reason": "geometry" - } + "invalidations": [ + [0, 160, 40, 40], + [0, 80, 40, 40] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/platform/linux/paint/float/float-under-inline-self-painting-change-expected.txt b/third_party/blink/web_tests/platform/linux/paint/float/float-under-inline-self-painting-change-expected.txt deleted file mode 100644 index 1275b269..0000000 --- a/third_party/blink/web_tests/platform/linux/paint/float/float-under-inline-self-painting-change-expected.txt +++ /dev/null
@@ -1,38 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTextControl (floating) TEXTAREA id='target'", - "rect": [8, 8, 306, 306], - "reason": "appeared" - }, - { - "object": "LayoutTextControl (floating) TEXTAREA id='target'", - "rect": [8, 8, 306, 306], - "reason": "chunk disappeared" - }, - { - "object": "LayoutTextControl (floating) TEXTAREA id='target'", - "rect": [11, 11, 285, 302], - "reason": "chunk disappeared" - }, - { - "object": "VerticalScrollbar", - "rect": [298, 9, 15, 304], - "reason": "chunk disappeared" - }, - { - "object": "LayoutTextControl (floating) TEXTAREA id='target'", - "rect": [298, 298, 15, 15], - "reason": "chunk appeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/background/backgroundSizeRepaint-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/background/backgroundSizeRepaint-expected.txt index 6aaa4498..1550a9e 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/background/backgroundSizeRepaint-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/background/backgroundSizeRepaint-expected.txt
@@ -5,27 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [19, 339, 200, 60], - "reason": "background" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [19, 177, 200, 60], - "reason": "background" - }, - { - "object": "LayoutNGBlockFlow DIV id='b'", - "rect": [29, 379, 180, 20], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow DIV id='a'", - "rect": [29, 217, 180, 20], - "reason": "incremental" - } + "invalidations": [ + [19, 339, 200, 60], + [19, 177, 200, 60] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/background/change-text-content-and-background-color-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/background/change-text-content-and-background-color-expected.txt deleted file mode 100644 index 32e1d48..0000000 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/background/change-text-content-and-background-color-expected.txt +++ /dev/null
@@ -1,28 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTextControl (positioned) INPUT id='input'", - "rect": [8, 8, 244, 68], - "reason": "background" - }, - { - "object": "InlineTextBox 'NEW'", - "rect": [30, 30, 46, 23], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'OLD'", - "rect": [30, 30, 41, 23], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/block-no-inflow-children-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/block-no-inflow-children-expected.txt index 81e4a17..da69a7b 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/block-no-inflow-children-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/block-no-inflow-children-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'La la la la'", - "rect": [0, 0, 62, 19], - "reason": "full" - } + "invalidations": [ + [0, 0, 62, 19] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/box/box-inline-resize-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/box/box-inline-resize-expected.txt index 2d87f50..98c7ceb 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/box/box-inline-resize-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/box/box-inline-resize-expected.txt
@@ -5,22 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Chromium'", - "rect": [40, 107, 113, 27], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'Chromium'", - "rect": [8, 107, 113, 27], - "reason": "geometry" - }, - { - "object": "LayoutImage IMG id='foo'", - "rect": [8, 88, 32, 32], - "reason": "appeared" - } + "invalidations": [ + [40, 107, 113, 27], + [8, 107, 113, 27], + [8, 88, 32, 32] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/box/invalidate-box-shadow-currentColor-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/box/invalidate-box-shadow-currentColor-expected.txt index fec83f8..5fc8c5e0 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/box/invalidate-box-shadow-currentColor-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/box/invalidate-box-shadow-currentColor-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Text'", - "rect": [8, 8, 29, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalBoxFragment LayoutInline SPAN id='target'", - "rect": [8, 8, 28, 24], - "reason": "style change" - } + "invalidations": [ + [8, 8, 29, 19], + [8, 8, 28, 24] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/bugzilla-5699-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/bugzilla-5699-expected.txt index 5af8331..dedf7046 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/bugzilla-5699-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/bugzilla-5699-expected.txt
@@ -5,27 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Hello'", - "rect": [8, 184, 35, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Hello'", - "rect": [8, 156, 35, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [8, 150, 4, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [8, 136, 4, 19], - "reason": "style change" - } + "invalidations": [ + [8, 184, 35, 19], + [8, 156, 35, 19], + [8, 150, 4, 19], + [8, 136, 4, 19] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/bugzilla-6278-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/bugzilla-6278-expected.txt index f4a8ed0..dc2060b 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/bugzilla-6278-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/bugzilla-6278-expected.txt
@@ -5,127 +5,13 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [10, 303, 292, 50], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Curabitur pretium, quam quis semper'", - "rect": [10, 138, 291, 159], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Phasellus vehicula, sem at posuere'", - "rect": [10, 138, 291, 159], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Quisque eu nulla non nisi molestie'", - "rect": [10, 138, 291, 159], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'ac, laoreet non, suscipit sed, sapien.'", - "rect": [10, 138, 291, 159], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'accumsan. Etiam tellus urna, laoreet'", - "rect": [10, 138, 291, 159], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'malesuada, est libero feugiat libero,'", - "rect": [10, 138, 291, 159], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'vehicula, augue nibh molestie nisl,'", - "rect": [10, 138, 291, 159], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'vel fringilla orci nibh sed neque.'", - "rect": [10, 138, 291, 159], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [10, 343, 242, 50], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD id='col1'", - "rect": [10, 353, 242, 40], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [10, 298, 242, 40], - "reason": "incremental" - }, - { - "object": "NGPhysicalTextFragment 'Curabitur pretium, quam quis semper'", - "rect": [10, 138, 235, 199], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Phasellus vehicula, sem at posuere'", - "rect": [10, 138, 235, 199], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Quisque eu nulla non nisi molestie'", - "rect": [10, 138, 235, 199], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'ac, laoreet non, suscipit sed, sapien.'", - "rect": [10, 138, 235, 199], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'accumsan. Etiam tellus urna, laoreet'", - "rect": [10, 138, 235, 199], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'malesuada, est libero feugiat libero,'", - "rect": [10, 138, 235, 199], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'nec ullamcorper lacus ante vulputate'", - "rect": [10, 138, 235, 199], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'pede.'", - "rect": [10, 138, 235, 199], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'vehicula, augue nibh molestie nisl,'", - "rect": [10, 138, 235, 199], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'vel fringilla orci nibh sed neque.'", - "rect": [10, 138, 235, 199], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD id='col1'", - "rect": [252, 138, 50, 215], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [252, 138, 50, 160], - "reason": "incremental" - } + "invalidations": [ + [10, 303, 292, 50], + [10, 138, 291, 159], + [10, 343, 242, 50], + [10, 298, 242, 40], + [10, 138, 235, 199], + [252, 138, 50, 215] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/bugzilla-6473-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/bugzilla-6473-expected.txt deleted file mode 100644 index a1232cf..0000000 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/bugzilla-6473-expected.txt +++ /dev/null
@@ -1,28 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) P", - "rect": [8, 152, 784, 20], - "reason": "chunk disappeared" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) P", - "rect": [8, 136, 784, 20], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'SUCCESS'", - "rect": [8, 136, 71, 19], - "reason": "appeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/clip/control-clip-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/clip/control-clip-expected.txt index eea9a27c..e4b33d4 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/clip/control-clip-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/clip/control-clip-expected.txt
@@ -5,27 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'SUCCESS'", - "rect": [76, 117, 64, 16], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox 'SUCCESS'", - "rect": [9, 87, 63, 16], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'FAILURE'", - "rect": [81, 117, 54, 16], - "reason": "chunk disappeared" - }, - { - "object": "InlineTextBox 'FAILURE'", - "rect": [9, 87, 54, 16], - "reason": "disappeared" - } + "invalidations": [ + [76, 117, 64, 16], + [9, 87, 63, 16] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/clip/outline-clip-change-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/clip/outline-clip-change-expected.txt index d727699..33aa60b 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/clip/outline-clip-change-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/clip/outline-clip-change-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) A id='link' class='updated'", - "rect": [48, 88, 90, 25], - "reason": "chunk appeared" - }, - { - "object": "NGPhysicalTextFragment 'Lorem Ipsum'", - "rect": [48, 88, 86, 19], - "reason": "disappeared" - } + "invalidations": [ + [48, 88, 90, 25] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/compositing/text-match-highlight-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/compositing/text-match-highlight-expected.txt index 9b8e3f6..09e4c9a 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/compositing/text-match-highlight-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/compositing/text-match-highlight-expected.txt
@@ -5,47 +5,15 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Can you findme in this boring text?'", - "rect": [10, 135, 223, 19], - "reason": "DocumentMarker change" - }, - { - "object": "InlineTextBox 'Findme on a path! Did you findme?'", - "rect": [20, 224, 182, 72], - "reason": "DocumentMarker change" - }, - { - "object": "InlineTextBox 'Findme in a typewriter!'", - "rect": [10, 191, 138, 12], - "reason": "DocumentMarker change" - }, - { - "object": "NGPhysicalTextFragment 'findme'", - "rect": [278, 40, 44, 19], - "reason": "DocumentMarker change" - }, - { - "object": "NGPhysicalTextFragment 'findme'", - "rect": [264, 60, 44, 19], - "reason": "DocumentMarker change" - }, - { - "object": "NGPhysicalTextFragment 'findme'", - "rect": [220, 60, 44, 19], - "reason": "DocumentMarker change" - }, - { - "object": "NGPhysicalTextFragment 'findme'", - "rect": [89, 60, 44, 19], - "reason": "DocumentMarker change" - }, - { - "object": "NGPhysicalTextFragment 'findme'", - "rect": [51, 80, 44, 19], - "reason": "DocumentMarker change" - } + "invalidations": [ + [10, 135, 223, 19], + [20, 224, 182, 72], + [10, 191, 138, 12], + [278, 40, 44, 19], + [264, 60, 44, 19], + [220, 60, 44, 19], + [89, 60, 44, 19], + [51, 80, 44, 19] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/compositing/updating-scrolling-container-and-content-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/compositing/updating-scrolling-container-and-content-expected.txt index 70dd5700..2713ebd 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/compositing/updating-scrolling-container-and-content-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/compositing/updating-scrolling-container-and-content-expected.txt
@@ -5,57 +5,17 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'CONTENT'", - "rect": [8, 258, 77, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'CONTENT'", - "rect": [8, 238, 77, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'CONTENT'", - "rect": [8, 218, 77, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'CONTENT'", - "rect": [8, 198, 77, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'CONTENT'", - "rect": [8, 178, 77, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'CONTENT'", - "rect": [8, 158, 77, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'CONTENT'", - "rect": [8, 138, 77, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'CONTENT'", - "rect": [8, 118, 77, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'CONTENT'", - "rect": [8, 278, 77, 15], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'CONTENT'", - "rect": [8, 108, 77, 9], - "reason": "style change" - } + "invalidations": [ + [8, 258, 77, 19], + [8, 238, 77, 19], + [8, 218, 77, 19], + [8, 198, 77, 19], + [8, 178, 77, 19], + [8, 158, 77, 19], + [8, 138, 77, 19], + [8, 118, 77, 19], + [8, 278, 77, 15], + [8, 108, 77, 9] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/create-layer-repaint-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/create-layer-repaint-expected.txt deleted file mode 100644 index 01e3c4c..0000000 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/create-layer-repaint-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='test' class='big stretchy'", - "rect": [28, 56, 500, 50], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='test' class='stretchy'", - "rect": [28, 56, 250, 50], - "reason": "chunk appeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/css-grid-layout/grid-item-z-index-change-repaint-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/css-grid-layout/grid-item-z-index-change-repaint-expected.txt index c5e9425..c20ee96e6 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/css-grid-layout/grid-item-z-index-change-repaint-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/css-grid-layout/grid-item-z-index-change-repaint-expected.txt
@@ -5,47 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow HTML", - "rect": [8, 16, 454, 320], - "reason": "chunk disappeared" - }, - { - "object": "NGPhysicalTextFragment 'This test checks that grid items correctly repaint when 'z-index' changes.'", - "rect": [8, 16, 454, 19], - "reason": "appeared" - }, - { - "object": "LayoutGrid DIV class='grid fit-content'", - "rect": [8, 236, 400, 100], - "reason": "appeared" - }, - { - "object": "LayoutGrid DIV class='grid fit-content'", - "rect": [8, 126, 400, 100], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'For this test to pass, there should be no red below.'", - "rect": [8, 52, 314, 19], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow DIV class='sizedToGridArea red'", - "rect": [208, 236, 200, 100], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow DIV class='sizedToGridArea red'", - "rect": [208, 126, 200, 100], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='item2' class='sizedToGridArea green'", - "rect": [8, 236, 200, 100], - "reason": "chunk appeared" - } + "invalidations": [ + [8, 16, 454, 320] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/delete-into-nested-block-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/delete-into-nested-block-expected.txt index bfcc298..64b68a2 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/delete-into-nested-block-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/delete-into-nested-block-expected.txt
@@ -5,32 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'three'", - "rect": [8, 167, 31, 20], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'three'", - "rect": [8, 127, 31, 20], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'one'", - "rect": [8, 127, 27, 20], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'two'", - "rect": [8, 147, 24, 20], - "reason": "disappeared" - }, - { - "object": "Caret", - "rect": [8, 127, 1, 20], - "reason": "appeared" - } + "invalidations": [ + [8, 167, 31, 20], + [8, 127, 31, 20], + [8, 147, 24, 20] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/details-open-repaint-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/details-open-repaint-expected.txt index 58508e10..7f0473fb 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/details-open-repaint-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/details-open-repaint-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTextControl INPUT", - "rect": [8, 72, 185, 22], - "reason": "appeared" - }, - { - "object": "LayoutDetailsMarker DIV id='details-marker'", - "rect": [8, 56, 11, 11], - "reason": "full" - } + "invalidations": [ + [8, 72, 185, 22], + [8, 56, 11, 11] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/filters/filter-repaint-accelerated-child-with-filter-child-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/filters/filter-repaint-accelerated-child-with-filter-child-expected.txt index 9c6b080b..8e33782 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/filters/filter-repaint-accelerated-child-with-filter-child-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/filters/filter-repaint-accelerated-child-with-filter-child-expected.txt
@@ -15,17 +15,8 @@ "name": "LayoutNGBlockFlow DIV class='accelerated'", "position": [-12, -12], "bounds": [212, 257], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='resize' class='drop-shadow'", - "rect": [0, 0, 212, 257], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow DIV id='resize' class='drop-shadow'", - "rect": [0, 0, 158, 257], - "reason": "paint property change" - } + "invalidations": [ + [0, 0, 212, 257] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/flexbox/repaint-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/flexbox/repaint-expected.txt index 5d3697c85..ffb4395 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/flexbox/repaint-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/flexbox/repaint-expected.txt
@@ -5,157 +5,12 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='content'", - "rect": [138, 128, 654, 100], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow DIV id='content'", - "rect": [148, 128, 644, 100], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean laoreet dolor id urna eleifend aliquet.'", - "rect": [138, 128, 636, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Nulla vel dolor ipsum. Aliquam ut turpis nisl, in vulputate sapien. Cum sociis natoque penatibus et'", - "rect": [138, 128, 636, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Sed volutpat, tellus vel varius vestibulum, purus quam mollis sapien, in condimentum leo neque sed'", - "rect": [138, 128, 636, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'magnis dis parturient montes, nascetur ridiculus mus. Sed congue magna vitae dolor feugiat vehicula.'", - "rect": [138, 128, 636, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'nulla. Nunc quis porta elit. Pellentesque erat lectus, ultricies a lobortis id, faucibus id quam.'", - "rect": [138, 128, 636, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean laoreet dolor id urna eleifend aliquet.'", - "rect": [148, 128, 635, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean laoreet dolor id urna eleifend aliquet.'", - "rect": [148, 128, 635, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Nulla vel dolor ipsum. Aliquam ut turpis nisl, in vulputate sapien. Cum sociis natoque penatibus et'", - "rect": [148, 128, 635, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Nulla vel dolor ipsum. Aliquam ut turpis nisl, in vulputate sapien. Cum sociis natoque penatibus et'", - "rect": [148, 128, 635, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Sed volutpat, tellus vel varius vestibulum, purus quam mollis sapien, in condimentum leo neque sed'", - "rect": [148, 128, 635, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Sed volutpat, tellus vel varius vestibulum, purus quam mollis sapien, in condimentum leo neque sed'", - "rect": [148, 128, 635, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'magnis dis parturient montes, nascetur ridiculus mus. Sed congue magna vitae dolor feugiat vehicula.'", - "rect": [148, 128, 635, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'magnis dis parturient montes, nascetur ridiculus mus. Sed congue magna vitae dolor feugiat vehicula.'", - "rect": [148, 128, 635, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'nulla. Nunc quis porta elit. Pellentesque erat lectus, ultricies a lobortis id, faucibus id quam.'", - "rect": [148, 128, 635, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'nulla. Nunc quis porta elit. Pellentesque erat lectus, ultricies a lobortis id, faucibus id quam.'", - "rect": [148, 128, 635, 99], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV id='content'", - "rect": [400, 128, 392, 180], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow DIV id='left'", - "rect": [8, 228, 392, 80], - "reason": "incremental" - }, - { - "object": "NGPhysicalTextFragment 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean laoreet dolor id urna eleifend aliquet.'", - "rect": [400, 128, 391, 179], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Nulla vel dolor ipsum. Aliquam ut turpis nisl, in vulputate sapien. Cum sociis natoque penatibus et'", - "rect": [400, 128, 391, 179], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Sed volutpat, tellus vel varius vestibulum, purus quam mollis sapien, in condimentum leo neque sed'", - "rect": [400, 128, 391, 179], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Sed volutpat, tellus vel varius vestibulum, purus quam mollis'", - "rect": [400, 128, 391, 179], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'elit. Pellentesque erat lectus, ultricies a lobortis id, faucibus id'", - "rect": [400, 128, 391, 179], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'magnis dis parturient montes, nascetur ridiculus mus. Sed congue magna vitae dolor feugiat vehicula.'", - "rect": [400, 128, 391, 179], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'nulla. Nunc quis porta elit. Pellentesque erat lectus, ultricies a lobortis id, faucibus id quam.'", - "rect": [400, 128, 391, 179], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'quam.'", - "rect": [400, 128, 391, 179], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'sapien, in condimentum leo neque sed nulla. Nunc quis porta'", - "rect": [400, 128, 391, 179], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='left'", - "rect": [148, 128, 252, 180], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow DIV id='left'", - "rect": [8, 128, 140, 100], - "reason": "geometry" - } + "invalidations": [ + [138, 128, 654, 100], + [400, 128, 392, 180], + [8, 228, 392, 80], + [148, 128, 252, 180], + [8, 128, 140, 100] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/float-offscreen-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/float-offscreen-expected.txt index ed0a834..82691fdb 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/float-offscreen-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/float-offscreen-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [11, 11, 89, 22], - "reason": "chunk appeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [11, 11, 89, 22], - "reason": "chunk disappeared" - } + "invalidations": [ + [11, 11, 89, 22] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/forms/button-reset-focus-by-mouse-then-keydown-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/forms/button-reset-focus-by-mouse-then-keydown-expected.txt deleted file mode 100644 index 54cc259..0000000 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/forms/button-reset-focus-by-mouse-then-keydown-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutButton BUTTON", - "rect": [6, 6, 54, 26], - "reason": "subtree" - }, - { - "object": "InlineTextBox 'Reset'", - "rect": [16, 11, 34, 16], - "reason": "subtree" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/forms/details-marker-color-change-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/forms/details-marker-color-change-expected.txt index c7309e21..98bb374e7 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/forms/details-marker-color-change-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/forms/details-marker-color-change-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Details'", - "rect": [24, 8, 45, 19], - "reason": "style change" - }, - { - "object": "LayoutDetailsMarker DIV id='details-marker'", - "rect": [8, 12, 11, 11], - "reason": "style change" - } + "invalidations": [ + [24, 8, 45, 19], + [8, 12, 11, 11] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.txt deleted file mode 100644 index c2ce56e..0000000 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.txt +++ /dev/null
@@ -1,28 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutButton INPUT", - "rect": [6, 6, 61, 26], - "reason": "subtree" - }, - { - "object": "LayoutButton INPUT", - "rect": [6, 6, 61, 26], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox 'Submit'", - "rect": [16, 11, 41, 16], - "reason": "subtree" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/image/canvas-composite-repaint-by-all-imagesource-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/image/canvas-composite-repaint-by-all-imagesource-expected.txt index beb7544..941b880f 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/image/canvas-composite-repaint-by-all-imagesource-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/image/canvas-composite-repaint-by-all-imagesource-expected.txt
@@ -5,447 +5,51 @@ "bounds": [785, 933], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutHTMLCanvas CANVAS id='copyvideo'", - "rect": [571, 515, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='copyvideo'", - "rect": [571, 515, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-atopvideo'", - "rect": [571, 415, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-atopvideo'", - "rect": [571, 415, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-invideo'", - "rect": [571, 315, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-invideo'", - "rect": [571, 315, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-outvideo'", - "rect": [571, 165, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-outvideo'", - "rect": [571, 165, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-invideo'", - "rect": [571, 115, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-invideo'", - "rect": [571, 115, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='copycanvas'", - "rect": [429, 515, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='copycanvas'", - "rect": [429, 515, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-atopcanvas'", - "rect": [429, 415, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-atopcanvas'", - "rect": [429, 415, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-incanvas'", - "rect": [429, 315, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-incanvas'", - "rect": [429, 315, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-outcanvas'", - "rect": [429, 165, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-outcanvas'", - "rect": [429, 165, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-incanvas'", - "rect": [429, 115, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-incanvas'", - "rect": [429, 115, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='copyimage'", - "rect": [287, 515, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='copyimage'", - "rect": [287, 515, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-atopimage'", - "rect": [287, 415, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-atopimage'", - "rect": [287, 415, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-inimage'", - "rect": [287, 315, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-inimage'", - "rect": [287, 315, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-outimage'", - "rect": [287, 165, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-outimage'", - "rect": [287, 165, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-inimage'", - "rect": [287, 115, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-inimage'", - "rect": [287, 115, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='copysolid color'", - "rect": [145, 515, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='copysolid color'", - "rect": [145, 515, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-atopsolid color'", - "rect": [145, 415, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-atopsolid color'", - "rect": [145, 415, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-insolid color'", - "rect": [145, 315, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-insolid color'", - "rect": [145, 315, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-outsolid color'", - "rect": [145, 165, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-outsolid color'", - "rect": [145, 165, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-insolid color'", - "rect": [145, 115, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-insolid color'", - "rect": [145, 115, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='xorvideo'", - "rect": [601, 565, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='xorvideo'", - "rect": [601, 565, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='lightervideo'", - "rect": [601, 465, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='lightervideo'", - "rect": [601, 465, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-outvideo'", - "rect": [601, 365, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-outvideo'", - "rect": [601, 365, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-overvideo'", - "rect": [601, 265, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-overvideo'", - "rect": [601, 265, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-atopvideo'", - "rect": [601, 215, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-atopvideo'", - "rect": [601, 215, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-overvideo'", - "rect": [601, 65, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-overvideo'", - "rect": [601, 65, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='xorcanvas'", - "rect": [459, 565, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='xorcanvas'", - "rect": [459, 565, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='lightercanvas'", - "rect": [459, 465, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='lightercanvas'", - "rect": [459, 465, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-outcanvas'", - "rect": [459, 365, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-outcanvas'", - "rect": [459, 365, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-overcanvas'", - "rect": [459, 265, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-overcanvas'", - "rect": [459, 265, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-atopcanvas'", - "rect": [459, 215, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-atopcanvas'", - "rect": [459, 215, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-overcanvas'", - "rect": [459, 65, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-overcanvas'", - "rect": [459, 65, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='xorimage'", - "rect": [317, 565, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='xorimage'", - "rect": [317, 565, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='lighterimage'", - "rect": [317, 465, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='lighterimage'", - "rect": [317, 465, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-outimage'", - "rect": [317, 365, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-outimage'", - "rect": [317, 365, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-overimage'", - "rect": [317, 265, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-overimage'", - "rect": [317, 265, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-atopimage'", - "rect": [317, 215, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-atopimage'", - "rect": [317, 215, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-overimage'", - "rect": [317, 65, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-overimage'", - "rect": [317, 65, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='xorsolid color'", - "rect": [175, 565, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='xorsolid color'", - "rect": [175, 565, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='lightersolid color'", - "rect": [175, 465, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='lightersolid color'", - "rect": [175, 465, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-outsolid color'", - "rect": [175, 365, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-outsolid color'", - "rect": [175, 365, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-oversolid color'", - "rect": [175, 265, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-oversolid color'", - "rect": [175, 265, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-atopsolid color'", - "rect": [175, 215, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-atopsolid color'", - "rect": [175, 215, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-oversolid color'", - "rect": [175, 65, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-oversolid color'", - "rect": [175, 65, 50, 40], - "reason": "invalidate paint rectangle" - } + "invalidations": [ + [571, 515, 80, 40], + [571, 415, 80, 40], + [571, 315, 80, 40], + [571, 165, 80, 40], + [571, 115, 80, 40], + [429, 515, 80, 40], + [429, 415, 80, 40], + [429, 315, 80, 40], + [429, 165, 80, 40], + [429, 115, 80, 40], + [287, 515, 80, 40], + [287, 415, 80, 40], + [287, 315, 80, 40], + [287, 165, 80, 40], + [287, 115, 80, 40], + [145, 515, 80, 40], + [145, 415, 80, 40], + [145, 315, 80, 40], + [145, 165, 80, 40], + [145, 115, 80, 40], + [601, 565, 50, 40], + [601, 465, 50, 40], + [601, 365, 50, 40], + [601, 265, 50, 40], + [601, 215, 50, 40], + [601, 65, 50, 40], + [459, 565, 50, 40], + [459, 465, 50, 40], + [459, 365, 50, 40], + [459, 265, 50, 40], + [459, 215, 50, 40], + [459, 65, 50, 40], + [317, 565, 50, 40], + [317, 465, 50, 40], + [317, 365, 50, 40], + [317, 265, 50, 40], + [317, 215, 50, 40], + [317, 65, 50, 40], + [175, 565, 50, 40], + [175, 465, 50, 40], + [175, 365, 50, 40], + [175, 265, 50, 40], + [175, 215, 50, 40], + [175, 65, 50, 40] ] }, {
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/inline-color-change-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/inline-color-change-expected.txt index 10a06194..17dd4dc 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/inline-color-change-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/inline-color-change-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalBoxFragment LayoutInline SPAN id='target'", - "rect": [8, 72, 38, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'PASS'", - "rect": [8, 72, 38, 19], - "reason": "style change" - } + "invalidations": [ + [8, 72, 38, 19] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/invalidation-after-opacity-change-subtree-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/invalidation-after-opacity-change-subtree-expected.txt index 94f733d..9c67362 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/invalidation-after-opacity-change-subtree-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/invalidation-after-opacity-change-subtree-expected.txt
@@ -5,27 +5,9 @@ "bounds": [785, 2350], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'This test checks that switching opacity'", - "rect": [8, 2046, 774, 107], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'invalidates the full subtree.'", - "rect": [8, 2046, 774, 107], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'This text should be visible in the'", - "rect": [8, 2196, 655, 107], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'output.'", - "rect": [8, 2196, 655, 107], - "reason": "appeared" - } + "invalidations": [ + [8, 2046, 774, 107], + [8, 2196, 655, 107] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/line-flow-with-floats-1-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/line-flow-with-floats-1-expected.txt index f1df12d..eb13537 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/line-flow-with-floats-1-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/line-flow-with-floats-1-expected.txt
@@ -5,167 +5,16 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'become of me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'a ridge or furrow in the way wherever she wanted to send the'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'getting up and walking off to other parts of the ground, Alice'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog to, and, as the doubled-up soldiers were always'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'in the act of crawling away: besides all this, there was generally'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'provoking to find that the hedgehog had unrolled itself, and was'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'soon came to the conclusion that it was a very '", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'could not help bursting out laughing: and when she had got its'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'head down, and was going to '", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'look up in her face, with such a puzzled expression that she'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in managing'", - "rect": [14, 80, 406, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'away, comfortably enough, under her arm, with its legs'", - "rect": [14, 80, 406, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hanging down, but generally, just as she had got its'", - "rect": [14, 80, 406, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog a blow with its head, it '", - "rect": [14, 80, 406, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'her flamingo: she succeeded in getting its body tucked'", - "rect": [14, 80, 406, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'neck nicely straightened out, and was going to give the'", - "rect": [14, 80, 406, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'difficult'", - "rect": [65, 360, 356, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'game indeed.'", - "rect": [65, 360, 356, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'about once in a minute.'", - "rect": [14, 460, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'shouting \u2018Off with his head!\u2019 or \u2018Off with her head!\u2019'", - "rect": [14, 460, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'was in a furious passion, and went stamping about, and'", - "rect": [14, 460, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for the hedgehogs; and in a very short time '", - "rect": [14, 420, 355, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for turns, quarrelling all the while, and fighting'", - "rect": [14, 420, 355, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting'", - "rect": [65, 400, 304, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV id='pinkFloat'", - "rect": [378, 138, 70, 30], - "reason": "incremental" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [302, 440, 67, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [238, 180, 41, 19], - "reason": "geometry" - } + "invalidations": [ + [14, 520, 408, 80], + [14, 240, 407, 139], + [14, 180, 407, 79], + [14, 80, 406, 119], + [65, 360, 356, 39], + [14, 460, 355, 59], + [14, 420, 355, 39], + [65, 400, 304, 19], + [378, 138, 70, 30] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/line-flow-with-floats-10-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/line-flow-with-floats-10-expected.txt index b1f24af8..adff8e2 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/line-flow-with-floats-10-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/line-flow-with-floats-10-expected.txt
@@ -5,182 +5,18 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'become of me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'a ridge or furrow in the way wherever she wanted to send the'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'getting up and walking off to other parts of the ground, Alice'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog to, and, as the doubled-up soldiers were always'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'in the act of crawling away: besides all this, there was generally'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'provoking to find that the hedgehog had unrolled itself, and was'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'soon came to the conclusion that it was a very '", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'could not help bursting out laughing: and when she had got its'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'head down, and was going to '", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'look up in her face, with such a puzzled expression that she'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'difficult'", - "rect": [65, 360, 356, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'game indeed.'", - "rect": [65, 360, 356, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in managing'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'away, comfortably enough, under her arm, with its legs'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hanging down, but generally, just as she had got its'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog a blow with its head, it '", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'her flamingo: she succeeded in getting its body tucked'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'neck nicely straightened out, and was going to give the'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' was in a furious passion, and went stamping'", - "rect": [14, 460, 355, 59], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'about, and shouting \u2018Off with his head!\u2019 or \u2018Off with'", - "rect": [14, 460, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'her head!\u2019 about once in a minute.'", - "rect": [14, 460, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'was in a furious passion, and went stamping about, and'", - "rect": [14, 460, 355, 59], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'Queen'", - "rect": [14, 440, 355, 39], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'the'", - "rect": [14, 440, 355, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for the hedgehogs; and in a very short time '", - "rect": [14, 420, 355, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for turns, quarrelling all the while, and fighting'", - "rect": [14, 420, 355, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting'", - "rect": [65, 400, 304, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 363, 48, 65], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 374, 48, 64], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [238, 180, 41, 19], - "reason": "geometry" - } + "invalidations": [ + [14, 520, 408, 80], + [14, 240, 407, 139], + [14, 180, 407, 79], + [65, 360, 356, 39], + [14, 80, 355, 119], + [14, 460, 355, 59], + [14, 440, 355, 39], + [14, 420, 355, 39], + [65, 400, 304, 19], + [14, 363, 48, 65], + [14, 374, 48, 64] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/line-flow-with-floats-2-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/line-flow-with-floats-2-expected.txt deleted file mode 100644 index be57b05..0000000 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/line-flow-with-floats-2-expected.txt +++ /dev/null
@@ -1,318 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow P", - "rect": [8, 74, 418, 526], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'become of me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet'", - "rect": [14, 521, 408, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'become of me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 521, 408, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 521, 408, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 521, 408, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'a ridge or furrow in the way wherever she wanted to send the'", - "rect": [14, 241, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very'", - "rect": [14, 241, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'getting up and walking off to other parts of the ground, Alice'", - "rect": [14, 241, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog to, and, as the doubled-up soldiers were always'", - "rect": [14, 241, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'in the act of crawling away: besides all this, there was generally'", - "rect": [14, 241, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'provoking to find that the hedgehog had unrolled itself, and was'", - "rect": [14, 241, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'soon came to the conclusion that it was a very '", - "rect": [14, 241, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'a ridge or furrow in the way wherever she wanted to send the'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'getting up and walking off to other parts of the ground, Alice'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog to, and, as the doubled-up soldiers were always'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'in the act of crawling away: besides all this, there was generally'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'provoking to find that the hedgehog had unrolled itself, and was'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'soon came to the conclusion that it was a very '", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and'", - "rect": [14, 181, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'could not help bursting out laughing: and when she had got its'", - "rect": [14, 181, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'head down, and was going to '", - "rect": [14, 181, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'look up in her face, with such a puzzled expression that she'", - "rect": [14, 181, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'could not help bursting out laughing: and when she had got its'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'head down, and was going to '", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'look up in her face, with such a puzzled expression that she'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'difficult'", - "rect": [65, 361, 356, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'game indeed.'", - "rect": [65, 361, 356, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'difficult'", - "rect": [65, 360, 356, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'game indeed.'", - "rect": [65, 360, 356, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in managing'", - "rect": [14, 80, 355, 120], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'away, comfortably enough, under her arm, with its legs'", - "rect": [14, 80, 355, 120], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hanging down, but generally, just as she had got its'", - "rect": [14, 80, 355, 120], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog a blow with its head, it '", - "rect": [14, 80, 355, 120], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'her flamingo: she succeeded in getting its body tucked'", - "rect": [14, 80, 355, 120], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'neck nicely straightened out, and was going to give the'", - "rect": [14, 80, 355, 120], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'about once in a minute.'", - "rect": [14, 461, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'shouting \u2018Off with his head!\u2019 or \u2018Off with her head!\u2019'", - "rect": [14, 461, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'was in a furious passion, and went stamping about, and'", - "rect": [14, 461, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'about once in a minute.'", - "rect": [14, 460, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'shouting \u2018Off with his head!\u2019 or \u2018Off with her head!\u2019'", - "rect": [14, 460, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'was in a furious passion, and went stamping about, and'", - "rect": [14, 460, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for the hedgehogs; and in a very short time '", - "rect": [14, 421, 355, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for turns, quarrelling all the while, and fighting'", - "rect": [14, 421, 355, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for the hedgehogs; and in a very short time '", - "rect": [14, 420, 355, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for turns, quarrelling all the while, and fighting'", - "rect": [14, 420, 355, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting'", - "rect": [65, 401, 304, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting'", - "rect": [65, 400, 304, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [302, 441, 67, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [302, 440, 67, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='greenFloat'", - "rect": [372, 404, 48, 81], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='greenFloat'", - "rect": [372, 403, 48, 81], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 364, 48, 65], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 363, 48, 65], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [235, 180, 46, 20], - "reason": "style change" - }, - { - "object": "VerticalScrollbar", - "rect": [485, 0, 15, 600], - "reason": "scroll control" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/line-flow-with-floats-3-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/line-flow-with-floats-3-expected.txt index 76b39caa..070223c 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/line-flow-with-floats-3-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/line-flow-with-floats-3-expected.txt
@@ -5,202 +5,17 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'become of me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'a ridge or furrow in the way wherever she wanted to send the'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'getting up and walking off to other parts of the ground, Alice'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog to, and, as the doubled-up soldiers were always'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'in the act of crawling away: besides all this, there was generally'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'provoking to find that the hedgehog had unrolled itself, and was'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'soon came to the conclusion that it was a very '", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'could not help bursting out laughing: and when she had got its'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'head down, and was going to '", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'look up in her face, with such a puzzled expression that she'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for turns,'", - "rect": [14, 400, 406, 59], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'hedgehogs; and in a very short time '", - "rect": [14, 400, 406, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'quarrelling all the while, and fighting for the'", - "rect": [14, 400, 406, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'difficult'", - "rect": [65, 360, 356, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'game indeed.'", - "rect": [65, 360, 356, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in managing'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'away, comfortably enough, under her arm, with its legs'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hanging down, but generally, just as she had got its'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog a blow with its head, it '", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'her flamingo: she succeeded in getting its body tucked'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'neck nicely straightened out, and was going to give the'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'a furious passion, and went stamping about, and'", - "rect": [14, 460, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'about once in a minute.'", - "rect": [14, 460, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'shouting \u2018Off with his head!\u2019 or \u2018Off with her head!\u2019'", - "rect": [14, 460, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' was in'", - "rect": [14, 440, 339, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'a furious passion, and went stamping about, and'", - "rect": [14, 440, 339, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'about once in a minute.'", - "rect": [14, 440, 339, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'shouting \u2018Off with his head!\u2019 or \u2018Off with her head!\u2019'", - "rect": [14, 440, 339, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting '", - "rect": [65, 400, 304, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [302, 440, 67, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [242, 440, 66, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='greenFloat'", - "rect": [356, 423, 64, 81], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='greenFloat'", - "rect": [372, 403, 48, 81], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [238, 180, 41, 19], - "reason": "geometry" - } + "invalidations": [ + [14, 520, 408, 80], + [14, 240, 407, 139], + [14, 180, 407, 79], + [14, 400, 406, 59], + [65, 360, 356, 39], + [14, 80, 355, 119], + [14, 460, 355, 59], + [14, 440, 339, 79], + [356, 423, 64, 81], + [372, 403, 48, 81] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/line-flow-with-floats-4-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/line-flow-with-floats-4-expected.txt index fb87beef..a4c9b9d2 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/line-flow-with-floats-4-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/line-flow-with-floats-4-expected.txt
@@ -5,167 +5,16 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'become of me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'a ridge or furrow in the way wherever she wanted to send the'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'getting up and walking off to other parts of the ground, Alice'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog to, and, as the doubled-up soldiers were always'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'in the act of crawling away: besides all this, there was generally'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'provoking to find that the hedgehog had unrolled itself, and was'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'soon came to the conclusion that it was a very '", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'could not help bursting out laughing: and when she had got its'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'head down, and was going to '", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'look up in her face, with such a puzzled expression that she'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'in a minute.'", - "rect": [14, 460, 407, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'shouting \u2018Off with his head!\u2019 or \u2018Off with her head!\u2019 about once'", - "rect": [14, 460, 407, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'was in a furious passion, and went stamping about, and'", - "rect": [14, 460, 407, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'difficult'", - "rect": [65, 360, 356, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'game indeed.'", - "rect": [65, 360, 356, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in managing'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'away, comfortably enough, under her arm, with its legs'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hanging down, but generally, just as she had got its'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog a blow with its head, it '", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'her flamingo: she succeeded in getting its body tucked'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'neck nicely straightened out, and was going to give the'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for the hedgehogs; and in a very short time '", - "rect": [14, 420, 355, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for turns, quarrelling all the while, and fighting'", - "rect": [14, 420, 355, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting'", - "rect": [65, 400, 304, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [302, 440, 67, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='greenFloat'", - "rect": [372, 403, 48, 81], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [238, 180, 41, 19], - "reason": "geometry" - } + "invalidations": [ + [14, 520, 408, 80], + [14, 240, 407, 139], + [14, 180, 407, 79], + [14, 460, 407, 59], + [65, 360, 356, 39], + [14, 80, 355, 119], + [14, 420, 355, 39], + [65, 400, 304, 19], + [372, 403, 48, 81] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/line-flow-with-floats-5-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/line-flow-with-floats-5-expected.txt index a9a6187..377f0ab 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/line-flow-with-floats-5-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/line-flow-with-floats-5-expected.txt
@@ -5,187 +5,15 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'become of me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'a ridge or furrow in the way wherever she wanted to send the'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'getting up and walking off to other parts of the ground, Alice'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog to, and, as the doubled-up soldiers were always'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'in the act of crawling away: besides all this, there was generally'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'provoking to find that the hedgehog had unrolled itself, and was'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'soon came to the conclusion that it was a very '", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'could not help bursting out laughing: and when she had got its'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'head down, and was going to '", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'look up in her face, with such a puzzled expression that she'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'difficult'", - "rect": [49, 360, 372, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'game indeed.'", - "rect": [49, 360, 372, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for'", - "rect": [14, 400, 356, 59], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'hedgehogs; and in a very short time '", - "rect": [14, 400, 356, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'turns, quarrelling all the while, and fighting for the'", - "rect": [14, 400, 356, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in managing'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'away, comfortably enough, under her arm, with its legs'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hanging down, but generally, just as she had got its'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog a blow with its head, it '", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'her flamingo: she succeeded in getting its body tucked'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'neck nicely straightened out, and was going to give the'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' was in a'", - "rect": [14, 440, 355, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'furious passion, and went stamping about, and shouting'", - "rect": [14, 440, 355, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'in a minute.'", - "rect": [14, 440, 355, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u2018Off with his head!\u2019 or \u2018Off with her head!\u2019 about once'", - "rect": [14, 440, 355, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting '", - "rect": [65, 400, 304, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting '", - "rect": [49, 400, 302, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [302, 440, 67, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [245, 440, 67, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 363, 48, 65], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [238, 180, 41, 19], - "reason": "geometry" - } + "invalidations": [ + [14, 520, 408, 80], + [14, 240, 407, 139], + [14, 180, 407, 79], + [49, 360, 372, 39], + [14, 400, 356, 59], + [14, 80, 355, 119], + [14, 440, 355, 79], + [14, 363, 48, 65] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/line-flow-with-floats-6-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/line-flow-with-floats-6-expected.txt index ebe3055..f455e90 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/line-flow-with-floats-6-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/line-flow-with-floats-6-expected.txt
@@ -5,177 +5,16 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'become of me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'a ridge or furrow in the way wherever she wanted to send the'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'getting up and walking off to other parts of the ground, Alice'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog to, and, as the doubled-up soldiers were always'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'in the act of crawling away: besides all this, there was generally'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'provoking to find that the hedgehog had unrolled itself, and was'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'soon came to the conclusion that it was a very '", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'could not help bursting out laughing: and when she had got its'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'head down, and was going to '", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'look up in her face, with such a puzzled expression that she'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'difficult'", - "rect": [65, 360, 356, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'game indeed.'", - "rect": [65, 360, 356, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in managing'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'away, comfortably enough, under her arm, with its legs'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hanging down, but generally, just as she had got its'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog a blow with its head, it '", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'her flamingo: she succeeded in getting its body tucked'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'neck nicely straightened out, and was going to give the'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'about once in a minute.'", - "rect": [14, 460, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'shouting \u2018Off with his head!\u2019 or \u2018Off with her head!\u2019'", - "rect": [14, 460, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'was in a furious passion, and went stamping about, and'", - "rect": [14, 460, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for the hedgehogs; and in a very short time '", - "rect": [14, 420, 355, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for turns, quarrelling all the while, and fighting'", - "rect": [14, 420, 355, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting'", - "rect": [65, 400, 304, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [302, 440, 67, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 363, 48, 65], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 363, 48, 65], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [238, 180, 41, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'foo'", - "rect": [27, 363, 22, 20], - "reason": "appeared" - } + "invalidations": [ + [14, 520, 408, 80], + [14, 240, 407, 139], + [14, 180, 407, 79], + [65, 360, 356, 39], + [14, 80, 355, 119], + [14, 460, 355, 59], + [14, 420, 355, 39], + [65, 400, 304, 19], + [14, 363, 48, 65] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/line-flow-with-floats-7-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/line-flow-with-floats-7-expected.txt index 271f8f21..c58b609 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/line-flow-with-floats-7-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/line-flow-with-floats-7-expected.txt
@@ -5,162 +5,15 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'become of me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'a ridge or furrow in the way wherever she wanted to send the'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'getting up and walking off to other parts of the ground, Alice'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog to, and, as the doubled-up soldiers were always'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'in the act of crawling away: besides all this, there was generally'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'provoking to find that the hedgehog had unrolled itself, and was'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'soon came to the conclusion that it was a very '", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'could not help bursting out laughing: and when she had got its'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'head down, and was going to '", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'look up in her face, with such a puzzled expression that she'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'difficult'", - "rect": [65, 360, 356, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'game indeed.'", - "rect": [65, 360, 356, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in managing'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'away, comfortably enough, under her arm, with its legs'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hanging down, but generally, just as she had got its'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog a blow with its head, it '", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'her flamingo: she succeeded in getting its body tucked'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'neck nicely straightened out, and was going to give the'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'about once in a minute.'", - "rect": [14, 460, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'shouting \u2018Off with his head!\u2019 or \u2018Off with her head!\u2019'", - "rect": [14, 460, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'was in a furious passion, and went stamping about, and'", - "rect": [14, 460, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for the hedgehogs; and in a very short time '", - "rect": [14, 420, 355, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for turns, quarrelling all the while, and fighting'", - "rect": [14, 420, 355, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting'", - "rect": [65, 400, 304, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [298, 440, 71, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [238, 180, 41, 19], - "reason": "geometry" - } + "invalidations": [ + [14, 520, 408, 80], + [14, 240, 407, 139], + [14, 180, 407, 79], + [65, 360, 356, 39], + [14, 80, 355, 119], + [14, 460, 355, 59], + [14, 420, 355, 39], + [65, 400, 304, 19] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/line-flow-with-floats-8-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/line-flow-with-floats-8-expected.txt index d329eaa..e91b04e 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/line-flow-with-floats-8-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/line-flow-with-floats-8-expected.txt
@@ -5,192 +5,15 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'become of me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'a ridge or furrow in the way wherever she wanted to send the'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'getting up and walking off to other parts of the ground, Alice'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog to, and, as the doubled-up soldiers were always'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'in the act of crawling away: besides all this, there was generally'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'provoking to find that the hedgehog had unrolled itself, and was'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'soon came to the conclusion that it was a very '", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'could not help bursting out laughing: and when she had got its'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'head down, and was going to '", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'look up in her face, with such a puzzled expression that she'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'difficult game'", - "rect": [14, 360, 407, 39], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'indeed.'", - "rect": [14, 360, 407, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' was in a furious'", - "rect": [14, 440, 356, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'minute.'", - "rect": [14, 440, 356, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'passion, and went stamping about, and shouting \u2018Off'", - "rect": [14, 440, 356, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'with his head!\u2019 or \u2018Off with her head!\u2019 about once in a'", - "rect": [14, 440, 356, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'difficult'", - "rect": [65, 360, 356, 39], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in managing'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'away, comfortably enough, under her arm, with its legs'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hanging down, but generally, just as she had got its'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog a blow with its head, it '", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'her flamingo: she succeeded in getting its body tucked'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'neck nicely straightened out, and was going to give the'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'and in a very short time '", - "rect": [14, 400, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for turns,'", - "rect": [14, 400, 355, 59], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'quarrelling all the while, and fighting for the hedgehogs;'", - "rect": [14, 400, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting '", - "rect": [65, 400, 304, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting '", - "rect": [14, 400, 298, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [184, 440, 69, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [302, 440, 67, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 363, 48, 65], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [238, 180, 41, 19], - "reason": "geometry" - } + "invalidations": [ + [14, 520, 408, 80], + [14, 240, 407, 139], + [14, 180, 407, 79], + [14, 360, 407, 39], + [14, 440, 356, 79], + [14, 80, 355, 119], + [14, 400, 355, 59], + [14, 363, 48, 65] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/line-flow-with-floats-9-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/line-flow-with-floats-9-expected.txt index 3d1d9bf8..846d90e 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/line-flow-with-floats-9-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/line-flow-with-floats-9-expected.txt
@@ -5,192 +5,18 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'become of me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 520, 408, 80], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'and was in the act of crawling away: besides all this,'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very'", - "rect": [14, 240, 407, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'ground, Alice soon came to the conclusion that it was a very'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'provoking to find that the hedgehog had unrolled itself,'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'there was generally a ridge or furrow in the way wherever she'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'wanted to send the hedgehog to, and, as the doubled-up soldiers'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'were always getting up and walking off to other parts of the'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'could not help bursting out laughing: and when she had got its'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'head down, and was going to '", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'look up in her face, with such a puzzled expression that she'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'difficult game indeed.'", - "rect": [65, 360, 356, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'difficult'", - "rect": [65, 360, 356, 39], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in managing'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'away, comfortably enough, under her arm, with its legs'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hanging down, but generally, just as she had got its'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog a blow with its head, it '", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'her flamingo: she succeeded in getting its body tucked'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'neck nicely straightened out, and was going to give the'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' was in a furious passion, and went stamping'", - "rect": [14, 460, 355, 59], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'about, and shouting \u2018Off with his head!\u2019 or \u2018Off with'", - "rect": [14, 460, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'her head!\u2019 about once in a minute.'", - "rect": [14, 460, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'was in a furious passion, and went stamping about, and'", - "rect": [14, 460, 355, 59], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'Queen'", - "rect": [14, 440, 355, 39], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'the'", - "rect": [14, 440, 355, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for the hedgehogs; and in a very short time '", - "rect": [14, 420, 355, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for turns, quarrelling all the while, and fighting'", - "rect": [14, 420, 355, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting'", - "rect": [65, 400, 304, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 383, 48, 65], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 363, 48, 65], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='yellowFloat'", - "rect": [372, 243, 48, 49], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [238, 180, 41, 19], - "reason": "geometry" - } + "invalidations": [ + [14, 520, 408, 80], + [14, 240, 407, 139], + [14, 180, 407, 79], + [65, 360, 356, 39], + [14, 80, 355, 119], + [14, 460, 355, 59], + [14, 440, 355, 39], + [14, 420, 355, 39], + [65, 400, 304, 19], + [14, 383, 48, 65], + [14, 363, 48, 65] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/lines-with-layout-delta-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/lines-with-layout-delta-expected.txt index 3db7556..29ccfc98 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/lines-with-layout-delta-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/lines-with-layout-delta-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'PASS'", - "rect": [8, 58, 38, 19], - "reason": "full" - } + "invalidations": [ + [8, 58, 38, 19] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/make-children-non-inline-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/make-children-non-inline-expected.txt index 25dbeeeb..275fedf 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/make-children-non-inline-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/make-children-non-inline-expected.txt
@@ -5,102 +5,21 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'about all the stuff'", - "rect": [8, 264, 110, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'about all the stuff'", - "rect": [8, 164, 110, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'write a book'", - "rect": [8, 144, 79, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'write a book'", - "rect": [8, 144, 79, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'more words.'", - "rect": [8, 104, 79, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'more words.'", - "rect": [8, 104, 79, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'that comes'", - "rect": [8, 284, 67, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'that comes'", - "rect": [8, 184, 67, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'the break.'", - "rect": [8, 324, 62, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'the break.'", - "rect": [8, 224, 62, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'I could'", - "rect": [8, 124, 44, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'I could'", - "rect": [8, 124, 44, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'words,'", - "rect": [8, 84, 43, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'words,'", - "rect": [8, 84, 43, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'Word,'", - "rect": [8, 64, 39, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'Word,'", - "rect": [8, 64, 39, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'after'", - "rect": [8, 304, 29, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'after'", - "rect": [8, 204, 29, 19], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [8, 164, 10, 100], - "reason": "appeared" - } + "invalidations": [ + [8, 264, 110, 19], + [8, 164, 110, 19], + [8, 144, 79, 19], + [8, 104, 79, 19], + [8, 284, 67, 19], + [8, 184, 67, 19], + [8, 324, 62, 19], + [8, 224, 62, 19], + [8, 124, 44, 19], + [8, 84, 43, 19], + [8, 64, 39, 19], + [8, 304, 29, 19], + [8, 204, 29, 19], + [8, 164, 10, 100] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/multi-layout-one-frame-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/multi-layout-one-frame-expected.txt index d8f303e..a159dfa 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/multi-layout-one-frame-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/multi-layout-one-frame-expected.txt
@@ -5,32 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'PASSED'", - "rect": [201, 11, 53, 16], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'PASSED'", - "rect": [12, 11, 53, 16], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'FAILED'", - "rect": [201, 11, 45, 16], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'FAILED'", - "rect": [12, 11, 45, 16], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment ' '", - "rect": [193, 9, 4, 19], - "reason": "geometry" - } + "invalidations": [ + [201, 11, 53, 16], + [12, 11, 53, 16], + [193, 9, 4, 19] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/multicol/multicol-repaint-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/multicol/multicol-repaint-expected.txt index 6517603..0ccec10 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/multicol/multicol-repaint-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/multicol/multicol-repaint-expected.txt
@@ -5,27 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'XXXXXX'", - "rect": [234, 15, 300, 50], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'x'", - "rect": [234, 15, 50, 50], - "reason": "disappeared" - }, - { - "object": "InlineTextBox '\u00A0'", - "rect": [9, 10, 13, 57], - "reason": "appeared" - }, - { - "object": "InlineTextBox '\u00A0'", - "rect": [9, 10, 13, 57], - "reason": "disappeared" - } + "invalidations": [ + [234, 15, 300, 50], + [9, 10, 13, 57] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/non-text-link-invalidation-optimization-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/non-text-link-invalidation-optimization-expected.txt index d51742d..3c0331a 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/non-text-link-invalidation-optimization-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/non-text-link-invalidation-optimization-expected.txt
@@ -5,37 +5,13 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment ' text is invalidated and '", - "rect": [164, 8, 145, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment ' passes if '", - "rect": [75, 8, 61, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'This test '", - "rect": [8, 8, 57, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment ' images.'", - "rect": [353, 8, 52, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'only'", - "rect": [136, 8, 28, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment ' no '", - "rect": [319, 8, 24, 19], - "reason": "style change" - } + "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] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/outline/focus-continuations-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/outline/focus-continuations-expected.txt index 7025df3..8201bdb 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/outline/focus-continuations-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/outline/focus-continuations-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalBoxFragment LayoutInline SPAN id='outer'", - "rect": [6, 86, 90, 24], - "reason": "disappeared" - } + "invalidations": [ + [6, 86, 90, 24] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/outline/focus-enable-continuations-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/outline/focus-enable-continuations-expected.txt index 0167d17..8201bdb 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/outline/focus-enable-continuations-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/outline/focus-enable-continuations-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalBoxFragment LayoutInline SPAN id='outer'", - "rect": [6, 86, 90, 24], - "reason": "appeared" - } + "invalidations": [ + [6, 86, 90, 24] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/outline/inline-outline-repaint-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/outline/inline-outline-repaint-expected.txt index 98a036a..219d850e 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/outline/inline-outline-repaint-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/outline/inline-outline-repaint-expected.txt
@@ -5,47 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutInline SPAN id='test'", - "rect": [5, 173, 95, 45], - "reason": "geometry" - }, - { - "object": "InlineTextBox ' '", - "rect": [8, 176, 89, 39], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'Lorem ipsum'", - "rect": [8, 176, 89, 39], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'dolor sit amet\u00A0'", - "rect": [8, 176, 89, 39], - "reason": "disappeared" - }, - { - "object": "InlineTextBox ' '", - "rect": [8, 176, 88, 39], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'Lorem ipsum'", - "rect": [8, 176, 88, 39], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'dolor\u00A0'", - "rect": [8, 176, 88, 39], - "reason": "appeared" - }, - { - "object": "Caret", - "rect": [45, 196, 1, 19], - "reason": "appeared" - } + "invalidations": [ + [5, 173, 95, 45] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/outline/outline-continuations-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/outline/outline-continuations-expected.txt index 05094ec..32df285 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/outline/outline-continuations-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/outline/outline-continuations-expected.txt
@@ -5,32 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalBoxFragment LayoutInline SPAN id='outer'", - "rect": [16, 108, 90, 63], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'CONTENTS'", - "rect": [18, 150, 86, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'CONTENTS'", - "rect": [18, 150, 86, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'CONTENTS'", - "rect": [18, 110, 86, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'CONTENTS'", - "rect": [18, 110, 86, 19], - "reason": "disappeared" - } + "invalidations": [ + [16, 108, 90, 63] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/overflow/float-overflow-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/overflow/float-overflow-expected.txt index 094e036f..f6d96e80 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/overflow/float-overflow-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/overflow/float-overflow-expected.txt
@@ -5,557 +5,76 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 537, 62, 37], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 531, 62, 37], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 498, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 492, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 459, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 453, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 420, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow 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": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 171, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 165, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 132, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 126, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 93, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 87, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 54, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 48, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 15, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow 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": "LayoutNGBlockFlow DIV", - "rect": [67, 504, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 498, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 465, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 459, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 426, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow 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": "LayoutNGBlockFlow DIV", - "rect": [67, 177, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 171, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 138, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 132, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 99, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 93, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 60, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 54, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 21, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 15, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [69, 374, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [69, 368, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [69, 335, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [69, 329, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [69, 296, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [69, 290, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [70, 375, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [70, 369, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [70, 336, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [70, 330, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [70, 297, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [70, 291, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [67, 138, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [67, 132, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [65, 60, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [65, 54, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [65, 21, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [65, 15, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [59, 543, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [59, 537, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [59, 504, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [59, 498, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [59, 465, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [59, 459, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [59, 426, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (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": "LayoutNGBlockFlow (floating) DIV", - "rect": [59, 177, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [59, 171, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [59, 99, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [59, 93, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 543, 32, 20], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 537, 32, 20], - "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": "NGPhysicalTextFragment 'x'", - "rect": [66, 299, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [66, 293, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [63, 23, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [63, 17, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [59, 545, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [59, 539, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [59, 506, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [59, 500, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [59, 467, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [59, 461, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [59, 428, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [59, 422, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [59, 179, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [59, 173, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [59, 140, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [59, 134, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [58, 377, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [58, 371, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [58, 338, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [58, 332, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [57, 101, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [57, 95, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [57, 62, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [57, 56, 16, 16], - "reason": "geometry" - } + "invalidations": [ + [61, 537, 62, 37], + [61, 531, 62, 37], + [61, 498, 62, 22], + [61, 492, 62, 22], + [61, 459, 62, 22], + [61, 453, 62, 22], + [61, 420, 62, 22], + [61, 414, 62, 22], + [61, 249, 62, 22], + [61, 243, 62, 22], + [61, 210, 62, 22], + [61, 204, 62, 22], + [61, 171, 62, 22], + [61, 165, 62, 22], + [61, 132, 62, 22], + [61, 126, 62, 22], + [61, 93, 62, 22], + [61, 87, 62, 22], + [61, 54, 62, 22], + [61, 48, 62, 22], + [61, 15, 62, 22], + [61, 9, 62, 22], + [61, 366, 58, 28], + [61, 360, 58, 28], + [61, 327, 58, 28], + [61, 321, 58, 28], + [61, 288, 58, 28], + [61, 282, 58, 28], + [59, 543, 40, 10], + [59, 537, 40, 10], + [59, 504, 40, 10], + [59, 498, 40, 10], + [59, 465, 40, 10], + [59, 459, 40, 10], + [59, 426, 40, 10], + [59, 420, 40, 10], + [59, 255, 40, 10], + [59, 249, 40, 10], + [59, 216, 40, 10], + [59, 210, 40, 10], + [59, 177, 40, 10], + [59, 171, 40, 10], + [59, 99, 40, 10], + [59, 93, 40, 10], + [59, 257, 16, 17], + [59, 251, 16, 17], + [59, 218, 16, 17], + [59, 212, 16, 17], + [63, 23, 16, 16], + [59, 545, 16, 16], + [59, 539, 16, 16], + [59, 506, 16, 16], + [59, 500, 16, 16], + [59, 467, 16, 16], + [59, 461, 16, 16], + [59, 428, 16, 16], + [59, 422, 16, 16], + [59, 179, 16, 16], + [59, 173, 16, 16], + [59, 140, 16, 16], + [59, 134, 16, 16], + [58, 377, 16, 16], + [58, 371, 16, 16], + [58, 338, 16, 16], + [58, 332, 16, 16], + [57, 101, 16, 16], + [57, 95, 16, 16], + [57, 62, 16, 16], + [57, 56, 16, 16] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/overflow/float-overflow-right-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/overflow/float-overflow-right-expected.txt index c05b06d2..7286ab7 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/overflow/float-overflow-right-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/overflow/float-overflow-right-expected.txt
@@ -5,557 +5,76 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 537, 62, 37], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 531, 62, 37], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 498, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 492, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 459, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 453, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 420, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow 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": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 171, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 165, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 132, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 126, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 93, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 87, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 54, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 48, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 15, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow 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": "LayoutNGBlockFlow DIV", - "rect": [683, 504, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 498, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 465, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 459, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 426, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow 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": "LayoutNGBlockFlow DIV", - "rect": [683, 177, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 171, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 138, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 132, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 99, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 93, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 60, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 54, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 21, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 15, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [689, 374, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [689, 368, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [689, 335, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [689, 329, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [689, 296, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [689, 290, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [701, 543, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [701, 537, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [701, 504, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [701, 498, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [701, 465, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [701, 459, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [701, 426, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (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": "LayoutNGBlockFlow (floating) DIV", - "rect": [701, 177, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [701, 171, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [701, 99, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [701, 93, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [695, 60, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [695, 54, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [695, 21, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [695, 15, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [693, 138, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [693, 132, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [690, 375, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [690, 369, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [690, 336, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [690, 330, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [690, 297, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [690, 291, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [701, 543, 32, 20], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [701, 537, 32, 20], - "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": "NGPhysicalTextFragment 'x'", - "rect": [727, 101, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [727, 95, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [727, 62, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [727, 56, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [726, 377, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [726, 371, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [726, 338, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [726, 332, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 545, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 539, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 506, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 500, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 467, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 461, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 428, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 422, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 179, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 173, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 140, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 134, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [721, 23, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [721, 17, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [718, 299, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [718, 293, 16, 16], - "reason": "geometry" - } + "invalidations": [ + [677, 537, 62, 37], + [677, 531, 62, 37], + [677, 498, 62, 22], + [677, 492, 62, 22], + [677, 459, 62, 22], + [677, 453, 62, 22], + [677, 420, 62, 22], + [677, 414, 62, 22], + [677, 249, 62, 22], + [677, 243, 62, 22], + [677, 210, 62, 22], + [677, 204, 62, 22], + [677, 171, 62, 22], + [677, 165, 62, 22], + [677, 132, 62, 22], + [677, 126, 62, 22], + [677, 93, 62, 22], + [677, 87, 62, 22], + [677, 54, 62, 22], + [677, 48, 62, 22], + [677, 15, 62, 22], + [677, 9, 62, 22], + [681, 366, 58, 28], + [681, 360, 58, 28], + [681, 327, 58, 28], + [681, 321, 58, 28], + [681, 288, 58, 28], + [681, 282, 58, 28], + [701, 543, 40, 10], + [701, 537, 40, 10], + [701, 504, 40, 10], + [701, 498, 40, 10], + [701, 465, 40, 10], + [701, 459, 40, 10], + [701, 426, 40, 10], + [701, 420, 40, 10], + [701, 255, 40, 10], + [701, 249, 40, 10], + [701, 216, 40, 10], + [701, 210, 40, 10], + [701, 177, 40, 10], + [701, 171, 40, 10], + [701, 99, 40, 10], + [701, 93, 40, 10], + [725, 257, 16, 17], + [725, 251, 16, 17], + [725, 218, 16, 17], + [725, 212, 16, 17], + [727, 101, 16, 16], + [727, 95, 16, 16], + [727, 62, 16, 16], + [727, 56, 16, 16], + [726, 377, 16, 16], + [726, 371, 16, 16], + [726, 338, 16, 16], + [726, 332, 16, 16], + [725, 545, 16, 16], + [725, 539, 16, 16], + [725, 506, 16, 16], + [725, 500, 16, 16], + [725, 467, 16, 16], + [725, 461, 16, 16], + [725, 428, 16, 16], + [725, 422, 16, 16], + [725, 179, 16, 16], + [725, 173, 16, 16], + [725, 140, 16, 16], + [725, 134, 16, 16], + [721, 23, 16, 16] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/overflow/line-overflow-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/overflow/line-overflow-expected.txt index 2bc791a..936474cc 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/overflow/line-overflow-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/overflow/line-overflow-expected.txt
@@ -5,67 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment ' eleifend'", - "rect": [8, 122, 195, 99], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'convallis.'", - "rect": [8, 122, 195, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'lacus, at sagittis eros leo'", - "rect": [8, 122, 195, 99], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'pulvinar velit. Integer'", - "rect": [8, 122, 195, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'sollicitudin nisi ut urna blandit'", - "rect": [8, 122, 195, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' eleifend lacus,'", - "rect": [8, 142, 195, 79], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'Cras faucibus. Nunc'", - "rect": [8, 82, 192, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'adipiscing, enim in scelerisque'", - "rect": [8, 82, 192, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'convallis, augue '", - "rect": [8, 82, 192, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalBoxFragment LayoutInline SPAN id='t'", - "rect": [114, 92, 35, 49], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'purus'", - "rect": [114, 122, 35, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'purus'", - "rect": [38, 142, 35, 19], - "reason": "disappeared" - } + "invalidations": [ + [8, 122, 195, 99], + [8, 82, 192, 59] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/overflow/opacity-change-on-overflow-float-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/overflow/opacity-change-on-overflow-float-expected.txt index eecab97..5b8e337 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/overflow/opacity-change-on-overflow-float-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/overflow/opacity-change-on-overflow-float-expected.txt
@@ -5,47 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow HTML", - "rect": [8, 8, 784, 59], - "reason": "chunk appeared" - }, - { - "object": "NGPhysicalTextFragment 'REGRESSION (r41203): Facebook friend suggestions disappear on update. Make sure when a layer'", - "rect": [8, 8, 784, 59], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'a 100x100 green square below. If you see any red, the test has failed.'", - "rect": [8, 8, 784, 59], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'switches from being self-painting to non-self-painting that a layout happens to fix up the floating objects lists. You should see'", - "rect": [8, 8, 784, 59], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV class='green'", - "rect": [8, 84, 100, 100], - "reason": "chunk disappeared" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV class='red'", - "rect": [8, 84, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV class='red'", - "rect": [8, 84, 100, 100], - "reason": "chunk appeared" - }, - { - "object": "NGPhysicalTextFragment 'Repaint test for '", - "rect": [8, 8, 100, 19], - "reason": "disappeared" - } + "invalidations": [ + [8, 8, 784, 59], + [8, 84, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/overflow/overflow-delete-line-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/overflow/overflow-delete-line-expected.txt index 0616b790..3af7946 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/overflow/overflow-delete-line-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/overflow/overflow-delete-line-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Lorem ipsu'", - "rect": [8, 74, 72, 19], - "reason": "appeared" - }, - { - "object": "LayoutBlockFlow DIV id='dv'", - "rect": [8, 74, 46, 36], - "reason": "chunk disappeared" - } + "invalidations": [ + [8, 74, 72, 19], + [8, 74, 46, 36] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/overflow/repaint-resized-overflow-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/overflow/repaint-resized-overflow-expected.txt index 744ede97..54f00d3 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/overflow/repaint-resized-overflow-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/overflow/repaint-resized-overflow-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='s'", - "rect": [8, 156, 108, 108], - "reason": "geometry" - } + "invalidations": [ + [8, 156, 108, 108] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/position/absolute-display-block-to-none-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/position/absolute-display-block-to-none-expected.txt index 0b4332a..e2ceb96 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/position/absolute-display-block-to-none-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/position/absolute-display-block-to-none-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'When an absolute positioned element is set display:none, we should not invalidate the whole body.'", - "rect": [8, 8, 621, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='absolute'", - "rect": [100, 100, 100, 100], - "reason": "disappeared" - } + "invalidations": [ + [8, 8, 621, 19], + [100, 100, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/position/block-layout-inline-children-float-positioned-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/position/block-layout-inline-children-float-positioned-expected.txt deleted file mode 100644 index 517485d2..0000000 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/position/block-layout-inline-children-float-positioned-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [0, 36, 602, 102], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [0, 36, 602, 102], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'the quick brown fox jumped over the lazy dog'", - "rect": [309, 37, 292, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'the quick brown fox jumped over the lazy dog'", - "rect": [155, 37, 292, 19], - "reason": "appeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/position/layout-state-relative-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/position/layout-state-relative-expected.txt index e2822c7..12ca0f7 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/position/layout-state-relative-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/position/layout-state-relative-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'PASS'", - "rect": [8, 152, 38, 19], - "reason": "full" - } + "invalidations": [ + [8, 152, 38, 19] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/position/positioned-document-element-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/position/positioned-document-element-expected.txt deleted file mode 100644 index bb5144b5..0000000 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/position/positioned-document-element-expected.txt +++ /dev/null
@@ -1,28 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 800, 600], - "reason": "background" - }, - { - "object": "NGPhysicalTextFragment 'Tests that the entire viewport is painted with a floated html element.'", - "rect": [108, 116, 424, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Tests that the entire viewport is painted with a floated html element.'", - "rect": [8, 16, 424, 19], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/position/positioned-great-grandparent-change-location-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/position/positioned-great-grandparent-change-location-expected.txt deleted file mode 100644 index 0b707ae4..0000000 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/position/positioned-great-grandparent-change-location-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [100, 200, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [100, 100, 100, 100], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Target'", - "rect": [100, 200, 41, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Target'", - "rect": [100, 100, 41, 19], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/position/relative-inline-positioned-movement-repaint-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/position/relative-inline-positioned-movement-repaint-expected.txt index e44ce025..6da05c3f 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/position/relative-inline-positioned-movement-repaint-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/position/relative-inline-positioned-movement-repaint-expected.txt
@@ -11,12 +11,8 @@ "position": [68, 7], "bounds": [365, 21], "backfaceVisibility": "hidden", - "paintInvalidations": [ - { - "object": "LayoutInline (relative positioned) DIV id='block'", - "rect": [0, 0, 365, 21], - "reason": "paint property change" - } + "invalidations": [ + [0, 0, 365, 21] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/quotes-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/quotes-expected.txt index 84f1633..3667907 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/quotes-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/quotes-expected.txt
@@ -5,32 +5,12 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'quote 2'", - "rect": [17, 28, 47, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'quote 2'", - "rect": [16, 28, 47, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment '}'", - "rect": [64, 28, 9, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment '{'", - "rect": [8, 28, 9, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment '}'", - "rect": [63, 28, 8, 19], - "reason": "style change" - } + "invalidations": [ + [17, 28, 47, 19], + [16, 28, 47, 19], + [64, 28, 9, 19], + [8, 28, 9, 19], + [63, 28, 8, 19] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/reflection/reflection-redraw-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/reflection/reflection-redraw-expected.txt index 640e7cd..d386573b 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/reflection/reflection-redraw-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/reflection/reflection-redraw-expected.txt
@@ -5,67 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'The color of this'", - "rect": [380, 267, 286, 59], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'should be green'", - "rect": [380, 267, 286, 59], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'text in the reflection'", - "rect": [380, 267, 286, 59], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'The color of this'", - "rect": [70, 267, 286, 59], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'should be green'", - "rect": [70, 267, 286, 59], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'text in the reflection'", - "rect": [70, 267, 286, 59], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'The color of this'", - "rect": [305, 34, 126, 182], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'should be green'", - "rect": [305, 34, 126, 182], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'text in the reflection'", - "rect": [305, 34, 126, 182], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'The color of this'", - "rect": [305, 377, 126, 156], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'should be green'", - "rect": [305, 377, 126, 156], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'text in the reflection'", - "rect": [305, 377, 126, 156], - "reason": "style change" - } + "invalidations": [ + [380, 267, 286, 59], + [70, 267, 286, 59], + [305, 34, 126, 182], + [305, 377, 126, 156] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/reflection/reflection-with-rotation-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/reflection/reflection-with-rotation-expected.txt index 0efcaad..aee60eb 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/reflection/reflection-with-rotation-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/reflection/reflection-with-rotation-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'PASS'", - "rect": [23, 51, 72, 110], - "reason": "full" - } + "invalidations": [ + [23, 51, 72, 110] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/remove-block-after-layout-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/remove-block-after-layout-expected.txt deleted file mode 100644 index e53446ee..0000000 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/remove-block-after-layout-expected.txt +++ /dev/null
@@ -1,28 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target'", - "rect": [8, 108, 100, 100], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'This div should'", - "rect": [8, 108, 98, 39], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'disappear.'", - "rect": [8, 108, 98, 39], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/remove-inline-after-layout-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/remove-inline-after-layout-expected.txt index 068b187..2bf4f3a 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/remove-inline-after-layout-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/remove-inline-after-layout-expected.txt
@@ -5,27 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'This span should disappear. '", - "rect": [112, 193, 178, 19], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [290, 108, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [112, 108, 100, 100], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' '", - "rect": [108, 193, 4, 19], - "reason": "geometry" - } + "invalidations": [ + [112, 193, 178, 19], + [290, 108, 100, 100], + [112, 108, 100, 100], + [108, 193, 4, 19] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/remove-inline-layer-after-layout-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/remove-inline-layer-after-layout-expected.txt index d7d98018..2bf4f3a 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/remove-inline-layer-after-layout-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/remove-inline-layer-after-layout-expected.txt
@@ -5,27 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutInline SPAN id='target'", - "rect": [112, 193, 178, 19], - "reason": "chunk disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [290, 108, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [112, 108, 100, 100], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' '", - "rect": [108, 193, 4, 19], - "reason": "geometry" - } + "invalidations": [ + [112, 193, 178, 19], + [290, 108, 100, 100], + [112, 108, 100, 100], + [108, 193, 4, 19] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/repaint-across-writing-mode-boundary-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/repaint-across-writing-mode-boundary-expected.txt index 8428610..ec1278b 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/repaint-across-writing-mode-boundary-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/repaint-across-writing-mode-boundary-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment '\u7B2C\u4E00\u6BB5\u843D paragraph 1'", - "rect": [548, 191, 23, 36], - "reason": "selection" - } + "invalidations": [ + [548, 191, 23, 36] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/repaint-descandant-on-ancestor-layer-move-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/repaint-descandant-on-ancestor-layer-move-expected.txt deleted file mode 100644 index 25f74b0..0000000 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/repaint-descandant-on-ancestor-layer-move-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV", - "rect": [428, 38, 300, 20], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV", - "rect": [28, 38, 300, 20], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'There should only be one copy of this text.'", - "rect": [428, 38, 270, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'There should only be one copy of this text.'", - "rect": [28, 38, 270, 19], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/resize-iframe-text-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/resize-iframe-text-expected.txt deleted file mode 100644 index 32d3ee5..0000000 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/resize-iframe-text-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [500, 400], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 200, 500, 200], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow HTML", - "rect": [8, 300, 60, 22], - "reason": "incremental" - }, - { - "object": "NGPhysicalTextFragment 'Success'", - "rect": [8, 300, 60, 22], - "reason": "appeared" - }, - { - "object": "VerticalScrollbar", - "rect": [485, 0, 15, 200], - "reason": "chunk disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/scroll/caret-invalidation-in-overflow-scroll-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/scroll/caret-invalidation-in-overflow-scroll-expected.txt index 92e4f02..b7e10e0 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/scroll/caret-invalidation-in-overflow-scroll-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/scroll/caret-invalidation-in-overflow-scroll-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Caret", - "rect": [401, 11, 1, 16], - "reason": "caret" - }, - { - "object": "Caret", - "rect": [398, 11, 1, 16], - "reason": "caret" - } + "invalidations": [ + [401, 11, 1, 16], + [398, 11, 1, 16] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/scroll/inline-style-change-in-scrolled-view-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/scroll/inline-style-change-in-scrolled-view-expected.txt index abefc0d..c222f56d 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/scroll/inline-style-change-in-scrolled-view-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/scroll/inline-style-change-in-scrolled-view-expected.txt
@@ -5,12 +5,8 @@ "bounds": [2000, 2000], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Text Text Text Text Text Text Text Text Text Text Text Text Text'", - "rect": [0, 320, 413, 19], - "reason": "style change" - } + "invalidations": [ + [0, 320, 413, 19] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/scroll/invalidate-after-composited-scroll-of-window-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/scroll/invalidate-after-composited-scroll-of-window-expected.txt index d0870dd..fd156d1 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/scroll/invalidate-after-composited-scroll-of-window-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/scroll/invalidate-after-composited-scroll-of-window-expected.txt
@@ -5,17 +5,9 @@ "bounds": [785, 4936], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Tests that invalidation of a div after scrolling invalidates just the div and no other area.'", - "rect": [8, 4908, 540, 19], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [8, 2408, 100, 100], - "reason": "background" - } + "invalidations": [ + [8, 4908, 540, 19], + [8, 2408, 100, 100] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/scroll/invalidate-caret-in-composited-scrolling-container-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/scroll/invalidate-caret-in-composited-scrolling-container-expected.txt index 43eb0175..742412e 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/scroll/invalidate-caret-in-composited-scrolling-container-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/scroll/invalidate-caret-in-composited-scrolling-container-expected.txt
@@ -11,22 +11,8 @@ "position": [-2, -2], "bounds": [69, 26], "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTextControl INPUT id='root'", - "rect": [0, 0, 69, 26], - "reason": "full layer" - }, - { - "object": "LayoutTextControl INPUT id='root'", - "rect": [0, 0, 65, 22], - "reason": "full layer" - }, - { - "object": "Caret", - "rect": [61, 5, 1, 16], - "reason": "caret" - } + "invalidations": [ + [0, 0, 69, 26] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/scroll/invalidate-caret-in-non-composited-scrolling-container-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/scroll/invalidate-caret-in-non-composited-scrolling-container-expected.txt index 43eb0175..742412e 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/scroll/invalidate-caret-in-non-composited-scrolling-container-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/scroll/invalidate-caret-in-non-composited-scrolling-container-expected.txt
@@ -11,22 +11,8 @@ "position": [-2, -2], "bounds": [69, 26], "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTextControl INPUT id='root'", - "rect": [0, 0, 69, 26], - "reason": "full layer" - }, - { - "object": "LayoutTextControl INPUT id='root'", - "rect": [0, 0, 65, 22], - "reason": "full layer" - }, - { - "object": "Caret", - "rect": [61, 5, 1, 16], - "reason": "caret" - } + "invalidations": [ + [0, 0, 69, 26] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/scroll/layout-state-scrolloffset-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/scroll/layout-state-scrolloffset-expected.txt index f1baafa..a340142 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/scroll/layout-state-scrolloffset-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/scroll/layout-state-scrolloffset-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'after'", - "rect": [100, 120, 40, 19], - "reason": "full" - } + "invalidations": [ + [100, 120, 40, 19] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/scroll/layout-state-scrolloffset2-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/scroll/layout-state-scrolloffset2-expected.txt index bcabc68e..77ffbbf 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/scroll/layout-state-scrolloffset2-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/scroll/layout-state-scrolloffset2-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'after'", - "rect": [102, 122, 40, 19], - "reason": "full" - } + "invalidations": [ + [102, 122, 40, 19] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/scroll/overflow-scroll-body-appear-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/scroll/overflow-scroll-body-appear-expected.txt deleted file mode 100644 index a5d118f..0000000 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/scroll/overflow-scroll-body-appear-expected.txt +++ /dev/null
@@ -1,62 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [2008, 2096], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 2008, 2096], - "reason": "background" - }, - { - "object": "NGPhysicalTextFragment 'Bug 36461 - No vertical scrollbar after the CSS class change'", - "rect": [124, 52, 383, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'You should see both vertical and horizontal scrollbars.'", - "rect": [8, 16, 340, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'This is the test for '", - "rect": [8, 52, 116, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '.'", - "rect": [507, 52, 4, 19], - "reason": "geometry" - } - ] - }, - { - "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], - "paintInvalidations": [ - { - "object": "Scroll Corner Layer", - "rect": [0, 0, 15, 15], - "reason": "full layer" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/scroll/repaint-during-scroll-with-zoom-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/scroll/repaint-during-scroll-with-zoom-expected.txt index 9823dce..ad7f17f 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/scroll/repaint-during-scroll-with-zoom-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/scroll/repaint-during-scroll-with-zoom-expected.txt
@@ -5,22 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#C0C0C0", - "paintInvalidations": [ - { - "object": "HorizontalScrollbar", - "rect": [3, 300, 235, 15], - "reason": "scroll control" - }, - { - "object": "LayoutNGBlockFlow HTML", - "rect": [3, 65, 55, 17], - "reason": "paint property change" - }, - { - "object": "VerticalScrollbar", - "rect": [238, 65, 15, 235], - "reason": "scroll control" - } + "invalidations": [ + [3, 300, 235, 15], + [3, 65, 55, 17], + [238, 65, 15, 235] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/search-field-cancel-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/search-field-cancel-expected.txt index 85a974f..4553a30 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/search-field-cancel-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/search-field-cancel-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV", - "rect": [12, 47, 58, 16], - "reason": "chunk appeared" - } + "invalidations": [ + [12, 47, 58, 16] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/selection/japanese-rl-selection-clear-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/selection/japanese-rl-selection-clear-expected.txt index b027fe31..1fc5e11 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/selection/japanese-rl-selection-clear-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/selection/japanese-rl-selection-clear-expected.txt
@@ -5,77 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment '\u3042\u3063\u305F\u304B\u5FD8\u308C\u3066\u3057\u307E\u3063\u305F\u7D4C\u9A13\u306F\u3042\u308A\u307E\u3059\u304B'", - "rect": [334, 123, 443, 404], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u3057\u305F\u30A6\u30A7\u30D6\u30DA\u30FC\u30B8\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u304B\u3089\u3082\u691C\u7D22'", - "rect": [334, 123, 443, 404], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u3059\u3002\u8A2A\u554F\u3057\u305F\u30A6\u30A7\u30D6\u30DA\u30FC\u30B8\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u304B'", - "rect": [334, 123, 443, 404], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002\u305B\u3063\u304B\u304F\u898B\u3064\u3051\u305F\u3059'", - "rect": [334, 123, 443, 404], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u305B\u3063\u304B\u304F\u898B\u3064\u3051\u305F\u3059\u3070\u3089\u3057\u3044\u8A18\u4E8B\u304C\u3069\u3053\u306B'", - "rect": [334, 123, 443, 404], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u3063\u305F\u7D4C\u9A13\u306F\u3042\u308A\u307E\u3059\u304B \u306A\u3089\u30BF\u30A4\u30C8\u30EB\u3068\u30A2'", - "rect": [334, 123, 443, 404], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u3064\u3051\u305F\u3059\u3070\u3089\u3057\u3044\u8A18\u4E8B\u304C\u3069\u3053\u306B\u3042\u3063\u305F\u304B\u5FD8'", - "rect": [334, 123, 443, 404], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u306A\u3089\u30BF\u30A4\u30C8\u30EB\u3068\u30A2\u30C9\u30EC\u30B9\u3060\u3051\u3067\u306A\u304F\u3001\u8A2A\u554F'", - "rect": [334, 123, 443, 404], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u304B\u3089\u3082\u691C\u7D22\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E'", - "rect": [334, 123, 443, 404], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u3070\u3089\u3057\u3044\u8A18\u4E8B\u304C\u3069\u3053\u306B\u3042\u3063\u305F\u304B\u5FD8\u308C\u3066\u3057\u307E'", - "rect": [334, 123, 443, 404], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u3089\u3082\u691C\u7D22\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002\u305B\u3063\u304B\u304F\u898B'", - "rect": [334, 123, 443, 404], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u308C\u3066\u3057\u307E\u3063\u305F\u7D4C\u9A13\u306F\u3042\u308A\u307E\u3059\u304B \u306A\u3089\u30BF\u30A4'", - "rect": [334, 123, 443, 404], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u30C8\u30EB\u3068\u30A2\u30C9\u30EC\u30B9\u3060\u3051\u3067\u306A\u304F\u3001\u8A2A\u554F'", - "rect": [334, 123, 443, 404], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u30C9\u30EC\u30B9\u3060\u3051\u3067\u306A\u304F\u3001\u8A2A\u554F\u3057\u305F\u30A6\u30A7\u30D6\u30DA\u30FC\u30B8'", - "rect": [334, 123, 443, 404], - "reason": "geometry" - } + "invalidations": [ + [334, 123, 443, 404] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/selection/repaint-rect-for-vertical-writing-mode-with-positioned-root-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/selection/repaint-rect-for-vertical-writing-mode-with-positioned-root-expected.txt index 9759f59b..7e48155 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/selection/repaint-rect-for-vertical-writing-mode-with-positioned-root-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/selection/repaint-rect-for-vertical-writing-mode-with-positioned-root-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Some text in vertical mode'", - "rect": [184, 201, 19, 168], - "reason": "selection" - } + "invalidations": [ + [184, 201, 19, 168] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/selection/selection-after-delete-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/selection/selection-after-delete-expected.txt index a01607b..74bed83 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/selection/selection-after-delete-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/selection/selection-after-delete-expected.txt
@@ -5,64 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox ' '", - "rect": [39, 79, 154, 99], - "reason": "disappeared" - }, - { - "object": "InlineTextBox ' '", - "rect": [39, 79, 154, 99], - "reason": "disappeared" - }, - { - "object": "InlineTextBox ' '", - "rect": [39, 79, 154, 99], - "reason": "disappeared" - }, - { - "object": "InlineTextBox ' '", - "rect": [39, 79, 154, 99], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'hello world hello world'", - "rect": [39, 79, 154, 99], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'hello world hello world'", - "rect": [39, 79, 154, 99], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'hello world hello world'", - "rect": [39, 79, 154, 99], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'hello world hello world'", - "rect": [39, 79, 154, 99], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'hello'", - "rect": [39, 79, 154, 99], - "reason": "disappeared" - }, - { - "object": "LayoutBlockFlow DIV id='test'", - "rect": [38, 78, 152, 102], - "reason": "geometry" - }, - { - "object": "Caret", - "rect": [39, 79, 1, 19], - "reason": "appeared" - } + "invalidations": [ + [39, 79, 154, 99], + [38, 78, 152, 102] ], - "underPaintInvalidations": [ + "underInvalidations": [ { "x": 194, "y": 79,
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/selection/selection-after-remove-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/selection/selection-after-remove-expected.txt index 50dec70..74bed83 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/selection/selection-after-remove-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/selection/selection-after-remove-expected.txt
@@ -5,79 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox ' '", - "rect": [39, 79, 154, 99], - "reason": "disappeared" - }, - { - "object": "InlineTextBox ' '", - "rect": [39, 79, 154, 99], - "reason": "disappeared" - }, - { - "object": "InlineTextBox ' '", - "rect": [39, 79, 154, 99], - "reason": "disappeared" - }, - { - "object": "InlineTextBox ' '", - "rect": [39, 79, 154, 99], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'hello world hello world'", - "rect": [39, 79, 154, 99], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'hello world hello world'", - "rect": [39, 79, 154, 99], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'hello world hello world'", - "rect": [39, 79, 154, 99], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'hello'", - "rect": [39, 79, 154, 99], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'world hello world'", - "rect": [39, 79, 154, 99], - "reason": "disappeared" - }, - { - "object": "LayoutBlockFlow DIV id='test'", - "rect": [38, 78, 152, 102], - "reason": "geometry" - }, - { - "object": "InlineTextBox ' world'", - "rect": [70, 158, 41, 20], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'world'", - "rect": [74, 79, 37, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'hello '", - "rect": [39, 79, 35, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'hello '", - "rect": [39, 79, 35, 19], - "reason": "disappeared" - } + "invalidations": [ + [39, 79, 154, 99], + [38, 78, 152, 102] ], - "underPaintInvalidations": [ + "underInvalidations": [ { "x": 194, "y": 79,
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/selection/selection-clear-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/selection/selection-clear-expected.txt deleted file mode 100644 index 95368b3..0000000 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/selection/selection-clear-expected.txt +++ /dev/null
@@ -1,38 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='firstLine'", - "rect": [8, 8, 100, 200], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='firstLine'", - "rect": [8, 8, 100, 100], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'FAIL: Test did'", - "rect": [8, 8, 97, 200], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'not run'", - "rect": [8, 8, 97, 200], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [8, 8, 8, 100], - "reason": "appeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/selection/selection-in-composited-scrolling-container-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/selection/selection-in-composited-scrolling-container-expected.txt index 64cda2b..98ef525 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/selection/selection-in-composited-scrolling-container-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/selection/selection-in-composited-scrolling-container-expected.txt
@@ -5,27 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTextControl INPUT id='target'", - "rect": [6, 6, 69, 26], - "reason": "subtree" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [12, 11, 57, 16], - "reason": "paint property change" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [12, 11, 56, 16], - "reason": "paint property change" - }, - { - "object": "InlineTextBox 'test test test'", - "rect": [20, 11, 26, 16], - "reason": "selection" - } + "invalidations": [ + [6, 6, 69, 26] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/selection/selection-in-non-composited-scrolling-container-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/selection/selection-in-non-composited-scrolling-container-expected.txt index 61a48281..98ef525 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/selection/selection-in-non-composited-scrolling-container-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/selection/selection-in-non-composited-scrolling-container-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTextControl INPUT id='target'", - "rect": [6, 6, 69, 26], - "reason": "subtree" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [12, 11, 57, 16], - "reason": "paint property change" - }, - { - "object": "InlineTextBox 'test test test'", - "rect": [33, 11, 26, 16], - "reason": "selection" - } + "invalidations": [ + [6, 6, 69, 26] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/selection/selection-partial-invalidation-between-blocks-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/selection/selection-partial-invalidation-between-blocks-expected.txt index 92d40789..b8bfb44 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/selection/selection-partial-invalidation-between-blocks-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/selection/selection-partial-invalidation-between-blocks-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Second cell'", - "rect": [11, 35, 74, 20], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'First cell'", - "rect": [11, 11, 58, 20], - "reason": "geometry" - } + "invalidations": [ + [11, 35, 74, 20], + [11, 11, 58, 20] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/selection/selection-rl-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/selection/selection-rl-expected.txt index 4979d09..f941592 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/selection/selection-rl-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/selection/selection-rl-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Testing both hit testing'", - "rect": [772, 8, 20, 143], - "reason": "geometry" - } + "invalidations": [ + [772, 8, 20, 143] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/selection/selection-within-composited-scroller-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/selection/selection-within-composited-scroller-expected.txt index d4577da..5cb4e17 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/selection/selection-within-composited-scroller-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/selection/selection-within-composited-scroller-expected.txt
@@ -17,12 +17,8 @@ "bounds": [200, 1620], "contentsOpaque": true, "backgroundColor": "#D3D3D3", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'test'", - "rect": [0, 610, 22, 20], - "reason": "geometry" - } + "invalidations": [ + [0, 610, 22, 20] ], "transform": 2 },
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/selection/text-selection-rect-in-overflow-2-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/selection/text-selection-rect-in-overflow-2-expected.txt index 632dd2b..9a199d4 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/selection/text-selection-rect-in-overflow-2-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/selection/text-selection-rect-in-overflow-2-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Should have blue, not gray, highlight'", - "rect": [18, 18, 233, 20], - "reason": "selection" - } + "invalidations": [ + [18, 18, 233, 20] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/selection/text-selection-rect-in-overflow-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/selection/text-selection-rect-in-overflow-expected.txt index d723ffe..f9fd7fc6 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/selection/text-selection-rect-in-overflow-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/selection/text-selection-rect-in-overflow-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Should have green background'", - "rect": [8, 8, 197, 20], - "reason": "geometry" - } + "invalidations": [ + [8, 8, 197, 20] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/stacked-diacritics-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/stacked-diacritics-expected.txt index 2c85fd02..935a60b 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/stacked-diacritics-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/stacked-diacritics-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment '\u1EA6\u1EA4\u1EAA\u1EA8\u1EB0'", - "rect": [19, 166, 130, 43], - "reason": "disappeared" - } + "invalidations": [ + [19, 166, 130, 43] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/subtree-root-skipped-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/subtree-root-skipped-expected.txt index 975e4d5..8a9da0d9 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/subtree-root-skipped-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/subtree-root-skipped-expected.txt
@@ -5,22 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'PASS'", - "rect": [12, 11, 35, 16], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'FAIL'", - "rect": [12, 11, 27, 16], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='div'", - "rect": [8, 288, 10, 20], - "reason": "geometry" - } + "invalidations": [ + [12, 11, 35, 16], + [8, 288, 10, 20] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/animated-path-inside-transformed-html-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/animated-path-inside-transformed-html-expected.txt index e10d405..786e0028 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/animated-path-inside-transformed-html-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/animated-path-inside-transformed-html-expected.txt
@@ -5,37 +5,13 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'This is some text'", - "rect": [246, 89, 127, 46], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'This is some text'", - "rect": [203, 336, 126, 45], - "reason": "appeared" - }, - { - "object": "LayoutSVGRect rect id='rect'", - "rect": [108, 84, 105, 102], - "reason": "full" - }, - { - "object": "LayoutSVGRect rect id='rect'", - "rect": [355, 125, 104, 104], - "reason": "full" - }, - { - "object": "LayoutSVGImage image id='image'", - "rect": [352, 398, 99, 98], - "reason": "full" - }, - { - "object": "LayoutSVGImage image id='image'", - "rect": [90, 207, 98, 99], - "reason": "full" - } + "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/platform/linux/paint/invalidation/svg/ems-display-none-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/ems-display-none-expected.txt index ac005fb..8fda540 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/ems-display-none-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/ems-display-none-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRoot svg", - "rect": [50, 54, 571, 86], - "reason": "chunk appeared" - } + "invalidations": [ + [50, 54, 571, 86] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/exs-display-none-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/exs-display-none-expected.txt index 5744e2b..00d1a6d 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/exs-display-none-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/exs-display-none-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRoot svg", - "rect": [50, 52, 571, 84], - "reason": "chunk appeared" - } + "invalidations": [ + [50, 52, 571, 84] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.txt deleted file mode 100644 index e0c2a713..0000000 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.txt +++ /dev/null
@@ -1,63 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [0, 0, 200, 200], - "reason": "full" - }, - { - "object": "InlineTextBox 'right-aligned text'", - "rect": [93, 85, 107, 19], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGViewportContainer svg id='inner'", - "rect": [100, 0, 100, 200], - "reason": "incremental" - }, - { - "object": "InlineTextBox 'right-aligned text'", - "rect": [0, 85, 100, 19], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGContainer use", - "rect": [180, 120, 20, 20], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRect rect", - "rect": [180, 60, 20, 20], - "reason": "incremental" - }, - { - "object": "LayoutSVGRect rect", - "rect": [180, 60, 20, 20], - "reason": "full" - }, - { - "object": "LayoutSVGContainer use", - "rect": [80, 120, 20, 20], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRect rect", - "rect": [80, 60, 20, 20], - "reason": "incremental" - }, - { - "object": "LayoutSVGRect rect", - "rect": [80, 60, 20, 20], - "reason": "full" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/js-late-pattern-and-object-creation-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/js-late-pattern-and-object-creation-expected.txt index 4545c323..6b7a30c2 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/js-late-pattern-and-object-creation-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/js-late-pattern-and-object-creation-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRoot svg id='svg-root'", - "rect": [0, 15, 682, 365], - "reason": "chunk appeared" - } + "invalidations": [ + [0, 15, 682, 365] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/marker-text-decoration-change-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/marker-text-decoration-change-expected.txt index 998dd553..d005e6e7 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/marker-text-decoration-change-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/marker-text-decoration-change-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGPath path", - "rect": [8, 13, 146, 19], - "reason": "style change" - }, - { - "object": "LayoutSVGPath path", - "rect": [8, 13, 146, 19], - "reason": "style change" - } + "invalidations": [ + [8, 13, 146, 19] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/repaint-non-scaling-stroke-text-decoration-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/repaint-non-scaling-stroke-text-decoration-expected.txt index adade2a..31a5ac0 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/repaint-non-scaling-stroke-text-decoration-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/repaint-non-scaling-stroke-text-decoration-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGContainer g", - "rect": [9, 13, 48, 28], - "reason": "chunk appeared" - } + "invalidations": [ + [9, 13, 48, 28] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/repaint-non-scaling-stroke-text-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/repaint-non-scaling-stroke-text-expected.txt index adade2a..31a5ac0 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/repaint-non-scaling-stroke-text-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/repaint-non-scaling-stroke-text-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGContainer g", - "rect": [9, 13, 48, 28], - "reason": "chunk appeared" - } + "invalidations": [ + [9, 13, 48, 28] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.txt index 2a259fe..867c15e 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.txt
@@ -5,42 +5,12 @@ "bounds": [1026, 996], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'pservers-pattern-01-b \u2190'", - "rect": [208, 972, 173, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u2192 script-handle-01-b'", - "rect": [427, 972, 150, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalBoxFragment LayoutInline A", - "rect": [381, 969, 46, 25], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'index'", - "rect": [384, 972, 40, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'index'", - "rect": [384, 972, 40, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment ' '", - "rect": [423, 972, 5, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' '", - "rect": [380, 972, 5, 19], - "reason": "geometry" - } + "invalidations": [ + [208, 972, 173, 19], + [427, 972, 150, 19], + [381, 969, 46, 25], + [423, 972, 5, 19], + [380, 972, 5, 19] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/tabgroup-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/tabgroup-expected.txt deleted file mode 100644 index baaaa17..0000000 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/tabgroup-expected.txt +++ /dev/null
@@ -1,78 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGContainer g", - "rect": [388, 37, 318, 83], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer g", - "rect": [261, 277, 305, 305], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer g", - "rect": [5, 255, 240, 162], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGPath path", - "rect": [5, 255, 240, 162], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGPath path", - "rect": [5, 255, 240, 162], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGPath path", - "rect": [5, 255, 240, 162], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer g", - "rect": [505, 232, 240, 161], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox 'This is a tabgroup with triangular tab corners'", - "rect": [15, 291, 211, 37], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer g id='tabgroupRect'", - "rect": [37, 5, 161, 240], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGText text", - "rect": [66, 257, 57, 29], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGText text", - "rect": [11, 257, 49, 29], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGText text", - "rect": [130, 257, 47, 29], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGText text", - "rect": [183, 257, 32, 29], - "reason": "chunk appeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/text-dom-removal-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/text-dom-removal-expected.txt index 33eb744b8..90432e1 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/text-dom-removal-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/text-dom-removal-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'This should not be visible'", - "rect": [49, 109, 164, 21], - "reason": "disappeared" - }, - { - "object": "LayoutSVGRect rect", - "rect": [0, 0, 21, 21], - "reason": "disappeared" - } + "invalidations": [ + [49, 109, 164, 21], + [0, 0, 21, 21] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/text-mask-update-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/text-mask-update-expected.txt index d43aef6..3fad3a7 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/text-mask-update-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/text-mask-update-expected.txt
@@ -5,27 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [10, 3, 45, 22], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGRect rect", - "rect": [10, 3, 45, 22], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGRect rect", - "rect": [10, 33, 43, 17], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGRect rect", - "rect": [10, 33, 43, 17], - "reason": "chunk disappeared" - } + "invalidations": [ + [10, 3, 45, 22], + [10, 33, 43, 17] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/text-repaint-including-stroke-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/text-repaint-including-stroke-expected.txt index 1682104..ca65aa49 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/text-repaint-including-stroke-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/text-repaint-including-stroke-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGText text id='bounce'", - "rect": [80, 0, 553, 117], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [30, 0, 404, 59], - "reason": "chunk disappeared" - } + "invalidations": [ + [80, 0, 553, 117], + [30, 0, 404, 59] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/text-rescale-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/text-rescale-expected.txt index c7bd91b..3932a34 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/text-rescale-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/text-rescale-expected.txt
@@ -5,57 +5,17 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'PASS '", - "rect": [0, 114, 192, 46], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGRoot (positioned) svg", - "rect": [0, 14, 192, 46], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGViewportContainer svg", - "rect": [310, 114, 91, 46], - "reason": "paint property change" - }, - { - "object": "LayoutSVGViewportContainer svg", - "rect": [310, 14, 91, 46], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGForeignObject foreignObject", - "rect": [210, 114, 91, 46], - "reason": "paint property change" - }, - { - "object": "LayoutSVGForeignObject foreignObject", - "rect": [210, 14, 91, 46], - "reason": "paint property change" - }, - { - "object": "LayoutSVGContainer g id='text3g'", - "rect": [0, 3, 8, 3], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGViewportContainer svg", - "rect": [9, 3, 4, 3], - "reason": "paint property change" - }, - { - "object": "LayoutSVGForeignObject foreignObject", - "rect": [6, 3, 4, 2], - "reason": "paint property change" - }, - { - "object": "LayoutSVGForeignObject foreignObject", - "rect": [0, 0, 1, 1], - "reason": "paint property change" - } + "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/platform/linux/paint/invalidation/svg/text-selection-text-05-t-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/text-selection-text-05-t-expected.txt deleted file mode 100644 index cb003d2..0000000 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/text-selection-text-05-t-expected.txt +++ /dev/null
@@ -1,443 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox '$Revision: 1.8 $'", - "rect": [0, 0, 800, 600], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text id='revision'", - "rect": [0, 0, 800, 600], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox 'text-anchor'", - "rect": [519, 12, 129, 36], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [519, 12, 129, 36], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'text-anchor'", - "rect": [352, 12, 129, 36], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [352, 12, 129, 36], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'text-anchor'", - "rect": [186, 12, 128, 36], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [186, 12, 128, 36], - "reason": "appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [266, 485, 113, 29], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [266, 485, 113, 29], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [266, 201, 113, 21], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [266, 201, 113, 21], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [428, 485, 104, 29], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [428, 485, 104, 29], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [428, 201, 104, 21], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [428, 201, 104, 21], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [590, 485, 94, 29], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [590, 485, 94, 29], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [590, 201, 94, 21], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [590, 201, 94, 21], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox 'middle'", - "rect": [376, 36, 82, 35], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [376, 36, 82, 35], - "reason": "appeared" - }, - { - "object": "InlineTextBox '2.x 2.y'", - "rect": [16, 491, 79, 34], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [16, 491, 79, 34], - "reason": "appeared" - }, - { - "object": "InlineTextBox '4.x 2.y'", - "rect": [16, 441, 79, 34], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [16, 441, 79, 34], - "reason": "appeared" - }, - { - "object": "InlineTextBox '1.x 2.y'", - "rect": [16, 391, 79, 34], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [16, 391, 79, 34], - "reason": "appeared" - }, - { - "object": "InlineTextBox '2.x 4.y'", - "rect": [16, 341, 79, 34], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [16, 341, 79, 34], - "reason": "appeared" - }, - { - "object": "InlineTextBox '4.x 4.y'", - "rect": [16, 291, 79, 34], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [16, 291, 79, 34], - "reason": "appeared" - }, - { - "object": "InlineTextBox '1.x 4.y'", - "rect": [16, 241, 79, 34], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [16, 241, 79, 34], - "reason": "appeared" - }, - { - "object": "InlineTextBox '2.x 1.y'", - "rect": [16, 191, 79, 34], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [16, 191, 79, 34], - "reason": "appeared" - }, - { - "object": "InlineTextBox '4.x 1.y'", - "rect": [16, 141, 79, 34], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [16, 141, 79, 34], - "reason": "appeared" - }, - { - "object": "InlineTextBox '1.x 1.y'", - "rect": [16, 91, 79, 34], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [16, 91, 79, 34], - "reason": "appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [428, 285, 61, 54], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [428, 285, 61, 54], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [266, 285, 61, 54], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [266, 285, 61, 54], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [428, 435, 61, 29], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [428, 435, 61, 29], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [266, 435, 61, 29], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [266, 435, 61, 29], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [428, 151, 61, 21], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [428, 151, 61, 21], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [266, 151, 61, 21], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [266, 151, 61, 21], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [590, 285, 60, 54], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [590, 285, 60, 54], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [590, 435, 60, 29], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [590, 435, 60, 29], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [590, 151, 60, 21], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [590, 151, 60, 21], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox 'start'", - "rect": [224, 36, 52, 35], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [224, 36, 52, 35], - "reason": "appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [428, 335, 46, 54], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [428, 335, 46, 54], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [266, 335, 46, 54], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [266, 335, 46, 54], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [590, 335, 45, 54], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [590, 335, 45, 54], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox 'end'", - "rect": [562, 36, 42, 35], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [562, 36, 42, 35], - "reason": "appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [573, 235, 39, 54], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [573, 235, 39, 54], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [411, 235, 38, 54], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [411, 235, 38, 54], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1234'", - "rect": [546, 101, 38, 21], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [546, 101, 38, 21], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [250, 235, 37, 54], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [250, 235, 37, 54], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [250, 385, 37, 45], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [250, 385, 37, 45], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1234'", - "rect": [398, 101, 37, 21], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [398, 101, 37, 21], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1234'", - "rect": [250, 101, 37, 21], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [250, 101, 37, 21], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [565, 385, 29, 45], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [565, 385, 29, 45], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [411, 385, 29, 45], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [411, 385, 29, 45], - "reason": "chunk appeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/text-selection-update-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/text-selection-update-expected.txt index c73caf7..d8ae15a 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/text-selection-update-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/text-selection-update-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'foobar'", - "rect": [23, 0, 23, 14], - "reason": "selection" - } + "invalidations": [ + [23, 0, 23, 14] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/text-xy-updates-SVGList-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/text-xy-updates-SVGList-expected.txt index 4bde7ea..42bebb55 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/text-xy-updates-SVGList-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/text-xy-updates-SVGList-expected.txt
@@ -5,17 +5,9 @@ "bounds": [808, 621], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Passes, if text is at 200x20'", - "rect": [208, 13, 166, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'Passes, if text is at 200x20'", - "rect": [18, 193, 166, 19], - "reason": "disappeared" - } + "invalidations": [ + [208, 13, 166, 19], + [18, 193, 166, 19] ] }, {
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/tspan-dynamic-positioning-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/tspan-dynamic-positioning-expected.txt index b5c578d8..cf74b78 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/tspan-dynamic-positioning-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/tspan-dynamic-positioning-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'This text should be at visible at 200,200'", - "rect": [200, 185, 251, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'This text should be at visible at 200,200'", - "rect": [20, 5, 251, 19], - "reason": "disappeared" - } + "invalidations": [ + [200, 185, 251, 19], + [20, 5, 251, 19] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/use-clipped-hit-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/use-clipped-hit-expected.txt index badb6d1f..27492e6 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/use-clipped-hit-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/use-clipped-hit-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Unknown'", - "rect": [90, 115, 64, 19], - "reason": "chunk disappeared" - }, - { - "object": "InlineTextBox 'Passed'", - "rect": [90, 115, 43, 19], - "reason": "chunk appeared" - } + "invalidations": [ + [90, 115, 64, 19] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/use-detach-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/use-detach-expected.txt index 3b3e89b..694d00ea 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/use-detach-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/svg/use-detach-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGContainer g", - "rect": [207, 57, 50, 66], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer g", - "rect": [207, 57, 50, 66], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer g", - "rect": [207, 57, 50, 66], - "reason": "chunk disappeared" - } + "invalidations": [ + [207, 57, 50, 66] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/table/cached-change-cell-sl-border-color-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/table/cached-change-cell-sl-border-color-expected.txt deleted file mode 100644 index b4aa36b..0000000 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/table/cached-change-cell-sl-border-color-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR", - "rect": [8, 8, 114, 54], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='blockDiv'", - "rect": [90, 30, 20, 20], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='blockDiv'", - "rect": [90, 30, 20, 20], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'A'", - "rect": [90, 30, 12, 19], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/table/caret-contenteditable-content-after-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/table/caret-contenteditable-content-after-expected.txt deleted file mode 100644 index b14e9e1..0000000 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/table/caret-contenteditable-content-after-expected.txt +++ /dev/null
@@ -1,123 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='editor'", - "rect": [6, 46, 788, 24], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV id='editor'", - "rect": [6, 46, 788, 24], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV id='editor'", - "rect": [6, 46, 788, 24], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV id='editor'", - "rect": [6, 46, 788, 24], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'abc'", - "rect": [8, 48, 22, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'ab'", - "rect": [8, 48, 15, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'ab'", - "rect": [8, 48, 15, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'x'", - "rect": [30, 48, 8, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'x'", - "rect": [23, 48, 8, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'x'", - "rect": [23, 48, 8, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'x'", - "rect": [15, 48, 8, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'x'", - "rect": [15, 48, 8, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'x'", - "rect": [8, 48, 8, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'a'", - "rect": [8, 48, 7, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'a'", - "rect": [8, 48, 7, 19], - "reason": "disappeared" - }, - { - "object": "Caret", - "rect": [8, 48, 1, 20], - "reason": "appeared" - }, - { - "object": "Caret", - "rect": [8, 48, 1, 20], - "reason": "caret" - }, - { - "object": "Caret", - "rect": [30, 48, 1, 19], - "reason": "caret" - }, - { - "object": "Caret", - "rect": [23, 48, 1, 19], - "reason": "caret" - }, - { - "object": "Caret", - "rect": [23, 48, 1, 19], - "reason": "caret" - }, - { - "object": "Caret", - "rect": [15, 48, 1, 19], - "reason": "caret" - }, - { - "object": "Caret", - "rect": [15, 48, 1, 19], - "reason": "caret" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-background-col-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-background-col-expected.txt index 0381b167..c6816917 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-background-col-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-background-col-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY", - "rect": [8, 28, 186, 134], - "reason": "style change" - } + "invalidations": [ + [8, 28, 186, 134] ] }, {
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-background-col-initial-empty-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-background-col-initial-empty-expected.txt index 1463d160..c6816917 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-background-col-initial-empty-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-background-col-initial-empty-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY", - "rect": [8, 28, 186, 134], - "reason": "appeared" - } + "invalidations": [ + [8, 28, 186, 134] ] }, {
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-background-col-span-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-background-col-span-expected.txt index 35ef4f1..9a38376 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-background-col-span-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-background-col-span-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY", - "rect": [8, 28, 186, 134], - "reason": "style change" - } + "invalidations": [ + [8, 28, 186, 134] ] }, {
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-background-col-span-initial-empty-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-background-col-span-initial-empty-expected.txt index 44159ae..9a38376 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-background-col-span-initial-empty-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-background-col-span-initial-empty-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY", - "rect": [8, 28, 186, 134], - "reason": "appeared" - } + "invalidations": [ + [8, 28, 186, 134] ] }, {
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-background-colgroup-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-background-colgroup-expected.txt index baf92027..1fd8dc83 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-background-colgroup-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-background-colgroup-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY", - "rect": [8, 28, 186, 134], - "reason": "style change" - } + "invalidations": [ + [8, 28, 186, 134] ] }, {
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-background-colgroup-initial-empty-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-background-colgroup-initial-empty-expected.txt index 1a9ca7206..1fd8dc83 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-background-colgroup-initial-empty-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-background-colgroup-initial-empty-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY", - "rect": [8, 28, 186, 134], - "reason": "appeared" - } + "invalidations": [ + [8, 28, 186, 134] ] }, {
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-background-composited-row-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-background-composited-row-expected.txt index f5c18e2..82ba6cb 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-background-composited-row-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-background-composited-row-expected.txt
@@ -11,12 +11,8 @@ "position": [8, 96], "bounds": [186, 64], "backgroundColor": "#ADD8E6", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR id='target'", - "rect": [0, 0, 186, 64], - "reason": "background" - } + "invalidations": [ + [0, 0, 186, 64] ] }, {
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-background-composited-row-initial-empty-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-background-composited-row-initial-empty-expected.txt index 04e0a6b..82ba6cb 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-background-composited-row-initial-empty-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-background-composited-row-initial-empty-expected.txt
@@ -11,12 +11,8 @@ "position": [8, 96], "bounds": [186, 64], "backgroundColor": "#ADD8E6", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR id='target'", - "rect": [0, 0, 186, 64], - "reason": "appeared" - } + "invalidations": [ + [0, 0, 186, 64] ] }, {
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-background-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-background-expected.txt index 4ad0102..a7033e9 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-background-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-background-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR id='target'", - "rect": [8, 96, 186, 64], - "reason": "background" - } + "invalidations": [ + [8, 96, 186, 64] ] }, {
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-background-initial-empty-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-background-initial-empty-expected.txt index d74eecec..a7033e9 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-background-initial-empty-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-background-initial-empty-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR id='target'", - "rect": [8, 96, 186, 64], - "reason": "appeared" - } + "invalidations": [ + [8, 96, 186, 64] ] }, {
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-background-section-composited-row-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-background-section-composited-row-expected.txt index 67a2e13..688e9cd 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-background-section-composited-row-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-background-section-composited-row-expected.txt
@@ -11,12 +11,8 @@ "position": [8, 28], "bounds": [186, 134], "backgroundColor": "#ADD8E6", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY id='target'", - "rect": [0, 0, 186, 134], - "reason": "background" - } + "invalidations": [ + [0, 0, 186, 134] ] }, {
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-background-section-composited-row-initial-empty-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-background-section-composited-row-initial-empty-expected.txt index ab51aba23..688e9cd 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-background-section-composited-row-initial-empty-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-background-section-composited-row-initial-empty-expected.txt
@@ -11,12 +11,8 @@ "position": [8, 28], "bounds": [186, 134], "backgroundColor": "#ADD8E6", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY id='target'", - "rect": [0, 0, 186, 134], - "reason": "appeared" - } + "invalidations": [ + [0, 0, 186, 134] ] }, {
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-background-section-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-background-section-expected.txt index d3826a29..4b0ea00 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-background-section-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-background-section-expected.txt
@@ -11,12 +11,8 @@ "position": [8, 28], "bounds": [186, 134], "backgroundColor": "#ADD8E6", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY id='target'", - "rect": [0, 0, 186, 134], - "reason": "background" - } + "invalidations": [ + [0, 0, 186, 134] ] }, {
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-background-section-initial-empty-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-background-section-initial-empty-expected.txt index f499ec3..4b0ea00 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-background-section-initial-empty-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-background-section-initial-empty-expected.txt
@@ -11,12 +11,8 @@ "position": [8, 28], "bounds": [186, 134], "backgroundColor": "#ADD8E6", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY id='target'", - "rect": [0, 0, 186, 134], - "reason": "appeared" - } + "invalidations": [ + [0, 0, 186, 134] ] }, {
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-row-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-row-expected.txt index f5040b39..38091af 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-row-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/table/composited-table-row-expected.txt
@@ -11,12 +11,8 @@ "position": [8, 8], "bounds": [74, 24], "backgroundColor": "#FF0000", - "paintInvalidations": [ - { - "object": "LayoutNGTableCell TD id='target'", - "rect": [0, 0, 37, 23], - "reason": "appeared" - } + "invalidations": [ + [0, 0, 37, 23] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/table/resize-table-repaint-percent-size-cell-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/table/resize-table-repaint-percent-size-cell-expected.txt deleted file mode 100644 index 1426e44..0000000 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/table/resize-table-repaint-percent-size-cell-expected.txt +++ /dev/null
@@ -1,48 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR", - "rect": [0, 52, 106, 238], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [0, 292, 106, 236], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [0, 102, 106, 46], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'ROW2'", - "rect": [3, 400, 46, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'ROW1'", - "rect": [3, 161, 46, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'ROW2'", - "rect": [3, 115, 46, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'ROW1'", - "rect": [3, 66, 46, 19], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/table/resize-table-repaint-vertical-align-cell-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/table/resize-table-repaint-vertical-align-cell-expected.txt index 78edacb..5a70df9 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/table/resize-table-repaint-vertical-align-cell-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/table/resize-table-repaint-vertical-align-cell-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'MIDDLE'", - "rect": [3, 280, 63, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'MIDDLE'", - "rect": [3, 90, 63, 19], - "reason": "geometry" - } + "invalidations": [ + [3, 280, 63, 19], + [3, 90, 63, 19] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/table/resize-table-row-repaint-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/table/resize-table-row-repaint-expected.txt index ff4e20f..6d1f0dbd 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/table/resize-table-row-repaint-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/table/resize-table-row-repaint-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'MIDDLE'", - "rect": [3, 192, 63, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'MIDDLE'", - "rect": [3, 142, 63, 19], - "reason": "geometry" - } + "invalidations": [ + [3, 192, 63, 19], + [3, 142, 63, 19] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/table/single-line-cells-repeating-thead-break-inside-on-thead-only-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/table/single-line-cells-repeating-thead-break-inside-on-thead-only-expected.txt index 123b769..09efcdb1 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/table/single-line-cells-repeating-thead-break-inside-on-thead-only-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/table/single-line-cells-repeating-thead-break-inside-on-thead-only-expected.txt
@@ -5,27 +5,8 @@ "bounds": [1059, 585], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Col 1'", - "rect": [10, 74, 836, 19], - "reason": "style change" - }, - { - "object": "InlineTextBox 'Col 1'", - "rect": [10, 74, 836, 19], - "reason": "style change" - }, - { - "object": "InlineTextBox 'Col 1'", - "rect": [10, 74, 836, 19], - "reason": "style change" - }, - { - "object": "InlineTextBox 'Col 1'", - "rect": [10, 74, 836, 19], - "reason": "style change" - } + "invalidations": [ + [10, 74, 836, 19] ] }, {
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/table/table-collapsed-border-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/table/table-collapsed-border-expected.txt index e678e100..5cf532a 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/table/table-collapsed-border-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/table/table-collapsed-border-expected.txt
@@ -5,102 +5,17 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR id='r2'", - "rect": [8, 224, 108, 22], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 338, 99, 30], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 286, 99, 30], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 154, 99, 30], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 102, 99, 30], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 316, 99, 22], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR id='r'", - "rect": [8, 132, 99, 22], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 62, 95, 30], - "reason": "style change" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 10, 95, 30], - "reason": "style change" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 40, 95, 22], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'ipsum dolor'", - "rect": [23, 317, 76, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'ipsum dolor'", - "rect": [23, 133, 76, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'sit amet'", - "rect": [23, 339, 49, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'sit amet'", - "rect": [23, 155, 49, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Lorem'", - "rect": [23, 295, 43, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Lorem'", - "rect": [23, 111, 43, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'dolor'", - "rect": [23, 225, 34, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [17, 225, 4, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [17, 133, 4, 19], - "reason": "geometry" - } + "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/platform/linux/paint/invalidation/text-append-dirty-lines-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/text-append-dirty-lines-expected.txt index e35287d..b9ce8b4 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/text-append-dirty-lines-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/text-append-dirty-lines-expected.txt
@@ -5,42 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Curabitur a velit.'", - "rect": [8, 44, 756, 139], - "reason": "full" - }, - { - "object": "NGPhysicalTextFragment 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse placerat. Morbi tristique. Mauris eu lacus sed felis'", - "rect": [8, 44, 756, 139], - "reason": "full" - }, - { - "object": "NGPhysicalTextFragment 'fermentum ut, tortor. Sed rhoncus. Quisque enim metus, luctus tincidunt, vestibulum eu, vestibulum eu, libero. Mauris'", - "rect": [8, 44, 756, 139], - "reason": "full" - }, - { - "object": "NGPhysicalTextFragment 'feugiat molestie, mi lorem bibendum leo, ac gravida orci nunc nec nulla. Nunc nunc lorem, rhoncus et, rutrum ac,'", - "rect": [8, 44, 756, 139], - "reason": "full" - }, - { - "object": "NGPhysicalTextFragment 'laoreet feugiat. Phasellus mollis pulvinar mi. Etiam ut neque sed eros egestas laoreet. Vestibulum ullamcorper, nulla non'", - "rect": [8, 44, 756, 139], - "reason": "full" - }, - { - "object": "NGPhysicalTextFragment 'pellentesque cursus. Proin vitae nulla. Vivamus in ipsum. Etiam mi. Nam malesuada purus in sem. Sed eget elit vel erat'", - "rect": [8, 44, 756, 139], - "reason": "full" - }, - { - "object": "NGPhysicalTextFragment 'sagittis aliquam nunc. Nullam pharetra molestie eros. Donec tempus purus ut ligula. Phasellus non nisl. Etiam eu mauris.'", - "rect": [8, 44, 756, 139], - "reason": "full" - } + "invalidations": [ + [8, 44, 756, 139] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/text-line-clamp-truncation-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/text-line-clamp-truncation-expected.txt index 4116574..b463169 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/text-line-clamp-truncation-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/text-line-clamp-truncation-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutDeprecatedFlexibleBox DIV id='container' class='folded'", - "rect": [8, 8, 285, 24], - "reason": "chunk disappeared" - }, - { - "object": "LayoutFlexibleBox DIV id='container'", - "rect": [8, 10, 284, 43], - "reason": "chunk appeared" - } + "invalidations": [ + [8, 8, 285, 24], + [8, 10, 284, 43] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/text-match-document-change-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/text-match-document-change-expected.txt index 75b3f73..bd32cbf 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/text-match-document-change-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/text-match-document-change-expected.txt
@@ -5,27 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Find-in-page 'findme', then click here)'", - "rect": [18, 130, 251, 39], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'To be changed: findme (Manual testing:'", - "rect": [18, 130, 251, 39], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'After change'", - "rect": [18, 130, 82, 19], - "reason": "appeared" - }, - { - "object": "VerticalScrollbar", - "rect": [295, 102, 15, 400], - "reason": "scroll control" - } + "invalidations": [ + [18, 130, 251, 39], + [295, 102, 15, 400] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/transform/caret-with-transformation-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/transform/caret-with-transformation-expected.txt index 5867f19..de0f532 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/transform/caret-with-transformation-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/transform/caret-with-transformation-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Caret", - "rect": [337, 206, 11, 18], - "reason": "caret" - }, - { - "object": "Caret", - "rect": [42, 36, 11, 18], - "reason": "caret" - } + "invalidations": [ + [337, 206, 11, 18], + [42, 36, 11, 18] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/transform/transform-layout-repaint-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/transform/transform-layout-repaint-expected.txt index 66589fb..9084fe0 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/transform/transform-layout-repaint-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/transform/transform-layout-repaint-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'PASS'", - "rect": [52, 51, 43, 32], - "reason": "full" - } + "invalidations": [ + [52, 51, 43, 32] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/window-resize/window-resize-vertical-writing-mode-expected.txt b/third_party/blink/web_tests/platform/linux/paint/invalidation/window-resize/window-resize-vertical-writing-mode-expected.txt index 2961688..0f8a22a 100644 --- a/third_party/blink/web_tests/platform/linux/paint/invalidation/window-resize/window-resize-vertical-writing-mode-expected.txt +++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/window-resize/window-resize-vertical-writing-mode-expected.txt
@@ -5,12 +5,8 @@ "bounds": [939, 235], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling Contents Layer", - "rect": [0, 0, 939, 235], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 939, 235] ], "transform": 1 }, @@ -40,12 +36,8 @@ "bounds": [939, 235], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling Contents Layer", - "rect": [0, 0, 939, 235], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 939, 235] ], "transform": 1 }, @@ -75,12 +67,8 @@ "bounds": [400, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling Contents Layer", - "rect": [0, 0, 400, 600], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 400, 600] ] } ] @@ -92,62 +80,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [400, 0, 400, 600], - "reason": "incremental" - }, - { - "object": "NGPhysicalTextFragment 'AAAA BBBB CCCC'", - "rect": [439, 8, 352, 561], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'DDDD EEEE FFFF'", - "rect": [439, 8, 352, 561], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'GGGG HHHH IIII JJJJ'", - "rect": [439, 8, 352, 561], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'KKKK LLLL MMMM'", - "rect": [439, 8, 352, 561], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'NNNN'", - "rect": [439, 8, 352, 561], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'AAAA BBBB CCCC'", - "rect": [39, 8, 352, 561], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'DDDD EEEE FFFF'", - "rect": [39, 8, 352, 561], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'GGGG HHHH IIII JJJJ'", - "rect": [39, 8, 352, 561], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'KKKK LLLL MMMM'", - "rect": [39, 8, 352, 561], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'NNNN'", - "rect": [39, 8, 352, 561], - "reason": "geometry" - } + "invalidations": [ + [400, 0, 400, 600], + [39, 8, 352, 561] ] } ]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/controls-refresh-hc/virtual/controls-refresh/color-scheme/color/color-picker-appearance-expected.png b/third_party/blink/web_tests/platform/linux/virtual/controls-refresh-hc/virtual/controls-refresh/color-scheme/color/color-picker-appearance-expected.png index 2238c0b..725e299 100644 --- a/third_party/blink/web_tests/platform/linux/virtual/controls-refresh-hc/virtual/controls-refresh/color-scheme/color/color-picker-appearance-expected.png +++ b/third_party/blink/web_tests/platform/linux/virtual/controls-refresh-hc/virtual/controls-refresh/color-scheme/color/color-picker-appearance-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color-scheme/color/color-picker-appearance-expected.png b/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color-scheme/color/color-picker-appearance-expected.png index e660ac0..82757e6 100644 --- a/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color-scheme/color/color-picker-appearance-expected.png +++ b/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color-scheme/color/color-picker-appearance-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-color-well-click-expected.png b/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-color-well-click-expected.png index c35d590..2b877ad 100644 --- a/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-color-well-click-expected.png +++ b/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-color-well-click-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-color-well-down-keyboard-navigation-from-top-left-corner-expected.png b/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-color-well-down-keyboard-navigation-from-top-left-corner-expected.png index 173cfab..b60531b 100644 --- a/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-color-well-down-keyboard-navigation-from-top-left-corner-expected.png +++ b/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-color-well-down-keyboard-navigation-from-top-left-corner-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-color-well-down-keyboard-navigation-from-top-right-corner-expected.png b/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-color-well-down-keyboard-navigation-from-top-right-corner-expected.png index fae58d6..7ba9244 100644 --- a/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-color-well-down-keyboard-navigation-from-top-right-corner-expected.png +++ b/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-color-well-down-keyboard-navigation-from-top-right-corner-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-color-well-drag-expected.png b/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-color-well-drag-expected.png index c35d590..2b877ad 100644 --- a/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-color-well-drag-expected.png +++ b/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-color-well-drag-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-color-well-keyboard-navigation-expected.png b/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-color-well-keyboard-navigation-expected.png index 8552c07c..28c2fc2 100644 --- a/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-color-well-keyboard-navigation-expected.png +++ b/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-color-well-keyboard-navigation-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-color-well-left-keyboard-navigation-from-bottom-right-corner-expected.png b/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-color-well-left-keyboard-navigation-from-bottom-right-corner-expected.png index f56afe0d..61b9510 100644 --- a/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-color-well-left-keyboard-navigation-from-bottom-right-corner-expected.png +++ b/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-color-well-left-keyboard-navigation-from-bottom-right-corner-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-color-well-left-keyboard-navigation-from-top-right-corner-expected.png b/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-color-well-left-keyboard-navigation-from-top-right-corner-expected.png index 14563e93..2f275ba 100644 --- a/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-color-well-left-keyboard-navigation-from-top-right-corner-expected.png +++ b/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-color-well-left-keyboard-navigation-from-top-right-corner-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-color-well-right-keyboard-navigation-from-bottom-left-corner-expected.png b/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-color-well-right-keyboard-navigation-from-bottom-left-corner-expected.png index d94f739..acca9007 100644 --- a/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-color-well-right-keyboard-navigation-from-bottom-left-corner-expected.png +++ b/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-color-well-right-keyboard-navigation-from-bottom-left-corner-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-color-well-right-keyboard-navigation-from-top-left-corner-expected.png b/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-color-well-right-keyboard-navigation-from-top-left-corner-expected.png index af41f77..73002d1 100644 --- a/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-color-well-right-keyboard-navigation-from-top-left-corner-expected.png +++ b/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-color-well-right-keyboard-navigation-from-top-left-corner-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-color-well-up-keyboard-navigation-from-bottom-left-corner-expected.png b/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-color-well-up-keyboard-navigation-from-bottom-left-corner-expected.png index 40f59ba..814502e 100644 --- a/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-color-well-up-keyboard-navigation-from-bottom-left-corner-expected.png +++ b/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-color-well-up-keyboard-navigation-from-bottom-left-corner-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-color-well-up-keyboard-navigation-from-bottom-right-corner-expected.png b/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-color-well-up-keyboard-navigation-from-bottom-right-corner-expected.png index fdf9b1d..c84e297 100644 --- a/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-color-well-up-keyboard-navigation-from-bottom-right-corner-expected.png +++ b/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-color-well-up-keyboard-navigation-from-bottom-right-corner-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-hex-format-expected.png b/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-hex-format-expected.png index ef5b757..20cc959cb 100644 --- a/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-hex-format-expected.png +++ b/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-hex-format-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-hsl-format-expected.png b/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-hsl-format-expected.png index 8ebd5860..3a53b44 100644 --- a/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-hsl-format-expected.png +++ b/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-hsl-format-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-hue-slider-accelerated-keyboard-navigation-expected.png b/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-hue-slider-accelerated-keyboard-navigation-expected.png index 040d08d7..a1ddcc3 100644 --- a/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-hue-slider-accelerated-keyboard-navigation-expected.png +++ b/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-hue-slider-accelerated-keyboard-navigation-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-hue-slider-click-expected.png b/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-hue-slider-click-expected.png index d460e85..ed732bc 100644 --- a/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-hue-slider-click-expected.png +++ b/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-hue-slider-click-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-hue-slider-drag-expected.png b/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-hue-slider-drag-expected.png index d460e85..ed732bc 100644 --- a/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-hue-slider-drag-expected.png +++ b/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-hue-slider-drag-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-hue-slider-keyboard-navigation-expected.png b/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-hue-slider-keyboard-navigation-expected.png index 77d99a1..630759c 100644 --- a/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-hue-slider-keyboard-navigation-expected.png +++ b/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-hue-slider-keyboard-navigation-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-hue-slider-left-edge-zero-hue-expected.png b/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-hue-slider-left-edge-zero-hue-expected.png index e4cce321..b188b3e 100644 --- a/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-hue-slider-left-edge-zero-hue-expected.png +++ b/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-hue-slider-left-edge-zero-hue-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-hue-slider-right-edge-zero-hue-expected.png b/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-hue-slider-right-edge-zero-hue-expected.png index 8f57254..63b6ff0 100644 --- a/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-hue-slider-right-edge-zero-hue-expected.png +++ b/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-hue-slider-right-edge-zero-hue-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-imperfect-match-expected.png b/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-imperfect-match-expected.png index 6f3e299..5fd3057 100644 --- a/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-imperfect-match-expected.png +++ b/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-imperfect-match-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-manual-color-change-expected.png b/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-manual-color-change-expected.png index a8c03c4..8a20ca7 100644 --- a/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-manual-color-change-expected.png +++ b/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-manual-color-change-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-set-value-expected.png b/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-set-value-expected.png index 8be3c49..33fbd51 100644 --- a/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-set-value-expected.png +++ b/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-set-value-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-value-attribute-expected.png b/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-value-attribute-expected.png index 1da959e..99345ae 100644 --- a/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-value-attribute-expected.png +++ b/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-value-attribute-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-zoom125-expected.png b/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-zoom125-expected.png index 9e42dc6..342e91b 100644 --- a/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-zoom125-expected.png +++ b/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-zoom125-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-zoom200-expected.png b/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-zoom200-expected.png index cd1fd8a..6a84b0d 100644 --- a/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-zoom200-expected.png +++ b/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-appearance-zoom200-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-top-left-selection-position-after-reopen-expected.png b/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-top-left-selection-position-after-reopen-expected.png index ed1f02a10..43716d6 100644 --- a/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-top-left-selection-position-after-reopen-expected.png +++ b/third_party/blink/web_tests/platform/linux/virtual/controls-refresh/color/color-picker-top-left-selection-position-after-reopen-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.png deleted file mode 100644 index 5d379c3b..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.10/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.txt deleted file mode 100644 index 1d9dc3d0..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutButton INPUT", - "rect": [3, 4, 62, 29], - "reason": "subtree" - }, - { - "object": "InlineTextBox 'Submit'", - "rect": [16, 11, 36, 14], - "reason": "subtree" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/paint/invalidation/position/layout-state-relative-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.10/paint/invalidation/position/layout-state-relative-expected.txt deleted file mode 100644 index 43e7f80..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/paint/invalidation/position/layout-state-relative-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'PASS'", - "rect": [8, 150, 37, 18], - "reason": "full" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/controls-refresh-hc/virtual/controls-refresh/color-scheme/color/color-picker-appearance-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/controls-refresh-hc/virtual/controls-refresh/color-scheme/color/color-picker-appearance-expected.png new file mode 100644 index 0000000..ca56143 --- /dev/null +++ b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/controls-refresh-hc/virtual/controls-refresh/color-scheme/color/color-picker-appearance-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.11/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.png b/third_party/blink/web_tests/platform/mac-mac10.11/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.png deleted file mode 100644 index b466132..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.11/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.11/paint/invalidation/position/layout-state-relative-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.11/paint/invalidation/position/layout-state-relative-expected.txt deleted file mode 100644 index 43e7f80..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.11/paint/invalidation/position/layout-state-relative-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'PASS'", - "rect": [8, 150, 37, 18], - "reason": "full" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/controls-refresh-hc/virtual/controls-refresh/color-scheme/color/color-picker-appearance-expected.png b/third_party/blink/web_tests/platform/mac-mac10.11/virtual/controls-refresh-hc/virtual/controls-refresh/color-scheme/color/color-picker-appearance-expected.png new file mode 100644 index 0000000..ca56143 --- /dev/null +++ b/third_party/blink/web_tests/platform/mac-mac10.11/virtual/controls-refresh-hc/virtual/controls-refresh/color-scheme/color/color-picker-appearance-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/paint/invalidation/multicol/multicol-repaint-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.12/paint/invalidation/multicol/multicol-repaint-expected.txt index 2fd43ec..0cf9ade9 100644 --- a/third_party/blink/web_tests/platform/mac-mac10.12/paint/invalidation/multicol/multicol-repaint-expected.txt +++ b/third_party/blink/web_tests/platform/mac-mac10.12/paint/invalidation/multicol/multicol-repaint-expected.txt
@@ -5,27 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'XXXXXX'", - "rect": [234, 14, 300, 52], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'x'", - "rect": [234, 14, 50, 52], - "reason": "disappeared" - }, - { - "object": "InlineTextBox '\u00A0'", - "rect": [9, 9, 13, 59], - "reason": "appeared" - }, - { - "object": "InlineTextBox '\u00A0'", - "rect": [9, 9, 13, 59], - "reason": "disappeared" - } + "invalidations": [ + [234, 14, 300, 52], + [9, 9, 13, 59] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/paint/invalidation/multicol/multicol-with-abspos-in-relpos-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.12/paint/invalidation/multicol/multicol-with-abspos-in-relpos-expected.txt index 5da6c79..a40765f4 100644 --- a/third_party/blink/web_tests/platform/mac-mac10.12/paint/invalidation/multicol/multicol-with-abspos-in-relpos-expected.txt +++ b/third_party/blink/web_tests/platform/mac-mac10.12/paint/invalidation/multicol/multicol-with-abspos-in-relpos-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='target'", - "rect": [508, 27, 80, 22], - "reason": "chunk appeared" - } + "invalidations": [ + [508, 27, 80, 22] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/paint/invalidation/multicol/multicol-with-block-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.12/paint/invalidation/multicol/multicol-with-block-expected.txt index 17de14ae..30c6573 100644 --- a/third_party/blink/web_tests/platform/mac-mac10.12/paint/invalidation/multicol/multicol-with-block-expected.txt +++ b/third_party/blink/web_tests/platform/mac-mac10.12/paint/invalidation/multicol/multicol-with-block-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutMultiColumnFlowThread (anonymous)", - "rect": [328, 8, 240, 41], - "reason": "chunk appeared" - } + "invalidations": [ + [328, 8, 240, 41] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/paint/invalidation/multicol/multicol-with-inline-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.12/paint/invalidation/multicol/multicol-with-inline-expected.txt index 17de14ae..30c6573 100644 --- a/third_party/blink/web_tests/platform/mac-mac10.12/paint/invalidation/multicol/multicol-with-inline-expected.txt +++ b/third_party/blink/web_tests/platform/mac-mac10.12/paint/invalidation/multicol/multicol-with-inline-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutMultiColumnFlowThread (anonymous)", - "rect": [328, 8, 240, 41], - "reason": "chunk appeared" - } + "invalidations": [ + [328, 8, 240, 41] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/paint/invalidation/multicol/multicol-with-text-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.12/paint/invalidation/multicol/multicol-with-text-expected.txt index 17de14ae..30c6573 100644 --- a/third_party/blink/web_tests/platform/mac-mac10.12/paint/invalidation/multicol/multicol-with-text-expected.txt +++ b/third_party/blink/web_tests/platform/mac-mac10.12/paint/invalidation/multicol/multicol-with-text-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutMultiColumnFlowThread (anonymous)", - "rect": [328, 8, 240, 41], - "reason": "chunk appeared" - } + "invalidations": [ + [328, 8, 240, 41] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/paint/invalidation/ruby-flipped-blocks-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.12/paint/invalidation/ruby-flipped-blocks-expected.txt index 400c8c2..3617fb8 100644 --- a/third_party/blink/web_tests/platform/mac-mac10.12/paint/invalidation/ruby-flipped-blocks-expected.txt +++ b/third_party/blink/web_tests/platform/mac-mac10.12/paint/invalidation/ruby-flipped-blocks-expected.txt
@@ -5,32 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'b'", - "rect": [7, 28, 22, 20], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'b'", - "rect": [7, 28, 22, 20], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'a'", - "rect": [7, 8, 22, 20], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'a'", - "rect": [7, 8, 22, 20], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'c'", - "rect": [27, 33, 12, 10], - "reason": "style change" - } + "invalidations": [ + [7, 28, 22, 20], + [7, 8, 22, 20], + [27, 33, 12, 10] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/controls-refresh-hc/virtual/controls-refresh/color-scheme/color/color-picker-appearance-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/controls-refresh-hc/virtual/controls-refresh/color-scheme/color/color-picker-appearance-expected.png new file mode 100644 index 0000000..ca56143 --- /dev/null +++ b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/controls-refresh-hc/virtual/controls-refresh/color-scheme/color/color-picker-appearance-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/controls-refresh-hc/virtual/controls-refresh/color-scheme/color/color-picker-appearance-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/controls-refresh-hc/virtual/controls-refresh/color-scheme/color/color-picker-appearance-expected.png new file mode 100644 index 0000000..ca56143 --- /dev/null +++ b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/controls-refresh-hc/virtual/controls-refresh/color-scheme/color/color-picker-appearance-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-retina/virtual/controls-refresh-hc/virtual/controls-refresh/color-scheme/color/color-picker-appearance-expected.png b/third_party/blink/web_tests/platform/mac-retina/virtual/controls-refresh-hc/virtual/controls-refresh/color-scheme/color/color-picker-appearance-expected.png new file mode 100644 index 0000000..ca56143 --- /dev/null +++ b/third_party/blink/web_tests/platform/mac-retina/virtual/controls-refresh-hc/virtual/controls-refresh/color-scheme/color/color-picker-appearance-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/compositing/squashing/selection-repaint-with-gaps-expected.txt b/third_party/blink/web_tests/platform/mac/compositing/squashing/selection-repaint-with-gaps-expected.txt index a8d461c..45a1428 100644 --- a/third_party/blink/web_tests/platform/mac/compositing/squashing/selection-repaint-with-gaps-expected.txt +++ b/third_party/blink/web_tests/platform/mac/compositing/squashing/selection-repaint-with-gaps-expected.txt
@@ -16,17 +16,8 @@ "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV class='item')", "position": [7, 27], "bounds": [100, 210], - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'ipsum'", - "rect": [0, 80, 42, 36], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'lorem'", - "rect": [0, 80, 42, 36], - "reason": "geometry" - } + "invalidations": [ + [0, 80, 42, 36] ], "transform": 1 } @@ -61,27 +52,9 @@ "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV class='item')", "position": [7, 27], "bounds": [100, 210], - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'ipsum'", - "rect": [0, 160, 42, 36], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'lorem'", - "rect": [0, 160, 42, 36], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'ipsum'", - "rect": [0, 80, 42, 36], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'lorem'", - "rect": [0, 80, 42, 36], - "reason": "geometry" - } + "invalidations": [ + [0, 160, 42, 36], + [0, 80, 42, 36] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/4776765-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/4776765-expected.txt index a700b45..87561f7 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/4776765-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/4776765-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV", - "rect": [6, 40, 788, 58], - "reason": "geometry" - }, - { - "object": "Caret", - "rect": [8, 78, 1, 18], - "reason": "caret" - }, - { - "object": "Caret", - "rect": [8, 60, 1, 18], - "reason": "caret" - } + "invalidations": [ + [6, 40, 788, 58] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/background/backgroundSizeRepaint-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/background/backgroundSizeRepaint-expected.txt index e7069d9..ee8a0a8 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/background/backgroundSizeRepaint-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/background/backgroundSizeRepaint-expected.txt
@@ -5,27 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [19, 329, 200, 60], - "reason": "background" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [19, 169, 200, 60], - "reason": "background" - }, - { - "object": "LayoutNGBlockFlow DIV id='b'", - "rect": [29, 369, 180, 20], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow DIV id='a'", - "rect": [29, 209, 180, 20], - "reason": "incremental" - } + "invalidations": [ + [19, 329, 200, 60], + [19, 169, 200, 60] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/background/body-background-image-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/background/body-background-image-expected.txt index fdf5f6b..e99b6dc 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/background/body-background-image-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/background/body-background-image-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow BODY", - "rect": [8, 240, 784, 284], - "reason": "background" - } + "invalidations": [ + [8, 240, 784, 284] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/background/change-text-content-and-background-color-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/background/change-text-content-and-background-color-expected.txt index 42b62b1..646ca8c 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/background/change-text-content-and-background-color-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/background/change-text-content-and-background-color-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTextControl (positioned) INPUT id='input'", - "rect": [8, 8, 244, 67], - "reason": "background" - }, - { - "object": "InlineTextBox 'NEW'", - "rect": [30, 29, 47, 24], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'OLD'", - "rect": [30, 29, 42, 24], - "reason": "disappeared" - } + "invalidations": [ + [8, 8, 244, 67] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/block-no-inflow-children-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/block-no-inflow-children-expected.txt index 1ec196f..91b5c83c 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/block-no-inflow-children-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/block-no-inflow-children-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'La la la la'", - "rect": [0, 0, 64, 18], - "reason": "full" - } + "invalidations": [ + [0, 0, 64, 18] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/box/border-radius-repaint-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/box/border-radius-repaint-expected.txt index 36790af..f5e1a85 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/box/border-radius-repaint-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/box/border-radius-repaint-expected.txt
@@ -5,27 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [19, 239, 200, 88], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [19, 79, 200, 88], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV id='b'", - "rect": [33, 293, 172, 20], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow DIV id='a'", - "rect": [33, 133, 172, 20], - "reason": "incremental" - } + "invalidations": [ + [19, 239, 200, 88], + [19, 79, 200, 88] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/box/border-repaint-glitch-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/box/border-repaint-glitch-expected.txt index c6b728da..60dc446 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/box/border-repaint-glitch-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/box/border-repaint-glitch-expected.txt
@@ -5,27 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [19, 337, 200, 88], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [19, 177, 200, 88], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV id='b'", - "rect": [33, 391, 172, 20], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow DIV id='a'", - "rect": [33, 231, 172, 20], - "reason": "incremental" - } + "invalidations": [ + [19, 337, 200, 88], + [19, 177, 200, 88] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/box/box-inline-resize-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/box/box-inline-resize-expected.txt index 86b440d6..6e5db57 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/box/box-inline-resize-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/box/box-inline-resize-expected.txt
@@ -5,22 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Chromium'", - "rect": [40, 103, 113, 29], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'Chromium'", - "rect": [8, 103, 113, 29], - "reason": "geometry" - }, - { - "object": "LayoutImage IMG id='foo'", - "rect": [8, 84, 32, 32], - "reason": "appeared" - } + "invalidations": [ + [40, 103, 113, 29], + [8, 103, 113, 29], + [8, 84, 32, 32] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/box/box-shadow-dynamic-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/box/box-shadow-dynamic-expected.txt index bd3aa371..51ae79c 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/box/box-shadow-dynamic-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/box/box-shadow-dynamic-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [18, 70, 55, 75], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [18, 190, 55, 55], - "reason": "geometry" - } + "invalidations": [ + [18, 70, 55, 75], + [18, 190, 55, 55] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/box/invalidate-box-shadow-currentColor-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/box/invalidate-box-shadow-currentColor-expected.txt index a382ea3..672287c4 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/box/invalidate-box-shadow-currentColor-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/box/invalidate-box-shadow-currentColor-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalBoxFragment LayoutInline SPAN id='target'", - "rect": [8, 8, 29, 23], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'Text'", - "rect": [8, 8, 29, 18], - "reason": "style change" - } + "invalidations": [ + [8, 8, 29, 23] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/bugzilla-3509-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/bugzilla-3509-expected.txt index 2e43b100..3b18507 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/bugzilla-3509-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/bugzilla-3509-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='im'", - "rect": [61, 125, 50, 100], - "reason": "incremental" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [11, 125, 4, 18], - "reason": "geometry" - } + "invalidations": [ + [61, 125, 50, 100], + [11, 125, 4, 18] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/bugzilla-5699-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/bugzilla-5699-expected.txt index 79d1d04..0804516 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/bugzilla-5699-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/bugzilla-5699-expected.txt
@@ -5,27 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Hello'", - "rect": [8, 178, 36, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Hello'", - "rect": [8, 148, 36, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [8, 145, 4, 18], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [8, 130, 4, 18], - "reason": "style change" - } + "invalidations": [ + [8, 178, 36, 18], + [8, 148, 36, 18], + [8, 145, 4, 18], + [8, 130, 4, 18] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/bugzilla-6278-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/bugzilla-6278-expected.txt index eeafbca3..34f102e 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/bugzilla-6278-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/bugzilla-6278-expected.txt
@@ -5,127 +5,13 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [10, 281, 292, 50], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Curabitur pretium, quam quis semper'", - "rect": [10, 132, 276, 144], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Phasellus vehicula, sem at posuere'", - "rect": [10, 132, 276, 144], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Quisque eu nulla non nisi molestie'", - "rect": [10, 132, 276, 144], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'ac, laoreet non, suscipit sed, sapien.'", - "rect": [10, 132, 276, 144], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'accumsan. Etiam tellus urna, laoreet'", - "rect": [10, 132, 276, 144], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'malesuada, est libero feugiat libero,'", - "rect": [10, 132, 276, 144], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'vehicula, augue nibh molestie nisl,'", - "rect": [10, 132, 276, 144], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'vel fringilla orci nibh sed neque.'", - "rect": [10, 132, 276, 144], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [10, 317, 242, 50], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD id='col1'", - "rect": [10, 331, 242, 36], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [10, 276, 242, 36], - "reason": "incremental" - }, - { - "object": "NGPhysicalTextFragment 'Curabitur pretium, quam quis semper'", - "rect": [10, 132, 240, 180], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Phasellus vehicula, sem at posuere'", - "rect": [10, 132, 240, 180], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Quisque eu nulla non nisi molestie'", - "rect": [10, 132, 240, 180], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'ac, laoreet non, suscipit sed, sapien.'", - "rect": [10, 132, 240, 180], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'accumsan. Etiam tellus urna, laoreet'", - "rect": [10, 132, 240, 180], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'malesuada, est libero feugiat libero,'", - "rect": [10, 132, 240, 180], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'nec ullamcorper lacus ante vulputate'", - "rect": [10, 132, 240, 180], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'pede.'", - "rect": [10, 132, 240, 180], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'vehicula, augue nibh molestie nisl,'", - "rect": [10, 132, 240, 180], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'vel fringilla orci nibh sed neque.'", - "rect": [10, 132, 240, 180], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD id='col1'", - "rect": [252, 132, 50, 199], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [252, 132, 50, 144], - "reason": "incremental" - } + "invalidations": [ + [10, 281, 292, 50], + [10, 132, 276, 144], + [10, 317, 242, 50], + [10, 276, 242, 36], + [10, 132, 240, 180], + [252, 132, 50, 199] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/bugzilla-6388-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/bugzilla-6388-expected.txt index e28493c..686e94f 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/bugzilla-6388-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/bugzilla-6388-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [8, 130, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [8, 130, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [8, 130, 100, 100], - "reason": "disappeared" - } + "invalidations": [ + [8, 130, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/bugzilla-6473-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/bugzilla-6473-expected.txt index 05851eba..18124442 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/bugzilla-6473-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/bugzilla-6473-expected.txt
@@ -5,22 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) P", - "rect": [8, 146, 784, 18], - "reason": "chunk disappeared" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) P", - "rect": [8, 130, 784, 18], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'SUCCESS'", - "rect": [8, 130, 70, 18], - "reason": "appeared" - } + "invalidations": [ + [8, 146, 784, 18], + [8, 130, 784, 18] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/bugzilla-7235-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/bugzilla-7235-expected.txt index c546751b..b1980834 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/bugzilla-7235-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/bugzilla-7235-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='t'", - "rect": [8, 166, 100, 100], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [8, 148, 4, 18], - "reason": "geometry" - } + "invalidations": [ + [8, 166, 100, 100], + [8, 148, 4, 18] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/caret-outside-block-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/caret-outside-block-expected.txt index 1b314ce..d3977afd 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/caret-outside-block-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/caret-outside-block-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Caret", - "rect": [791, 8, 1, 18], - "reason": "appeared" - } + "invalidations": [ + [791, 8, 1, 18] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/caret-subpixel-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/caret-subpixel-expected.txt index b7a00e3..df4f8d99 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/caret-subpixel-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/caret-subpixel-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTextControl INPUT id='target'", - "rect": [8, 8, 226, 21], - "reason": "subtree" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [211, 11, 2, 15], - "reason": "chunk appeared" - } + "invalidations": [ + [8, 8, 226, 21] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/clip/clip-with-layout-delta-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/clip/clip-with-layout-delta-expected.txt deleted file mode 100644 index 719cb04..0000000 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/clip/clip-with-layout-delta-expected.txt +++ /dev/null
@@ -1,38 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV", - "rect": [108, 8, 100, 100], - "reason": "chunk appeared" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV", - "rect": [108, 8, 100, 100], - "reason": "chunk disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [8, 8, 100, 100], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [8, 8, 100, 100], - "reason": "chunk disappeared" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [8, 8, 4, 18], - "reason": "appeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/clip/clipped-relative-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/clip/clipped-relative-expected.txt index e8601a6..efc4a6f 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/clip/clipped-relative-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/clip/clipped-relative-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutImage IMG", - "rect": [8, 70, 204, 232], - "reason": "geometry" - }, - { - "object": "LayoutImage IMG", - "rect": [8, 70, 94, 232], - "reason": "geometry" - } + "invalidations": [ + [8, 70, 204, 232] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/clip/control-clip-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/clip/control-clip-expected.txt index 0192259..933c734 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/clip/control-clip-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/clip/control-clip-expected.txt
@@ -5,27 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'SUCCESS'", - "rect": [75, 112, 66, 17], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox 'SUCCESS'", - "rect": [9, 82, 65, 17], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'FAILURE'", - "rect": [80, 112, 56, 17], - "reason": "chunk disappeared" - }, - { - "object": "InlineTextBox 'FAILURE'", - "rect": [9, 82, 56, 17], - "reason": "disappeared" - } + "invalidations": [ + [75, 112, 66, 17], + [9, 82, 65, 17] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/clip/outline-clip-change-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/clip/outline-clip-change-expected.txt index 456aa04..ba92a10 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/clip/outline-clip-change-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/clip/outline-clip-change-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) A id='link' class='updated'", - "rect": [48, 84, 92, 23], - "reason": "chunk appeared" - }, - { - "object": "NGPhysicalTextFragment 'Lorem Ipsum'", - "rect": [48, 84, 87, 18], - "reason": "disappeared" - } + "invalidations": [ + [48, 84, 92, 23] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/compositing/iframe-inside-squashed-layer-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/compositing/iframe-inside-squashed-layer-expected.txt index c7aa0582..407f5d9d 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/compositing/iframe-inside-squashed-layer-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/compositing/iframe-inside-squashed-layer-expected.txt
@@ -17,17 +17,9 @@ "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV)", "position": [0, -8], "bounds": [300, 654], - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'test1'", - "rect": [8, 508, 31, 18], - "reason": "geometry" - }, - { - "object": "VerticalScrollbar", - "rect": [285, 500, 15, 150], - "reason": "chunk appeared" - } + "invalidations": [ + [8, 508, 31, 18], + [285, 500, 15, 150] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/compositing/remove-squashed-layer-plus-move-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/compositing/remove-squashed-layer-plus-move-expected.txt index 7535036..5f157a8 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/compositing/remove-squashed-layer-plus-move-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/compositing/remove-squashed-layer-plus-move-expected.txt
@@ -15,17 +15,9 @@ { "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (relative positioned) DIV class='mv-tile')", "bounds": [1000, 104], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV class='mv-tile'", - "rect": [0, 54, 100, 50], - "reason": "compositing update" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV class='mv-tile'", - "rect": [0, 0, 100, 50], - "reason": "compositing update" - } + "invalidations": [ + [0, 54, 100, 50], + [0, 0, 100, 50] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/compositing/text-color-change-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/compositing/text-color-change-expected.txt index 0ee499d..a2778e6 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/compositing/text-color-change-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/compositing/text-color-change-expected.txt
@@ -5,72 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment ' Text'", - "rect": [8, 57, 47, 185], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment ' Text'", - "rect": [8, 57, 47, 185], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment ' Text'", - "rect": [8, 57, 47, 185], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment ' Text'", - "rect": [8, 57, 47, 185], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment ' Text'", - "rect": [8, 57, 47, 185], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment ' Text'", - "rect": [8, 57, 47, 185], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment ' Text'", - "rect": [8, 57, 47, 185], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment ' Text'", - "rect": [8, 57, 47, 185], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment ' Text'", - "rect": [8, 57, 47, 185], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment ' Text'", - "rect": [8, 57, 47, 185], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment ' Text'", - "rect": [8, 57, 47, 185], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment ' Text'", - "rect": [8, 57, 47, 185], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment ' Text'", - "rect": [8, 57, 47, 185], - "reason": "style change" - } + "invalidations": [ + [8, 57, 47, 185] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/compositing/text-match-highlight-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/compositing/text-match-highlight-expected.txt index b051be6..55f5ee10 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/compositing/text-match-highlight-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/compositing/text-match-highlight-expected.txt
@@ -5,47 +5,15 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Can you findme in this boring text?'", - "rect": [10, 126, 227, 18], - "reason": "DocumentMarker change" - }, - { - "object": "InlineTextBox 'Findme on a path! Did you findme?'", - "rect": [20, 214, 200, 72], - "reason": "DocumentMarker change" - }, - { - "object": "InlineTextBox 'Findme in a typewriter!'", - "rect": [10, 180, 139, 12], - "reason": "DocumentMarker change" - }, - { - "object": "NGPhysicalTextFragment 'findme'", - "rect": [268, 54, 46, 18], - "reason": "DocumentMarker change" - }, - { - "object": "NGPhysicalTextFragment 'findme'", - "rect": [90, 54, 46, 18], - "reason": "DocumentMarker change" - }, - { - "object": "NGPhysicalTextFragment 'findme'", - "rect": [282, 36, 45, 18], - "reason": "DocumentMarker change" - }, - { - "object": "NGPhysicalTextFragment 'findme'", - "rect": [224, 54, 45, 18], - "reason": "DocumentMarker change" - }, - { - "object": "NGPhysicalTextFragment 'findme'", - "rect": [52, 72, 45, 18], - "reason": "DocumentMarker change" - } + "invalidations": [ + [10, 126, 227, 18], + [20, 214, 200, 72], + [10, 180, 139, 12], + [268, 54, 46, 18], + [90, 54, 46, 18], + [282, 36, 45, 18], + [224, 54, 45, 18], + [52, 72, 45, 18] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/compositing/updating-scrolling-container-and-content-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/compositing/updating-scrolling-container-and-content-expected.txt index ac09835..a7a36ae 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/compositing/updating-scrolling-container-and-content-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/compositing/updating-scrolling-container-and-content-expected.txt
@@ -5,62 +5,18 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'CONTENT'", - "rect": [8, 275, 75, 18], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'CONTENT'", - "rect": [8, 257, 75, 18], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'CONTENT'", - "rect": [8, 239, 75, 18], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'CONTENT'", - "rect": [8, 221, 75, 18], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'CONTENT'", - "rect": [8, 203, 75, 18], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'CONTENT'", - "rect": [8, 185, 75, 18], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'CONTENT'", - "rect": [8, 167, 75, 18], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'CONTENT'", - "rect": [8, 149, 75, 18], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'CONTENT'", - "rect": [8, 131, 75, 18], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'CONTENT'", - "rect": [8, 113, 75, 18], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'CONTENT'", - "rect": [8, 108, 75, 5], - "reason": "style change" - } + "invalidations": [ + [8, 275, 75, 18], + [8, 257, 75, 18], + [8, 239, 75, 18], + [8, 221, 75, 18], + [8, 203, 75, 18], + [8, 185, 75, 18], + [8, 167, 75, 18], + [8, 149, 75, 18], + [8, 131, 75, 18], + [8, 113, 75, 18], + [8, 108, 75, 5] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/crbug-371640-2-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/crbug-371640-2-expected.txt index 1d8a76e..470a511a 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/crbug-371640-2-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/crbug-371640-2-expected.txt
@@ -5,22 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='keep' class='item'", - "rect": [348, 84, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV id='to_remove' class='item'", - "rect": [348, 84, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='keep' class='item'", - "rect": [88, 84, 100, 100], - "reason": "geometry" - } + "invalidations": [ + [348, 84, 100, 100], + [88, 84, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/crbug-371640-3-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/crbug-371640-3-expected.txt index 3352310a..15f60b7 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/crbug-371640-3-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/crbug-371640-3-expected.txt
@@ -5,22 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='keep_child'", - "rect": [508, 204, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='remove_child'", - "rect": [508, 84, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='keep_child'", - "rect": [408, 204, 100, 100], - "reason": "geometry" - } + "invalidations": [ + [508, 204, 100, 100], + [508, 84, 100, 100], + [408, 204, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/crbug-371640-4-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/crbug-371640-4-expected.txt index aa8075f..1e9bb2c 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/crbug-371640-4-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/crbug-371640-4-expected.txt
@@ -5,37 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='keep' class='item'", - "rect": [408, 84, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV id='to_remove' class='item'", - "rect": [408, 84, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='keep' class='item'", - "rect": [208, 84, 100, 100], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [408, 84, 4, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [408, 84, 4, 18], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [208, 84, 4, 18], - "reason": "geometry" - } + "invalidations": [ + [408, 84, 100, 100], + [208, 84, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/crbug-371640-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/crbug-371640-expected.txt index 3ba1c4de..470a511a 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/crbug-371640-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/crbug-371640-expected.txt
@@ -5,37 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='keep' class='item'", - "rect": [348, 84, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV id='to_remove' class='item'", - "rect": [348, 84, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='keep' class='item'", - "rect": [88, 84, 100, 100], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [348, 84, 4, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [348, 84, 4, 18], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [88, 84, 4, 18], - "reason": "geometry" - } + "invalidations": [ + [348, 84, 100, 100], + [88, 84, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/create-layer-repaint-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/create-layer-repaint-expected.txt index 3e49a162..a6496a7b 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/create-layer-repaint-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/create-layer-repaint-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='test' class='big stretchy'", - "rect": [28, 54, 500, 50], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='test' class='stretchy'", - "rect": [28, 54, 250, 50], - "reason": "chunk appeared" - } + "invalidations": [ + [28, 54, 500, 50] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/css-grid-layout/grid-item-z-index-change-repaint-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/css-grid-layout/grid-item-z-index-change-repaint-expected.txt index 076072a..1252ac13 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/css-grid-layout/grid-item-z-index-change-repaint-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/css-grid-layout/grid-item-z-index-change-repaint-expected.txt
@@ -5,47 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow HTML", - "rect": [8, 16, 464, 320], - "reason": "chunk disappeared" - }, - { - "object": "NGPhysicalTextFragment 'This test checks that grid items correctly repaint when 'z-index' changes.'", - "rect": [8, 16, 464, 18], - "reason": "appeared" - }, - { - "object": "LayoutGrid DIV class='grid fit-content'", - "rect": [8, 236, 400, 100], - "reason": "appeared" - }, - { - "object": "LayoutGrid DIV class='grid fit-content'", - "rect": [8, 126, 400, 100], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'For this test to pass, there should be no red below.'", - "rect": [8, 50, 320, 18], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow DIV class='sizedToGridArea red'", - "rect": [208, 236, 200, 100], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow DIV class='sizedToGridArea red'", - "rect": [208, 126, 200, 100], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='item2' class='sizedToGridArea green'", - "rect": [8, 236, 200, 100], - "reason": "chunk appeared" - } + "invalidations": [ + [8, 16, 464, 320] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/delete-into-nested-block-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/delete-into-nested-block-expected.txt index 47910b5..75ad19d 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/delete-into-nested-block-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/delete-into-nested-block-expected.txt
@@ -5,32 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'three'", - "rect": [8, 155, 32, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'three'", - "rect": [8, 119, 32, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'one'", - "rect": [8, 119, 28, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'two'", - "rect": [8, 137, 24, 19], - "reason": "disappeared" - }, - { - "object": "Caret", - "rect": [8, 119, 1, 19], - "reason": "appeared" - } + "invalidations": [ + [8, 155, 32, 19], + [8, 119, 32, 19], + [8, 137, 24, 19] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/details-open-repaint-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/details-open-repaint-expected.txt index 19dbd07..fb14cf6 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/details-open-repaint-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/details-open-repaint-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTextControl INPUT", - "rect": [8, 68, 153, 21], - "reason": "appeared" - }, - { - "object": "LayoutDetailsMarker DIV id='details-marker'", - "rect": [8, 53, 11, 11], - "reason": "full" - } + "invalidations": [ + [8, 68, 153, 21], + [8, 53, 11, 11] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/filters/filter-repaint-accelerated-child-with-filter-child-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/filters/filter-repaint-accelerated-child-with-filter-child-expected.txt index 9c6b080b..8e33782 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/filters/filter-repaint-accelerated-child-with-filter-child-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/filters/filter-repaint-accelerated-child-with-filter-child-expected.txt
@@ -15,17 +15,8 @@ "name": "LayoutNGBlockFlow DIV class='accelerated'", "position": [-12, -12], "bounds": [212, 257], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='resize' class='drop-shadow'", - "rect": [0, 0, 212, 257], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow DIV id='resize' class='drop-shadow'", - "rect": [0, 0, 158, 257], - "reason": "paint property change" - } + "invalidations": [ + [0, 0, 212, 257] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/flexbox/repaint-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/flexbox/repaint-expected.txt index 1f42ea3d..029a6c2 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/flexbox/repaint-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/flexbox/repaint-expected.txt
@@ -5,172 +5,13 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='content'", - "rect": [138, 116, 654, 90], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean laoreet dolor id urna eleifend aliquet.'", - "rect": [138, 116, 651, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Nulla vel dolor ipsum. Aliquam ut turpis nisl, in vulputate sapien. Cum sociis natoque penatibus et'", - "rect": [138, 116, 651, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Sed volutpat, tellus vel varius vestibulum, purus quam mollis sapien, in condimentum leo neque sed'", - "rect": [138, 116, 651, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'magnis dis parturient montes, nascetur ridiculus mus. Sed congue magna vitae dolor feugiat vehicula.'", - "rect": [138, 116, 651, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'nulla. Nunc quis porta elit. Pellentesque erat lectus, ultricies a lobortis id, faucibus id quam.'", - "rect": [138, 116, 651, 90], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV id='content'", - "rect": [148, 116, 644, 108], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow DIV id='content'", - "rect": [148, 116, 644, 108], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean laoreet dolor id urna eleifend aliquet.'", - "rect": [148, 116, 632, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean laoreet dolor id urna eleifend'", - "rect": [148, 116, 632, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Nulla vel dolor ipsum. Aliquam ut turpis nisl, in vulputate sapien. Cum sociis natoque penatibus et'", - "rect": [148, 116, 632, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Sed volutpat, tellus vel varius vestibulum, purus quam mollis sapien, in condimentum leo neque sed'", - "rect": [148, 116, 632, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'aliquet. Nulla vel dolor ipsum. Aliquam ut turpis nisl, in vulputate sapien. Cum sociis natoque'", - "rect": [148, 116, 632, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'condimentum leo neque sed nulla. Nunc quis porta elit. Pellentesque erat lectus, ultricies a lobortis'", - "rect": [148, 116, 632, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'feugiat vehicula. Sed volutpat, tellus vel varius vestibulum, purus quam mollis sapien, in'", - "rect": [148, 116, 632, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'id, faucibus id quam.'", - "rect": [148, 116, 632, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'id, faucibus id quam.'", - "rect": [148, 116, 632, 108], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'magnis dis parturient montes, nascetur ridiculus mus. Sed congue magna vitae dolor feugiat vehicula.'", - "rect": [148, 116, 632, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'nulla. Nunc quis porta elit. Pellentesque erat lectus, ultricies a lobortis id, faucibus id quam.'", - "rect": [148, 116, 632, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'penatibus et magnis dis parturient montes, nascetur ridiculus mus. Sed congue magna vitae dolor'", - "rect": [148, 116, 632, 108], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV id='content'", - "rect": [400, 116, 392, 162], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean laoreet dolor id urna eleifend'", - "rect": [400, 116, 392, 162], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'a lobortis id, faucibus id quam.'", - "rect": [400, 116, 392, 162], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'aliquet. Nulla vel dolor ipsum. Aliquam ut turpis nisl, in vulputate sapien. Cum sociis natoque'", - "rect": [400, 116, 392, 162], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'condimentum leo neque sed nulla. Nunc quis porta elit. Pellentesque erat lectus, ultricies a lobortis'", - "rect": [400, 116, 392, 162], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'feugiat vehicula. Sed volutpat, tellus vel varius vestibulum, purus quam mollis sapien, in'", - "rect": [400, 116, 392, 162], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'id, faucibus id quam.'", - "rect": [400, 116, 392, 162], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'nulla. Nunc quis porta elit. Pellentesque erat lectus, ultricies'", - "rect": [400, 116, 392, 162], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'penatibus et magnis dis parturient montes, nascetur ridiculus mus. Sed congue magna vitae dolor'", - "rect": [400, 116, 392, 162], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'purus quam mollis sapien, in condimentum leo neque sed'", - "rect": [400, 116, 392, 162], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='left'", - "rect": [8, 224, 392, 54], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow DIV id='left'", - "rect": [148, 116, 252, 162], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow DIV id='left'", - "rect": [8, 116, 140, 108], - "reason": "geometry" - } + "invalidations": [ + [138, 116, 654, 90], + [148, 116, 644, 108], + [400, 116, 392, 162], + [8, 224, 392, 54], + [148, 116, 252, 162], + [8, 116, 140, 108] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/float-move-during-layout-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/float-move-during-layout-expected.txt index 9bcbfc0..af67732 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/float-move-during-layout-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/float-move-during-layout-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [8, 204, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [8, 104, 100, 100], - "reason": "geometry" - } + "invalidations": [ + [8, 204, 100, 100], + [8, 104, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/float-offscreen-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/float-offscreen-expected.txt index 0b93de6..9da76a0 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/float-offscreen-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/float-offscreen-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [11, 11, 69, 21], - "reason": "chunk appeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [11, 11, 69, 21], - "reason": "chunk disappeared" - } + "invalidations": [ + [11, 11, 69, 21] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/forms/button-checkbox-click-method-repaint-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/forms/button-checkbox-click-method-repaint-expected.txt deleted file mode 100644 index efd0f03..0000000 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/forms/button-checkbox-click-method-repaint-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow INPUT id='checkbox'", - "rect": [12, 61, 30, 30], - "reason": "subtree" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/forms/button-reset-focus-by-mouse-then-keydown-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/forms/button-reset-focus-by-mouse-then-keydown-expected.txt index 046353e..297d950 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/forms/button-reset-focus-by-mouse-then-keydown-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/forms/button-reset-focus-by-mouse-then-keydown-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutButton BUTTON", - "rect": [6, 6, 55, 25], - "reason": "subtree" - }, - { - "object": "InlineTextBox 'Reset'", - "rect": [16, 10, 35, 16], - "reason": "subtree" - } + "invalidations": [ + [6, 6, 55, 25] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/forms/details-marker-color-change-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/forms/details-marker-color-change-expected.txt index 867987d8..579ae7f 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/forms/details-marker-color-change-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/forms/details-marker-color-change-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Details'", - "rect": [24, 8, 47, 18], - "reason": "style change" - }, - { - "object": "LayoutDetailsMarker DIV id='details-marker'", - "rect": [8, 11, 11, 11], - "reason": "style change" - } + "invalidations": [ + [24, 8, 47, 18], + [8, 11, 11, 11] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/forms/select-option-background-color-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/forms/select-option-background-color-expected.txt index 783c722..4540a3c 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/forms/select-option-background-color-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/forms/select-option-background-color-expected.txt
@@ -5,22 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "VerticalScrollbar", - "rect": [14, 35, 15, 68], - "reason": "disappeared" - }, - { - "object": "VerticalScrollbar", - "rect": [14, 35, 15, 68], - "reason": "chunk appeared" - }, - { - "object": "LayoutBlockFlow SELECT", - "rect": [1, 35, 13, 17], - "reason": "chunk appeared" - } + "invalidations": [ + [14, 35, 15, 68], + [1, 35, 13, 17] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.png b/third_party/blink/web_tests/platform/mac/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.png index 1d371132..44b1a1b 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.png +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.txt index fe556fa..4c854b0 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutButton INPUT", - "rect": [3, 4, 63, 29], - "reason": "subtree" - }, - { - "object": "InlineTextBox 'Submit'", - "rect": [16, 11, 37, 14], - "reason": "subtree" - } + "invalidations": [ + [6, 6, 62, 25] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/forms/textarea-caret-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/forms/textarea-caret-expected.txt index 30487acb..90a10e9 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/forms/textarea-caret-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/forms/textarea-caret-expected.txt
@@ -5,37 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTextControl TEXTAREA id='editor'", - "rect": [6, 6, 185, 40], - "reason": "chunk appeared" - }, - { - "object": "LayoutTextControl TEXTAREA id='editor'", - "rect": [6, 6, 185, 40], - "reason": "chunk appeared" - }, - { - "object": "LayoutTextControl TEXTAREA id='editor'", - "rect": [8, 8, 181, 36], - "reason": "disappeared" - }, - { - "object": "LayoutTextControl TEXTAREA id='editor'", - "rect": [9, 11, 179, 16], - "reason": "chunk appeared" - }, - { - "object": "HorizontalScrollbar", - "rect": [9, 28, 179, 15], - "reason": "chunk appeared" - }, - { - "object": "LayoutTextControl TEXTAREA id='editor'", - "rect": [173, 28, 15, 15], - "reason": "chunk disappeared" - } + "invalidations": [ + [6, 6, 185, 40] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/gradients-em-stops-repaint-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/gradients-em-stops-repaint-expected.txt index d08f872..94f29a7 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/gradients-em-stops-repaint-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/gradients-em-stops-repaint-expected.txt
@@ -5,22 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='box4' class='box'", - "rect": [344, 18, 302, 122], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow DIV class='indicator'", - "rect": [345, 19, 240, 20], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment ' '", - "rect": [330, 136, 4, 18], - "reason": "geometry" - } + "invalidations": [ + [344, 18, 302, 122], + [330, 136, 4, 18] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/iframe-display-block-to-display-none-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/iframe-display-block-to-display-none-expected.txt index 1f8649b..9a889fa 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/iframe-display-block-to-display-none-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/iframe-display-block-to-display-none-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutIFrame IFRAME id='iframe'", - "rect": [8, 68, 732, 94], - "reason": "disappeared" - } + "invalidations": [ + [8, 68, 732, 94] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/iframe-display-none-to-display-block-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/iframe-display-none-to-display-block-expected.txt index 11fcdbd..9a889fa 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/iframe-display-none-to-display-block-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/iframe-display-none-to-display-block-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutIFrame IFRAME id='iframe'", - "rect": [8, 68, 732, 94], - "reason": "appeared" - } + "invalidations": [ + [8, 68, 732, 94] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/image/canvas-composite-repaint-by-all-imagesource-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/image/canvas-composite-repaint-by-all-imagesource-expected.txt index cde65031..e37b58f3 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/image/canvas-composite-repaint-by-all-imagesource-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/image/canvas-composite-repaint-by-all-imagesource-expected.txt
@@ -5,447 +5,51 @@ "bounds": [785, 928], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutHTMLCanvas CANVAS id='copyvideo'", - "rect": [571, 513, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='copyvideo'", - "rect": [571, 513, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-atopvideo'", - "rect": [571, 413, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-atopvideo'", - "rect": [571, 413, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-invideo'", - "rect": [571, 313, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-invideo'", - "rect": [571, 313, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-outvideo'", - "rect": [571, 163, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-outvideo'", - "rect": [571, 163, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-invideo'", - "rect": [571, 113, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-invideo'", - "rect": [571, 113, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='copycanvas'", - "rect": [429, 513, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='copycanvas'", - "rect": [429, 513, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-atopcanvas'", - "rect": [429, 413, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-atopcanvas'", - "rect": [429, 413, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-incanvas'", - "rect": [429, 313, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-incanvas'", - "rect": [429, 313, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-outcanvas'", - "rect": [429, 163, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-outcanvas'", - "rect": [429, 163, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-incanvas'", - "rect": [429, 113, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-incanvas'", - "rect": [429, 113, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='copyimage'", - "rect": [287, 513, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='copyimage'", - "rect": [287, 513, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-atopimage'", - "rect": [287, 413, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-atopimage'", - "rect": [287, 413, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-inimage'", - "rect": [287, 313, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-inimage'", - "rect": [287, 313, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-outimage'", - "rect": [287, 163, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-outimage'", - "rect": [287, 163, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-inimage'", - "rect": [287, 113, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-inimage'", - "rect": [287, 113, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='copysolid color'", - "rect": [145, 513, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='copysolid color'", - "rect": [145, 513, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-atopsolid color'", - "rect": [145, 413, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-atopsolid color'", - "rect": [145, 413, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-insolid color'", - "rect": [145, 313, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-insolid color'", - "rect": [145, 313, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-outsolid color'", - "rect": [145, 163, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-outsolid color'", - "rect": [145, 163, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-insolid color'", - "rect": [145, 113, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-insolid color'", - "rect": [145, 113, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='xorvideo'", - "rect": [601, 563, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='xorvideo'", - "rect": [601, 563, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='lightervideo'", - "rect": [601, 463, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='lightervideo'", - "rect": [601, 463, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-outvideo'", - "rect": [601, 363, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-outvideo'", - "rect": [601, 363, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-overvideo'", - "rect": [601, 263, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-overvideo'", - "rect": [601, 263, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-atopvideo'", - "rect": [601, 213, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-atopvideo'", - "rect": [601, 213, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-overvideo'", - "rect": [601, 63, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-overvideo'", - "rect": [601, 63, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='xorcanvas'", - "rect": [459, 563, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='xorcanvas'", - "rect": [459, 563, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='lightercanvas'", - "rect": [459, 463, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='lightercanvas'", - "rect": [459, 463, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-outcanvas'", - "rect": [459, 363, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-outcanvas'", - "rect": [459, 363, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-overcanvas'", - "rect": [459, 263, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-overcanvas'", - "rect": [459, 263, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-atopcanvas'", - "rect": [459, 213, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-atopcanvas'", - "rect": [459, 213, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-overcanvas'", - "rect": [459, 63, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-overcanvas'", - "rect": [459, 63, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='xorimage'", - "rect": [317, 563, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='xorimage'", - "rect": [317, 563, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='lighterimage'", - "rect": [317, 463, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='lighterimage'", - "rect": [317, 463, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-outimage'", - "rect": [317, 363, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-outimage'", - "rect": [317, 363, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-overimage'", - "rect": [317, 263, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-overimage'", - "rect": [317, 263, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-atopimage'", - "rect": [317, 213, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-atopimage'", - "rect": [317, 213, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-overimage'", - "rect": [317, 63, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-overimage'", - "rect": [317, 63, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='xorsolid color'", - "rect": [175, 563, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='xorsolid color'", - "rect": [175, 563, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='lightersolid color'", - "rect": [175, 463, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='lightersolid color'", - "rect": [175, 463, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-outsolid color'", - "rect": [175, 363, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-outsolid color'", - "rect": [175, 363, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-oversolid color'", - "rect": [175, 263, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-oversolid color'", - "rect": [175, 263, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-atopsolid color'", - "rect": [175, 213, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-atopsolid color'", - "rect": [175, 213, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-oversolid color'", - "rect": [175, 63, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-oversolid color'", - "rect": [175, 63, 50, 40], - "reason": "invalidate paint rectangle" - } + "invalidations": [ + [571, 513, 80, 40], + [571, 413, 80, 40], + [571, 313, 80, 40], + [571, 163, 80, 40], + [571, 113, 80, 40], + [429, 513, 80, 40], + [429, 413, 80, 40], + [429, 313, 80, 40], + [429, 163, 80, 40], + [429, 113, 80, 40], + [287, 513, 80, 40], + [287, 413, 80, 40], + [287, 313, 80, 40], + [287, 163, 80, 40], + [287, 113, 80, 40], + [145, 513, 80, 40], + [145, 413, 80, 40], + [145, 313, 80, 40], + [145, 163, 80, 40], + [145, 113, 80, 40], + [601, 563, 50, 40], + [601, 463, 50, 40], + [601, 363, 50, 40], + [601, 263, 50, 40], + [601, 213, 50, 40], + [601, 63, 50, 40], + [459, 563, 50, 40], + [459, 463, 50, 40], + [459, 363, 50, 40], + [459, 263, 50, 40], + [459, 213, 50, 40], + [459, 63, 50, 40], + [317, 563, 50, 40], + [317, 463, 50, 40], + [317, 363, 50, 40], + [317, 263, 50, 40], + [317, 213, 50, 40], + [317, 63, 50, 40], + [175, 563, 50, 40], + [175, 463, 50, 40], + [175, 363, 50, 40], + [175, 263, 50, 40], + [175, 213, 50, 40], + [175, 63, 50, 40] ] }, {
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/in-scaled-iframe-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/in-scaled-iframe-expected.txt index aa35aaa..9387631 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/in-scaled-iframe-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/in-scaled-iframe-expected.txt
@@ -5,12 +5,8 @@ "bounds": [785, 824], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='div'", - "rect": [209, 209, 100, 100], - "reason": "background" - } + "invalidations": [ + [209, 209, 100, 100] ] }, {
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/inline-color-change-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/inline-color-change-expected.txt index 6cb4ca4..0917a53 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/inline-color-change-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/inline-color-change-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalBoxFragment LayoutInline SPAN id='target'", - "rect": [8, 68, 37, 18], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'PASS'", - "rect": [8, 68, 37, 18], - "reason": "style change" - } + "invalidations": [ + [8, 68, 37, 18] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/invalidate-caret-before-text-node-update-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/invalidate-caret-before-text-node-update-expected.txt deleted file mode 100644 index ac3d734..0000000 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/invalidate-caret-before-text-node-update-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='root' class='editing'", - "rect": [6, 6, 788, 22], - "reason": "style change" - }, - { - "object": "InlineTextBox '1'", - "rect": [8, 7, 10, 19], - "reason": "disappeared" - }, - { - "object": "Caret", - "rect": [18, 8, 1, 18], - "reason": "caret" - }, - { - "object": "Caret", - "rect": [8, 8, 1, 18], - "reason": "caret" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/invalidation-after-opacity-change-subtree-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/invalidation-after-opacity-change-subtree-expected.txt index d8d635b..5716533 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/invalidation-after-opacity-change-subtree-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/invalidation-after-opacity-change-subtree-expected.txt
@@ -5,27 +5,9 @@ "bounds": [785, 2350], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'This test checks that switching opacity'", - "rect": [8, 2045, 774, 109], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'invalidates the full subtree.'", - "rect": [8, 2045, 774, 109], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'This text should be visible in the'", - "rect": [8, 2195, 653, 109], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'output.'", - "rect": [8, 2195, 653, 109], - "reason": "appeared" - } + "invalidations": [ + [8, 2045, 774, 109], + [8, 2195, 653, 109] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/line-flow-with-floats-1-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/line-flow-with-floats-1-expected.txt index 681f29d..b66a1680 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/line-flow-with-floats-1-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/line-flow-with-floats-1-expected.txt
@@ -5,252 +5,20 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment ' twist itself'", - "rect": [14, 170, 408, 72], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'had got its head down, and was going to '", - "rect": [14, 170, 408, 72], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'round and look up in her face, with such a puzzled expression'", - "rect": [14, 170, 408, 72], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'that she could not help bursting out laughing: and when she'", - "rect": [14, 170, 408, 72], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Alice soon came to the conclusion that it was a very'", - "rect": [14, 224, 407, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'always getting up and walking off to other parts of the ground,'", - "rect": [14, 224, 407, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'and was in the act of crawling away: besides all this, there was'", - "rect": [14, 224, 407, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was'", - "rect": [14, 224, 407, 126], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'generally a ridge or furrow in the way wherever she wanted to'", - "rect": [14, 224, 407, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'send the hedgehog to, and, as the doubled-up soldiers were'", - "rect": [14, 224, 407, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'very provoking to find that the hedgehog had unrolled itself,'", - "rect": [14, 224, 407, 126], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet'", - "rect": [14, 476, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'become of me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 476, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 476, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 476, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'here; the great wonder is, that there\u2018s any one left alive!\u2019'", - "rect": [14, 476, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and look up in her face, with such a'", - "rect": [14, 188, 407, 72], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'had got its head down, and was going to '", - "rect": [14, 188, 407, 72], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'that she could not help bursting out laughing: and when she'", - "rect": [14, 188, 407, 72], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'to '", - "rect": [14, 188, 407, 72], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'Alice soon came to the conclusion that it was a very'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'always getting up and walking off to other parts of the ground,'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'and was in the act of crawling away: besides all this, there was'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very provoking to find that the hedgehog'", - "rect": [14, 242, 406, 126], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'generally a ridge or furrow in the way wherever she wanted to'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'send the hedgehog to, and, as the doubled-up soldiers were'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'that it was a very '", - "rect": [14, 242, 406, 126], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in'", - "rect": [14, 80, 406, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'arm, with its legs hanging down, but generally, just as'", - "rect": [14, 80, 406, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'body tucked away, comfortably enough, under her'", - "rect": [14, 80, 406, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'give the hedgehog a blow with its head, it '", - "rect": [14, 80, 406, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'managing her flamingo: she succeeded in getting its'", - "rect": [14, 80, 406, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'she had got its neck nicely straightened out, and was going to'", - "rect": [14, 80, 406, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' was in a furious passion, and went stamping'", - "rect": [14, 422, 355, 54], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'about once in a minute.'", - "rect": [14, 422, 355, 54], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'shouting \u2018Off with his head!\u2019 or \u2018Off with her head!\u2019'", - "rect": [14, 422, 355, 54], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'was in a furious passion, and went stamping about, and'", - "rect": [14, 422, 355, 54], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'Queen'", - "rect": [14, 404, 355, 36], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [14, 404, 355, 36], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for the hedgehogs; and in a very short time '", - "rect": [14, 386, 355, 36], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for turns, quarrelling all the while, and fighting'", - "rect": [14, 386, 355, 36], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting'", - "rect": [65, 368, 304, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'difficult game indeed.'", - "rect": [178, 350, 141, 18], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'difficult game indeed.'", - "rect": [65, 350, 141, 18], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV id='pinkFloat'", - "rect": [378, 138, 70, 30], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 353, 48, 65], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 335, 48, 65], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [305, 170, 41, 18], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [14, 188, 40, 18], - "reason": "disappeared" - } + "invalidations": [ + [14, 170, 408, 72], + [14, 224, 407, 126], + [14, 476, 407, 90], + [14, 188, 407, 72], + [14, 242, 406, 126], + [14, 80, 406, 108], + [14, 422, 355, 54], + [14, 404, 355, 36], + [14, 386, 355, 36], + [65, 368, 304, 18], + [378, 138, 70, 30], + [14, 353, 48, 65], + [14, 335, 48, 65] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/line-flow-with-floats-10-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/line-flow-with-floats-10-expected.txt index be08477d..a51889f 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/line-flow-with-floats-10-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/line-flow-with-floats-10-expected.txt
@@ -5,177 +5,17 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet'", - "rect": [14, 476, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'become of me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 476, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 476, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 476, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'here; the great wonder is, that there\u2018s any one left alive!\u2019'", - "rect": [14, 476, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and look up in her face, with such a'", - "rect": [14, 188, 407, 72], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'laughing: and when she had got its head down, and was going'", - "rect": [14, 188, 407, 72], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'puzzled expression that she could not help bursting out'", - "rect": [14, 188, 407, 72], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'to '", - "rect": [14, 188, 407, 72], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very provoking to find that the hedgehog'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'besides all this, there was generally a ridge or furrow in the'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'doubled-up soldiers were always getting up and walking off to'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'had unrolled itself, and was in the act of crawling away:'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'other parts of the ground, Alice soon came to the conclusion'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'that it was a very '", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'way wherever she wanted to send the hedgehog to, and, as the'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in'", - "rect": [14, 80, 355, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'arm, with its legs hanging down, but generally, just as'", - "rect": [14, 80, 355, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'body tucked away, comfortably enough, under her'", - "rect": [14, 80, 355, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'going to give the hedgehog a blow with its head, it'", - "rect": [14, 80, 355, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'managing her flamingo: she succeeded in getting its'", - "rect": [14, 80, 355, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'she had got its neck nicely straightened out, and was'", - "rect": [14, 80, 355, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' was in a furious passion, and went'", - "rect": [14, 422, 355, 54], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'stamping about, and shouting \u2018Off with his head!\u2019 or'", - "rect": [14, 422, 355, 54], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u2018Off with her head!\u2019 about once in a minute.'", - "rect": [14, 422, 355, 54], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Queen'", - "rect": [14, 404, 355, 36], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'the'", - "rect": [14, 404, 355, 36], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for the hedgehogs; and in a very short time '", - "rect": [65, 386, 304, 36], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for turns, quarrelling all the while, and fighting'", - "rect": [65, 386, 304, 36], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting'", - "rect": [65, 368, 304, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'difficult game indeed.'", - "rect": [178, 350, 141, 18], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 353, 48, 65], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 364, 48, 64], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [14, 188, 40, 18], - "reason": "geometry" - } + "invalidations": [ + [14, 476, 407, 90], + [14, 188, 407, 72], + [14, 242, 406, 126], + [14, 80, 355, 108], + [14, 422, 355, 54], + [14, 404, 355, 36], + [65, 386, 304, 36], + [65, 368, 304, 18], + [14, 353, 48, 65], + [14, 364, 48, 64] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/line-flow-with-floats-2-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/line-flow-with-floats-2-expected.txt index 518428f..75f5e904 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/line-flow-with-floats-2-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/line-flow-with-floats-2-expected.txt
@@ -5,317 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow P", - "rect": [8, 74, 418, 502], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet'", - "rect": [14, 480, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'become of me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 480, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 480, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 480, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'here; the great wonder is, that there\u2018s any one left alive!\u2019'", - "rect": [14, 480, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet'", - "rect": [14, 476, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'become of me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 476, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 476, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 476, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'here; the great wonder is, that there\u2018s any one left alive!\u2019'", - "rect": [14, 476, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and look up in her face, with such a'", - "rect": [14, 191, 407, 73], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'laughing: and when she had got its head down, and was going'", - "rect": [14, 191, 407, 73], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'puzzled expression that she could not help bursting out'", - "rect": [14, 191, 407, 73], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'to '", - "rect": [14, 191, 407, 73], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and look up in her face, with such a'", - "rect": [14, 188, 407, 72], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'laughing: and when she had got its head down, and was going'", - "rect": [14, 188, 407, 72], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'puzzled expression that she could not help bursting out'", - "rect": [14, 188, 407, 72], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'to '", - "rect": [14, 188, 407, 72], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very provoking to find that the hedgehog'", - "rect": [14, 246, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'besides all this, there was generally a ridge or furrow in the'", - "rect": [14, 246, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'doubled-up soldiers were always getting up and walking off to'", - "rect": [14, 246, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'had unrolled itself, and was in the act of crawling away:'", - "rect": [14, 246, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'other parts of the ground, Alice soon came to the conclusion'", - "rect": [14, 246, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'that it was a very '", - "rect": [14, 246, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'way wherever she wanted to send the hedgehog to, and, as the'", - "rect": [14, 246, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very provoking to find that the hedgehog'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'besides all this, there was generally a ridge or furrow in the'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'doubled-up soldiers were always getting up and walking off to'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'had unrolled itself, and was in the act of crawling away:'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'other parts of the ground, Alice soon came to the conclusion'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'that it was a very '", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'way wherever she wanted to send the hedgehog to, and, as the'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in'", - "rect": [14, 80, 355, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'arm, with its legs hanging down, but generally, just as'", - "rect": [14, 80, 355, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'body tucked away, comfortably enough, under her'", - "rect": [14, 80, 355, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'going to give the hedgehog a blow with its head, it'", - "rect": [14, 80, 355, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'managing her flamingo: she succeeded in getting its'", - "rect": [14, 80, 355, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'she had got its neck nicely straightened out, and was'", - "rect": [14, 80, 355, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' was in a furious passion, and went stamping'", - "rect": [14, 426, 355, 54], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'about, and shouting \u2018Off with his head!\u2019 or \u2018Off with'", - "rect": [14, 426, 355, 54], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'her head!\u2019 about once in a minute.'", - "rect": [14, 426, 355, 54], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' was in a furious passion, and went stamping'", - "rect": [14, 422, 355, 54], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'about, and shouting \u2018Off with his head!\u2019 or \u2018Off with'", - "rect": [14, 422, 355, 54], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'her head!\u2019 about once in a minute.'", - "rect": [14, 422, 355, 54], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Queen'", - "rect": [14, 408, 355, 36], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'the'", - "rect": [14, 408, 355, 36], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Queen'", - "rect": [14, 404, 355, 36], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'the'", - "rect": [14, 404, 355, 36], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for the hedgehogs; and in a very short time '", - "rect": [65, 390, 304, 36], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for turns, quarrelling all the while, and fighting'", - "rect": [65, 390, 304, 36], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for the hedgehogs; and in a very short time '", - "rect": [65, 386, 304, 36], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for turns, quarrelling all the while, and fighting'", - "rect": [65, 386, 304, 36], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting'", - "rect": [65, 372, 304, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting'", - "rect": [65, 368, 304, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'difficult game indeed.'", - "rect": [178, 354, 141, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'difficult game indeed.'", - "rect": [178, 350, 141, 18], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='greenFloat'", - "rect": [372, 375, 48, 81], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='greenFloat'", - "rect": [372, 371, 48, 81], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 357, 48, 65], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 353, 48, 65], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [14, 188, 45, 22], - "reason": "style change" - } + "invalidations": [ + [8, 74, 418, 502] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/line-flow-with-floats-3-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/line-flow-with-floats-3-expected.txt index 37d270aa..e67aaa4 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/line-flow-with-floats-3-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/line-flow-with-floats-3-expected.txt
@@ -5,182 +5,16 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet'", - "rect": [14, 476, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'become of me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 476, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 476, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 476, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'here; the great wonder is, that there\u2018s any one left alive!\u2019'", - "rect": [14, 476, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and look up in her face, with such a'", - "rect": [14, 188, 407, 72], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'laughing: and when she had got its head down, and was going'", - "rect": [14, 188, 407, 72], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'puzzled expression that she could not help bursting out'", - "rect": [14, 188, 407, 72], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'to '", - "rect": [14, 188, 407, 72], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very provoking to find that the hedgehog'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'besides all this, there was generally a ridge or furrow in the'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'doubled-up soldiers were always getting up and walking off to'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'had unrolled itself, and was in the act of crawling away:'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'other parts of the ground, Alice soon came to the conclusion'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'that it was a very '", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'way wherever she wanted to send the hedgehog to, and, as the'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for the hedgehogs; and in a very short time'", - "rect": [65, 368, 356, 54], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for'", - "rect": [65, 368, 356, 54], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'turns, quarrelling all the while, and fighting'", - "rect": [65, 368, 356, 54], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in'", - "rect": [14, 80, 355, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'arm, with its legs hanging down, but generally, just as'", - "rect": [14, 80, 355, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'body tucked away, comfortably enough, under her'", - "rect": [14, 80, 355, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'going to give the hedgehog a blow with its head, it'", - "rect": [14, 80, 355, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'managing her flamingo: she succeeded in getting its'", - "rect": [14, 80, 355, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'she had got its neck nicely straightened out, and was'", - "rect": [14, 80, 355, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' was in a furious passion, and went'", - "rect": [14, 422, 355, 54], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'stamping about, and shouting \u2018Off with his head!\u2019 or'", - "rect": [14, 422, 355, 54], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u2018Off with her head!\u2019 about once in a minute.'", - "rect": [14, 422, 355, 54], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [14, 404, 355, 36], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'the'", - "rect": [14, 404, 355, 36], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting '", - "rect": [65, 368, 337, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'difficult game indeed.'", - "rect": [178, 350, 141, 18], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='greenFloat'", - "rect": [356, 389, 64, 81], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='greenFloat'", - "rect": [372, 371, 48, 81], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [14, 188, 40, 18], - "reason": "geometry" - } + "invalidations": [ + [14, 476, 407, 90], + [14, 188, 407, 72], + [14, 242, 406, 126], + [65, 368, 356, 54], + [14, 80, 355, 108], + [14, 422, 355, 54], + [14, 404, 355, 36], + [356, 389, 64, 81], + [372, 371, 48, 81] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/line-flow-with-floats-4-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/line-flow-with-floats-4-expected.txt index 4c3c4e0..a8e5cd0c8 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/line-flow-with-floats-4-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/line-flow-with-floats-4-expected.txt
@@ -5,172 +5,16 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet'", - "rect": [14, 476, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'become of me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 476, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 476, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 476, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'here; the great wonder is, that there\u2018s any one left alive!\u2019'", - "rect": [14, 476, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and look up in her face, with such a'", - "rect": [14, 188, 407, 72], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'laughing: and when she had got its head down, and was going'", - "rect": [14, 188, 407, 72], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'puzzled expression that she could not help bursting out'", - "rect": [14, 188, 407, 72], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'to '", - "rect": [14, 188, 407, 72], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' was in a furious passion, and went stamping'", - "rect": [14, 422, 407, 54], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'about, and shouting \u2018Off with his head!\u2019 or \u2018Off with her'", - "rect": [14, 422, 407, 54], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'head!\u2019 about once in a minute.'", - "rect": [14, 422, 407, 54], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very provoking to find that the hedgehog'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'besides all this, there was generally a ridge or furrow in the'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'doubled-up soldiers were always getting up and walking off to'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'had unrolled itself, and was in the act of crawling away:'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'other parts of the ground, Alice soon came to the conclusion'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'that it was a very '", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'way wherever she wanted to send the hedgehog to, and, as the'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in'", - "rect": [14, 80, 355, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'arm, with its legs hanging down, but generally, just as'", - "rect": [14, 80, 355, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'body tucked away, comfortably enough, under her'", - "rect": [14, 80, 355, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'going to give the hedgehog a blow with its head, it'", - "rect": [14, 80, 355, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'managing her flamingo: she succeeded in getting its'", - "rect": [14, 80, 355, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'she had got its neck nicely straightened out, and was'", - "rect": [14, 80, 355, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Queen'", - "rect": [14, 404, 355, 36], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'the'", - "rect": [14, 404, 355, 36], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for the hedgehogs; and in a very short time '", - "rect": [65, 386, 304, 36], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for turns, quarrelling all the while, and fighting'", - "rect": [65, 386, 304, 36], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting'", - "rect": [65, 368, 304, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'difficult game indeed.'", - "rect": [178, 350, 141, 18], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='greenFloat'", - "rect": [372, 371, 48, 81], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [14, 188, 40, 18], - "reason": "geometry" - } + "invalidations": [ + [14, 476, 407, 90], + [14, 188, 407, 72], + [14, 422, 407, 54], + [14, 242, 406, 126], + [14, 80, 355, 108], + [14, 404, 355, 36], + [65, 386, 304, 36], + [65, 368, 304, 18], + [372, 371, 48, 81] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/line-flow-with-floats-5-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/line-flow-with-floats-5-expected.txt index 91ca224..0384260 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/line-flow-with-floats-5-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/line-flow-with-floats-5-expected.txt
@@ -5,187 +5,15 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet'", - "rect": [14, 476, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'become of me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 476, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 476, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 476, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'here; the great wonder is, that there\u2018s any one left alive!\u2019'", - "rect": [14, 476, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and look up in her face, with such a'", - "rect": [14, 188, 407, 72], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'laughing: and when she had got its head down, and was going'", - "rect": [14, 188, 407, 72], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'puzzled expression that she could not help bursting out'", - "rect": [14, 188, 407, 72], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'to '", - "rect": [14, 188, 407, 72], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very provoking to find that the hedgehog'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'besides all this, there was generally a ridge or furrow in the'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'doubled-up soldiers were always getting up and walking off to'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'had unrolled itself, and was in the act of crawling away:'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'other parts of the ground, Alice soon came to the conclusion'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'that it was a very '", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'way wherever she wanted to send the hedgehog to, and, as the'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in'", - "rect": [14, 80, 355, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'arm, with its legs hanging down, but generally, just as'", - "rect": [14, 80, 355, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'body tucked away, comfortably enough, under her'", - "rect": [14, 80, 355, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'going to give the hedgehog a blow with its head, it'", - "rect": [14, 80, 355, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'managing her flamingo: she succeeded in getting its'", - "rect": [14, 80, 355, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'she had got its neck nicely straightened out, and was'", - "rect": [14, 80, 355, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' was in a furious passion, and went stamping'", - "rect": [14, 422, 355, 54], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'about, and shouting \u2018Off with his head!\u2019 or \u2018Off with'", - "rect": [14, 422, 355, 54], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'her head!\u2019 about once in a minute.'", - "rect": [14, 422, 355, 54], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Queen'", - "rect": [14, 404, 355, 36], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'the'", - "rect": [14, 404, 355, 36], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for'", - "rect": [49, 368, 321, 54], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'the hedgehogs; and in a very short time '", - "rect": [49, 368, 321, 54], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'turns, quarrelling all the while, and fighting for'", - "rect": [49, 368, 321, 54], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting '", - "rect": [65, 368, 304, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting '", - "rect": [49, 368, 302, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'difficult game indeed.'", - "rect": [178, 350, 141, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'difficult game indeed.'", - "rect": [162, 350, 141, 18], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 353, 48, 65], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [14, 188, 40, 18], - "reason": "geometry" - } + "invalidations": [ + [14, 476, 407, 90], + [14, 188, 407, 72], + [14, 242, 406, 126], + [14, 80, 355, 108], + [14, 422, 355, 54], + [14, 404, 355, 36], + [49, 368, 321, 54], + [14, 353, 48, 65] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/line-flow-with-floats-6-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/line-flow-with-floats-6-expected.txt index cb0df89..7562eae 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/line-flow-with-floats-6-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/line-flow-with-floats-6-expected.txt
@@ -5,182 +5,16 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet'", - "rect": [14, 476, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'become of me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 476, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 476, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 476, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'here; the great wonder is, that there\u2018s any one left alive!\u2019'", - "rect": [14, 476, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and look up in her face, with such a'", - "rect": [14, 188, 407, 72], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'laughing: and when she had got its head down, and was going'", - "rect": [14, 188, 407, 72], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'puzzled expression that she could not help bursting out'", - "rect": [14, 188, 407, 72], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'to '", - "rect": [14, 188, 407, 72], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very provoking to find that the hedgehog'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'besides all this, there was generally a ridge or furrow in the'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'doubled-up soldiers were always getting up and walking off to'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'had unrolled itself, and was in the act of crawling away:'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'other parts of the ground, Alice soon came to the conclusion'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'that it was a very '", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'way wherever she wanted to send the hedgehog to, and, as the'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in'", - "rect": [14, 80, 355, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'arm, with its legs hanging down, but generally, just as'", - "rect": [14, 80, 355, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'body tucked away, comfortably enough, under her'", - "rect": [14, 80, 355, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'going to give the hedgehog a blow with its head, it'", - "rect": [14, 80, 355, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'managing her flamingo: she succeeded in getting its'", - "rect": [14, 80, 355, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'she had got its neck nicely straightened out, and was'", - "rect": [14, 80, 355, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' was in a furious passion, and went stamping'", - "rect": [14, 422, 355, 54], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'about, and shouting \u2018Off with his head!\u2019 or \u2018Off with'", - "rect": [14, 422, 355, 54], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'her head!\u2019 about once in a minute.'", - "rect": [14, 422, 355, 54], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Queen'", - "rect": [14, 404, 355, 36], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'the'", - "rect": [14, 404, 355, 36], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for the hedgehogs; and in a very short time '", - "rect": [65, 386, 304, 36], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for turns, quarrelling all the while, and fighting'", - "rect": [65, 386, 304, 36], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting'", - "rect": [65, 368, 304, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'difficult game indeed.'", - "rect": [178, 350, 141, 18], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 353, 48, 65], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 353, 48, 65], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [14, 188, 40, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'foo'", - "rect": [27, 353, 22, 19], - "reason": "appeared" - } + "invalidations": [ + [14, 476, 407, 90], + [14, 188, 407, 72], + [14, 242, 406, 126], + [14, 80, 355, 108], + [14, 422, 355, 54], + [14, 404, 355, 36], + [65, 386, 304, 36], + [65, 368, 304, 18], + [14, 353, 48, 65] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/line-flow-with-floats-7-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/line-flow-with-floats-7-expected.txt index c0da34d..d7d4851 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/line-flow-with-floats-7-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/line-flow-with-floats-7-expected.txt
@@ -5,167 +5,15 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet'", - "rect": [14, 476, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'become of me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 476, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 476, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 476, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'here; the great wonder is, that there\u2018s any one left alive!\u2019'", - "rect": [14, 476, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and look up in her face, with such a'", - "rect": [14, 188, 407, 72], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'laughing: and when she had got its head down, and was going'", - "rect": [14, 188, 407, 72], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'puzzled expression that she could not help bursting out'", - "rect": [14, 188, 407, 72], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'to '", - "rect": [14, 188, 407, 72], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very provoking to find that the hedgehog'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'besides all this, there was generally a ridge or furrow in the'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'doubled-up soldiers were always getting up and walking off to'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'had unrolled itself, and was in the act of crawling away:'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'other parts of the ground, Alice soon came to the conclusion'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'that it was a very '", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'way wherever she wanted to send the hedgehog to, and, as the'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in'", - "rect": [14, 80, 355, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'arm, with its legs hanging down, but generally, just as'", - "rect": [14, 80, 355, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'body tucked away, comfortably enough, under her'", - "rect": [14, 80, 355, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'going to give the hedgehog a blow with its head, it'", - "rect": [14, 80, 355, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'managing her flamingo: she succeeded in getting its'", - "rect": [14, 80, 355, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'she had got its neck nicely straightened out, and was'", - "rect": [14, 80, 355, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' was in a furious passion, and went stamping'", - "rect": [14, 422, 355, 54], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'about, and shouting \u2018Off with his head!\u2019 or \u2018Off with'", - "rect": [14, 422, 355, 54], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'her head!\u2019 about once in a minute.'", - "rect": [14, 422, 355, 54], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Queen'", - "rect": [14, 404, 355, 36], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'the'", - "rect": [14, 404, 355, 36], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'for the hedgehogs; and in a very short time '", - "rect": [65, 386, 304, 36], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for turns, quarrelling all the while, and fighting'", - "rect": [65, 386, 304, 36], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting'", - "rect": [65, 368, 304, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'difficult game indeed.'", - "rect": [178, 350, 141, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [14, 188, 40, 18], - "reason": "geometry" - } + "invalidations": [ + [14, 476, 407, 90], + [14, 188, 407, 72], + [14, 242, 406, 126], + [14, 80, 355, 108], + [14, 422, 355, 54], + [14, 404, 355, 36], + [65, 386, 304, 36], + [65, 368, 304, 18] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/line-flow-with-floats-8-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/line-flow-with-floats-8-expected.txt index d1dcbc38..bd9e206 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/line-flow-with-floats-8-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/line-flow-with-floats-8-expected.txt
@@ -5,197 +5,14 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet'", - "rect": [14, 476, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'become of me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 476, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 476, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 476, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'here; the great wonder is, that there\u2018s any one left alive!\u2019'", - "rect": [14, 476, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and look up in her face, with such a'", - "rect": [14, 188, 407, 72], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'laughing: and when she had got its head down, and was going'", - "rect": [14, 188, 407, 72], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'puzzled expression that she could not help bursting out'", - "rect": [14, 188, 407, 72], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'to '", - "rect": [14, 188, 407, 72], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very provoking to find that the hedgehog'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'besides all this, there was generally a ridge or furrow in the'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'doubled-up soldiers were always getting up and walking off to'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'had unrolled itself, and was in the act of crawling away:'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'other parts of the ground, Alice soon came to the conclusion'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'that it was a very '", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'way wherever she wanted to send the hedgehog to, and, as the'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for'", - "rect": [14, 368, 356, 54], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'hedgehogs; and in a very short time '", - "rect": [14, 368, 356, 54], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'turns, quarrelling all the while, and fighting for the'", - "rect": [14, 368, 356, 54], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in'", - "rect": [14, 80, 355, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'arm, with its legs hanging down, but generally, just as'", - "rect": [14, 80, 355, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'body tucked away, comfortably enough, under her'", - "rect": [14, 80, 355, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'going to give the hedgehog a blow with its head, it'", - "rect": [14, 80, 355, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'managing her flamingo: she succeeded in getting its'", - "rect": [14, 80, 355, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'she had got its neck nicely straightened out, and was'", - "rect": [14, 80, 355, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' was in a'", - "rect": [14, 404, 355, 72], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'about once in a minute.'", - "rect": [14, 404, 355, 72], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'furious passion, and went stamping about, and'", - "rect": [14, 404, 355, 72], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'shouting \u2018Off with his head!\u2019 or \u2018Off with her head!\u2019'", - "rect": [14, 404, 355, 72], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' was in a furious passion, and went stamping'", - "rect": [14, 422, 355, 54], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'Queen'", - "rect": [14, 404, 355, 36], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [14, 404, 355, 36], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting '", - "rect": [14, 368, 337, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting '", - "rect": [65, 368, 304, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'difficult game indeed.'", - "rect": [178, 350, 141, 18], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'difficult game indeed.'", - "rect": [127, 350, 141, 18], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 353, 48, 65], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [14, 188, 40, 18], - "reason": "geometry" - } + "invalidations": [ + [14, 476, 407, 90], + [14, 188, 407, 72], + [14, 242, 406, 126], + [14, 368, 356, 54], + [14, 80, 355, 108], + [14, 404, 355, 72], + [14, 353, 48, 65] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/line-flow-with-floats-9-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/line-flow-with-floats-9-expected.txt index bd15aba..444f9a3 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/line-flow-with-floats-9-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/line-flow-with-floats-9-expected.txt
@@ -5,267 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow HTML", - "rect": [8, 572, 440, 18], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow P", - "rect": [8, 74, 418, 516], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet'", - "rect": [14, 494, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'become of me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 494, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 494, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 494, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'here; the great wonder is, that there\u2018s any one left alive!\u2019'", - "rect": [14, 494, 407, 90], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet'", - "rect": [14, 476, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet'", - "rect": [14, 476, 407, 90], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'become of me? They\u2019re dreadfully fond of beheading people'", - "rect": [14, 476, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'had any dispute with the Queen, but she knew that it might'", - "rect": [14, 476, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'happen any minute, \u2018and then,\u2019 thought she, \u2018what would'", - "rect": [14, 476, 407, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and look up in her face, with such a'", - "rect": [14, 188, 407, 72], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'laughing: and when she had got its head down, and was going'", - "rect": [14, 188, 407, 72], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'puzzled expression that she could not help bursting out'", - "rect": [14, 188, 407, 72], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'to '", - "rect": [14, 188, 407, 72], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Alice soon came to the conclusion that it was a very'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'always getting up and walking off to other parts of the ground,'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very provoking to find that the hedgehog'", - "rect": [14, 242, 406, 126], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very provoking to find that the'", - "rect": [14, 242, 406, 126], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'crawling away: besides all this, there was generally a'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog had unrolled itself, and was in the act of'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'ridge or furrow in the way wherever she wanted to'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'send the hedgehog to, and, as the doubled-up soldiers were'", - "rect": [14, 242, 406, 126], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in'", - "rect": [14, 80, 355, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'arm, with its legs hanging down, but generally, just as'", - "rect": [14, 80, 355, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'body tucked away, comfortably enough, under her'", - "rect": [14, 80, 355, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'going to give the hedgehog a blow with its head, it'", - "rect": [14, 80, 355, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'managing her flamingo: she succeeded in getting its'", - "rect": [14, 80, 355, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'she had got its neck nicely straightened out, and was'", - "rect": [14, 80, 355, 108], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'about once in a minute.'", - "rect": [14, 440, 355, 54], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'shouting \u2018Off with his head!\u2019 or \u2018Off with her head!\u2019'", - "rect": [14, 440, 355, 54], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'was in a furious passion, and went stamping about, and'", - "rect": [14, 440, 355, 54], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' was in a furious passion, and went stamping'", - "rect": [14, 422, 355, 54], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'shouting \u2018Off with his head!\u2019 or \u2018Off with her head!\u2019'", - "rect": [14, 422, 355, 54], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'was in a furious passion, and went stamping about, and'", - "rect": [14, 422, 355, 54], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Queen'", - "rect": [14, 404, 355, 36], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'for the hedgehogs; and in a very short time '", - "rect": [14, 404, 355, 36], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'for turns, quarrelling all the while, and fighting'", - "rect": [14, 404, 355, 36], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'the'", - "rect": [14, 404, 355, 36], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'for turns, quarrelling all the while, and fighting'", - "rect": [65, 386, 304, 36], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for turns, quarrelling all the while, and fighting'", - "rect": [65, 386, 304, 36], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting'", - "rect": [65, 386, 304, 18], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting'", - "rect": [65, 368, 304, 18], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'difficult game indeed.'", - "rect": [178, 350, 141, 18], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'difficult game indeed.'", - "rect": [65, 368, 141, 18], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [302, 422, 67, 18], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='greenFloat'", - "rect": [372, 389, 48, 81], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='greenFloat'", - "rect": [372, 371, 48, 81], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='yellowFloat'", - "rect": [372, 245, 48, 49], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [14, 188, 40, 18], - "reason": "geometry" - }, - { - "object": "VerticalScrollbar", - "rect": [485, 0, 15, 600], - "reason": "chunk appeared" - } + "invalidations": [ + [8, 572, 440, 18], + [8, 74, 418, 516], + [485, 0, 15, 600] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/lines-with-layout-delta-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/lines-with-layout-delta-expected.txt index d8c7035..958f43c4 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/lines-with-layout-delta-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/lines-with-layout-delta-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'PASS'", - "rect": [8, 58, 37, 18], - "reason": "full" - } + "invalidations": [ + [8, 58, 37, 18] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/list-marker-2-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/list-marker-2-expected.txt index c7118c63..20f562d 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/list-marker-2-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/list-marker-2-expected.txt
@@ -5,22 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutImage IMG id='target'", - "rect": [48, 94, 100, 100], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u2022 '", - "rect": [31, 180, 7, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u2022 '", - "rect": [31, 130, 7, 18], - "reason": "geometry" - } + "invalidations": [ + [48, 94, 100, 100], + [31, 180, 7, 18], + [31, 130, 7, 18] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/make-children-non-inline-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/make-children-non-inline-expected.txt index 2ea1266..473f78e 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/make-children-non-inline-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/make-children-non-inline-expected.txt
@@ -5,102 +5,21 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'about all the stuff'", - "rect": [8, 250, 113, 18], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'about all the stuff'", - "rect": [8, 150, 113, 18], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'write a book'", - "rect": [8, 132, 80, 18], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'write a book'", - "rect": [8, 132, 80, 18], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'more words.'", - "rect": [8, 96, 80, 18], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'more words.'", - "rect": [8, 96, 80, 18], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'that comes'", - "rect": [8, 268, 69, 18], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'that comes'", - "rect": [8, 168, 69, 18], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'the break.'", - "rect": [8, 304, 64, 18], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'the break.'", - "rect": [8, 204, 64, 18], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'I could'", - "rect": [8, 114, 45, 18], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'I could'", - "rect": [8, 114, 45, 18], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'words,'", - "rect": [8, 78, 44, 18], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'words,'", - "rect": [8, 78, 44, 18], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'Word,'", - "rect": [8, 60, 40, 18], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'Word,'", - "rect": [8, 60, 40, 18], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'after'", - "rect": [8, 286, 30, 18], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'after'", - "rect": [8, 186, 30, 18], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [8, 150, 10, 100], - "reason": "appeared" - } + "invalidations": [ + [8, 250, 113, 18], + [8, 150, 113, 18], + [8, 132, 80, 18], + [8, 96, 80, 18], + [8, 268, 69, 18], + [8, 168, 69, 18], + [8, 304, 64, 18], + [8, 204, 64, 18], + [8, 114, 45, 18], + [8, 78, 44, 18], + [8, 60, 40, 18], + [8, 286, 30, 18], + [8, 186, 30, 18], + [8, 150, 10, 100] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/multi-layout-one-frame-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/multi-layout-one-frame-expected.txt index 08635618..3aea38a 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/multi-layout-one-frame-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/multi-layout-one-frame-expected.txt
@@ -5,32 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'PASSED'", - "rect": [169, 10, 54, 16], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'PASSED'", - "rect": [12, 10, 54, 16], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'FAILED'", - "rect": [169, 10, 46, 16], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'FAILED'", - "rect": [12, 10, 46, 16], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment ' '", - "rect": [161, 9, 4, 18], - "reason": "geometry" - } + "invalidations": [ + [169, 10, 54, 16], + [12, 10, 54, 16], + [161, 9, 4, 18] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/multicol/column-rules-fixed-height-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/multicol/column-rules-fixed-height-expected.txt index 1e62e2c9..123fc12 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/multicol/column-rules-fixed-height-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/multicol/column-rules-fixed-height-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutMultiColumnSet (anonymous)", - "rect": [8, 50, 525, 315], - "reason": "style change" - } + "invalidations": [ + [8, 50, 525, 315] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/multicol/multicol-repaint-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/multicol/multicol-repaint-expected.txt index b78ece0..447d1195 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/multicol/multicol-repaint-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/multicol/multicol-repaint-expected.txt
@@ -5,27 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'XXXXXX'", - "rect": [234, 14, 300, 51], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'x'", - "rect": [234, 14, 50, 51], - "reason": "disappeared" - }, - { - "object": "InlineTextBox '\u00A0'", - "rect": [9, 9, 13, 59], - "reason": "appeared" - }, - { - "object": "InlineTextBox '\u00A0'", - "rect": [9, 9, 13, 59], - "reason": "disappeared" - } + "invalidations": [ + [234, 14, 300, 51], + [9, 9, 13, 59] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/multicol/multicol-with-abspos-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/multicol/multicol-with-abspos-expected.txt index d5744c1..bec2120 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/multicol/multicol-with-abspos-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/multicol/multicol-with-abspos-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'PASS'", - "rect": [0, 579, 80, 21], - "reason": "appeared" - } + "invalidations": [ + [0, 579, 80, 21] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/multicol/multicol-with-abspos-in-relpos-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/multicol/multicol-with-abspos-in-relpos-expected.txt index 0cb4fb8..f4e69e0 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/multicol/multicol-with-abspos-in-relpos-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/multicol/multicol-with-abspos-in-relpos-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='target'", - "rect": [508, 27, 80, 21], - "reason": "chunk appeared" - } + "invalidations": [ + [508, 27, 80, 21] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/multicol/multicol-with-block-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/multicol/multicol-with-block-expected.txt index 3ed4ae8..f53ea6f 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/multicol/multicol-with-block-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/multicol/multicol-with-block-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutMultiColumnFlowThread (anonymous)", - "rect": [328, 8, 240, 40], - "reason": "chunk appeared" - } + "invalidations": [ + [328, 8, 240, 40] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/multicol/multicol-with-inline-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/multicol/multicol-with-inline-expected.txt index 3ed4ae8..f53ea6f 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/multicol/multicol-with-inline-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/multicol/multicol-with-inline-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutMultiColumnFlowThread (anonymous)", - "rect": [328, 8, 240, 40], - "reason": "chunk appeared" - } + "invalidations": [ + [328, 8, 240, 40] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/multicol/multicol-with-text-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/multicol/multicol-with-text-expected.txt index 3ed4ae8..f53ea6f 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/multicol/multicol-with-text-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/multicol/multicol-with-text-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutMultiColumnFlowThread (anonymous)", - "rect": [328, 8, 240, 40], - "reason": "chunk appeared" - } + "invalidations": [ + [328, 8, 240, 40] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/non-text-link-invalidation-optimization-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/non-text-link-invalidation-optimization-expected.txt index aa00394..f0f894d 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/non-text-link-invalidation-optimization-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/non-text-link-invalidation-optimization-expected.txt
@@ -5,37 +5,13 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment ' text is invalidated and '", - "rect": [167, 8, 150, 18], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment ' passes if '", - "rect": [76, 8, 64, 18], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'This test '", - "rect": [8, 8, 59, 18], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment ' images.'", - "rect": [360, 8, 54, 18], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'only'", - "rect": [139, 8, 29, 18], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment ' no '", - "rect": [326, 8, 25, 18], - "reason": "style change" - } + "invalidations": [ + [167, 8, 150, 18], + [76, 8, 64, 18], + [8, 8, 59, 18], + [360, 8, 54, 18], + [139, 8, 29, 18], + [326, 8, 25, 18] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/offset-change-wrong-invalidation-with-float-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/offset-change-wrong-invalidation-with-float-expected.txt index 5b6528ce..207a8e3 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/offset-change-wrong-invalidation-with-float-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/offset-change-wrong-invalidation-with-float-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) UL id='submenu'", - "rect": [48, 92, 40, 18], - "reason": "chunk disappeared" - } + "invalidations": [ + [48, 92, 40, 18] ] }, {
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/outline/focus-continuations-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/outline/focus-continuations-expected.txt index 32b8b2d..0be9d0b 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/outline/focus-continuations-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/outline/focus-continuations-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalBoxFragment LayoutInline SPAN id='outer'", - "rect": [6, 86, 88, 24], - "reason": "disappeared" - } + "invalidations": [ + [6, 86, 88, 24] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/outline/focus-enable-continuations-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/outline/focus-enable-continuations-expected.txt index 86d2248..0be9d0b 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/outline/focus-enable-continuations-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/outline/focus-enable-continuations-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalBoxFragment LayoutInline SPAN id='outer'", - "rect": [6, 86, 88, 24], - "reason": "appeared" - } + "invalidations": [ + [6, 86, 88, 24] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/outline/inline-outline-repaint-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/outline/inline-outline-repaint-expected.txt index 1eaf9182..626701a 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/outline/inline-outline-repaint-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/outline/inline-outline-repaint-expected.txt
@@ -5,47 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutInline SPAN id='test'", - "rect": [5, 163, 98, 42], - "reason": "geometry" - }, - { - "object": "InlineTextBox ' '", - "rect": [8, 166, 92, 36], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'Lorem ipsum'", - "rect": [8, 166, 92, 36], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'dolor sit amet\u00A0'", - "rect": [8, 166, 92, 36], - "reason": "disappeared" - }, - { - "object": "InlineTextBox ' '", - "rect": [8, 166, 90, 36], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'Lorem ipsum'", - "rect": [8, 166, 90, 36], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'dolor\u00A0'", - "rect": [8, 166, 90, 36], - "reason": "appeared" - }, - { - "object": "Caret", - "rect": [46, 184, 1, 18], - "reason": "appeared" - } + "invalidations": [ + [5, 163, 98, 42] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/outline/outline-change-invalidation-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/outline/outline-change-invalidation-expected.txt index b608c9bd..b453b42d 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/outline/outline-change-invalidation-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/outline/outline-change-invalidation-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow A id='link'", - "rect": [43, 79, 754, 28], - "reason": "appeared" - } + "invalidations": [ + [43, 79, 754, 28] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/outline/outline-continuations-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/outline/outline-continuations-expected.txt index 6ed00d95..34ef42f 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/outline/outline-continuations-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/outline/outline-continuations-expected.txt
@@ -5,32 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalBoxFragment LayoutInline SPAN id='outer'", - "rect": [16, 108, 88, 60], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'CONTENTS'", - "rect": [18, 148, 84, 18], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'CONTENTS'", - "rect": [18, 148, 84, 18], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'CONTENTS'", - "rect": [18, 110, 84, 18], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'CONTENTS'", - "rect": [18, 110, 84, 18], - "reason": "disappeared" - } + "invalidations": [ + [16, 108, 88, 60] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/outline/outline-inset-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/outline/outline-inset-expected.txt index 4bdcfb2..d28abeb8 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/outline/outline-inset-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/outline/outline-inset-expected.txt
@@ -5,27 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [19, 189, 200, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [19, 29, 200, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV id='b'", - "rect": [29, 229, 180, 20], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow DIV id='a'", - "rect": [29, 69, 180, 20], - "reason": "incremental" - } + "invalidations": [ + [19, 189, 200, 60], + [19, 29, 200, 60] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/outline/outline-repaint-glitch-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/outline/outline-repaint-glitch-expected.txt index b460775..38e37da 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/outline/outline-repaint-glitch-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/outline/outline-repaint-glitch-expected.txt
@@ -5,27 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [15, 377, 208, 68], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [15, 217, 208, 68], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV id='b'", - "rect": [29, 421, 180, 20], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow DIV id='a'", - "rect": [29, 261, 180, 20], - "reason": "incremental" - } + "invalidations": [ + [15, 377, 208, 68], + [15, 217, 208, 68] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/outline/outline-shrinking-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/outline/outline-shrinking-expected.txt index 68cd122..a42739a 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/outline/outline-shrinking-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/outline/outline-shrinking-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='t'", - "rect": [4, 108, 108, 108], - "reason": "style change" - } + "invalidations": [ + [4, 108, 108, 108] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/overflow/composited-overflow-local-background-removed-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/overflow/composited-overflow-local-background-removed-expected.txt index edf932e..faa1bdeb 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/overflow/composited-overflow-local-background-removed-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/overflow/composited-overflow-local-background-removed-expected.txt
@@ -9,24 +9,16 @@ { "name": "LayoutNGBlockFlow DIV id='scroller'", "bounds": [200, 200], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='scroller'", - "rect": [0, 0, 200, 200], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 200, 200] ], "transform": 1 }, { "name": "Scrolling Contents Layer", "bounds": [185, 350], - "paintInvalidations": [ - { - "object": "Scrolling Contents Layer", - "rect": [0, 0, 185, 350], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 185, 350] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/overflow/float-overflow-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/overflow/float-overflow-expected.txt index 9f70ff3..1e8f065 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/overflow/float-overflow-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/overflow/float-overflow-expected.txt
@@ -5,557 +5,76 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 537, 62, 36], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 531, 62, 36], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 498, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 492, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 459, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 453, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 420, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow 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": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 171, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 165, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 132, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 126, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 93, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 87, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 54, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 48, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 15, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow 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": "LayoutNGBlockFlow DIV", - "rect": [67, 504, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 498, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 465, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 459, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 426, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow 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": "LayoutNGBlockFlow DIV", - "rect": [67, 177, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 171, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 138, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 132, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 99, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 93, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 60, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 54, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 21, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 15, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [69, 374, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [69, 368, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [69, 335, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [69, 329, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [69, 296, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [69, 290, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [70, 375, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [70, 369, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [70, 336, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [70, 330, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [70, 297, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [70, 291, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [67, 138, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [67, 132, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [65, 60, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [65, 54, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [65, 21, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [65, 15, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [59, 543, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [59, 537, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [59, 504, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [59, 498, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [59, 465, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [59, 459, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [59, 426, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (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": "LayoutNGBlockFlow (floating) DIV", - "rect": [59, 177, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [59, 171, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [59, 99, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [59, 93, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 543, 32, 20], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 537, 32, 20], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [59, 256, 16, 18], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [59, 250, 16, 18], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [59, 217, 16, 18], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [59, 211, 16, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [66, 298, 16, 17], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [66, 292, 16, 17], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [63, 22, 16, 17], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [63, 16, 16, 17], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [59, 544, 16, 17], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [59, 538, 16, 17], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [59, 505, 16, 17], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [59, 499, 16, 17], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [59, 466, 16, 17], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [59, 460, 16, 17], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [59, 427, 16, 17], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [59, 421, 16, 17], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [59, 178, 16, 17], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [59, 172, 16, 17], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [59, 139, 16, 17], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [59, 133, 16, 17], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [58, 376, 16, 17], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [58, 370, 16, 17], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [58, 337, 16, 17], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [58, 331, 16, 17], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [57, 100, 16, 17], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [57, 94, 16, 17], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [57, 61, 16, 17], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [57, 55, 16, 17], - "reason": "geometry" - } + "invalidations": [ + [61, 537, 62, 36], + [61, 531, 62, 36], + [61, 498, 62, 22], + [61, 492, 62, 22], + [61, 459, 62, 22], + [61, 453, 62, 22], + [61, 420, 62, 22], + [61, 414, 62, 22], + [61, 249, 62, 22], + [61, 243, 62, 22], + [61, 210, 62, 22], + [61, 204, 62, 22], + [61, 171, 62, 22], + [61, 165, 62, 22], + [61, 132, 62, 22], + [61, 126, 62, 22], + [61, 93, 62, 22], + [61, 87, 62, 22], + [61, 54, 62, 22], + [61, 48, 62, 22], + [61, 15, 62, 22], + [61, 9, 62, 22], + [61, 366, 58, 28], + [61, 360, 58, 28], + [61, 327, 58, 28], + [61, 321, 58, 28], + [61, 288, 58, 28], + [61, 282, 58, 28], + [59, 543, 40, 10], + [59, 537, 40, 10], + [59, 504, 40, 10], + [59, 498, 40, 10], + [59, 465, 40, 10], + [59, 459, 40, 10], + [59, 426, 40, 10], + [59, 420, 40, 10], + [59, 255, 40, 10], + [59, 249, 40, 10], + [59, 216, 40, 10], + [59, 210, 40, 10], + [59, 177, 40, 10], + [59, 171, 40, 10], + [59, 99, 40, 10], + [59, 93, 40, 10], + [59, 256, 16, 18], + [59, 250, 16, 18], + [59, 217, 16, 18], + [59, 211, 16, 18], + [63, 22, 16, 17], + [59, 544, 16, 17], + [59, 538, 16, 17], + [59, 505, 16, 17], + [59, 499, 16, 17], + [59, 466, 16, 17], + [59, 460, 16, 17], + [59, 427, 16, 17], + [59, 421, 16, 17], + [59, 178, 16, 17], + [59, 172, 16, 17], + [59, 139, 16, 17], + [59, 133, 16, 17], + [58, 376, 16, 17], + [58, 370, 16, 17], + [58, 337, 16, 17], + [58, 331, 16, 17], + [57, 100, 16, 17], + [57, 94, 16, 17], + [57, 61, 16, 17], + [57, 55, 16, 17] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/overflow/float-overflow-right-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/overflow/float-overflow-right-expected.txt index a0f63d2..73b32f3 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/overflow/float-overflow-right-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/overflow/float-overflow-right-expected.txt
@@ -5,557 +5,76 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 537, 62, 36], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 531, 62, 36], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 498, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 492, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 459, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 453, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 420, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow 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": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 171, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 165, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 132, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 126, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 93, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 87, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 54, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 48, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 15, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow 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": "LayoutNGBlockFlow DIV", - "rect": [683, 504, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 498, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 465, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 459, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 426, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow 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": "LayoutNGBlockFlow DIV", - "rect": [683, 177, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 171, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 138, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 132, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 99, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 93, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 60, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 54, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 21, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 15, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [689, 374, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [689, 368, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [689, 335, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [689, 329, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [689, 296, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [689, 290, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [701, 543, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [701, 537, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [701, 504, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [701, 498, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [701, 465, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [701, 459, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [701, 426, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (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": "LayoutNGBlockFlow (floating) DIV", - "rect": [701, 177, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [701, 171, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [701, 99, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [701, 93, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [695, 60, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [695, 54, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [695, 21, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [695, 15, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [693, 138, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [693, 132, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [690, 375, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [690, 369, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [690, 336, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [690, 330, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [690, 297, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [690, 291, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [701, 543, 32, 20], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [701, 537, 32, 20], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [725, 256, 16, 18], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [725, 250, 16, 18], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [725, 217, 16, 18], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [725, 211, 16, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [727, 100, 16, 17], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [727, 94, 16, 17], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [727, 61, 16, 17], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [727, 55, 16, 17], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [726, 376, 16, 17], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [726, 370, 16, 17], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [726, 337, 16, 17], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [726, 331, 16, 17], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 544, 16, 17], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 538, 16, 17], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 505, 16, 17], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 499, 16, 17], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 466, 16, 17], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 460, 16, 17], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 427, 16, 17], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 421, 16, 17], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 178, 16, 17], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 172, 16, 17], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 139, 16, 17], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 133, 16, 17], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [721, 22, 16, 17], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [721, 16, 16, 17], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [718, 298, 16, 17], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [718, 292, 16, 17], - "reason": "geometry" - } + "invalidations": [ + [677, 537, 62, 36], + [677, 531, 62, 36], + [677, 498, 62, 22], + [677, 492, 62, 22], + [677, 459, 62, 22], + [677, 453, 62, 22], + [677, 420, 62, 22], + [677, 414, 62, 22], + [677, 249, 62, 22], + [677, 243, 62, 22], + [677, 210, 62, 22], + [677, 204, 62, 22], + [677, 171, 62, 22], + [677, 165, 62, 22], + [677, 132, 62, 22], + [677, 126, 62, 22], + [677, 93, 62, 22], + [677, 87, 62, 22], + [677, 54, 62, 22], + [677, 48, 62, 22], + [677, 15, 62, 22], + [677, 9, 62, 22], + [681, 366, 58, 28], + [681, 360, 58, 28], + [681, 327, 58, 28], + [681, 321, 58, 28], + [681, 288, 58, 28], + [681, 282, 58, 28], + [701, 543, 40, 10], + [701, 537, 40, 10], + [701, 504, 40, 10], + [701, 498, 40, 10], + [701, 465, 40, 10], + [701, 459, 40, 10], + [701, 426, 40, 10], + [701, 420, 40, 10], + [701, 255, 40, 10], + [701, 249, 40, 10], + [701, 216, 40, 10], + [701, 210, 40, 10], + [701, 177, 40, 10], + [701, 171, 40, 10], + [701, 99, 40, 10], + [701, 93, 40, 10], + [725, 256, 16, 18], + [725, 250, 16, 18], + [725, 217, 16, 18], + [725, 211, 16, 18], + [727, 100, 16, 17], + [727, 94, 16, 17], + [727, 61, 16, 17], + [727, 55, 16, 17], + [726, 376, 16, 17], + [726, 370, 16, 17], + [726, 337, 16, 17], + [726, 331, 16, 17], + [725, 544, 16, 17], + [725, 538, 16, 17], + [725, 505, 16, 17], + [725, 499, 16, 17], + [725, 466, 16, 17], + [725, 460, 16, 17], + [725, 427, 16, 17], + [725, 421, 16, 17], + [725, 178, 16, 17], + [725, 172, 16, 17], + [725, 139, 16, 17], + [725, 133, 16, 17], + [721, 22, 16, 17] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/overflow/line-overflow-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/overflow/line-overflow-expected.txt index baf0a7f..9bce242 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/overflow/line-overflow-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/overflow/line-overflow-expected.txt
@@ -5,67 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment ' eleifend'", - "rect": [8, 114, 200, 90], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'convallis.'", - "rect": [8, 114, 200, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'lacus, at sagittis eros leo'", - "rect": [8, 114, 200, 90], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'pulvinar velit. Integer'", - "rect": [8, 114, 200, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'sollicitudin nisi ut urna blandit'", - "rect": [8, 114, 200, 90], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Cras faucibus. Nunc'", - "rect": [8, 78, 198, 54], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'adipiscing, enim in scelerisque'", - "rect": [8, 78, 198, 54], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'convallis, augue '", - "rect": [8, 78, 198, 54], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' eleifend lacus,'", - "rect": [8, 132, 192, 72], - "reason": "disappeared" - }, - { - "object": "NGPhysicalBoxFragment LayoutInline SPAN id='t'", - "rect": [115, 84, 37, 48], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'purus'", - "rect": [115, 114, 37, 18], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'purus'", - "rect": [38, 132, 36, 18], - "reason": "disappeared" - } + "invalidations": [ + [8, 114, 200, 90], + [8, 78, 198, 54] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/overflow/opacity-change-on-overflow-float-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/overflow/opacity-change-on-overflow-float-expected.txt index 0d595fc7f..4d89fcd 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/overflow/opacity-change-on-overflow-float-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/overflow/opacity-change-on-overflow-float-expected.txt
@@ -5,47 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow HTML", - "rect": [8, 8, 778, 54], - "reason": "chunk appeared" - }, - { - "object": "NGPhysicalTextFragment 'REGRESSION (r41203): Facebook friend suggestions disappear on update. Make sure when a layer'", - "rect": [8, 8, 778, 54], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'see a 100x100 green square below. If you see any red, the test has failed.'", - "rect": [8, 8, 778, 54], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'switches from being self-painting to non-self-painting that a layout happens to fix up the floating objects lists. You should'", - "rect": [8, 8, 778, 54], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'Repaint test for '", - "rect": [8, 8, 103, 18], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV class='green'", - "rect": [8, 78, 100, 100], - "reason": "chunk disappeared" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV class='red'", - "rect": [8, 78, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV class='red'", - "rect": [8, 78, 100, 100], - "reason": "chunk appeared" - } + "invalidations": [ + [8, 8, 778, 54], + [8, 78, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/overflow/overflow-delete-line-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/overflow/overflow-delete-line-expected.txt index ca4b12e..7d0eaca 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/overflow/overflow-delete-line-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/overflow/overflow-delete-line-expected.txt
@@ -5,27 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Lorem ipsu'", - "rect": [8, 70, 74, 18], - "reason": "appeared" - }, - { - "object": "InlineTextBox ' '", - "rect": [8, 70, 47, 36], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'Lorem'", - "rect": [8, 70, 47, 36], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'ipsum'", - "rect": [8, 70, 47, 36], - "reason": "disappeared" - } + "invalidations": [ + [8, 70, 74, 18], + [8, 70, 47, 36] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/overflow/rel-positioned-inline-with-overflow-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/overflow/rel-positioned-inline-with-overflow-expected.txt index e7e9065a..dca8576e 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/overflow/rel-positioned-inline-with-overflow-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/overflow/rel-positioned-inline-with-overflow-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [8, 92, 100, 50], - "reason": "background" - } + "invalidations": [ + [8, 92, 100, 50] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/overflow/repaint-resized-overflow-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/overflow/repaint-resized-overflow-expected.txt index 08e5f2c..03438a2 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/overflow/repaint-resized-overflow-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/overflow/repaint-resized-overflow-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='s'", - "rect": [8, 148, 108, 108], - "reason": "geometry" - } + "invalidations": [ + [8, 148, 108, 108] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/overhanging-float-detach-repaint-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/overhanging-float-detach-repaint-expected.txt index f770fa1..54e3d5f 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/overhanging-float-detach-repaint-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/overhanging-float-detach-repaint-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (floating) DIV class='float'", - "rect": [8, 62, 100, 100], - "reason": "disappeared" - } + "invalidations": [ + [8, 62, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/paint-invalidation-with-reparent-across-frame-boundaries-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/paint-invalidation-with-reparent-across-frame-boundaries-expected.txt index 70c22a9..cd25ff12 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/paint-invalidation-with-reparent-across-frame-boundaries-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/paint-invalidation-with-reparent-across-frame-boundaries-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'abc'", - "rect": [18, 18, 23, 18], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'abc'", - "rect": [8, 184, 23, 18], - "reason": "appeared" - } + "invalidations": [ + [18, 18, 23, 18], + [8, 184, 23, 18] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/position/absolute-display-block-to-none-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/position/absolute-display-block-to-none-expected.txt index da7c56c..bb52a79 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/position/absolute-display-block-to-none-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/position/absolute-display-block-to-none-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'When an absolute positioned element is set display:none, we should not invalidate the whole body.'", - "rect": [8, 8, 633, 18], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='absolute'", - "rect": [100, 100, 100, 100], - "reason": "disappeared" - } + "invalidations": [ + [8, 8, 633, 18], + [100, 100, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/position/abspos-shift-image-incorrect-repaint-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/position/abspos-shift-image-incorrect-repaint-expected.txt index f30564e..9d8fb6d 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/position/abspos-shift-image-incorrect-repaint-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/position/abspos-shift-image-incorrect-repaint-expected.txt
@@ -5,32 +5,12 @@ "bounds": [1250, 585], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutImage IMG", - "rect": [704, 0, 214, 232], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV class='imageWrapper'", - "rect": [454, 0, 214, 232], - "reason": "chunk appeared" - }, - { - "object": "LayoutImage IMG", - "rect": [0, 0, 214, 232], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment ' '", - "rect": [700, 218, 4, 18], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='shiftMe'", - "rect": [450, 218, 4, 18], - "reason": "chunk appeared" - } + "invalidations": [ + [704, 0, 214, 232], + [454, 0, 214, 232], + [0, 0, 214, 232], + [700, 218, 4, 18], + [450, 218, 4, 18] ] }, {
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/position/block-layout-inline-children-float-positioned-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/position/block-layout-inline-children-float-positioned-expected.txt index 1baabad3..3d85705 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/position/block-layout-inline-children-float-positioned-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/position/block-layout-inline-children-float-positioned-expected.txt
@@ -5,27 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [0, 34, 602, 102], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [0, 34, 602, 102], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'the quick brown fox jumped over the lazy dog'", - "rect": [305, 35, 296, 18], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'the quick brown fox jumped over the lazy dog'", - "rect": [153, 35, 296, 18], - "reason": "appeared" - } + "invalidations": [ + [0, 34, 602, 102] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/position/containing-block-position-change-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/position/containing-block-position-change-expected.txt index 68926dc..2b1af2b1 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/position/containing-block-position-change-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/position/containing-block-position-change-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [158, 70, 50, 50], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [100, 70, 50, 50], - "reason": "geometry" - } + "invalidations": [ + [158, 70, 50, 50], + [100, 70, 50, 50] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/position/fixed-element-repaint-after-compositing-update-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/position/fixed-element-repaint-after-compositing-update-expected.txt index 2f9a4690..182a7cf 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/position/fixed-element-repaint-after-compositing-update-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/position/fixed-element-repaint-after-compositing-update-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='moveMe'", - "rect": [150, 150, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='moveMe'", - "rect": [8, 102, 100, 100], - "reason": "geometry" - } + "invalidations": [ + [150, 150, 100, 100], + [8, 102, 100, 100] ] }, {
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/position/fixed-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/position/fixed-expected.txt index 5416e7f..3f876f2 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/position/fixed-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/position/fixed-expected.txt
@@ -12,12 +12,8 @@ "bounds": [100, 100], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='t'", - "rect": [0, 0, 100, 100], - "reason": "background" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 2 },
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/position/layout-state-relative-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/position/layout-state-relative-expected.txt index 43e7f80..be7b2b9 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/position/layout-state-relative-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/position/layout-state-relative-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'PASS'", - "rect": [8, 150, 37, 18], - "reason": "full" - } + "invalidations": [ + [8, 150, 37, 18] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/position/positioned-document-element-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/position/positioned-document-element-expected.txt deleted file mode 100644 index e2936fd..0000000 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/position/positioned-document-element-expected.txt +++ /dev/null
@@ -1,28 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 800, 600], - "reason": "background" - }, - { - "object": "NGPhysicalTextFragment 'Tests that the entire viewport is painted with a floated html element.'", - "rect": [108, 116, 435, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Tests that the entire viewport is painted with a floated html element.'", - "rect": [8, 16, 435, 18], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/position/positioned-great-grandparent-change-location-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/position/positioned-great-grandparent-change-location-expected.txt deleted file mode 100644 index 48f4d293..0000000 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/position/positioned-great-grandparent-change-location-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [100, 200, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [100, 100, 100, 100], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Target'", - "rect": [100, 200, 41, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Target'", - "rect": [100, 100, 41, 18], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/position/positioned-list-offset-change-repaint-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/position/positioned-list-offset-change-repaint-expected.txt index 9885ac0..e9b9fa0 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/position/positioned-list-offset-change-repaint-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/position/positioned-list-offset-change-repaint-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutImage IMG", - "rect": [8, 60, 214, 232], - "reason": "geometry" - }, - { - "object": "LayoutImage IMG", - "rect": [8, 60, 114, 232], - "reason": "geometry" - } + "invalidations": [ + [8, 60, 214, 232] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/position/relative-inline-positioned-movement-repaint-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/position/relative-inline-positioned-movement-repaint-expected.txt index ec537b2..1502415 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/position/relative-inline-positioned-movement-repaint-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/position/relative-inline-positioned-movement-repaint-expected.txt
@@ -11,12 +11,8 @@ "position": [68, 7], "bounds": [374, 20], "backfaceVisibility": "hidden", - "paintInvalidations": [ - { - "object": "LayoutInline (relative positioned) DIV id='block'", - "rect": [0, 0, 374, 20], - "reason": "paint property change" - } + "invalidations": [ + [0, 0, 374, 20] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/position/shift-relative-positioned-container-with-image-addition-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/position/shift-relative-positioned-container-with-image-addition-expected.txt index 45199b7..c3bd013 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/position/shift-relative-positioned-container-with-image-addition-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/position/shift-relative-positioned-container-with-image-addition-expected.txt
@@ -5,27 +5,11 @@ "bounds": [785, 829], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 735, 785, 94], - "reason": "incremental" - }, - { - "object": "LayoutIFrame IFRAME id='iframe'", - "rect": [8, 86, 732, 94], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV class='relative paddingTop'", - "rect": [58, 230, 489, 537], - "reason": "chunk appeared" - }, - { - "object": "LayoutImage IMG", - "rect": [58, 136, 489, 537], - "reason": "disappeared" - } + "invalidations": [ + [0, 735, 785, 94], + [8, 86, 732, 94], + [58, 230, 489, 537], + [58, 136, 489, 537] ] }, {
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/position/shift-relative-positioned-container-with-image-removal-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/position/shift-relative-positioned-container-with-image-removal-expected.txt index 463c8cf..f499e3a 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/position/shift-relative-positioned-container-with-image-removal-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/position/shift-relative-positioned-container-with-image-removal-expected.txt
@@ -5,22 +5,10 @@ "bounds": [785, 735], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutIFrame IFRAME id='iframe'", - "rect": [8, 86, 732, 94], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV class='relative paddingTop'", - "rect": [58, 234, 489, 537], - "reason": "chunk disappeared" - }, - { - "object": "LayoutImage IMG", - "rect": [58, 136, 489, 537], - "reason": "appeared" - } + "invalidations": [ + [8, 86, 732, 94], + [58, 234, 489, 537], + [58, 136, 489, 537] ] }, {
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/position/static-to-positioned-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/position/static-to-positioned-expected.txt index 42803932..5219058 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/position/static-to-positioned-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/position/static-to-positioned-expected.txt
@@ -5,27 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='t'", - "rect": [8, 328, 100, 100], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='t'", - "rect": [8, 278, 100, 100], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='a'", - "rect": [8, 128, 100, 100], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='a'", - "rect": [8, 78, 100, 100], - "reason": "style change" - } + "invalidations": [ + [8, 328, 100, 100], + [8, 278, 100, 100], + [8, 128, 100, 100], + [8, 78, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/position/transform-absolute-in-positioned-container-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/position/transform-absolute-in-positioned-container-expected.txt index aa0c1da..0ce88d1 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/position/transform-absolute-in-positioned-container-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/position/transform-absolute-in-positioned-container-expected.txt
@@ -5,17 +5,8 @@ "bounds": [802, 585], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='box' class='rotated'", - "rect": [76, 186, 286, 286], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='box' class='rotated'", - "rect": [118, 228, 202, 202], - "reason": "paint property change" - } + "invalidations": [ + [76, 186, 286, 286] ] }, {
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/position/transform-relative-position-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/position/transform-relative-position-expected.txt index 8db9c8c..d8bb373 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/position/transform-relative-position-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/position/transform-relative-position-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='box' class='rotated'", - "rect": [66, 108, 286, 286], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='box' class='rotated'", - "rect": [108, 150, 202, 202], - "reason": "paint property change" - } + "invalidations": [ + [66, 108, 286, 286] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/quotes-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/quotes-expected.txt index 7d7dc83..5259cdc 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/quotes-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/quotes-expected.txt
@@ -5,32 +5,12 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'quote 2'", - "rect": [15, 26, 49, 18], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'quote 2'", - "rect": [17, 26, 48, 18], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment '}'", - "rect": [64, 26, 10, 18], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment '{'", - "rect": [8, 26, 10, 18], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment '}'", - "rect": [63, 26, 8, 18], - "reason": "style change" - } + "invalidations": [ + [15, 26, 49, 18], + [17, 26, 48, 18], + [64, 26, 10, 18], + [8, 26, 10, 18], + [63, 26, 8, 18] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/reflection/reflection-redraw-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/reflection/reflection-redraw-expected.txt index 6b32532..3345584 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/reflection/reflection-redraw-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/reflection/reflection-redraw-expected.txt
@@ -5,87 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'The color of this'", - "rect": [379, 267, 288, 72], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'green'", - "rect": [379, 267, 288, 72], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'reflection should be'", - "rect": [379, 267, 288, 72], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'text in the'", - "rect": [379, 267, 288, 72], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'The color of this'", - "rect": [69, 267, 288, 72], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'green'", - "rect": [69, 267, 288, 72], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'reflection should be'", - "rect": [69, 267, 288, 72], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'text in the'", - "rect": [69, 267, 288, 72], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'The color of this'", - "rect": [304, 21, 128, 208], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'green'", - "rect": [304, 21, 128, 208], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'reflection should be'", - "rect": [304, 21, 128, 208], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'text in the'", - "rect": [304, 21, 128, 208], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'The color of this'", - "rect": [304, 377, 128, 156], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'green'", - "rect": [304, 377, 128, 156], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'reflection should be'", - "rect": [304, 377, 128, 156], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'text in the'", - "rect": [304, 377, 128, 156], - "reason": "style change" - } + "invalidations": [ + [379, 267, 288, 72], + [69, 267, 288, 72], + [304, 21, 128, 208], + [304, 377, 128, 156] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/remove-block-after-layout-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/remove-block-after-layout-expected.txt deleted file mode 100644 index 0b79b7a..0000000 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/remove-block-after-layout-expected.txt +++ /dev/null
@@ -1,28 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target'", - "rect": [8, 108, 100, 100], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'This div should'", - "rect": [8, 108, 100, 36], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'disappear.'", - "rect": [8, 108, 100, 36], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/remove-inline-after-layout-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/remove-inline-after-layout-expected.txt index 83fb2a9b..3560f18 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/remove-inline-after-layout-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/remove-inline-after-layout-expected.txt
@@ -5,27 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'This span should disappear. '", - "rect": [111, 194, 182, 18], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [292, 108, 101, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [111, 108, 101, 100], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' '", - "rect": [108, 194, 4, 18], - "reason": "geometry" - } + "invalidations": [ + [111, 194, 182, 18], + [292, 108, 101, 100], + [111, 108, 101, 100], + [108, 194, 4, 18] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/remove-inline-layer-after-layout-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/remove-inline-layer-after-layout-expected.txt index 3e85465..3560f18 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/remove-inline-layer-after-layout-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/remove-inline-layer-after-layout-expected.txt
@@ -5,27 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutInline SPAN id='target'", - "rect": [111, 194, 182, 18], - "reason": "chunk disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [292, 108, 101, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [111, 108, 101, 100], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' '", - "rect": [108, 194, 4, 18], - "reason": "geometry" - } + "invalidations": [ + [111, 194, 182, 18], + [292, 108, 101, 100], + [111, 108, 101, 100], + [108, 194, 4, 18] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/repaint-across-writing-mode-boundary-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/repaint-across-writing-mode-boundary-expected.txt index e86b6116..c479a2a 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/repaint-across-writing-mode-boundary-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/repaint-across-writing-mode-boundary-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment '\u7B2C\u4E00\u6BB5\u843D paragraph 1'", - "rect": [548, 190, 24, 36], - "reason": "selection" - } + "invalidations": [ + [548, 190, 24, 36] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/repaint-descandant-on-ancestor-layer-move-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/repaint-descandant-on-ancestor-layer-move-expected.txt index 4102183..840a2706 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/repaint-descandant-on-ancestor-layer-move-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/repaint-descandant-on-ancestor-layer-move-expected.txt
@@ -5,27 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV", - "rect": [428, 38, 300, 18], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV", - "rect": [28, 38, 300, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'There should only be one copy of this text.'", - "rect": [428, 38, 275, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'There should only be one copy of this text.'", - "rect": [28, 38, 275, 18], - "reason": "geometry" - } + "invalidations": [ + [428, 38, 300, 18], + [28, 38, 300, 18] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/resize-iframe-text-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/resize-iframe-text-expected.txt deleted file mode 100644 index 4f68837..0000000 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/resize-iframe-text-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [500, 400], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 200, 500, 200], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow HTML", - "rect": [8, 300, 61, 22], - "reason": "incremental" - }, - { - "object": "NGPhysicalTextFragment 'Success'", - "rect": [8, 300, 61, 22], - "reason": "appeared" - }, - { - "object": "VerticalScrollbar", - "rect": [485, 0, 15, 200], - "reason": "chunk disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/ruby-flipped-blocks-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/ruby-flipped-blocks-expected.txt index df247f0..577ed41 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/ruby-flipped-blocks-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/ruby-flipped-blocks-expected.txt
@@ -5,32 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'b'", - "rect": [8, 28, 21, 20], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'b'", - "rect": [8, 28, 21, 20], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'a'", - "rect": [8, 8, 21, 20], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'a'", - "rect": [8, 8, 21, 20], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'c'", - "rect": [28, 33, 11, 10], - "reason": "style change" - } + "invalidations": [ + [8, 28, 21, 20], + [8, 8, 21, 20], + [28, 33, 11, 10] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/caret-invalidation-in-overflow-scroll-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/caret-invalidation-in-overflow-scroll-expected.txt index 0b36b61..cf1732f 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/caret-invalidation-in-overflow-scroll-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/caret-invalidation-in-overflow-scroll-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Caret", - "rect": [408, 11, 2, 15], - "reason": "caret" - }, - { - "object": "Caret", - "rect": [405, 11, 2, 15], - "reason": "caret" - } + "invalidations": [ + [408, 11, 2, 15], + [405, 11, 2, 15] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/caret-with-composited-scroll-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/caret-with-composited-scroll-expected.txt index 37de9ee..0257aa80 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/caret-with-composited-scroll-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/caret-with-composited-scroll-expected.txt
@@ -14,22 +14,8 @@ { "name": "Scrolling Contents Layer", "bounds": [205, 1021], - "paintInvalidations": [ - { - "object": "LayoutTextControl INPUT id='text'", - "rect": [0, 998, 205, 23], - "reason": "subtree" - }, - { - "object": "LayoutTextControl INPUT id='text'", - "rect": [0, 998, 205, 23], - "reason": "chunk appeared" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [3, 1003, 1, 15], - "reason": "chunk appeared" - } + "invalidations": [ + [0, 998, 205, 23] ], "transform": 2 },
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/inline-style-change-in-scrolled-view-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/inline-style-change-in-scrolled-view-expected.txt index a82eaa8..d726e7ee8 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/inline-style-change-in-scrolled-view-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/inline-style-change-in-scrolled-view-expected.txt
@@ -5,12 +5,8 @@ "bounds": [2000, 2000], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Text Text Text Text Text Text Text Text Text Text Text Text Text'", - "rect": [0, 288, 412, 18], - "reason": "style change" - } + "invalidations": [ + [0, 288, 412, 18] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/invalidate-after-composited-scroll-of-window-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/invalidate-after-composited-scroll-of-window-expected.txt index 1ae8074..ece5b84 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/invalidate-after-composited-scroll-of-window-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/invalidate-after-composited-scroll-of-window-expected.txt
@@ -5,17 +5,9 @@ "bounds": [785, 4934], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Tests that invalidation of a div after scrolling invalidates just the div and no other area.'", - "rect": [8, 4908, 555, 18], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [8, 2408, 100, 100], - "reason": "background" - } + "invalidations": [ + [8, 4908, 555, 18], + [8, 2408, 100, 100] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/invalidate-caret-in-composited-scrolling-container-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/invalidate-caret-in-composited-scrolling-container-expected.txt index 4d0089a..8cd559ce 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/invalidate-caret-in-composited-scrolling-container-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/invalidate-caret-in-composited-scrolling-container-expected.txt
@@ -11,22 +11,8 @@ "position": [-2, -2], "bounds": [52, 25], "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTextControl INPUT id='root'", - "rect": [0, 0, 52, 25], - "reason": "full layer" - }, - { - "object": "LayoutTextControl INPUT id='root'", - "rect": [0, 0, 48, 21], - "reason": "full layer" - }, - { - "object": "Caret", - "rect": [44, 5, 1, 15], - "reason": "caret" - } + "invalidations": [ + [0, 0, 52, 25] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/invalidate-caret-in-non-composited-scrolling-container-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/invalidate-caret-in-non-composited-scrolling-container-expected.txt index 4d0089a..8cd559ce 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/invalidate-caret-in-non-composited-scrolling-container-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/invalidate-caret-in-non-composited-scrolling-container-expected.txt
@@ -11,22 +11,8 @@ "position": [-2, -2], "bounds": [52, 25], "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTextControl INPUT id='root'", - "rect": [0, 0, 52, 25], - "reason": "full layer" - }, - { - "object": "LayoutTextControl INPUT id='root'", - "rect": [0, 0, 48, 21], - "reason": "full layer" - }, - { - "object": "Caret", - "rect": [44, 5, 1, 15], - "reason": "caret" - } + "invalidations": [ + [0, 0, 52, 25] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/layout-state-scrolloffset-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/layout-state-scrolloffset-expected.txt index 221a33c..a71b66a 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/layout-state-scrolloffset-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/layout-state-scrolloffset-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'after'", - "rect": [100, 118, 41, 18], - "reason": "full" - } + "invalidations": [ + [100, 118, 41, 18] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/layout-state-scrolloffset2-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/layout-state-scrolloffset2-expected.txt index b363705..7b14034 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/layout-state-scrolloffset2-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/layout-state-scrolloffset2-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'after'", - "rect": [102, 120, 41, 18], - "reason": "full" - } + "invalidations": [ + [102, 120, 41, 18] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/layout-state-scrolloffset3-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/layout-state-scrolloffset3-expected.txt index 9d8810e9..4bd4498 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/layout-state-scrolloffset3-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/layout-state-scrolloffset3-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'after'", - "rect": [100, 118, 34, 18], - "reason": "full" - } + "invalidations": [ + [100, 118, 34, 18] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/line-in-scrolled-clipped-block-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/line-in-scrolled-clipped-block-expected.txt index 3386122..a4647ed 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/line-in-scrolled-clipped-block-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/line-in-scrolled-clipped-block-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment ' PASS .'", - "rect": [8, 8, 100, 18], - "reason": "full" - } + "invalidations": [ + [8, 8, 100, 18] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/outline-change-in-scrollers-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/outline-change-in-scrollers-expected.txt index 01718ef..98935c1 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/outline-change-in-scrollers-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/outline-change-in-scrollers-expected.txt
@@ -5,37 +5,13 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='target'", - "rect": [286, 172, 75, 75], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow DIV class='target'", - "rect": [286, 18, 75, 75], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow DIV class='target'", - "rect": [172, 172, 75, 75], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow DIV class='target'", - "rect": [172, 18, 75, 75], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow DIV class='target'", - "rect": [53, 152, 75, 75], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow DIV class='target'", - "rect": [18, 18, 75, 75], - "reason": "style change" - } + "invalidations": [ + [286, 172, 75, 75], + [286, 18, 75, 75], + [172, 172, 75, 75], + [172, 18, 75, 75], + [53, 152, 75, 75], + [18, 18, 75, 75] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/overflow-scroll-body-appear-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/overflow-scroll-body-appear-expected.txt index c34879b..229991d 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/overflow-scroll-body-appear-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/overflow-scroll-body-appear-expected.txt
@@ -5,32 +5,8 @@ "bounds": [2008, 2092], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 2008, 2092], - "reason": "background" - }, - { - "object": "NGPhysicalTextFragment 'Bug 36461 - No vertical scrollbar after the CSS class change'", - "rect": [127, 50, 390, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'You should see both vertical and horizontal scrollbars.'", - "rect": [8, 16, 348, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'This is the test for '", - "rect": [8, 50, 120, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '.'", - "rect": [516, 50, 5, 18], - "reason": "geometry" - } + "invalidations": [ + [0, 0, 2008, 2092] ] }, { @@ -49,12 +25,8 @@ "name": "Scroll Corner Layer", "position": [785, 585], "bounds": [15, 15], - "paintInvalidations": [ - { - "object": "Scroll Corner Layer", - "rect": [0, 0, 15, 15], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 15, 15] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/overflow-scroll-delete-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/overflow-scroll-delete-expected.txt index 79603e7..29d05cc 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/overflow-scroll-delete-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/overflow-scroll-delete-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Passed'", - "rect": [8, 112, 44, 35], - "reason": "full" - }, - { - "object": "NGPhysicalTextFragment 'Test'", - "rect": [8, 112, 44, 35], - "reason": "full" - } + "invalidations": [ + [8, 112, 44, 35] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/overflow-scroll-local-background-text-color-change-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/overflow-scroll-local-background-text-color-change-expected.txt index 212f16dd..7825934 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/overflow-scroll-local-background-text-color-change-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/overflow-scroll-local-background-text-color-change-expected.txt
@@ -17,12 +17,8 @@ "bounds": [185, 550], "contentsOpaque": true, "backgroundColor": "#0000FF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutNGBlockFlow DIV id='scroller'", - "rect": [0, 0, 185, 550], - "reason": "background" - } + "invalidations": [ + [0, 0, 185, 550] ], "transform": 2 },
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/repaint-during-scroll-with-zoom-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/repaint-during-scroll-with-zoom-expected.txt index 3b5ab25..dc4cae5 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/repaint-during-scroll-with-zoom-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/repaint-during-scroll-with-zoom-expected.txt
@@ -5,22 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#C0C0C0", - "paintInvalidations": [ - { - "object": "HorizontalScrollbar", - "rect": [3, 300, 235, 15], - "reason": "scroll control" - }, - { - "object": "LayoutNGBlockFlow HTML", - "rect": [3, 65, 58, 16], - "reason": "paint property change" - }, - { - "object": "VerticalScrollbar", - "rect": [238, 65, 15, 235], - "reason": "scroll control" - } + "invalidations": [ + [3, 300, 235, 15], + [3, 65, 58, 16], + [238, 65, 15, 235] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/scroll-descendant-with-cached-cliprects-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/scroll-descendant-with-cached-cliprects-expected.txt index d6f88303..a1dbd876 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/scroll-descendant-with-cached-cliprects-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/scroll-descendant-with-cached-cliprects-expected.txt
@@ -5,24 +5,16 @@ "bounds": [785, 1893], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='ul'", - "rect": [677, 50, 100, 100], - "reason": "chunk disappeared" - } + "invalidations": [ + [677, 50, 100, 100] ], "transform": 1 }, { "name": "LayoutNGBlockFlow (positioned) DIV id='scrollpanel'", "bounds": [100, 100], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='scrollpanel'", - "rect": [0, 0, 100, 100], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 2 },
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/sticky/invalidate-after-composited-scroll-with-sticky-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/sticky/invalidate-after-composited-scroll-with-sticky-expected.txt index 042d658..4c0135f 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/sticky/invalidate-after-composited-scroll-with-sticky-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/scroll/sticky/invalidate-after-composited-scroll-with-sticky-expected.txt
@@ -5,12 +5,8 @@ "bounds": [785, 656], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "VerticalScrollbar", - "rect": [353, 8, 15, 640], - "reason": "scroll control" - } + "invalidations": [ + [353, 8, 15, 640] ] }, {
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/search-field-cancel-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/search-field-cancel-expected.txt index 8113148..52b8175 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/search-field-cancel-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/search-field-cancel-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV", - "rect": [12, 44, 58, 16], - "reason": "chunk appeared" - } + "invalidations": [ + [12, 44, 58, 16] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/invalidation-rect-includes-newline-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/invalidation-rect-includes-newline-expected.txt index 39f4ae0..558d0b9 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/invalidation-rect-includes-newline-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/invalidation-rect-includes-newline-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'xx'", - "rect": [8, 8, 48, 33], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'y'", - "rect": [8, 8, 48, 33], - "reason": "geometry" - } + "invalidations": [ + [8, 8, 48, 33] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/invalidation-rect-includes-newline-for-rtl-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/invalidation-rect-includes-newline-for-rtl-expected.txt index b9212a9..29aa934 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/invalidation-rect-includes-newline-for-rtl-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/invalidation-rect-includes-newline-for-rtl-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'xx'", - "rect": [0, 8, 40, 33], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'y'", - "rect": [0, 8, 40, 33], - "reason": "geometry" - } + "invalidations": [ + [0, 8, 40, 33] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/invalidation-rect-includes-newline-for-vertical-lr-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/invalidation-rect-includes-newline-for-vertical-lr-expected.txt index a15890c..458670f 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/invalidation-rect-includes-newline-for-vertical-lr-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/invalidation-rect-includes-newline-for-vertical-lr-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'xx'", - "rect": [7, 8, 33, 48], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'y'", - "rect": [7, 8, 33, 48], - "reason": "geometry" - } + "invalidations": [ + [7, 8, 33, 48] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/invalidation-rect-includes-newline-for-vertical-rl-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/invalidation-rect-includes-newline-for-vertical-rl-expected.txt index a15890c..458670f 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/invalidation-rect-includes-newline-for-vertical-rl-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/invalidation-rect-includes-newline-for-vertical-rl-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'xx'", - "rect": [7, 8, 33, 48], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'y'", - "rect": [7, 8, 33, 48], - "reason": "geometry" - } + "invalidations": [ + [7, 8, 33, 48] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/japanese-rl-selection-clear-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/japanese-rl-selection-clear-expected.txt index e7b4447..618857ac 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/japanese-rl-selection-clear-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/japanese-rl-selection-clear-expected.txt
@@ -5,82 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment '\u3044\u8A18\u4E8B\u304C\u3069\u3053\u306B\u3042\u3063\u305F\u304B\u5FD8\u308C\u3066\u3057\u307E\u3063\u305F'", - "rect": [288, 123, 489, 399], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u304B\u3089\u3082\u691C\u7D22\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002\u305B\u3063\u304B'", - "rect": [288, 123, 489, 399], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u304C\u3067\u304D\u307E\u3059\u3002\u305B\u3063\u304B\u304F\u898B\u3064\u3051\u305F\u3059\u3070\u3089\u3057'", - "rect": [288, 123, 489, 399], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u304F\u3001\u8A2A\u554F\u3057\u305F\u30A6\u30A7\u30D6\u30DA\u30FC\u30B8\u306E\u30B3\u30F3\u30C6\u30F3\u30C4'", - "rect": [288, 123, 489, 399], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u304F\u898B\u3064\u3051\u305F\u3059\u3070\u3089\u3057\u3044\u8A18\u4E8B\u304C\u3069\u3053\u306B\u3042\u3063'", - "rect": [288, 123, 489, 399], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u3057\u305F\u30A6\u30A7\u30D6\u30DA\u30FC\u30B8\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u304B\u3089\u3082\u691C'", - "rect": [288, 123, 489, 399], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u3059\u304B\u306A\u3089\u30BF\u30A4\u30C8\u30EB\u3068\u30A2\u30C9\u30EC\u30B9\u3060\u3051\u3067\u306A'", - "rect": [288, 123, 489, 399], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u305B\u3063\u304B\u304F\u898B\u3064\u3051\u305F\u3059\u3070\u3089\u3057\u3044\u8A18\u4E8B\u304C\u3069\u3053'", - "rect": [288, 123, 489, 399], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u305F\u304B\u5FD8\u308C\u3066\u3057\u307E\u3063\u305F\u7D4C\u9A13\u306F\u3042\u308A\u307E\u3059\u304B \u306A'", - "rect": [288, 123, 489, 399], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u306B\u3042\u3063\u305F\u304B\u5FD8\u308C\u3066\u3057\u307E\u3063\u305F\u7D4C\u9A13\u306F\u3042\u308A\u307E'", - "rect": [288, 123, 489, 399], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u3089\u30BF\u30A4\u30C8\u30EB\u3068\u30A2\u30C9\u30EC\u30B9\u3060\u3051\u3067\u306A\u304F\u3001\u8A2A\u554F'", - "rect": [288, 123, 489, 399], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u30B9\u3060\u3051\u3067\u306A\u304F\u3001\u8A2A\u554F'", - "rect": [288, 123, 489, 399], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u30DA\u30FC\u30B8\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u304B\u3089\u3082\u691C\u7D22\u3059\u308B\u3053\u3068'", - "rect": [288, 123, 489, 399], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u7D22\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002\u8A2A\u554F\u3057\u305F\u30A6\u30A7\u30D6'", - "rect": [288, 123, 489, 399], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u7D4C\u9A13\u306F\u3042\u308A\u307E\u3059\u304B \u306A\u3089\u30BF\u30A4\u30C8\u30EB\u3068\u30A2\u30C9\u30EC'", - "rect": [288, 123, 489, 399], - "reason": "geometry" - } + "invalidations": [ + [288, 123, 489, 399] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/repaint-rect-for-vertical-writing-mode-with-positioned-root-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/repaint-rect-for-vertical-writing-mode-with-positioned-root-expected.txt index 1164d39..41f9d3a29 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/repaint-rect-for-vertical-writing-mode-with-positioned-root-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/repaint-rect-for-vertical-writing-mode-with-positioned-root-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Some text in vertical mode'", - "rect": [185, 201, 18, 173], - "reason": "selection" - } + "invalidations": [ + [185, 201, 18, 173] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/selected-replaced-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/selected-replaced-expected.txt index 984b7a4..0173512 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/selected-replaced-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/selected-replaced-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutImage (relative positioned) IMG id='test' class='moved'", - "rect": [8, 148, 214, 232], - "reason": "geometry" - }, - { - "object": "LayoutImage (relative positioned) IMG id='test' class='moved'", - "rect": [8, 68, 214, 232], - "reason": "geometry" - } + "invalidations": [ + [8, 148, 214, 232], + [8, 68, 214, 232] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/selection-after-delete-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/selection-after-delete-expected.txt index 9e5b068..a692944 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/selection-after-delete-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/selection-after-delete-expected.txt
@@ -5,72 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='test'", - "rect": [38, 74, 152, 110], - "reason": "geometry" - }, - { - "object": "InlineTextBox ' '", - "rect": [39, 75, 123, 108], - "reason": "disappeared" - }, - { - "object": "InlineTextBox ' '", - "rect": [39, 75, 123, 108], - "reason": "disappeared" - }, - { - "object": "InlineTextBox ' '", - "rect": [39, 75, 123, 108], - "reason": "disappeared" - }, - { - "object": "InlineTextBox ' '", - "rect": [39, 75, 123, 108], - "reason": "disappeared" - }, - { - "object": "InlineTextBox ' '", - "rect": [39, 75, 123, 108], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'hello world hello'", - "rect": [39, 75, 123, 108], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'hello world hello'", - "rect": [39, 75, 123, 108], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'hello world hello'", - "rect": [39, 75, 123, 108], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'world hello world'", - "rect": [39, 75, 123, 108], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'world hello world'", - "rect": [39, 75, 123, 108], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'world hello'", - "rect": [39, 75, 123, 108], - "reason": "disappeared" - }, - { - "object": "Caret", - "rect": [39, 75, 1, 18], - "reason": "appeared" - } + "invalidations": [ + [38, 74, 152, 110] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/selection-after-remove-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/selection-after-remove-expected.txt index cb64fee..a692944 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/selection-after-remove-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/selection-after-remove-expected.txt
@@ -5,87 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='test'", - "rect": [38, 74, 152, 110], - "reason": "geometry" - }, - { - "object": "InlineTextBox ' '", - "rect": [39, 75, 123, 108], - "reason": "disappeared" - }, - { - "object": "InlineTextBox ' '", - "rect": [39, 75, 123, 108], - "reason": "disappeared" - }, - { - "object": "InlineTextBox ' '", - "rect": [39, 75, 123, 108], - "reason": "disappeared" - }, - { - "object": "InlineTextBox ' '", - "rect": [39, 75, 123, 108], - "reason": "disappeared" - }, - { - "object": "InlineTextBox ' '", - "rect": [39, 75, 123, 108], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'hello world hello'", - "rect": [39, 75, 123, 108], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'hello world hello'", - "rect": [39, 75, 123, 108], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'world hello world'", - "rect": [39, 75, 123, 108], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'world hello world'", - "rect": [39, 75, 123, 108], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'world hello'", - "rect": [39, 75, 123, 108], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'world hello'", - "rect": [39, 75, 123, 108], - "reason": "disappeared" - }, - { - "object": "InlineTextBox ' world'", - "rect": [112, 165, 42, 18], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'world'", - "rect": [74, 75, 39, 18], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'hello '", - "rect": [39, 75, 36, 18], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'hello '", - "rect": [39, 75, 36, 18], - "reason": "disappeared" - } + "invalidations": [ + [38, 74, 152, 110] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/selection-clear-after-move-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/selection-clear-after-move-expected.txt index f3b70ee..4486ba2 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/selection-clear-after-move-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/selection-clear-after-move-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutImage IMG", - "rect": [100, 300, 50, 50], - "reason": "selection" - } + "invalidations": [ + [100, 300, 50, 50] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/selection-clear-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/selection-clear-expected.txt deleted file mode 100644 index 4c12cfe..0000000 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/selection-clear-expected.txt +++ /dev/null
@@ -1,38 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='firstLine'", - "rect": [8, 8, 100, 200], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='firstLine'", - "rect": [8, 8, 100, 100], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'FAIL: Test did'", - "rect": [8, 8, 98, 200], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'not run'", - "rect": [8, 8, 98, 200], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [8, 8, 8, 100], - "reason": "appeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/selection-in-composited-scrolling-container-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/selection-in-composited-scrolling-container-expected.txt index 833dc93..3826a1f9 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/selection-in-composited-scrolling-container-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/selection-in-composited-scrolling-container-expected.txt
@@ -5,27 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTextControl INPUT id='target'", - "rect": [6, 6, 52, 25], - "reason": "subtree" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [12, 11, 40, 15], - "reason": "paint property change" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [12, 11, 39, 15], - "reason": "paint property change" - }, - { - "object": "InlineTextBox 'test test test'", - "rect": [12, 11, 17, 15], - "reason": "selection" - } + "invalidations": [ + [6, 6, 52, 25] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/selection-in-non-composited-scrolling-container-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/selection-in-non-composited-scrolling-container-expected.txt index d556593a..3826a1f9 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/selection-in-non-composited-scrolling-container-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/selection-in-non-composited-scrolling-container-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTextControl INPUT id='target'", - "rect": [6, 6, 52, 25], - "reason": "subtree" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [12, 11, 40, 15], - "reason": "paint property change" - }, - { - "object": "InlineTextBox 'test test test'", - "rect": [32, 11, 20, 15], - "reason": "selection" - } + "invalidations": [ + [6, 6, 52, 25] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/selection-partial-invalidation-between-blocks-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/selection-partial-invalidation-between-blocks-expected.txt index 1fc0e5e..eebedf1 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/selection-partial-invalidation-between-blocks-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/selection-partial-invalidation-between-blocks-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Second cell'", - "rect": [11, 33, 75, 18], - "reason": "selection" - }, - { - "object": "NGPhysicalTextFragment 'First cell'", - "rect": [11, 11, 61, 18], - "reason": "geometry" - } + "invalidations": [ + [11, 33, 75, 18], + [11, 11, 61, 18] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/selection-rl-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/selection-rl-expected.txt index d7a15326..330096ef 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/selection-rl-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/selection-rl-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Testing both hit testing'", - "rect": [774, 38, 18, 79], - "reason": "selection" - } + "invalidations": [ + [774, 38, 18, 79] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/selection-within-composited-scroller-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/selection-within-composited-scroller-expected.txt index 42ac640..7b06cd2 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/selection-within-composited-scroller-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/selection-within-composited-scroller-expected.txt
@@ -17,12 +17,8 @@ "bounds": [200, 1620], "contentsOpaque": true, "backgroundColor": "#D3D3D3", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'test'", - "rect": [0, 610, 23, 18], - "reason": "selection" - } + "invalidations": [ + [0, 610, 23, 18] ], "transform": 2 },
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/text-selection-rect-in-overflow-2-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/text-selection-rect-in-overflow-2-expected.txt index 9220985..267582c 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/text-selection-rect-in-overflow-2-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/text-selection-rect-in-overflow-2-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Should have blue, not gray, highlight'", - "rect": [18, 28, 237, 18], - "reason": "selection" - } + "invalidations": [ + [18, 28, 237, 18] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/text-selection-rect-in-overflow-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/text-selection-rect-in-overflow-expected.txt index 9cdea427..4c846bf4 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/text-selection-rect-in-overflow-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/selection/text-selection-rect-in-overflow-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Should have green background'", - "rect": [8, 18, 199, 18], - "reason": "selection" - } + "invalidations": [ + [8, 18, 199, 18] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/stacked-diacritics-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/stacked-diacritics-expected.txt index 27d941b..64267fd 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/stacked-diacritics-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/stacked-diacritics-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment '\u1EA6\u1EA4\u1EAA\u1EA8\u1EB0'", - "rect": [18, 153, 132, 47], - "reason": "disappeared" - } + "invalidations": [ + [18, 153, 132, 47] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/subtree-root-skipped-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/subtree-root-skipped-expected.txt index 97b9d7f6..4018972 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/subtree-root-skipped-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/subtree-root-skipped-expected.txt
@@ -5,22 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'PASS'", - "rect": [12, 10, 35, 16], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'FAIL'", - "rect": [12, 10, 28, 16], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='div'", - "rect": [8, 288, 10, 20], - "reason": "geometry" - } + "invalidations": [ + [12, 10, 35, 16], + [8, 288, 10, 20] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/absolute-sized-content-with-resources-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/absolute-sized-content-with-resources-expected.txt index 766e675..b88daa0a 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/absolute-sized-content-with-resources-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/absolute-sized-content-with-resources-expected.txt
@@ -5,32 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow div id='contentBox'", - "rect": [8, 50, 402, 402], - "reason": "geometry" - }, - { - "object": "LayoutSVGRect rect", - "rect": [42, 117, 334, 268], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRect rect", - "rect": [42, 117, 334, 268], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRect rect", - "rect": [17, 217, 84, 68], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRect rect", - "rect": [17, 217, 84, 68], - "reason": "paint property change" - } + "invalidations": [ + [8, 50, 402, 402] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/animated-path-inside-transformed-html-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/animated-path-inside-transformed-html-expected.txt index c3179e1..a17e7c7 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/animated-path-inside-transformed-html-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/animated-path-inside-transformed-html-expected.txt
@@ -5,37 +5,13 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'This is some text'", - "rect": [246, 88, 122, 44], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'This is some text'", - "rect": [203, 334, 121, 44], - "reason": "appeared" - }, - { - "object": "LayoutSVGRect rect id='rect'", - "rect": [108, 82, 105, 102], - "reason": "full" - }, - { - "object": "LayoutSVGRect rect id='rect'", - "rect": [355, 123, 104, 104], - "reason": "full" - }, - { - "object": "LayoutSVGImage image id='image'", - "rect": [352, 396, 99, 98], - "reason": "full" - }, - { - "object": "LayoutSVGImage image id='image'", - "rect": [90, 205, 98, 99], - "reason": "full" - } + "invalidations": [ + [246, 88, 122, 44], + [203, 334, 121, 44], + [108, 82, 105, 102], + [355, 123, 104, 104], + [352, 396, 99, 98], + [90, 205, 98, 99] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/color-stop-properties-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/color-stop-properties-expected.txt index 1ee394a8..fcd146c 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/color-stop-properties-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/color-stop-properties-expected.txt
@@ -5,127 +5,31 @@ "bounds": [808, 620], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect id='r12'", - "rect": [608, 368, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r6'", - "rect": [608, 248, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r12'", - "rect": [608, 128, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r6'", - "rect": [608, 8, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r11'", - "rect": [488, 368, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r5'", - "rect": [488, 248, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r11'", - "rect": [488, 128, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r5'", - "rect": [488, 8, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r10'", - "rect": [368, 368, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r4'", - "rect": [368, 248, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r10'", - "rect": [368, 128, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r4'", - "rect": [368, 8, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r9'", - "rect": [248, 368, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r3'", - "rect": [248, 248, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r9'", - "rect": [248, 128, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r3'", - "rect": [248, 8, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r8'", - "rect": [128, 368, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r2'", - "rect": [128, 248, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r8'", - "rect": [128, 128, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r2'", - "rect": [128, 8, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r7'", - "rect": [8, 368, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r1'", - "rect": [8, 248, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r7'", - "rect": [8, 128, 100, 100], - "reason": "SVG resource change" - }, - { - "object": "LayoutSVGRect rect id='r1'", - "rect": [8, 8, 100, 100], - "reason": "SVG resource change" - } + "invalidations": [ + [608, 368, 100, 100], + [608, 248, 100, 100], + [608, 128, 100, 100], + [608, 8, 100, 100], + [488, 368, 100, 100], + [488, 248, 100, 100], + [488, 128, 100, 100], + [488, 8, 100, 100], + [368, 368, 100, 100], + [368, 248, 100, 100], + [368, 128, 100, 100], + [368, 8, 100, 100], + [248, 368, 100, 100], + [248, 248, 100, 100], + [248, 128, 100, 100], + [248, 8, 100, 100], + [128, 368, 100, 100], + [128, 248, 100, 100], + [128, 128, 100, 100], + [128, 8, 100, 100], + [8, 368, 100, 100], + [8, 248, 100, 100], + [8, 128, 100, 100], + [8, 8, 100, 100] ] }, {
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/ems-display-none-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/ems-display-none-expected.txt index ac005fb..8fda540 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/ems-display-none-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/ems-display-none-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRoot svg", - "rect": [50, 54, 571, 86], - "reason": "chunk appeared" - } + "invalidations": [ + [50, 54, 571, 86] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/exs-display-none-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/exs-display-none-expected.txt index 087eacb..e12fc46 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/exs-display-none-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/exs-display-none-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRoot svg", - "rect": [50, 50, 571, 82], - "reason": "chunk appeared" - } + "invalidations": [ + [50, 50, 571, 82] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.txt deleted file mode 100644 index 4c71017..0000000 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.txt +++ /dev/null
@@ -1,63 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [0, 0, 200, 200], - "reason": "full" - }, - { - "object": "InlineTextBox 'right-aligned text'", - "rect": [89, 86, 111, 18], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGViewportContainer svg id='inner'", - "rect": [100, 0, 100, 200], - "reason": "incremental" - }, - { - "object": "InlineTextBox 'right-aligned text'", - "rect": [0, 86, 100, 18], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGContainer use", - "rect": [180, 120, 20, 20], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRect rect", - "rect": [180, 60, 20, 20], - "reason": "incremental" - }, - { - "object": "LayoutSVGRect rect", - "rect": [180, 60, 20, 20], - "reason": "full" - }, - { - "object": "LayoutSVGContainer use", - "rect": [80, 120, 20, 20], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRect rect", - "rect": [80, 60, 20, 20], - "reason": "incremental" - }, - { - "object": "LayoutSVGRect rect", - "rect": [80, 60, 20, 20], - "reason": "full" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/js-late-clipPath-and-object-creation-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/js-late-clipPath-and-object-creation-expected.txt index e750d80..a739afa 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/js-late-clipPath-and-object-creation-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/js-late-clipPath-and-object-creation-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGContainer g id='content'", - "rect": [16, 37, 784, 178], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer g id='content'", - "rect": [16, 37, 784, 178], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [16, 37, 318, 178], - "reason": "chunk appeared" - } + "invalidations": [ + [16, 37, 784, 178] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/js-late-clipPath-creation-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/js-late-clipPath-creation-expected.txt index 2989d11..a739afa 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/js-late-clipPath-creation-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/js-late-clipPath-creation-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGContainer g id='content'", - "rect": [16, 37, 784, 178], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [16, 37, 318, 178], - "reason": "chunk appeared" - } + "invalidations": [ + [16, 37, 784, 178] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/js-late-gradient-and-object-creation-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/js-late-gradient-and-object-creation-expected.txt index 0ccd04bc..793876c 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/js-late-gradient-and-object-creation-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/js-late-gradient-and-object-creation-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRoot svg id='svg-root'", - "rect": [0, 13, 754, 367], - "reason": "chunk appeared" - } + "invalidations": [ + [0, 13, 754, 367] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/js-late-gradient-creation-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/js-late-gradient-creation-expected.txt index 9c8e4d9..25af60b4 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/js-late-gradient-creation-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/js-late-gradient-creation-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGContainer g id='content'", - "rect": [33, 20, 694, 198], - "reason": "chunk appeared" - } + "invalidations": [ + [33, 20, 694, 198] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/js-late-pattern-and-object-creation-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/js-late-pattern-and-object-creation-expected.txt index f0b9477..495c874 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/js-late-pattern-and-object-creation-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/js-late-pattern-and-object-creation-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRoot svg id='svg-root'", - "rect": [0, 13, 679, 367], - "reason": "chunk appeared" - } + "invalidations": [ + [0, 13, 679, 367] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/js-late-pattern-creation-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/js-late-pattern-creation-expected.txt index c4f0e3f2..1fa582f 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/js-late-pattern-creation-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/js-late-pattern-creation-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGContainer g id='content'", - "rect": [33, 20, 619, 198], - "reason": "chunk appeared" - } + "invalidations": [ + [33, 20, 619, 198] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/marker-text-decoration-change-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/marker-text-decoration-change-expected.txt index fdb415e..ae2e20f 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/marker-text-decoration-change-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/marker-text-decoration-change-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGPath path", - "rect": [8, 14, 148, 18], - "reason": "style change" - }, - { - "object": "LayoutSVGPath path", - "rect": [8, 14, 148, 18], - "reason": "style change" - } + "invalidations": [ + [8, 14, 148, 18] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/modify-transferred-listitem-different-attr-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/modify-transferred-listitem-different-attr-expected.txt index 46af806..1c2df0f 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/modify-transferred-listitem-different-attr-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/modify-transferred-listitem-different-attr-expected.txt
@@ -5,62 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox ' B C'", - "rect": [23, 8, 85, 24], - "reason": "appeared" - }, - { - "object": "InlineTextBox ' B C'", - "rect": [23, 8, 85, 24], - "reason": "appeared" - }, - { - "object": "InlineTextBox ' B C'", - "rect": [23, 8, 85, 24], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'A'", - "rect": [23, 8, 85, 24], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'A'", - "rect": [23, 8, 85, 24], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'A'", - "rect": [23, 8, 85, 24], - "reason": "disappeared" - }, - { - "object": "InlineTextBox ' B C'", - "rect": [23, 8, 80, 24], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'A'", - "rect": [23, 8, 80, 24], - "reason": "disappeared" - }, - { - "object": "InlineTextBox ' Y Z'", - "rect": [58, 45, 50, 27], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'X'", - "rect": [58, 45, 50, 27], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'X Y Z'", - "rect": [58, 45, 50, 17], - "reason": "appeared" - } + "invalidations": [ + [23, 8, 85, 24], + [58, 45, 50, 27] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/outline-offset-text-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/outline-offset-text-expected.txt index eb4a2ad..c1b5dd3 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/outline-offset-text-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/outline-offset-text-expected.txt
@@ -5,27 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Foo'", - "rect": [103, 24, 160, 116], - "reason": "disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [103, 24, 160, 116], - "reason": "full" - }, - { - "object": "InlineTextBox 'Foo'", - "rect": [63, 24, 160, 116], - "reason": "appeared" - }, - { - "object": "LayoutSVGText text", - "rect": [63, 24, 160, 116], - "reason": "full" - } + "invalidations": [ + [103, 24, 160, 116], + [63, 24, 160, 116] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/relative-sized-content-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/relative-sized-content-expected.txt index df7e186..6c61e66 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/relative-sized-content-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/relative-sized-content-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow div id='contentBox'", - "rect": [8, 68, 402, 402], - "reason": "geometry" - }, - { - "object": "LayoutSVGRect rect id='targetRect'", - "rect": [9, 69, 400, 400], - "reason": "geometry" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [109, 69, 300, 400], - "reason": "incremental" - } + "invalidations": [ + [8, 68, 402, 402] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/relative-sized-content-with-resources-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/relative-sized-content-with-resources-expected.txt index decb716..6c61e66 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/relative-sized-content-with-resources-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/relative-sized-content-with-resources-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow div id='contentBox'", - "rect": [8, 68, 402, 402], - "reason": "geometry" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [47, 107, 324, 324], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [8, 150, 102, 238], - "reason": "paint property change" - } + "invalidations": [ + [8, 68, 402, 402] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/relative-sized-deep-shadow-tree-content-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/relative-sized-deep-shadow-tree-content-expected.txt index 3f723a0..6c61e66 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/relative-sized-deep-shadow-tree-content-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/relative-sized-deep-shadow-tree-content-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow div id='contentBox'", - "rect": [8, 68, 402, 402], - "reason": "geometry" - }, - { - "object": "LayoutSVGContainer use id='targetUse'", - "rect": [209, 269, 200, 200], - "reason": "paint property change" - }, - { - "object": "LayoutSVGContainer use id='targetUse'", - "rect": [59, 269, 50, 200], - "reason": "paint property change" - } + "invalidations": [ + [8, 68, 402, 402] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/relative-sized-image-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/relative-sized-image-expected.txt index 68ccc994..6c61e66 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/relative-sized-image-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/relative-sized-image-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow div id='contentBox'", - "rect": [8, 68, 402, 402], - "reason": "geometry" - }, - { - "object": "LayoutSVGImage image", - "rect": [9, 69, 400, 400], - "reason": "image" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [109, 69, 300, 400], - "reason": "incremental" - } + "invalidations": [ + [8, 68, 402, 402] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/relative-sized-inner-svg-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/relative-sized-inner-svg-expected.txt index d75afe0..b88daa0a 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/relative-sized-inner-svg-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/relative-sized-inner-svg-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow div id='contentBox'", - "rect": [8, 50, 402, 402], - "reason": "geometry" - }, - { - "object": "LayoutSVGViewportContainer svg", - "rect": [27, 67, 364, 366], - "reason": "paint property change" - }, - { - "object": "LayoutSVGViewportContainer svg", - "rect": [13, 205, 92, 92], - "reason": "paint property change" - } + "invalidations": [ + [8, 50, 402, 402] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/relative-sized-shadow-tree-content-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/relative-sized-shadow-tree-content-expected.txt index 28924a33..6c61e66 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/relative-sized-shadow-tree-content-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/relative-sized-shadow-tree-content-expected.txt
@@ -5,32 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow div id='contentBox'", - "rect": [8, 68, 402, 402], - "reason": "geometry" - }, - { - "object": "LayoutSVGContainer use", - "rect": [209, 269, 200, 200], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRect rect id='targetRect1'", - "rect": [9, 69, 200, 200], - "reason": "geometry" - }, - { - "object": "LayoutSVGRect rect id='targetRect1'", - "rect": [59, 69, 150, 200], - "reason": "incremental" - }, - { - "object": "LayoutSVGContainer use", - "rect": [59, 269, 50, 200], - "reason": "paint property change" - } + "invalidations": [ + [8, 68, 402, 402] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/relative-sized-shadow-tree-content-with-symbol-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/relative-sized-shadow-tree-content-with-symbol-expected.txt index 71089045..6c61e66 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/relative-sized-shadow-tree-content-with-symbol-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/relative-sized-shadow-tree-content-with-symbol-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow div id='contentBox'", - "rect": [8, 68, 402, 402], - "reason": "geometry" - }, - { - "object": "LayoutSVGViewportContainer svg id='targetSymbol'", - "rect": [9, 69, 400, 400], - "reason": "paint property change" - }, - { - "object": "LayoutSVGViewportContainer svg id='targetSymbol'", - "rect": [9, 219, 100, 100], - "reason": "paint property change" - } + "invalidations": [ + [8, 68, 402, 402] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.txt index 4ffb7c2d..b88daa0a 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow div id='contentBox'", - "rect": [8, 50, 402, 402], - "reason": "geometry" - }, - { - "object": "LayoutSVGViewportContainer svg id='gamesBorder'", - "rect": [27, 67, 364, 366], - "reason": "paint property change" - }, - { - "object": "LayoutSVGViewportContainer svg id='gamesBorder'", - "rect": [13, 205, 92, 92], - "reason": "paint property change" - } + "invalidations": [ + [8, 50, 402, 402] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/repaint-non-scaling-stroke-text-decoration-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/repaint-non-scaling-stroke-text-decoration-expected.txt index 40c75cc..6184a19 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/repaint-non-scaling-stroke-text-decoration-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/repaint-non-scaling-stroke-text-decoration-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGContainer g", - "rect": [9, 12, 48, 30], - "reason": "chunk appeared" - } + "invalidations": [ + [9, 12, 48, 30] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/repaint-non-scaling-stroke-text-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/repaint-non-scaling-stroke-text-expected.txt index 40c75cc..6184a19 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/repaint-non-scaling-stroke-text-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/repaint-non-scaling-stroke-text-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGContainer g", - "rect": [9, 12, 48, 30], - "reason": "chunk appeared" - } + "invalidations": [ + [9, 12, 48, 30] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.txt index fc32521..5b6d7acc 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.txt
@@ -5,42 +5,12 @@ "bounds": [1026, 1016], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'pservers-pattern-01-b \u2190'", - "rect": [177, 992, 202, 20], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u2192 script-handle-01-b'", - "rect": [432, 992, 177, 20], - "reason": "geometry" - }, - { - "object": "NGPhysicalBoxFragment LayoutInline A", - "rect": [380, 989, 51, 25], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'index'", - "rect": [383, 992, 45, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'index'", - "rect": [383, 992, 45, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment ' '", - "rect": [427, 992, 6, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' '", - "rect": [378, 992, 6, 19], - "reason": "geometry" - } + "invalidations": [ + [177, 992, 202, 20], + [432, 992, 177, 20], + [380, 989, 51, 25], + [427, 992, 6, 19], + [378, 992, 6, 19] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/svg-background-partial-redraw-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/svg-background-partial-redraw-expected.txt index be8415e..6cc90f2 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/svg-background-partial-redraw-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/svg-background-partial-redraw-expected.txt
@@ -5,22 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='test'", - "rect": [8, 50, 200, 200], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='test' class='revealed'", - "rect": [8, 50, 200, 200], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='revealer'", - "rect": [9, 151, 200, 100], - "reason": "disappeared" - } + "invalidations": [ + [8, 50, 200, 200], + [9, 151, 200, 100] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/svg-image-change-content-size-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/svg-image-change-content-size-expected.txt index f4b37bb..e8982ce9 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/svg-image-change-content-size-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/svg-image-change-content-size-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow div id='contentBox'", - "rect": [8, 50, 602, 422], - "reason": "geometry" - } + "invalidations": [ + [8, 50, 602, 422] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/tabgroup-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/tabgroup-expected.txt deleted file mode 100644 index 7e81ef9..0000000 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/tabgroup-expected.txt +++ /dev/null
@@ -1,78 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGContainer g", - "rect": [388, 37, 318, 83], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer g", - "rect": [261, 277, 305, 305], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer g", - "rect": [5, 255, 240, 162], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGPath path", - "rect": [5, 255, 240, 162], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGPath path", - "rect": [5, 255, 240, 162], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGPath path", - "rect": [5, 255, 240, 162], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer g", - "rect": [505, 232, 240, 161], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox 'This is a tabgroup with triangular tab corners'", - "rect": [15, 292, 212, 35], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer g id='tabgroupRect'", - "rect": [37, 5, 161, 240], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGText text", - "rect": [64, 257, 54, 29], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGText text", - "rect": [11, 257, 46, 29], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGText text", - "rect": [124, 257, 45, 29], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGText text", - "rect": [174, 257, 32, 29], - "reason": "chunk appeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/text-dom-removal-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/text-dom-removal-expected.txt index fb548ac0..b81afbf 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/text-dom-removal-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/text-dom-removal-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'This should not be visible'", - "rect": [49, 110, 168, 20], - "reason": "disappeared" - }, - { - "object": "LayoutSVGRect rect", - "rect": [0, 0, 21, 21], - "reason": "disappeared" - } + "invalidations": [ + [49, 110, 168, 20], + [0, 0, 21, 21] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/text-mask-update-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/text-mask-update-expected.txt index 84525749..b3d70aae 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/text-mask-update-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/text-mask-update-expected.txt
@@ -5,27 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [10, 2, 46, 23], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGRect rect", - "rect": [10, 2, 46, 23], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGRect rect", - "rect": [10, 32, 43, 18], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGRect rect", - "rect": [10, 32, 43, 18], - "reason": "chunk disappeared" - } + "invalidations": [ + [10, 2, 46, 23], + [10, 32, 43, 18] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/text-repaint-including-stroke-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/text-repaint-including-stroke-expected.txt index 3db2184c..d53a7c7 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/text-repaint-including-stroke-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/text-repaint-including-stroke-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGText text id='bounce'", - "rect": [80, 0, 551, 118], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [30, 0, 404, 60], - "reason": "chunk disappeared" - } + "invalidations": [ + [80, 0, 551, 118], + [30, 0, 404, 60] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/text-rescale-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/text-rescale-expected.txt index c7bf613..9b099b4e 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/text-rescale-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/text-rescale-expected.txt
@@ -5,57 +5,17 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'PASS '", - "rect": [0, 114, 194, 46], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGRoot (positioned) svg", - "rect": [0, 14, 194, 46], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGViewportContainer svg", - "rect": [310, 114, 92, 46], - "reason": "paint property change" - }, - { - "object": "LayoutSVGViewportContainer svg", - "rect": [310, 14, 92, 46], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGForeignObject foreignObject", - "rect": [210, 113, 92, 46], - "reason": "paint property change" - }, - { - "object": "LayoutSVGForeignObject foreignObject", - "rect": [210, 13, 92, 46], - "reason": "paint property change" - }, - { - "object": "LayoutSVGContainer g id='text3g'", - "rect": [0, 3, 6, 2], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGViewportContainer svg", - "rect": [9, 3, 4, 2], - "reason": "paint property change" - }, - { - "object": "LayoutSVGForeignObject foreignObject", - "rect": [6, 3, 4, 2], - "reason": "paint property change" - }, - { - "object": "LayoutSVGForeignObject foreignObject", - "rect": [0, 0, 1, 1], - "reason": "paint property change" - } + "invalidations": [ + [0, 114, 194, 46], + [0, 14, 194, 46], + [310, 114, 92, 46], + [310, 14, 92, 46], + [210, 113, 92, 46], + [210, 13, 92, 46], + [0, 3, 6, 2], + [9, 3, 4, 2], + [6, 3, 4, 2], + [0, 0, 1, 1] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/text-selection-text-05-t-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/text-selection-text-05-t-expected.txt deleted file mode 100644 index 401a0bc..0000000 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/text-selection-text-05-t-expected.txt +++ /dev/null
@@ -1,443 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox '$Revision: 1.8 $'", - "rect": [0, 0, 800, 600], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text id='revision'", - "rect": [0, 0, 800, 600], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox 'text-anchor'", - "rect": [187, 12, 126, 36], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [187, 12, 126, 36], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'text-anchor'", - "rect": [521, 12, 125, 36], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [521, 12, 125, 36], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'text-anchor'", - "rect": [354, 12, 125, 36], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [354, 12, 125, 36], - "reason": "appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [266, 485, 109, 29], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [266, 485, 109, 29], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [266, 201, 109, 21], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [266, 201, 109, 21], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [428, 485, 102, 29], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [428, 485, 102, 29], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [428, 201, 102, 21], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [428, 201, 102, 21], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [591, 485, 93, 29], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [591, 485, 93, 29], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [591, 201, 93, 21], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [591, 201, 93, 21], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox 'middle'", - "rect": [377, 36, 79, 35], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [377, 36, 79, 35], - "reason": "appeared" - }, - { - "object": "InlineTextBox '2.x 2.y'", - "rect": [16, 491, 74, 34], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [16, 491, 74, 34], - "reason": "appeared" - }, - { - "object": "InlineTextBox '4.x 2.y'", - "rect": [16, 441, 74, 34], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [16, 441, 74, 34], - "reason": "appeared" - }, - { - "object": "InlineTextBox '1.x 2.y'", - "rect": [16, 391, 74, 34], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [16, 391, 74, 34], - "reason": "appeared" - }, - { - "object": "InlineTextBox '2.x 4.y'", - "rect": [16, 341, 74, 34], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [16, 341, 74, 34], - "reason": "appeared" - }, - { - "object": "InlineTextBox '4.x 4.y'", - "rect": [16, 291, 74, 34], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [16, 291, 74, 34], - "reason": "appeared" - }, - { - "object": "InlineTextBox '1.x 4.y'", - "rect": [16, 241, 74, 34], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [16, 241, 74, 34], - "reason": "appeared" - }, - { - "object": "InlineTextBox '2.x 1.y'", - "rect": [16, 191, 74, 34], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [16, 191, 74, 34], - "reason": "appeared" - }, - { - "object": "InlineTextBox '4.x 1.y'", - "rect": [16, 141, 74, 34], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [16, 141, 74, 34], - "reason": "appeared" - }, - { - "object": "InlineTextBox '1.x 1.y'", - "rect": [16, 91, 74, 34], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [16, 91, 74, 34], - "reason": "appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [428, 285, 61, 54], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [428, 285, 61, 54], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [428, 435, 61, 29], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [428, 435, 61, 29], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [428, 151, 61, 21], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [428, 151, 61, 21], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [591, 285, 59, 54], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [591, 285, 59, 54], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [266, 285, 59, 54], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [266, 285, 59, 54], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [591, 435, 59, 29], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [591, 435, 59, 29], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [266, 435, 59, 29], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [266, 435, 59, 29], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [591, 151, 59, 21], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [591, 151, 59, 21], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [266, 151, 59, 21], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [266, 151, 59, 21], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox 'start'", - "rect": [226, 36, 48, 35], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [226, 36, 48, 35], - "reason": "appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [428, 335, 44, 54], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [428, 335, 44, 54], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [591, 335, 43, 54], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [591, 335, 43, 54], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [266, 335, 43, 54], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [266, 335, 43, 54], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox 'end'", - "rect": [562, 36, 42, 35], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [562, 36, 42, 35], - "reason": "appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [411, 235, 36, 54], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [411, 235, 36, 54], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [575, 235, 34, 54], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [575, 235, 34, 54], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [250, 235, 34, 54], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [250, 235, 34, 54], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [250, 385, 34, 45], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [250, 385, 34, 45], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1234'", - "rect": [550, 101, 34, 21], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [550, 101, 34, 21], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1234'", - "rect": [400, 101, 34, 21], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [400, 101, 34, 21], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1234'", - "rect": [250, 101, 34, 21], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [250, 101, 34, 21], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [411, 385, 28, 45], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [411, 385, 28, 45], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [566, 385, 26, 45], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [566, 385, 26, 45], - "reason": "chunk appeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/text-selection-update-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/text-selection-update-expected.txt index c73caf7..d8ae15a 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/text-selection-update-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/text-selection-update-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'foobar'", - "rect": [23, 0, 23, 14], - "reason": "selection" - } + "invalidations": [ + [23, 0, 23, 14] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/text-xy-updates-SVGList-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/text-xy-updates-SVGList-expected.txt index 221e6c9..bd7e1fbc 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/text-xy-updates-SVGList-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/text-xy-updates-SVGList-expected.txt
@@ -5,17 +5,9 @@ "bounds": [808, 620], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Passes, if text is at 200x20'", - "rect": [208, 14, 170, 18], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'Passes, if text is at 200x20'", - "rect": [18, 194, 170, 18], - "reason": "disappeared" - } + "invalidations": [ + [208, 14, 170, 18], + [18, 194, 170, 18] ] }, {
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/tspan-dynamic-positioning-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/tspan-dynamic-positioning-expected.txt index 89415a1..9288a0b 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/tspan-dynamic-positioning-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/tspan-dynamic-positioning-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'This text should be at visible at 200,200'", - "rect": [200, 186, 256, 18], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'This text should be at visible at 200,200'", - "rect": [20, 6, 256, 18], - "reason": "disappeared" - } + "invalidations": [ + [200, 186, 256, 18], + [20, 6, 256, 18] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/use-clipped-hit-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/use-clipped-hit-expected.txt index 42df5adf..b5196b8f 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/use-clipped-hit-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/use-clipped-hit-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Unknown'", - "rect": [90, 116, 64, 18], - "reason": "chunk disappeared" - }, - { - "object": "InlineTextBox 'Passed'", - "rect": [90, 116, 44, 18], - "reason": "chunk appeared" - } + "invalidations": [ + [90, 116, 64, 18] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/window-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/window-expected.txt deleted file mode 100644 index 8d85112..0000000 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/svg/window-expected.txt +++ /dev/null
@@ -1,188 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGContainer g id='bigWindow'", - "rect": [37, 142, 551, 394], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGRect rect id='titleBarbigWindow'", - "rect": [37, 142, 551, 17], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer g id='nestedWindow'", - "rect": [76, 181, 316, 238], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGRect rect id='titleBarnestedWindow'", - "rect": [76, 181, 316, 17], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGRect rect id='decoGroupMinimizednavWindow'", - "rect": [612, 80, 187, 18], - "reason": "appeared" - }, - { - "object": "LayoutSVGContainer g id='navWindow'", - "rect": [623, 91, 176, 160], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer g id='colourPickerWindow'", - "rect": [76, 194, 176, 144], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer g id='smallWindow'", - "rect": [311, 376, 160, 145], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer g id='statusWindow'", - "rect": [248, 343, 144, 66], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer g id='minimalWindow'", - "rect": [38, 475, 121, 50], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGRect rect", - "rect": [612, 80, 18, 160], - "reason": "appeared" - }, - { - "object": "LayoutSVGText text", - "rect": [616, 153, 12, 81], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer use id='closeButtonnavWindow'", - "rect": [615, 83, 12, 12], - "reason": "paint property change" - }, - { - "object": "LayoutSVGContainer use id='closeButtonnavWindow'", - "rect": [782, 94, 12, 11], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer use id='closeButtonnavWindow'", - "rect": [782, 94, 12, 11], - "reason": "paint property change" - }, - { - "object": "LayoutSVGContainer use id='maximizeButtonnavWindow'", - "rect": [615, 99, 12, 11], - "reason": "paint property change" - }, - { - "object": "LayoutSVGContainer use id='closeButtonbigWindow'", - "rect": [571, 145, 12, 11], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer use id='closeButtoncolourPickerWindow'", - "rect": [235, 197, 12, 11], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer use id='minimizeButtonnavWindow'", - "rect": [615, 123, 12, 3], - "reason": "paint property change" - }, - { - "object": "LayoutSVGContainer use id='minimizeButtonnestedWindow'", - "rect": [349, 192, 12, 3], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer use id='maximizeButtonstatusWindow'", - "rect": [376, 345, 11, 12], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer use id='maximizeButtonnavWindow'", - "rect": [769, 94, 11, 11], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer use id='maximizeButtonnavWindow'", - "rect": [769, 94, 11, 11], - "reason": "paint property change" - }, - { - "object": "LayoutSVGContainer use id='maximizeButtonbigWindow'", - "rect": [558, 145, 11, 11], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer use id='closeButtonsmallWindow'", - "rect": [454, 379, 11, 11], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer use id='maximizeButtonsmallWindow'", - "rect": [441, 379, 11, 11], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer use id='closeButtonnestedWindow'", - "rect": [376, 184, 11, 11], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer use id='maximizeButtonnestedWindow'", - "rect": [363, 184, 11, 11], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer use id='maximizeButtoncolourPickerWindow'", - "rect": [222, 197, 11, 11], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer use id='minimizeButtonbigWindow'", - "rect": [545, 153, 11, 3], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer use id='minimizeButtonstatusWindow'", - "rect": [363, 354, 11, 3], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer use id='minimizeButtonnavWindow'", - "rect": [756, 103, 11, 2], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer use id='minimizeButtonnavWindow'", - "rect": [756, 103, 11, 2], - "reason": "paint property change" - }, - { - "object": "LayoutSVGContainer use id='minimizeButtonsmallWindow'", - "rect": [428, 388, 11, 2], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer use id='minimizeButtoncolourPickerWindow'", - "rect": [209, 206, 11, 2], - "reason": "chunk appeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/table/cached-change-cell-sl-border-color-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/table/cached-change-cell-sl-border-color-expected.txt deleted file mode 100644 index 2d8a5e08..0000000 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/table/cached-change-cell-sl-border-color-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR", - "rect": [8, 8, 114, 54], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='blockDiv'", - "rect": [90, 30, 20, 20], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='blockDiv'", - "rect": [90, 30, 20, 20], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'A'", - "rect": [90, 30, 12, 18], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/table/caret-contenteditable-content-after-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/table/caret-contenteditable-content-after-expected.txt index 587d075..d549e56 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/table/caret-contenteditable-content-after-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/table/caret-contenteditable-content-after-expected.txt
@@ -5,117 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='editor'", - "rect": [6, 42, 788, 22], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV id='editor'", - "rect": [6, 42, 788, 22], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV id='editor'", - "rect": [6, 42, 788, 22], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV id='editor'", - "rect": [6, 42, 788, 22], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'abc'", - "rect": [8, 44, 23, 18], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'ab'", - "rect": [8, 44, 16, 18], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'ab'", - "rect": [8, 44, 16, 18], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'x'", - "rect": [30, 44, 9, 18], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'x'", - "rect": [23, 44, 9, 18], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'x'", - "rect": [23, 44, 9, 18], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'x'", - "rect": [15, 44, 9, 18], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'x'", - "rect": [15, 44, 9, 18], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'a'", - "rect": [8, 44, 8, 18], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'a'", - "rect": [8, 44, 8, 18], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'x'", - "rect": [8, 44, 8, 18], - "reason": "disappeared" - }, - { - "object": "Caret", - "rect": [30, 44, 1, 18], - "reason": "caret" - }, - { - "object": "Caret", - "rect": [23, 44, 1, 18], - "reason": "caret" - }, - { - "object": "Caret", - "rect": [23, 44, 1, 18], - "reason": "caret" - }, - { - "object": "Caret", - "rect": [15, 44, 1, 18], - "reason": "caret" - }, - { - "object": "Caret", - "rect": [15, 44, 1, 18], - "reason": "caret" - }, - { - "object": "Caret", - "rect": [8, 44, 1, 18], - "reason": "appeared" - }, - { - "object": "Caret", - "rect": [8, 44, 1, 18], - "reason": "caret" - } + "invalidations": [ + [6, 42, 788, 22] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-background-col-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-background-col-expected.txt index a4e7835..a1cab7dc 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-background-col-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-background-col-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY", - "rect": [8, 26, 186, 134], - "reason": "style change" - } + "invalidations": [ + [8, 26, 186, 134] ] }, {
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-background-col-initial-empty-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-background-col-initial-empty-expected.txt index 131d102..a1cab7dc 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-background-col-initial-empty-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-background-col-initial-empty-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY", - "rect": [8, 26, 186, 134], - "reason": "appeared" - } + "invalidations": [ + [8, 26, 186, 134] ] }, {
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-background-col-span-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-background-col-span-expected.txt index bae5df0..56730dc 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-background-col-span-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-background-col-span-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY", - "rect": [8, 26, 186, 134], - "reason": "style change" - } + "invalidations": [ + [8, 26, 186, 134] ] }, {
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-background-col-span-initial-empty-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-background-col-span-initial-empty-expected.txt index 9595654..56730dc 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-background-col-span-initial-empty-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-background-col-span-initial-empty-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY", - "rect": [8, 26, 186, 134], - "reason": "appeared" - } + "invalidations": [ + [8, 26, 186, 134] ] }, {
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-background-colgroup-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-background-colgroup-expected.txt index c672c4e..d090c6a 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-background-colgroup-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-background-colgroup-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY", - "rect": [8, 26, 186, 134], - "reason": "style change" - } + "invalidations": [ + [8, 26, 186, 134] ] }, {
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-background-colgroup-initial-empty-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-background-colgroup-initial-empty-expected.txt index 672b1e15..d090c6a 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-background-colgroup-initial-empty-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-background-colgroup-initial-empty-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY", - "rect": [8, 26, 186, 134], - "reason": "appeared" - } + "invalidations": [ + [8, 26, 186, 134] ] }, {
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-background-composited-row-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-background-composited-row-expected.txt index 55c8d04..edbe923 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-background-composited-row-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-background-composited-row-expected.txt
@@ -11,12 +11,8 @@ "position": [8, 94], "bounds": [186, 64], "backgroundColor": "#ADD8E6", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR id='target'", - "rect": [0, 0, 186, 64], - "reason": "background" - } + "invalidations": [ + [0, 0, 186, 64] ] }, {
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-background-composited-row-initial-empty-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-background-composited-row-initial-empty-expected.txt index e70cc73e..edbe923 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-background-composited-row-initial-empty-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-background-composited-row-initial-empty-expected.txt
@@ -11,12 +11,8 @@ "position": [8, 94], "bounds": [186, 64], "backgroundColor": "#ADD8E6", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR id='target'", - "rect": [0, 0, 186, 64], - "reason": "appeared" - } + "invalidations": [ + [0, 0, 186, 64] ] }, {
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-background-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-background-expected.txt index bdbaea7..3f007491 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-background-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-background-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR id='target'", - "rect": [8, 94, 186, 64], - "reason": "background" - } + "invalidations": [ + [8, 94, 186, 64] ] }, {
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-background-initial-empty-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-background-initial-empty-expected.txt index 35346bb..3f007491 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-background-initial-empty-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-background-initial-empty-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR id='target'", - "rect": [8, 94, 186, 64], - "reason": "appeared" - } + "invalidations": [ + [8, 94, 186, 64] ] }, {
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-background-section-composited-row-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-background-section-composited-row-expected.txt index fd8b8cc..8dc0313 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-background-section-composited-row-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-background-section-composited-row-expected.txt
@@ -11,12 +11,8 @@ "position": [8, 26], "bounds": [186, 134], "backgroundColor": "#ADD8E6", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY id='target'", - "rect": [0, 0, 186, 134], - "reason": "background" - } + "invalidations": [ + [0, 0, 186, 134] ] }, {
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-background-section-composited-row-initial-empty-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-background-section-composited-row-initial-empty-expected.txt index 01a3839..8dc0313 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-background-section-composited-row-initial-empty-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-background-section-composited-row-initial-empty-expected.txt
@@ -11,12 +11,8 @@ "position": [8, 26], "bounds": [186, 134], "backgroundColor": "#ADD8E6", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY id='target'", - "rect": [0, 0, 186, 134], - "reason": "appeared" - } + "invalidations": [ + [0, 0, 186, 134] ] }, {
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-background-section-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-background-section-expected.txt index e83ab41..0149375 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-background-section-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-background-section-expected.txt
@@ -11,12 +11,8 @@ "position": [8, 26], "bounds": [186, 134], "backgroundColor": "#ADD8E6", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY id='target'", - "rect": [0, 0, 186, 134], - "reason": "background" - } + "invalidations": [ + [0, 0, 186, 134] ] }, {
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-background-section-initial-empty-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-background-section-initial-empty-expected.txt index 5d1f92e..0149375 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-background-section-initial-empty-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-background-section-initial-empty-expected.txt
@@ -11,12 +11,8 @@ "position": [8, 26], "bounds": [186, 134], "backgroundColor": "#ADD8E6", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY id='target'", - "rect": [0, 0, 186, 134], - "reason": "appeared" - } + "invalidations": [ + [0, 0, 186, 134] ] }, {
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-row-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-row-expected.txt index c6b8b4b2..d054024 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-row-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/table/composited-table-row-expected.txt
@@ -11,12 +11,8 @@ "position": [8, 8], "bounds": [76, 22], "backgroundColor": "#FF0000", - "paintInvalidations": [ - { - "object": "LayoutNGTableCell TD id='target'", - "rect": [0, 0, 38, 21], - "reason": "appeared" - } + "invalidations": [ + [0, 0, 38, 21] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/table/dynamic-table-vertical-alignment-change-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/table/dynamic-table-vertical-alignment-change-expected.txt index 7ccd7cf8..eb923744 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/table/dynamic-table-vertical-alignment-change-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/table/dynamic-table-vertical-alignment-change-expected.txt
@@ -5,12 +5,8 @@ "bounds": [808, 585], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (floating) DIV id='target'", - "rect": [11, 71, 100, 100], - "reason": "appeared" - } + "invalidations": [ + [11, 71, 100, 100] ] }, {
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/table/resize-table-repaint-percent-size-cell-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/table/resize-table-repaint-percent-size-cell-expected.txt deleted file mode 100644 index 483c5d1..0000000 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/table/resize-table-repaint-percent-size-cell-expected.txt +++ /dev/null
@@ -1,48 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR", - "rect": [0, 52, 106, 238], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [0, 292, 106, 236], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [0, 102, 106, 46], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'ROW2'", - "rect": [3, 401, 46, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'ROW1'", - "rect": [3, 162, 46, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'ROW2'", - "rect": [3, 116, 46, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'ROW1'", - "rect": [3, 67, 46, 18], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/table/resize-table-repaint-vertical-align-cell-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/table/resize-table-repaint-vertical-align-cell-expected.txt index 99e60d01..1e5a0c2f 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/table/resize-table-repaint-vertical-align-cell-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/table/resize-table-repaint-vertical-align-cell-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'MIDDLE'", - "rect": [3, 281, 63, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'MIDDLE'", - "rect": [3, 91, 63, 18], - "reason": "geometry" - } + "invalidations": [ + [3, 281, 63, 18], + [3, 91, 63, 18] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/table/resize-table-row-repaint-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/table/resize-table-row-repaint-expected.txt index 585789b..f7b5aff 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/table/resize-table-row-repaint-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/table/resize-table-row-repaint-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'MIDDLE'", - "rect": [3, 193, 63, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'MIDDLE'", - "rect": [3, 143, 63, 18], - "reason": "geometry" - } + "invalidations": [ + [3, 193, 63, 18], + [3, 143, 63, 18] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/table/single-line-cells-repeating-thead-break-inside-on-thead-only-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/table/single-line-cells-repeating-thead-break-inside-on-thead-only-expected.txt index 4f2f401..f2725c8 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/table/single-line-cells-repeating-thead-break-inside-on-thead-only-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/table/single-line-cells-repeating-thead-break-inside-on-thead-only-expected.txt
@@ -5,27 +5,8 @@ "bounds": [1059, 585], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Col 1'", - "rect": [10, 71, 836, 18], - "reason": "style change" - }, - { - "object": "InlineTextBox 'Col 1'", - "rect": [10, 71, 836, 18], - "reason": "style change" - }, - { - "object": "InlineTextBox 'Col 1'", - "rect": [10, 71, 836, 18], - "reason": "style change" - }, - { - "object": "InlineTextBox 'Col 1'", - "rect": [10, 71, 836, 18], - "reason": "style change" - } + "invalidations": [ + [10, 71, 836, 18] ] }, {
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/table/table-cell-collapsed-border-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/table/table-cell-collapsed-border-expected.txt index c1fc81c..5fc0cda1 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/table/table-cell-collapsed-border-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/table/table-cell-collapsed-border-expected.txt
@@ -5,42 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR", - "rect": [3, 260, 441, 110], - "reason": "style change" - }, - { - "object": "LayoutTableRow TR", - "rect": [3, 162, 441, 108], - "reason": "style change" - }, - { - "object": "LayoutTableRow TR", - "rect": [3, 360, 441, 105], - "reason": "style change" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 60, 436, 108], - "reason": "style change" - }, - { - "object": "LayoutNGTableCell TD id='t3'", - "rect": [225, 265, 112, 100], - "reason": "style change" - }, - { - "object": "LayoutNGTableCell TD id='t1'", - "rect": [225, 65, 112, 100], - "reason": "style change" - }, - { - "object": "LayoutNGTableCell TD id='t2'", - "rect": [8, 265, 110, 100], - "reason": "style change" - } + "invalidations": [ + [3, 260, 441, 110], + [3, 162, 441, 108], + [3, 360, 441, 105], + [8, 60, 436, 108] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/table/table-cell-move-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/table/table-cell-move-expected.txt index e47f05a..d3e944b 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/table/table-cell-move-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/table/table-cell-move-expected.txt
@@ -5,22 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGTableCell TD", - "rect": [8, 320, 60, 60], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [8, 260, 60, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [8, 200, 60, 60], - "reason": "geometry" - } + "invalidations": [ + [8, 320, 60, 60], + [8, 260, 60, 60], + [8, 200, 60, 60] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/table/table-collapsed-border-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/table/table-collapsed-border-expected.txt index 3bb215c..ba348892 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/table/table-collapsed-border-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/table/table-collapsed-border-expected.txt
@@ -5,102 +5,17 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR id='r2'", - "rect": [8, 210, 110, 20], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 316, 101, 28], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 268, 101, 28], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 144, 101, 28], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 96, 101, 28], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 296, 101, 20], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR id='r'", - "rect": [8, 124, 101, 20], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 58, 97, 28], - "reason": "style change" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 10, 97, 28], - "reason": "style change" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 38, 97, 20], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'ipsum dolor'", - "rect": [23, 297, 77, 18], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'ipsum dolor'", - "rect": [23, 125, 77, 18], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'sit amet'", - "rect": [23, 317, 51, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'sit amet'", - "rect": [23, 145, 51, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Lorem'", - "rect": [23, 277, 43, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Lorem'", - "rect": [23, 105, 43, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'dolor'", - "rect": [23, 211, 34, 18], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [17, 211, 4, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [17, 125, 4, 18], - "reason": "geometry" - } + "invalidations": [ + [8, 210, 110, 20], + [8, 316, 101, 28], + [8, 268, 101, 28], + [8, 144, 101, 28], + [8, 96, 101, 28], + [8, 296, 101, 20], + [8, 124, 101, 20], + [8, 58, 97, 28], + [8, 10, 97, 28], + [8, 38, 97, 20] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/table/table-shrink-row-repaint-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/table/table-shrink-row-repaint-expected.txt index e7a8795..56cc26d 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/table/table-shrink-row-repaint-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/table/table-shrink-row-repaint-expected.txt
@@ -5,222 +5,26 @@ "bounds": [785, 848], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGTableCell TD id='resizeMe'", - "rect": [8, 110, 769, 210], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 780, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 740, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 720, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 680, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 660, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 620, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 600, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 560, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 540, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 500, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 480, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 440, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 420, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 380, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 360, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 320, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 300, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 240, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 180, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 120, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 800, 769, 48], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '10'", - "rect": [13, 821, 16, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '13'", - "rect": [13, 801, 16, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '12'", - "rect": [13, 741, 16, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '11'", - "rect": [13, 681, 16, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '10'", - "rect": [13, 621, 16, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '9'", - "rect": [13, 761, 8, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '8'", - "rect": [13, 701, 8, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '7'", - "rect": [13, 641, 8, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '6'", - "rect": [13, 581, 8, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '9'", - "rect": [13, 561, 8, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '5'", - "rect": [13, 521, 8, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '8'", - "rect": [13, 501, 8, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '4'", - "rect": [13, 461, 8, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '7'", - "rect": [13, 441, 8, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '3'", - "rect": [13, 401, 8, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '6'", - "rect": [13, 381, 8, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '2'", - "rect": [13, 341, 8, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '5'", - "rect": [13, 321, 8, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '4'", - "rect": [13, 261, 8, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '3'", - "rect": [13, 201, 8, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '2'", - "rect": [13, 141, 8, 18], - "reason": "geometry" - } + "invalidations": [ + [8, 110, 769, 210], + [8, 780, 769, 60], + [8, 740, 769, 60], + [8, 720, 769, 60], + [8, 680, 769, 60], + [8, 660, 769, 60], + [8, 620, 769, 60], + [8, 600, 769, 60], + [8, 560, 769, 60], + [8, 540, 769, 60], + [8, 500, 769, 60], + [8, 480, 769, 60], + [8, 440, 769, 60], + [8, 420, 769, 60], + [8, 380, 769, 60], + [8, 360, 769, 60], + [8, 320, 769, 60], + [8, 300, 769, 60], + [8, 800, 769, 48] ] }, {
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/text-append-dirty-lines-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/text-append-dirty-lines-expected.txt index 87fb9bed..caf83208 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/text-append-dirty-lines-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/text-append-dirty-lines-expected.txt
@@ -5,42 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Curabitur a velit.'", - "rect": [8, 42, 775, 126], - "reason": "full" - }, - { - "object": "NGPhysicalTextFragment 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse placerat. Morbi tristique. Mauris eu lacus sed felis'", - "rect": [8, 42, 775, 126], - "reason": "full" - }, - { - "object": "NGPhysicalTextFragment 'fermentum ut, tortor. Sed rhoncus. Quisque enim metus, luctus tincidunt, vestibulum eu, vestibulum eu, libero. Mauris'", - "rect": [8, 42, 775, 126], - "reason": "full" - }, - { - "object": "NGPhysicalTextFragment 'feugiat molestie, mi lorem bibendum leo, ac gravida orci nunc nec nulla. Nunc nunc lorem, rhoncus et, rutrum ac,'", - "rect": [8, 42, 775, 126], - "reason": "full" - }, - { - "object": "NGPhysicalTextFragment 'laoreet feugiat. Phasellus mollis pulvinar mi. Etiam ut neque sed eros egestas laoreet. Vestibulum ullamcorper, nulla non'", - "rect": [8, 42, 775, 126], - "reason": "full" - }, - { - "object": "NGPhysicalTextFragment 'pellentesque cursus. Proin vitae nulla. Vivamus in ipsum. Etiam mi. Nam malesuada purus in sem. Sed eget elit vel erat'", - "rect": [8, 42, 775, 126], - "reason": "full" - }, - { - "object": "NGPhysicalTextFragment 'sagittis aliquam nunc. Nullam pharetra molestie eros. Donec tempus purus ut ligula. Phasellus non nisl. Etiam eu mauris.'", - "rect": [8, 42, 775, 126], - "reason": "full" - } + "invalidations": [ + [8, 42, 775, 126] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/text-line-clamp-truncation-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/text-line-clamp-truncation-expected.txt index 5cd5230..eb7cc128 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/text-line-clamp-truncation-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/text-line-clamp-truncation-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutFlexibleBox DIV id='container'", - "rect": [8, 11, 285, 42], - "reason": "chunk appeared" - }, - { - "object": "LayoutDeprecatedFlexibleBox DIV id='container' class='folded'", - "rect": [8, 8, 285, 24], - "reason": "chunk disappeared" - } + "invalidations": [ + [8, 11, 285, 42], + [8, 8, 285, 24] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/text-match-document-change-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/text-match-document-change-expected.txt index 41546a1..ef30dc2b 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/text-match-document-change-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/text-match-document-change-expected.txt
@@ -5,27 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Find-in-page 'findme', then click here)'", - "rect": [18, 128, 256, 36], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'To be changed: findme (Manual testing:'", - "rect": [18, 128, 256, 36], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'After change'", - "rect": [18, 128, 84, 18], - "reason": "appeared" - }, - { - "object": "VerticalScrollbar", - "rect": [295, 102, 15, 400], - "reason": "scroll control" - } + "invalidations": [ + [18, 128, 256, 36], + [295, 102, 15, 400] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/transform/caret-with-transformation-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/transform/caret-with-transformation-expected.txt index deed895..f4f4108 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/transform/caret-with-transformation-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/transform/caret-with-transformation-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Caret", - "rect": [345, 211, 11, 17], - "reason": "caret" - }, - { - "object": "Caret", - "rect": [42, 36, 11, 17], - "reason": "caret" - } + "invalidations": [ + [345, 211, 11, 17], + [42, 36, 11, 17] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/transform/subtree-layoutstate-transform-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/transform/subtree-layoutstate-transform-expected.txt index 7f42adb..fe1246c 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/transform/subtree-layoutstate-transform-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/transform/subtree-layoutstate-transform-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='layoutroot'", - "rect": [28, 46, 200, 200], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [128, 46, 100, 200], - "reason": "incremental" - } + "invalidations": [ + [28, 46, 200, 200] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/transform/transform-inline-layered-child-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/transform/transform-inline-layered-child-expected.txt index cd4dfa14..936c0f0 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/transform/transform-inline-layered-child-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/transform/transform-inline-layered-child-expected.txt
@@ -5,57 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='box'", - "rect": [139, 359, 151, 181], - "reason": "chunk appeared" - }, - { - "object": "NGPhysicalTextFragment 'A B C'", - "rect": [300, 301, 80, 161], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'D E F'", - "rect": [300, 301, 80, 161], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'G H I'", - "rect": [300, 301, 80, 161], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'J K L'", - "rect": [300, 301, 80, 161], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'M N O'", - "rect": [300, 301, 80, 161], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'P Q R'", - "rect": [300, 301, 80, 161], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'S T U'", - "rect": [300, 301, 80, 161], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'V W X'", - "rect": [300, 301, 80, 161], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'Y Z'", - "rect": [300, 301, 80, 161], - "reason": "disappeared" - } + "invalidations": [ + [139, 359, 151, 181], + [300, 301, 80, 161] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/transform/transform-layout-repaint-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/transform/transform-layout-repaint-expected.txt index 9d38c96..922859e 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/transform/transform-layout-repaint-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/transform/transform-layout-repaint-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'PASS'", - "rect": [52, 51, 42, 30], - "reason": "full" - } + "invalidations": [ + [52, 51, 42, 30] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/transform/transform-repaint-descendants-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/transform/transform-repaint-descendants-expected.txt index 67afbf0..a625847f 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/transform/transform-repaint-descendants-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/transform/transform-repaint-descendants-expected.txt
@@ -5,27 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [176, 218, 394, 185], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [176, 218, 388, 203], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='box'", - "rect": [76, 118, 266, 266], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='box'", - "rect": [79, 121, 260, 260], - "reason": "paint property change" - } + "invalidations": [ + [176, 218, 394, 185], + [176, 218, 388, 203], + [76, 118, 266, 266] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/window-resize/window-resize-vertical-writing-mode-expected.txt b/third_party/blink/web_tests/platform/mac/paint/invalidation/window-resize/window-resize-vertical-writing-mode-expected.txt index 97760b08..50b595a 100644 --- a/third_party/blink/web_tests/platform/mac/paint/invalidation/window-resize/window-resize-vertical-writing-mode-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/window-resize/window-resize-vertical-writing-mode-expected.txt
@@ -5,12 +5,8 @@ "bounds": [913, 235], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling Contents Layer", - "rect": [0, 0, 913, 235], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 913, 235] ], "transform": 1 }, @@ -40,12 +36,8 @@ "bounds": [913, 235], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling Contents Layer", - "rect": [0, 0, 913, 235], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 913, 235] ], "transform": 1 }, @@ -75,12 +67,8 @@ "bounds": [400, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling Contents Layer", - "rect": [0, 0, 400, 600], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 400, 600] ] } ] @@ -92,62 +80,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [400, 0, 400, 600], - "reason": "incremental" - }, - { - "object": "NGPhysicalTextFragment 'AAAA BBBB CCCC'", - "rect": [447, 8, 345, 565], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'DDDD EEEE FFFF'", - "rect": [447, 8, 345, 565], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'GGGG HHHH IIII JJJJ'", - "rect": [447, 8, 345, 565], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'KKKK LLLL MMMM'", - "rect": [447, 8, 345, 565], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'NNNN'", - "rect": [447, 8, 345, 565], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'AAAA BBBB CCCC'", - "rect": [47, 8, 345, 565], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'DDDD EEEE FFFF'", - "rect": [47, 8, 345, 565], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'GGGG HHHH IIII JJJJ'", - "rect": [47, 8, 345, 565], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'KKKK LLLL MMMM'", - "rect": [47, 8, 345, 565], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'NNNN'", - "rect": [47, 8, 345, 565], - "reason": "geometry" - } + "invalidations": [ + [400, 0, 400, 600], + [47, 8, 345, 565] ] } ]
diff --git a/third_party/blink/web_tests/platform/mac/paint/pagination/pagination-change-clip-crash-expected.txt b/third_party/blink/web_tests/platform/mac/paint/pagination/pagination-change-clip-crash-expected.txt index 7216d13e..71bdfdd 100644 --- a/third_party/blink/web_tests/platform/mac/paint/pagination/pagination-change-clip-crash-expected.txt +++ b/third_party/blink/web_tests/platform/mac/paint/pagination/pagination-change-clip-crash-expected.txt
@@ -5,12 +5,8 @@ "bounds": [785, 734], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 634, 785, 100], - "reason": "incremental" - } + "invalidations": [ + [0, 634, 785, 100] ] }, {
diff --git a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh-hc/virtual/controls-refresh/color-scheme/color/color-picker-appearance-expected.png b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh-hc/virtual/controls-refresh/color-scheme/color/color-picker-appearance-expected.png index 65937bd..ca56143 100644 --- a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh-hc/virtual/controls-refresh/color-scheme/color/color-picker-appearance-expected.png +++ b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh-hc/virtual/controls-refresh/color-scheme/color/color-picker-appearance-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color-scheme/color/color-picker-appearance-expected.png b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color-scheme/color/color-picker-appearance-expected.png index 89e3c72..c070e4e 100644 --- a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color-scheme/color/color-picker-appearance-expected.png +++ b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color-scheme/color/color-picker-appearance-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-color-well-click-expected.png b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-color-well-click-expected.png index 167729c..d6d87cf 100644 --- a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-color-well-click-expected.png +++ b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-color-well-click-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-color-well-down-keyboard-navigation-from-top-left-corner-expected.png b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-color-well-down-keyboard-navigation-from-top-left-corner-expected.png index e99d8db6..4f964fe 100644 --- a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-color-well-down-keyboard-navigation-from-top-left-corner-expected.png +++ b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-color-well-down-keyboard-navigation-from-top-left-corner-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-color-well-down-keyboard-navigation-from-top-right-corner-expected.png b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-color-well-down-keyboard-navigation-from-top-right-corner-expected.png index 9b3a519..49c59bb 100644 --- a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-color-well-down-keyboard-navigation-from-top-right-corner-expected.png +++ b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-color-well-down-keyboard-navigation-from-top-right-corner-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-color-well-drag-expected.png b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-color-well-drag-expected.png index 167729c..d6d87cf 100644 --- a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-color-well-drag-expected.png +++ b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-color-well-drag-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-color-well-keyboard-navigation-expected.png b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-color-well-keyboard-navigation-expected.png index e24f94a..5556443 100644 --- a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-color-well-keyboard-navigation-expected.png +++ b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-color-well-keyboard-navigation-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-color-well-left-keyboard-navigation-from-bottom-right-corner-expected.png b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-color-well-left-keyboard-navigation-from-bottom-right-corner-expected.png index 10e0836..8feff2e1 100644 --- a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-color-well-left-keyboard-navigation-from-bottom-right-corner-expected.png +++ b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-color-well-left-keyboard-navigation-from-bottom-right-corner-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-color-well-left-keyboard-navigation-from-top-right-corner-expected.png b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-color-well-left-keyboard-navigation-from-top-right-corner-expected.png index 95c9d61..e8f025f 100644 --- a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-color-well-left-keyboard-navigation-from-top-right-corner-expected.png +++ b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-color-well-left-keyboard-navigation-from-top-right-corner-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-color-well-right-keyboard-navigation-from-bottom-left-corner-expected.png b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-color-well-right-keyboard-navigation-from-bottom-left-corner-expected.png index 6a0e29b..0cae8b9 100644 --- a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-color-well-right-keyboard-navigation-from-bottom-left-corner-expected.png +++ b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-color-well-right-keyboard-navigation-from-bottom-left-corner-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-color-well-right-keyboard-navigation-from-top-left-corner-expected.png b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-color-well-right-keyboard-navigation-from-top-left-corner-expected.png index a4d8887..6db87d8 100644 --- a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-color-well-right-keyboard-navigation-from-top-left-corner-expected.png +++ b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-color-well-right-keyboard-navigation-from-top-left-corner-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-color-well-up-keyboard-navigation-from-bottom-left-corner-expected.png b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-color-well-up-keyboard-navigation-from-bottom-left-corner-expected.png index 60e25c9..44f8538 100644 --- a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-color-well-up-keyboard-navigation-from-bottom-left-corner-expected.png +++ b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-color-well-up-keyboard-navigation-from-bottom-left-corner-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-color-well-up-keyboard-navigation-from-bottom-right-corner-expected.png b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-color-well-up-keyboard-navigation-from-bottom-right-corner-expected.png index 78d546bc..ebf3a3a 100644 --- a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-color-well-up-keyboard-navigation-from-bottom-right-corner-expected.png +++ b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-color-well-up-keyboard-navigation-from-bottom-right-corner-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-hex-format-expected.png b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-hex-format-expected.png index 3b9d018d..ddb5b4a 100644 --- a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-hex-format-expected.png +++ b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-hex-format-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-hsl-format-expected.png b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-hsl-format-expected.png index cd17259..16d04c6 100644 --- a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-hsl-format-expected.png +++ b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-hsl-format-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-hue-slider-accelerated-keyboard-navigation-expected.png b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-hue-slider-accelerated-keyboard-navigation-expected.png index 7358d22..8cd17429 100644 --- a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-hue-slider-accelerated-keyboard-navigation-expected.png +++ b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-hue-slider-accelerated-keyboard-navigation-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-hue-slider-click-expected.png b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-hue-slider-click-expected.png index 31f57e45..44fc4ad 100644 --- a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-hue-slider-click-expected.png +++ b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-hue-slider-click-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-hue-slider-drag-expected.png b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-hue-slider-drag-expected.png index 31f57e45..44fc4ad 100644 --- a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-hue-slider-drag-expected.png +++ b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-hue-slider-drag-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-hue-slider-keyboard-navigation-expected.png b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-hue-slider-keyboard-navigation-expected.png index bae5336..4819a11 100644 --- a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-hue-slider-keyboard-navigation-expected.png +++ b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-hue-slider-keyboard-navigation-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-hue-slider-left-edge-zero-hue-expected.png b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-hue-slider-left-edge-zero-hue-expected.png index 6295b57..efc0bf9 100644 --- a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-hue-slider-left-edge-zero-hue-expected.png +++ b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-hue-slider-left-edge-zero-hue-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-hue-slider-right-edge-zero-hue-expected.png b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-hue-slider-right-edge-zero-hue-expected.png index 45ce48f..efb48d7 100644 --- a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-hue-slider-right-edge-zero-hue-expected.png +++ b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-hue-slider-right-edge-zero-hue-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-imperfect-match-expected.png b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-imperfect-match-expected.png index 3b3d64d..81a95f2 100644 --- a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-imperfect-match-expected.png +++ b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-imperfect-match-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-manual-color-change-expected.png b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-manual-color-change-expected.png index eb9f662..a5065143 100644 --- a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-manual-color-change-expected.png +++ b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-manual-color-change-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-set-value-expected.png b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-set-value-expected.png index 442261e..d5ce2ec 100644 --- a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-set-value-expected.png +++ b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-set-value-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-value-attribute-expected.png b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-value-attribute-expected.png index 54c8158..d80c9ee90 100644 --- a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-value-attribute-expected.png +++ b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-value-attribute-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-zoom125-expected.png b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-zoom125-expected.png index 27402d9..d981d97 100644 --- a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-zoom125-expected.png +++ b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-zoom125-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-zoom200-expected.png b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-zoom200-expected.png index 585ac20..2b04192d 100644 --- a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-zoom200-expected.png +++ b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-appearance-zoom200-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-top-left-selection-position-after-reopen-expected.png b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-top-left-selection-position-after-reopen-expected.png index 3bd332c..2b00aea 100644 --- a/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-top-left-selection-position-after-reopen-expected.png +++ b/third_party/blink/web_tests/platform/mac/virtual/controls-refresh/color/color-picker-top-left-selection-position-after-reopen-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/compositing/squashing/selection-repaint-with-gaps-expected.txt b/third_party/blink/web_tests/platform/win/compositing/squashing/selection-repaint-with-gaps-expected.txt index 1db64cc..5c0b27b 100644 --- a/third_party/blink/web_tests/platform/win/compositing/squashing/selection-repaint-with-gaps-expected.txt +++ b/third_party/blink/web_tests/platform/win/compositing/squashing/selection-repaint-with-gaps-expected.txt
@@ -16,17 +16,8 @@ "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV class='item')", "position": [7, 27], "bounds": [100, 210], - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'ipsum'", - "rect": [0, 80, 38, 40], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'lorem'", - "rect": [0, 80, 38, 40], - "reason": "geometry" - } + "invalidations": [ + [0, 80, 38, 40] ], "transform": 1 } @@ -61,27 +52,9 @@ "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV class='item')", "position": [7, 27], "bounds": [100, 210], - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'ipsum'", - "rect": [0, 160, 38, 40], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'lorem'", - "rect": [0, 160, 38, 40], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'ipsum'", - "rect": [0, 80, 38, 40], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'lorem'", - "rect": [0, 80, 38, 40], - "reason": "geometry" - } + "invalidations": [ + [0, 160, 38, 40], + [0, 80, 38, 40] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/4776765-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/4776765-expected.txt index 09eb127..92f09ae 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/4776765-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/4776765-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV", - "rect": [6, 42, 788, 64], - "reason": "geometry" - }, - { - "object": "Caret", - "rect": [8, 84, 1, 19], - "reason": "caret" - }, - { - "object": "Caret", - "rect": [8, 64, 1, 19], - "reason": "caret" - } + "invalidations": [ + [6, 42, 788, 64] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/background/backgroundSizeRepaint-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/background/backgroundSizeRepaint-expected.txt index 79e2dd5..7fa8b92d 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/background/backgroundSizeRepaint-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/background/backgroundSizeRepaint-expected.txt
@@ -5,27 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [19, 319, 200, 60], - "reason": "background" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [19, 157, 200, 60], - "reason": "background" - }, - { - "object": "LayoutNGBlockFlow DIV id='b'", - "rect": [29, 359, 180, 20], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow DIV id='a'", - "rect": [29, 197, 180, 20], - "reason": "incremental" - } + "invalidations": [ + [19, 319, 200, 60], + [19, 157, 200, 60] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/background/body-background-image-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/background/body-background-image-expected.txt index 696c73b..e03e1d6 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/background/body-background-image-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/background/body-background-image-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow BODY", - "rect": [8, 240, 784, 288], - "reason": "background" - } + "invalidations": [ + [8, 240, 784, 288] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/background/change-text-content-and-background-color-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/background/change-text-content-and-background-color-expected.txt index 5f658da..906fcb7 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/background/change-text-content-and-background-color-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/background/change-text-content-and-background-color-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTextControl (positioned) INPUT id='input'", - "rect": [8, 8, 244, 68], - "reason": "background" - }, - { - "object": "InlineTextBox 'NEW'", - "rect": [30, 29, 45, 25], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'OLD'", - "rect": [30, 29, 41, 25], - "reason": "disappeared" - } + "invalidations": [ + [8, 8, 244, 68] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/block-no-inflow-children-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/block-no-inflow-children-expected.txt index 9a3e2a5..1a1c3afa 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/block-no-inflow-children-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/block-no-inflow-children-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'La la la la'", - "rect": [0, 0, 58, 19], - "reason": "full" - } + "invalidations": [ + [0, 0, 58, 19] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/box/border-radius-repaint-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/box/border-radius-repaint-expected.txt index 3f7a3a8..0ef79990 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/box/border-radius-repaint-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/box/border-radius-repaint-expected.txt
@@ -5,27 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [19, 245, 200, 88], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [19, 83, 200, 88], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV id='b'", - "rect": [33, 299, 172, 20], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow DIV id='a'", - "rect": [33, 137, 172, 20], - "reason": "incremental" - } + "invalidations": [ + [19, 245, 200, 88], + [19, 83, 200, 88] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/box/border-repaint-glitch-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/box/border-repaint-glitch-expected.txt index f8cedc3..303e2ff1 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/box/border-repaint-glitch-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/box/border-repaint-glitch-expected.txt
@@ -5,27 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [19, 349, 200, 88], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [19, 187, 200, 88], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV id='b'", - "rect": [33, 403, 172, 20], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow DIV id='a'", - "rect": [33, 241, 172, 20], - "reason": "incremental" - } + "invalidations": [ + [19, 349, 200, 88], + [19, 187, 200, 88] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/box/box-inline-resize-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/box/box-inline-resize-expected.txt index 1164021..2710f12 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/box/box-inline-resize-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/box/box-inline-resize-expected.txt
@@ -5,22 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Chromium'", - "rect": [40, 107, 111, 28], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'Chromium'", - "rect": [8, 107, 111, 28], - "reason": "geometry" - }, - { - "object": "LayoutImage IMG id='foo'", - "rect": [8, 88, 32, 32], - "reason": "appeared" - } + "invalidations": [ + [40, 107, 111, 28], + [8, 107, 111, 28], + [8, 88, 32, 32] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/box/box-shadow-dynamic-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/box/box-shadow-dynamic-expected.txt index ef5a6ba..0619010 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/box/box-shadow-dynamic-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/box/box-shadow-dynamic-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [18, 72, 55, 75], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [18, 192, 55, 55], - "reason": "geometry" - } + "invalidations": [ + [18, 72, 55, 75], + [18, 192, 55, 55] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/box/hover-pseudo-borders-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/box/hover-pseudo-borders-expected.txt index 424d029..4c4f44ac 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/box/hover-pseudo-borders-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/box/hover-pseudo-borders-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) ::after", - "rect": [138, 8, 100, 100], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow DIV class='hitregion'", - "rect": [8, 8, 100, 100], - "reason": "background" - } + "invalidations": [ + [138, 8, 100, 100], + [8, 8, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/box/invalidate-box-shadow-currentColor-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/box/invalidate-box-shadow-currentColor-expected.txt index b1d510c2..01d0a4a 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/box/invalidate-box-shadow-currentColor-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/box/invalidate-box-shadow-currentColor-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalBoxFragment LayoutInline SPAN id='target'", - "rect": [8, 8, 26, 24], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'Text'", - "rect": [8, 8, 26, 19], - "reason": "style change" - } + "invalidations": [ + [8, 8, 26, 24] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/bugzilla-3509-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/bugzilla-3509-expected.txt index 0bcba53..563e232 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/bugzilla-3509-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/bugzilla-3509-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='im'", - "rect": [61, 131, 50, 100], - "reason": "incremental" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [11, 131, 4, 19], - "reason": "geometry" - } + "invalidations": [ + [61, 131, 50, 100], + [11, 131, 4, 19] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/bugzilla-5699-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/bugzilla-5699-expected.txt index 812875f0..646562d 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/bugzilla-5699-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/bugzilla-5699-expected.txt
@@ -5,27 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Hello'", - "rect": [8, 184, 32, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Hello'", - "rect": [8, 156, 32, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [8, 150, 4, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [8, 136, 4, 19], - "reason": "style change" - } + "invalidations": [ + [8, 184, 32, 19], + [8, 156, 32, 19], + [8, 150, 4, 19], + [8, 136, 4, 19] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/bugzilla-6278-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/bugzilla-6278-expected.txt index 66f5f8c..3a97f9a8 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/bugzilla-6278-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/bugzilla-6278-expected.txt
@@ -5,122 +5,13 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV", - "rect": [10, 303, 292, 50], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Curabitur pretium, quam quis semper'", - "rect": [10, 138, 289, 159], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'fringilla orci nibh sed neque. Quisque eu'", - "rect": [10, 138, 289, 159], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'malesuada, est libero feugiat libero, vel'", - "rect": [10, 138, 289, 159], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'molestie nisl, nec ullamcorper lacus ante'", - "rect": [10, 138, 289, 159], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'nulla non nisi molestie accumsan. Etiam'", - "rect": [10, 138, 289, 159], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'sem at posuere vehicula, augue nibh'", - "rect": [10, 138, 289, 159], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'suscipit sed, sapien. Phasellus vehicula,'", - "rect": [10, 138, 289, 159], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'tellus urna, laoreet ac, laoreet non,'", - "rect": [10, 138, 289, 159], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [10, 323, 242, 50], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD id='col1'", - "rect": [10, 353, 242, 20], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [10, 298, 242, 20], - "reason": "incremental" - }, - { - "object": "NGPhysicalTextFragment 'Curabitur pretium, quam quis semper'", - "rect": [10, 138, 239, 179], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'fringilla orci nibh sed neque. Quisque eu'", - "rect": [10, 138, 239, 179], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'malesuada, est libero feugiat libero, vel'", - "rect": [10, 138, 239, 179], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'molestie nisl, nec ullamcorper lacus ante'", - "rect": [10, 138, 239, 179], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'nulla non nisi molestie accumsan. Etiam'", - "rect": [10, 138, 239, 179], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'sem at posuere vehicula, augue nibh'", - "rect": [10, 138, 239, 179], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'suscipit sed, sapien. Phasellus vehicula,'", - "rect": [10, 138, 239, 179], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'tellus urna, laoreet ac, laoreet non,'", - "rect": [10, 138, 239, 179], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'vulputate pede.'", - "rect": [10, 138, 239, 179], - "reason": "appeared" - }, - { - "object": "LayoutNGTableCell TD id='col1'", - "rect": [252, 138, 50, 215], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [252, 138, 50, 160], - "reason": "incremental" - } + "invalidations": [ + [10, 303, 292, 50], + [10, 138, 289, 159], + [10, 323, 242, 50], + [10, 298, 242, 20], + [10, 138, 239, 179], + [252, 138, 50, 215] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/bugzilla-6473-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/bugzilla-6473-expected.txt index be0743ba..6a0342a4 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/bugzilla-6473-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/bugzilla-6473-expected.txt
@@ -5,22 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) P", - "rect": [8, 152, 784, 20], - "reason": "chunk disappeared" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) P", - "rect": [8, 136, 784, 20], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'SUCCESS'", - "rect": [8, 136, 69, 19], - "reason": "appeared" - } + "invalidations": [ + [8, 152, 784, 20], + [8, 136, 784, 20] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/bugzilla-7235-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/bugzilla-7235-expected.txt index 790ee23..1fb49b16 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/bugzilla-7235-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/bugzilla-7235-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='t'", - "rect": [8, 176, 100, 100], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [8, 156, 4, 19], - "reason": "geometry" - } + "invalidations": [ + [8, 176, 100, 100], + [8, 156, 4, 19] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/caret-outside-block-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/caret-outside-block-expected.txt index ce20aa8..69ff3776 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/caret-outside-block-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/caret-outside-block-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Caret", - "rect": [791, 8, 1, 19], - "reason": "appeared" - } + "invalidations": [ + [791, 8, 1, 19] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/caret-subpixel-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/caret-subpixel-expected.txt index 4c148c4..dcfd0110 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/caret-subpixel-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/caret-subpixel-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTextControl INPUT id='target'", - "rect": [8, 8, 226, 22], - "reason": "subtree" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [211, 11, 2, 16], - "reason": "chunk appeared" - } + "invalidations": [ + [8, 8, 226, 22] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/clip/clip-with-layout-delta-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/clip/clip-with-layout-delta-expected.txt deleted file mode 100644 index 675542ca..0000000 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/clip/clip-with-layout-delta-expected.txt +++ /dev/null
@@ -1,38 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV", - "rect": [108, 8, 100, 100], - "reason": "chunk appeared" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV", - "rect": [108, 8, 100, 100], - "reason": "chunk disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [8, 8, 100, 100], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [8, 8, 100, 100], - "reason": "chunk disappeared" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [8, 8, 4, 19], - "reason": "appeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/clip/clipped-relative-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/clip/clipped-relative-expected.txt index a111b49..8cfd098d 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/clip/clipped-relative-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/clip/clipped-relative-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutImage IMG", - "rect": [8, 74, 204, 232], - "reason": "geometry" - }, - { - "object": "LayoutImage IMG", - "rect": [8, 74, 94, 232], - "reason": "geometry" - } + "invalidations": [ + [8, 74, 204, 232] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/clip/control-clip-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/clip/control-clip-expected.txt index c0862c4c..cfdf574d 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/clip/control-clip-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/clip/control-clip-expected.txt
@@ -5,27 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'SUCCESS'", - "rect": [76, 116, 64, 18], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox 'SUCCESS'", - "rect": [9, 86, 63, 18], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'FAILURE'", - "rect": [81, 116, 54, 18], - "reason": "chunk disappeared" - }, - { - "object": "InlineTextBox 'FAILURE'", - "rect": [9, 86, 53, 18], - "reason": "disappeared" - } + "invalidations": [ + [76, 116, 64, 18], + [9, 86, 63, 18] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/clip/outline-clip-change-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/clip/outline-clip-change-expected.txt index 62588f5b..a3d92e3 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/clip/outline-clip-change-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/clip/outline-clip-change-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) A id='link' class='updated'", - "rect": [48, 88, 86, 25], - "reason": "chunk appeared" - }, - { - "object": "NGPhysicalTextFragment 'Lorem Ipsum'", - "rect": [48, 88, 81, 19], - "reason": "disappeared" - } + "invalidations": [ + [48, 88, 86, 25] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/compositing/iframe-inside-squashed-layer-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/compositing/iframe-inside-squashed-layer-expected.txt index 36c3e289..3fea7d6 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/compositing/iframe-inside-squashed-layer-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/compositing/iframe-inside-squashed-layer-expected.txt
@@ -17,17 +17,9 @@ "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (positioned) DIV)", "position": [0, -8], "bounds": [300, 655], - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'test1'", - "rect": [8, 508, 29, 19], - "reason": "geometry" - }, - { - "object": "VerticalScrollbar", - "rect": [285, 500, 15, 150], - "reason": "chunk appeared" - } + "invalidations": [ + [8, 508, 29, 19], + [285, 500, 15, 150] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/compositing/remove-squashed-layer-plus-move-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/compositing/remove-squashed-layer-plus-move-expected.txt index 5cdad06b..e86e15e 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/compositing/remove-squashed-layer-plus-move-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/compositing/remove-squashed-layer-plus-move-expected.txt
@@ -15,17 +15,9 @@ { "name": "Squashing Layer (first squashed layer: LayoutNGBlockFlow (relative positioned) DIV class='mv-tile')", "bounds": [1000, 105], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV class='mv-tile'", - "rect": [0, 55, 100, 50], - "reason": "compositing update" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV class='mv-tile'", - "rect": [0, 0, 100, 50], - "reason": "compositing update" - } + "invalidations": [ + [0, 55, 100, 50], + [0, 0, 100, 50] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/compositing/text-color-change-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/compositing/text-color-change-expected.txt index 6a9ca0f..0ae777b 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/compositing/text-color-change-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/compositing/text-color-change-expected.txt
@@ -5,67 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment ' Text'", - "rect": [8, 61, 48, 185], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment ' Text'", - "rect": [8, 61, 48, 185], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment ' Text'", - "rect": [8, 61, 48, 185], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment ' Text'", - "rect": [8, 61, 48, 185], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment ' Text'", - "rect": [8, 61, 48, 185], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment ' Text'", - "rect": [8, 61, 48, 185], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment ' Text'", - "rect": [8, 61, 48, 185], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment ' Text'", - "rect": [8, 61, 48, 185], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment ' Text'", - "rect": [8, 61, 48, 185], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment ' Text'", - "rect": [8, 61, 48, 185], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment ' Text'", - "rect": [8, 61, 48, 185], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment ' Text'", - "rect": [8, 61, 48, 185], - "reason": "style change" - } + "invalidations": [ + [8, 61, 48, 185] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/compositing/text-match-highlight-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/compositing/text-match-highlight-expected.txt index 8bc63b4..d9d9342 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/compositing/text-match-highlight-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/compositing/text-match-highlight-expected.txt
@@ -5,47 +5,15 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Can you findme in this boring text?'", - "rect": [10, 135, 208, 19], - "reason": "DocumentMarker change" - }, - { - "object": "InlineTextBox 'Findme on a path! Did you findme?'", - "rect": [20, 224, 202, 72], - "reason": "DocumentMarker change" - }, - { - "object": "InlineTextBox 'Findme in a typewriter!'", - "rect": [10, 191, 138, 12], - "reason": "DocumentMarker change" - }, - { - "object": "NGPhysicalTextFragment 'findme'", - "rect": [259, 40, 40, 19], - "reason": "DocumentMarker change" - }, - { - "object": "NGPhysicalTextFragment 'findme'", - "rect": [244, 60, 40, 19], - "reason": "DocumentMarker change" - }, - { - "object": "NGPhysicalTextFragment 'findme'", - "rect": [204, 60, 40, 19], - "reason": "DocumentMarker change" - }, - { - "object": "NGPhysicalTextFragment 'findme'", - "rect": [83, 60, 40, 19], - "reason": "DocumentMarker change" - }, - { - "object": "NGPhysicalTextFragment 'findme'", - "rect": [47, 80, 40, 19], - "reason": "DocumentMarker change" - } + "invalidations": [ + [10, 135, 208, 19], + [20, 224, 202, 72], + [10, 191, 138, 12], + [259, 40, 40, 19], + [244, 60, 40, 19], + [204, 60, 40, 19], + [83, 60, 40, 19], + [47, 80, 40, 19] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/compositing/updating-scrolling-container-and-content-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/compositing/updating-scrolling-container-and-content-expected.txt index 794525d..3f251a3 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/compositing/updating-scrolling-container-and-content-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/compositing/updating-scrolling-container-and-content-expected.txt
@@ -5,57 +5,17 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'CONTENT'", - "rect": [8, 258, 74, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'CONTENT'", - "rect": [8, 238, 74, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'CONTENT'", - "rect": [8, 218, 74, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'CONTENT'", - "rect": [8, 198, 74, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'CONTENT'", - "rect": [8, 178, 74, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'CONTENT'", - "rect": [8, 158, 74, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'CONTENT'", - "rect": [8, 138, 74, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'CONTENT'", - "rect": [8, 118, 74, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'CONTENT'", - "rect": [8, 278, 74, 15], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'CONTENT'", - "rect": [8, 108, 74, 9], - "reason": "style change" - } + "invalidations": [ + [8, 258, 74, 19], + [8, 238, 74, 19], + [8, 218, 74, 19], + [8, 198, 74, 19], + [8, 178, 74, 19], + [8, 158, 74, 19], + [8, 138, 74, 19], + [8, 118, 74, 19], + [8, 278, 74, 15], + [8, 108, 74, 9] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/crbug-371640-3-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/crbug-371640-3-expected.txt index 8a4340d..09dfefcbf 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/crbug-371640-3-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/crbug-371640-3-expected.txt
@@ -5,22 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='keep_child'", - "rect": [508, 208, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='remove_child'", - "rect": [508, 88, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='keep_child'", - "rect": [408, 208, 100, 100], - "reason": "geometry" - } + "invalidations": [ + [508, 208, 100, 100], + [508, 88, 100, 100], + [408, 208, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/crbug-371640-4-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/crbug-371640-4-expected.txt index d85da24d..1654264 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/crbug-371640-4-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/crbug-371640-4-expected.txt
@@ -5,37 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='keep' class='item'", - "rect": [408, 88, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV id='to_remove' class='item'", - "rect": [408, 88, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='keep' class='item'", - "rect": [208, 88, 100, 100], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [408, 88, 4, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [408, 88, 4, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [208, 88, 4, 19], - "reason": "geometry" - } + "invalidations": [ + [408, 88, 100, 100], + [208, 88, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/crbug-371640-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/crbug-371640-expected.txt index 709121e..59fed2ea 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/crbug-371640-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/crbug-371640-expected.txt
@@ -5,37 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='keep' class='item'", - "rect": [348, 88, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV id='to_remove' class='item'", - "rect": [348, 88, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='keep' class='item'", - "rect": [88, 88, 100, 100], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [348, 88, 4, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [348, 88, 4, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [88, 88, 4, 19], - "reason": "geometry" - } + "invalidations": [ + [348, 88, 100, 100], + [88, 88, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/create-layer-repaint-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/create-layer-repaint-expected.txt index 01e3c4c..be366c8 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/create-layer-repaint-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/create-layer-repaint-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='test' class='big stretchy'", - "rect": [28, 56, 500, 50], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='test' class='stretchy'", - "rect": [28, 56, 250, 50], - "reason": "chunk appeared" - } + "invalidations": [ + [28, 56, 500, 50] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/css-grid-layout/grid-item-z-index-change-repaint-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/css-grid-layout/grid-item-z-index-change-repaint-expected.txt index 78a997d8..8a1c0d7 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/css-grid-layout/grid-item-z-index-change-repaint-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/css-grid-layout/grid-item-z-index-change-repaint-expected.txt
@@ -5,47 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow HTML", - "rect": [8, 16, 432, 320], - "reason": "chunk disappeared" - }, - { - "object": "NGPhysicalTextFragment 'This test checks that grid items correctly repaint when 'z-index' changes.'", - "rect": [8, 16, 432, 19], - "reason": "appeared" - }, - { - "object": "LayoutGrid DIV class='grid fit-content'", - "rect": [8, 236, 400, 100], - "reason": "appeared" - }, - { - "object": "LayoutGrid DIV class='grid fit-content'", - "rect": [8, 126, 400, 100], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'For this test to pass, there should be no red below.'", - "rect": [8, 52, 305, 19], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow DIV class='sizedToGridArea red'", - "rect": [208, 236, 200, 100], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow DIV class='sizedToGridArea red'", - "rect": [208, 126, 200, 100], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='item2' class='sizedToGridArea green'", - "rect": [8, 236, 200, 100], - "reason": "chunk appeared" - } + "invalidations": [ + [8, 16, 432, 320] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/delete-into-nested-block-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/delete-into-nested-block-expected.txt index 68582e8..8b843ee7 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/delete-into-nested-block-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/delete-into-nested-block-expected.txt
@@ -5,32 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'three'", - "rect": [8, 167, 30, 20], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'three'", - "rect": [8, 127, 30, 20], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'one'", - "rect": [8, 127, 26, 20], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'two'", - "rect": [8, 147, 23, 20], - "reason": "disappeared" - }, - { - "object": "Caret", - "rect": [8, 127, 1, 20], - "reason": "appeared" - } + "invalidations": [ + [8, 167, 30, 20], + [8, 127, 30, 20], + [8, 147, 23, 20] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/details-open-repaint-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/details-open-repaint-expected.txt index 55bedff..0e1d297 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/details-open-repaint-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/details-open-repaint-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTextControl INPUT", - "rect": [8, 72, 177, 22], - "reason": "appeared" - }, - { - "object": "LayoutDetailsMarker DIV id='details-marker'", - "rect": [8, 56, 11, 11], - "reason": "full" - } + "invalidations": [ + [8, 72, 177, 22], + [8, 56, 11, 11] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/flexbox/remove-inline-block-descendant-of-flex-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/flexbox/remove-inline-block-descendant-of-flex-expected.txt index 8a21de90..1edf629 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/flexbox/remove-inline-block-descendant-of-flex-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/flexbox/remove-inline-block-descendant-of-flex-expected.txt
@@ -5,22 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='inline-block-2' class='item'", - "rect": [0, 200, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV id='inline-block-1' class='item'", - "rect": [0, 100, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='inline-block-2' class='item'", - "rect": [0, 100, 100, 100], - "reason": "geometry" - } + "invalidations": [ + [0, 200, 100, 100], + [0, 100, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/flexbox/repaint-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/flexbox/repaint-expected.txt index 8a0a28d9..8d16b6977 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/flexbox/repaint-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/flexbox/repaint-expected.txt
@@ -5,127 +5,12 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='content'", - "rect": [138, 128, 654, 100], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean laoreet dolor id urna eleifend aliquet. Nulla'", - "rect": [138, 128, 651, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Pellentesque erat lectus, ultricies a lobortis id, faucibus id quam.'", - "rect": [138, 128, 651, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'parturient montes, nascetur ridiculus mus. Sed congue magna vitae dolor feugiat vehicula. Sed volutpat, tellus'", - "rect": [138, 128, 651, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'vel dolor ipsum. Aliquam ut turpis nisl, in vulputate sapien. Cum sociis natoque penatibus et magnis dis'", - "rect": [138, 128, 651, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'vel varius vestibulum, purus quam mollis sapien, in condimentum leo neque sed nulla. Nunc quis porta elit.'", - "rect": [138, 128, 651, 99], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV id='content'", - "rect": [148, 128, 644, 100], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean laoreet dolor id urna eleifend aliquet. Nulla'", - "rect": [148, 128, 640, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'elit. Pellentesque erat lectus, ultricies a lobortis id, faucibus id quam.'", - "rect": [148, 128, 640, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'parturient montes, nascetur ridiculus mus. Sed congue magna vitae dolor feugiat vehicula. Sed volutpat,'", - "rect": [148, 128, 640, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'tellus vel varius vestibulum, purus quam mollis sapien, in condimentum leo neque sed nulla. Nunc quis porta'", - "rect": [148, 128, 640, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'vel dolor ipsum. Aliquam ut turpis nisl, in vulputate sapien. Cum sociis natoque penatibus et magnis dis'", - "rect": [148, 128, 640, 99], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV id='content'", - "rect": [400, 128, 392, 160], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow DIV id='left'", - "rect": [8, 228, 392, 60], - "reason": "incremental" - }, - { - "object": "NGPhysicalTextFragment 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean laoreet dolor id urna eleifend aliquet. Nulla'", - "rect": [400, 128, 389, 159], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Pellentesque erat lectus, ultricies a lobortis id, faucibus id quam.'", - "rect": [400, 128, 389, 159], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'condimentum leo neque sed nulla. Nunc quis porta elit.'", - "rect": [400, 128, 389, 159], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'elit. Pellentesque erat lectus, ultricies a lobortis id, faucibus id quam.'", - "rect": [400, 128, 389, 159], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'parturient montes, nascetur ridiculus mus. Sed congue magna vitae dolor feugiat vehicula. Sed volutpat,'", - "rect": [400, 128, 389, 159], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'tellus vel varius vestibulum, purus quam mollis sapien, in condimentum leo neque sed nulla. Nunc quis porta'", - "rect": [400, 128, 389, 159], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'tellus vel varius vestibulum, purus quam mollis sapien, in'", - "rect": [400, 128, 389, 159], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'vel dolor ipsum. Aliquam ut turpis nisl, in vulputate sapien. Cum sociis natoque penatibus et magnis dis'", - "rect": [400, 128, 389, 159], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV id='left'", - "rect": [148, 128, 252, 160], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow DIV id='left'", - "rect": [8, 128, 140, 100], - "reason": "geometry" - } + "invalidations": [ + [138, 128, 654, 100], + [400, 128, 392, 160], + [8, 228, 392, 60], + [148, 128, 252, 160], + [8, 128, 140, 100] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/float-move-during-layout-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/float-move-during-layout-expected.txt index b91de16..d0194fc 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/float-move-during-layout-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/float-move-during-layout-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [8, 210, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [8, 110, 100, 100], - "reason": "geometry" - } + "invalidations": [ + [8, 210, 100, 100], + [8, 110, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/float-offscreen-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/float-offscreen-expected.txt index 2791db9..0a6bb70d 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/float-offscreen-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/float-offscreen-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [11, 11, 93, 22], - "reason": "chunk appeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [11, 11, 93, 22], - "reason": "chunk disappeared" - } + "invalidations": [ + [11, 11, 93, 22] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/forms/button-checkbox-click-method-repaint-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/forms/button-checkbox-click-method-repaint-expected.txt deleted file mode 100644 index e187e71e..0000000 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/forms/button-checkbox-click-method-repaint-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow INPUT id='checkbox'", - "rect": [12, 61, 30, 30], - "reason": "subtree" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/forms/button-reset-focus-by-mouse-then-keydown-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/forms/button-reset-focus-by-mouse-then-keydown-expected.txt index 26bbce4..3804e765 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/forms/button-reset-focus-by-mouse-then-keydown-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/forms/button-reset-focus-by-mouse-then-keydown-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutButton BUTTON", - "rect": [6, 6, 54, 26], - "reason": "subtree" - }, - { - "object": "InlineTextBox 'Reset'", - "rect": [16, 10, 34, 18], - "reason": "subtree" - } + "invalidations": [ + [6, 6, 54, 26] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/forms/details-marker-color-change-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/forms/details-marker-color-change-expected.txt index 1ff12166..b70caef 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/forms/details-marker-color-change-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/forms/details-marker-color-change-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Details'", - "rect": [24, 8, 42, 19], - "reason": "style change" - }, - { - "object": "LayoutDetailsMarker DIV id='details-marker'", - "rect": [8, 12, 11, 11], - "reason": "style change" - } + "invalidations": [ + [24, 8, 42, 19], + [8, 12, 11, 11] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/forms/select-option-background-color-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/forms/select-option-background-color-expected.txt index bd52b3bf4..422c5ed 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/forms/select-option-background-color-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/forms/select-option-background-color-expected.txt
@@ -5,22 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "VerticalScrollbar", - "rect": [14, 37, 15, 68], - "reason": "disappeared" - }, - { - "object": "VerticalScrollbar", - "rect": [14, 37, 15, 68], - "reason": "chunk appeared" - }, - { - "object": "LayoutBlockFlow SELECT", - "rect": [1, 37, 13, 17], - "reason": "chunk appeared" - } + "invalidations": [ + [14, 37, 15, 68], + [1, 37, 13, 17] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.txt index b9274879..739cb50 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutButton INPUT", - "rect": [6, 6, 61, 26], - "reason": "subtree" - }, - { - "object": "LayoutButton INPUT", - "rect": [6, 6, 61, 26], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox 'Submit'", - "rect": [16, 10, 41, 18], - "reason": "subtree" - } + "invalidations": [ + [6, 6, 61, 26] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/forms/textarea-caret-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/forms/textarea-caret-expected.txt index 4af80af..5ecb5e43 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/forms/textarea-caret-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/forms/textarea-caret-expected.txt
@@ -5,37 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTextControl TEXTAREA id='editor'", - "rect": [6, 6, 185, 42], - "reason": "chunk appeared" - }, - { - "object": "LayoutTextControl TEXTAREA id='editor'", - "rect": [6, 6, 185, 42], - "reason": "chunk appeared" - }, - { - "object": "LayoutTextControl TEXTAREA id='editor'", - "rect": [8, 8, 181, 38], - "reason": "disappeared" - }, - { - "object": "LayoutTextControl TEXTAREA id='editor'", - "rect": [9, 11, 179, 16], - "reason": "chunk appeared" - }, - { - "object": "HorizontalScrollbar", - "rect": [9, 30, 179, 15], - "reason": "chunk appeared" - }, - { - "object": "LayoutTextControl TEXTAREA id='editor'", - "rect": [173, 30, 15, 15], - "reason": "chunk disappeared" - } + "invalidations": [ + [6, 6, 185, 42] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/gradients-em-stops-repaint-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/gradients-em-stops-repaint-expected.txt index 4de9c6c3..d02c2fc7 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/gradients-em-stops-repaint-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/gradients-em-stops-repaint-expected.txt
@@ -5,22 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='box4' class='box'", - "rect": [344, 18, 302, 122], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow DIV class='indicator'", - "rect": [345, 19, 240, 20], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment ' '", - "rect": [330, 135, 4, 19], - "reason": "geometry" - } + "invalidations": [ + [344, 18, 302, 122], + [330, 135, 4, 19] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/iframe-display-block-to-display-none-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/iframe-display-block-to-display-none-expected.txt index dce918d0..af5bb16 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/iframe-display-block-to-display-none-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/iframe-display-block-to-display-none-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutIFrame IFRAME id='iframe'", - "rect": [8, 72, 732, 94], - "reason": "disappeared" - } + "invalidations": [ + [8, 72, 732, 94] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/iframe-display-none-to-display-block-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/iframe-display-none-to-display-block-expected.txt index 041cb35..af5bb16 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/iframe-display-none-to-display-block-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/iframe-display-none-to-display-block-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutIFrame IFRAME id='iframe'", - "rect": [8, 72, 732, 94], - "reason": "appeared" - } + "invalidations": [ + [8, 72, 732, 94] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/image/canvas-composite-repaint-by-all-imagesource-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/image/canvas-composite-repaint-by-all-imagesource-expected.txt index d3d9fb52..47313138 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/image/canvas-composite-repaint-by-all-imagesource-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/image/canvas-composite-repaint-by-all-imagesource-expected.txt
@@ -5,447 +5,51 @@ "bounds": [785, 933], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutHTMLCanvas CANVAS id='copyvideo'", - "rect": [569, 515, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='copyvideo'", - "rect": [569, 515, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-atopvideo'", - "rect": [569, 415, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-atopvideo'", - "rect": [569, 415, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-invideo'", - "rect": [569, 315, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-invideo'", - "rect": [569, 315, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-outvideo'", - "rect": [569, 165, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-outvideo'", - "rect": [569, 165, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-invideo'", - "rect": [569, 115, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-invideo'", - "rect": [569, 115, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='copycanvas'", - "rect": [427, 515, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='copycanvas'", - "rect": [427, 515, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-atopcanvas'", - "rect": [427, 415, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-atopcanvas'", - "rect": [427, 415, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-incanvas'", - "rect": [427, 315, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-incanvas'", - "rect": [427, 315, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-outcanvas'", - "rect": [427, 165, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-outcanvas'", - "rect": [427, 165, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-incanvas'", - "rect": [427, 115, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-incanvas'", - "rect": [427, 115, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='copyimage'", - "rect": [285, 515, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='copyimage'", - "rect": [285, 515, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-atopimage'", - "rect": [285, 415, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-atopimage'", - "rect": [285, 415, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-inimage'", - "rect": [285, 315, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-inimage'", - "rect": [285, 315, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-outimage'", - "rect": [285, 165, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-outimage'", - "rect": [285, 165, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-inimage'", - "rect": [285, 115, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-inimage'", - "rect": [285, 115, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='copysolid color'", - "rect": [143, 515, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='copysolid color'", - "rect": [143, 515, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-atopsolid color'", - "rect": [143, 415, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-atopsolid color'", - "rect": [143, 415, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-insolid color'", - "rect": [143, 315, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-insolid color'", - "rect": [143, 315, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-outsolid color'", - "rect": [143, 165, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-outsolid color'", - "rect": [143, 165, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-insolid color'", - "rect": [143, 115, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-insolid color'", - "rect": [143, 115, 80, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='xorvideo'", - "rect": [599, 565, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='xorvideo'", - "rect": [599, 565, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='lightervideo'", - "rect": [599, 465, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='lightervideo'", - "rect": [599, 465, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-outvideo'", - "rect": [599, 365, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-outvideo'", - "rect": [599, 365, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-overvideo'", - "rect": [599, 265, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-overvideo'", - "rect": [599, 265, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-atopvideo'", - "rect": [599, 215, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-atopvideo'", - "rect": [599, 215, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-overvideo'", - "rect": [599, 65, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-overvideo'", - "rect": [599, 65, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='xorcanvas'", - "rect": [457, 565, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='xorcanvas'", - "rect": [457, 565, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='lightercanvas'", - "rect": [457, 465, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='lightercanvas'", - "rect": [457, 465, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-outcanvas'", - "rect": [457, 365, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-outcanvas'", - "rect": [457, 365, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-overcanvas'", - "rect": [457, 265, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-overcanvas'", - "rect": [457, 265, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-atopcanvas'", - "rect": [457, 215, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-atopcanvas'", - "rect": [457, 215, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-overcanvas'", - "rect": [457, 65, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-overcanvas'", - "rect": [457, 65, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='xorimage'", - "rect": [315, 565, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='xorimage'", - "rect": [315, 565, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='lighterimage'", - "rect": [315, 465, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='lighterimage'", - "rect": [315, 465, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-outimage'", - "rect": [315, 365, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-outimage'", - "rect": [315, 365, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-overimage'", - "rect": [315, 265, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-overimage'", - "rect": [315, 265, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-atopimage'", - "rect": [315, 215, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-atopimage'", - "rect": [315, 215, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-overimage'", - "rect": [315, 65, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-overimage'", - "rect": [315, 65, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='xorsolid color'", - "rect": [173, 565, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='xorsolid color'", - "rect": [173, 565, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='lightersolid color'", - "rect": [173, 465, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='lightersolid color'", - "rect": [173, 465, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-outsolid color'", - "rect": [173, 365, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-outsolid color'", - "rect": [173, 365, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-oversolid color'", - "rect": [173, 265, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='destination-oversolid color'", - "rect": [173, 265, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-atopsolid color'", - "rect": [173, 215, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-atopsolid color'", - "rect": [173, 215, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-oversolid color'", - "rect": [173, 65, 50, 40], - "reason": "invalidate paint rectangle" - }, - { - "object": "LayoutHTMLCanvas CANVAS id='source-oversolid color'", - "rect": [173, 65, 50, 40], - "reason": "invalidate paint rectangle" - } + "invalidations": [ + [569, 515, 80, 40], + [569, 415, 80, 40], + [569, 315, 80, 40], + [569, 165, 80, 40], + [569, 115, 80, 40], + [427, 515, 80, 40], + [427, 415, 80, 40], + [427, 315, 80, 40], + [427, 165, 80, 40], + [427, 115, 80, 40], + [285, 515, 80, 40], + [285, 415, 80, 40], + [285, 315, 80, 40], + [285, 165, 80, 40], + [285, 115, 80, 40], + [143, 515, 80, 40], + [143, 415, 80, 40], + [143, 315, 80, 40], + [143, 165, 80, 40], + [143, 115, 80, 40], + [599, 565, 50, 40], + [599, 465, 50, 40], + [599, 365, 50, 40], + [599, 265, 50, 40], + [599, 215, 50, 40], + [599, 65, 50, 40], + [457, 565, 50, 40], + [457, 465, 50, 40], + [457, 365, 50, 40], + [457, 265, 50, 40], + [457, 215, 50, 40], + [457, 65, 50, 40], + [315, 565, 50, 40], + [315, 465, 50, 40], + [315, 365, 50, 40], + [315, 265, 50, 40], + [315, 215, 50, 40], + [315, 65, 50, 40], + [173, 565, 50, 40], + [173, 465, 50, 40], + [173, 365, 50, 40], + [173, 265, 50, 40], + [173, 215, 50, 40], + [173, 65, 50, 40] ] }, {
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/in-scaled-iframe-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/in-scaled-iframe-expected.txt index f0c49d9..d793885 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/in-scaled-iframe-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/in-scaled-iframe-expected.txt
@@ -5,12 +5,8 @@ "bounds": [785, 825], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='div'", - "rect": [209, 209, 100, 100], - "reason": "background" - } + "invalidations": [ + [209, 209, 100, 100] ] }, {
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/inline-color-change-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/inline-color-change-expected.txt index 8cdb47d..ec70428 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/inline-color-change-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/inline-color-change-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalBoxFragment LayoutInline SPAN id='target'", - "rect": [8, 72, 37, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'PASS'", - "rect": [8, 72, 37, 19], - "reason": "style change" - } + "invalidations": [ + [8, 72, 37, 19] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/invalidate-caret-before-text-node-update-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/invalidate-caret-before-text-node-update-expected.txt deleted file mode 100644 index 596d17b..0000000 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/invalidate-caret-before-text-node-update-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='root' class='editing'", - "rect": [6, 6, 788, 22], - "reason": "style change" - }, - { - "object": "InlineTextBox '1'", - "rect": [8, 8, 10, 18], - "reason": "disappeared" - }, - { - "object": "Caret", - "rect": [18, 8, 1, 18], - "reason": "caret" - }, - { - "object": "Caret", - "rect": [8, 8, 1, 18], - "reason": "caret" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/invalidation-after-opacity-change-subtree-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/invalidation-after-opacity-change-subtree-expected.txt index 40a9a2f5..847f420 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/invalidation-after-opacity-change-subtree-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/invalidation-after-opacity-change-subtree-expected.txt
@@ -5,27 +5,9 @@ "bounds": [785, 2350], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'This test checks that switching opacity'", - "rect": [8, 2046, 766, 107], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'invalidates the full subtree.'", - "rect": [8, 2046, 766, 107], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'This text should be visible in the'", - "rect": [8, 2196, 639, 107], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'output.'", - "rect": [8, 2196, 639, 107], - "reason": "appeared" - } + "invalidations": [ + [8, 2046, 766, 107], + [8, 2196, 639, 107] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/line-flow-with-floats-1-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/line-flow-with-floats-1-expected.txt index 2118a47..ea7e175 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/line-flow-with-floats-1-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/line-flow-with-floats-1-expected.txt
@@ -5,207 +5,16 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Alice soon came to the conclusion that it was a very'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very provoking to find that the'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'there was generally a ridge or furrow in the way wherever she'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'unrolled itself, and was in the act of crawling away: besides all this,'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'wanted to send the hedgehog to, and, as the doubled-up soldiers'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'was a very '", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'were always getting up and walking off to other parts of the ground,'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very provoking to find that the hedgehog had'", - "rect": [14, 240, 407, 119], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in managing her'", - "rect": [14, 80, 407, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'comfortably enough, under her arm, with its legs hanging'", - "rect": [14, 80, 407, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'down, but generally, just as she had got its neck nicely'", - "rect": [14, 80, 407, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'flamingo: she succeeded in getting its body tucked away,'", - "rect": [14, 80, 407, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'its head, it '", - "rect": [14, 80, 407, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'straightened out, and was going to give the hedgehog a blow with'", - "rect": [14, 80, 407, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet had'", - "rect": [14, 500, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'They\u2019re dreadfully fond of beheading people here; the great'", - "rect": [14, 500, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'any dispute with the Queen, but she knew that it might happen any'", - "rect": [14, 500, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'minute, \u2018and then,\u2019 thought she, \u2018what would become of me?'", - "rect": [14, 500, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'wonder is, that there\u2018s any one left alive!\u2019'", - "rect": [14, 500, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and look up in her face, with'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'going to '", - "rect": [14, 180, 407, 79], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'laughing: and when she had got its head down, and was going to'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'such a puzzled expression that she could not help bursting out'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' was in a'", - "rect": [14, 420, 355, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'furious passion, and went stamping about, and shouting'", - "rect": [14, 420, 355, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'minute.'", - "rect": [14, 420, 355, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u2018Off with his head!\u2019 or \u2018Off with her head!\u2019 about once in a'", - "rect": [14, 420, 355, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for'", - "rect": [14, 380, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehogs; and in a very short time '", - "rect": [14, 380, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'turns, quarrelling all the while, and fighting for the'", - "rect": [14, 380, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting '", - "rect": [65, 380, 287, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'difficult game indeed.'", - "rect": [134, 360, 128, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'difficult game indeed.'", - "rect": [65, 360, 128, 19], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV id='pinkFloat'", - "rect": [378, 138, 70, 30], - "reason": "incremental" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [303, 420, 66, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [245, 420, 65, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 363, 48, 65], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 343, 48, 65], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [151, 180, 40, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [84, 180, 40, 19], - "reason": "geometry" - } + "invalidations": [ + [14, 240, 407, 139], + [14, 80, 407, 119], + [14, 500, 407, 99], + [14, 180, 407, 79], + [14, 420, 355, 79], + [14, 380, 355, 59], + [378, 138, 70, 30], + [14, 363, 48, 65], + [14, 343, 48, 65] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/line-flow-with-floats-10-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/line-flow-with-floats-10-expected.txt index a87939a..20d2a2d 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/line-flow-with-floats-10-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/line-flow-with-floats-10-expected.txt
@@ -5,177 +5,15 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'begin again, it was very provoking to find that the'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'besides all this, there was generally a ridge or furrow in the way'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'doubled-up soldiers were always getting up and walking off to'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog had unrolled itself, and was in the act of crawling away:'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'other parts of the ground, Alice soon came to the conclusion that it'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'was a very '", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'wherever she wanted to send the hedgehog to, and, as the'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet had'", - "rect": [14, 500, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'They\u2019re dreadfully fond of beheading people here; the great'", - "rect": [14, 500, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'any dispute with the Queen, but she knew that it might happen any'", - "rect": [14, 500, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'minute, \u2018and then,\u2019 thought she, \u2018what would become of me?'", - "rect": [14, 500, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'wonder is, that there\u2018s any one left alive!\u2019'", - "rect": [14, 500, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and look up in her'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'bursting out laughing: and when she had got its head down, and was'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'face, with such a puzzled expression that she could not help'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'going to '", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in managing her'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'blow with its head, it '", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'comfortably enough, under her arm, with its legs hanging'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'down, but generally, just as she had got its neck nicely'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'flamingo: she succeeded in getting its body tucked away,'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'straightened out, and was going to give the hedgehog a'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'about, and shouting \u2018Off with his head!\u2019 or \u2018Off with her'", - "rect": [14, 440, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'head!\u2019 about once in a minute.'", - "rect": [14, 440, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'was in a furious passion, and went stamping'", - "rect": [14, 440, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for'", - "rect": [65, 380, 304, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehogs; and in a very short time '", - "rect": [65, 380, 304, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'turns, quarrelling all the while, and fighting for the'", - "rect": [65, 380, 304, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting '", - "rect": [65, 380, 287, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'difficult game indeed.'", - "rect": [134, 360, 128, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [303, 420, 66, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 363, 48, 65], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 374, 48, 64], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [151, 180, 40, 19], - "reason": "geometry" - } + "invalidations": [ + [14, 240, 407, 139], + [14, 500, 407, 99], + [14, 180, 407, 79], + [14, 80, 355, 119], + [14, 440, 355, 59], + [65, 380, 304, 59], + [14, 363, 48, 65], + [14, 374, 48, 64] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/line-flow-with-floats-2-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/line-flow-with-floats-2-expected.txt index d88a33b2..a3ebd1b6 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/line-flow-with-floats-2-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/line-flow-with-floats-2-expected.txt
@@ -5,322 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow P", - "rect": [8, 74, 418, 526], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very provoking to find that the'", - "rect": [14, 241, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'besides all this, there was generally a ridge or furrow in the way'", - "rect": [14, 241, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'doubled-up soldiers were always getting up and walking off to'", - "rect": [14, 241, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog had unrolled itself, and was in the act of crawling away:'", - "rect": [14, 241, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'other parts of the ground, Alice soon came to the conclusion that it'", - "rect": [14, 241, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'was a very '", - "rect": [14, 241, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'wherever she wanted to send the hedgehog to, and, as the'", - "rect": [14, 241, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very provoking to find that the'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'besides all this, there was generally a ridge or furrow in the way'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'doubled-up soldiers were always getting up and walking off to'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog had unrolled itself, and was in the act of crawling away:'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'other parts of the ground, Alice soon came to the conclusion that it'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'was a very '", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'wherever she wanted to send the hedgehog to, and, as the'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet had'", - "rect": [14, 501, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'They\u2019re dreadfully fond of beheading people here; the great'", - "rect": [14, 501, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'any dispute with the Queen, but she knew that it might happen any'", - "rect": [14, 501, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'minute, \u2018and then,\u2019 thought she, \u2018what would become of me?'", - "rect": [14, 501, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'wonder is, that there\u2018s any one left alive!\u2019'", - "rect": [14, 501, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet had'", - "rect": [14, 500, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'They\u2019re dreadfully fond of beheading people here; the great'", - "rect": [14, 500, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'any dispute with the Queen, but she knew that it might happen any'", - "rect": [14, 500, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'minute, \u2018and then,\u2019 thought she, \u2018what would become of me?'", - "rect": [14, 500, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'wonder is, that there\u2018s any one left alive!\u2019'", - "rect": [14, 500, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and look up in her'", - "rect": [14, 181, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'bursting out laughing: and when she had got its head down, and was'", - "rect": [14, 181, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'face, with such a puzzled expression that she could not help'", - "rect": [14, 181, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'going to '", - "rect": [14, 181, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and look up in her'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'bursting out laughing: and when she had got its head down, and was'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'face, with such a puzzled expression that she could not help'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'going to '", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in managing her'", - "rect": [14, 80, 355, 120], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'blow with its head, it '", - "rect": [14, 80, 355, 120], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'comfortably enough, under her arm, with its legs hanging'", - "rect": [14, 80, 355, 120], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'down, but generally, just as she had got its neck nicely'", - "rect": [14, 80, 355, 120], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'flamingo: she succeeded in getting its body tucked away,'", - "rect": [14, 80, 355, 120], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'straightened out, and was going to give the hedgehog a'", - "rect": [14, 80, 355, 120], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'once in a minute.'", - "rect": [14, 441, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'shouting \u2018Off with his head!\u2019 or \u2018Off with her head!\u2019 about'", - "rect": [14, 441, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'was in a furious passion, and went stamping about, and'", - "rect": [14, 441, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'once in a minute.'", - "rect": [14, 440, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'shouting \u2018Off with his head!\u2019 or \u2018Off with her head!\u2019 about'", - "rect": [14, 440, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'was in a furious passion, and went stamping about, and'", - "rect": [14, 440, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for'", - "rect": [65, 381, 304, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehogs; and in a very short time '", - "rect": [65, 381, 304, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'turns, quarrelling all the while, and fighting for the'", - "rect": [65, 381, 304, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for'", - "rect": [65, 380, 304, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehogs; and in a very short time '", - "rect": [65, 380, 304, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'turns, quarrelling all the while, and fighting for the'", - "rect": [65, 380, 304, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting '", - "rect": [65, 381, 287, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting '", - "rect": [65, 380, 287, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'difficult game indeed.'", - "rect": [134, 361, 128, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'difficult game indeed.'", - "rect": [134, 360, 128, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [303, 421, 66, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [303, 420, 66, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='greenFloat'", - "rect": [372, 384, 48, 81], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='greenFloat'", - "rect": [372, 383, 48, 81], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 364, 48, 65], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 363, 48, 65], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [149, 180, 45, 20], - "reason": "style change" - }, - { - "object": "VerticalScrollbar", - "rect": [485, 0, 15, 600], - "reason": "scroll control" - } + "invalidations": [ + [8, 74, 418, 526], + [485, 0, 15, 600] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/line-flow-with-floats-3-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/line-flow-with-floats-3-expected.txt index 9bc17dd..5b76263 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/line-flow-with-floats-3-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/line-flow-with-floats-3-expected.txt
@@ -5,187 +5,15 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'begin again, it was very provoking to find that the'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'besides all this, there was generally a ridge or furrow in the way'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'doubled-up soldiers were always getting up and walking off to'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog had unrolled itself, and was in the act of crawling away:'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'other parts of the ground, Alice soon came to the conclusion that it'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'was a very '", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'wherever she wanted to send the hedgehog to, and, as the'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet had'", - "rect": [14, 500, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'They\u2019re dreadfully fond of beheading people here; the great'", - "rect": [14, 500, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'any dispute with the Queen, but she knew that it might happen any'", - "rect": [14, 500, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'minute, \u2018and then,\u2019 thought she, \u2018what would become of me?'", - "rect": [14, 500, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'wonder is, that there\u2018s any one left alive!\u2019'", - "rect": [14, 500, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and look up in her'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'bursting out laughing: and when she had got its head down, and was'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'face, with such a puzzled expression that she could not help'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'going to '", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in managing her'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'blow with its head, it '", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'comfortably enough, under her arm, with its legs hanging'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'down, but generally, just as she had got its neck nicely'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'flamingo: she succeeded in getting its body tucked away,'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'straightened out, and was going to give the hedgehog a'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'about, and shouting \u2018Off with his head!\u2019 or \u2018Off with her'", - "rect": [14, 440, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'head!\u2019 about once in a minute.'", - "rect": [14, 440, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'was in a furious passion, and went stamping about, and'", - "rect": [14, 440, 355, 59], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment ' was in a furious passion, and went stamping'", - "rect": [14, 440, 339, 59], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'Queen'", - "rect": [14, 420, 339, 39], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'the'", - "rect": [14, 420, 339, 39], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for the hedgehogs; and in a very short time '", - "rect": [65, 380, 304, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for turns, quarrelling all the while, and fighting'", - "rect": [65, 380, 304, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for'", - "rect": [65, 380, 304, 59], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting'", - "rect": [65, 380, 288, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'difficult game indeed.'", - "rect": [134, 360, 128, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'the'", - "rect": [303, 420, 66, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='greenFloat'", - "rect": [356, 383, 64, 81], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [151, 180, 40, 19], - "reason": "geometry" - } + "invalidations": [ + [14, 240, 407, 139], + [14, 500, 407, 99], + [14, 180, 407, 79], + [14, 80, 355, 119], + [14, 440, 355, 59], + [14, 420, 339, 39], + [65, 380, 304, 59], + [356, 383, 64, 81] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/line-flow-with-floats-4-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/line-flow-with-floats-4-expected.txt index 14854ae..3a82310f 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/line-flow-with-floats-4-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/line-flow-with-floats-4-expected.txt
@@ -5,172 +5,14 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'begin again, it was very provoking to find that the'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'besides all this, there was generally a ridge or furrow in the way'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'doubled-up soldiers were always getting up and walking off to'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog had unrolled itself, and was in the act of crawling away:'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'other parts of the ground, Alice soon came to the conclusion that it'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'was a very '", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'wherever she wanted to send the hedgehog to, and, as the'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet had'", - "rect": [14, 500, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'They\u2019re dreadfully fond of beheading people here; the great'", - "rect": [14, 500, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'any dispute with the Queen, but she knew that it might happen any'", - "rect": [14, 500, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'minute, \u2018and then,\u2019 thought she, \u2018what would become of me?'", - "rect": [14, 500, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'wonder is, that there\u2018s any one left alive!\u2019'", - "rect": [14, 500, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and look up in her'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'bursting out laughing: and when she had got its head down, and was'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'face, with such a puzzled expression that she could not help'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'going to '", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'minute.'", - "rect": [14, 440, 407, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'shouting \u2018Off with his head!\u2019 or \u2018Off with her head!\u2019 about once in a'", - "rect": [14, 440, 407, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'was in a furious passion, and went stamping about, and'", - "rect": [14, 440, 407, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in managing her'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'blow with its head, it '", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'comfortably enough, under her arm, with its legs hanging'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'down, but generally, just as she had got its neck nicely'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'flamingo: she succeeded in getting its body tucked away,'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'straightened out, and was going to give the hedgehog a'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for'", - "rect": [65, 380, 304, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehogs; and in a very short time '", - "rect": [65, 380, 304, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'turns, quarrelling all the while, and fighting for the'", - "rect": [65, 380, 304, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting '", - "rect": [65, 380, 287, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'difficult game indeed.'", - "rect": [134, 360, 128, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [303, 420, 66, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='greenFloat'", - "rect": [372, 383, 48, 81], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [151, 180, 40, 19], - "reason": "geometry" - } + "invalidations": [ + [14, 240, 407, 139], + [14, 500, 407, 99], + [14, 180, 407, 79], + [14, 440, 407, 59], + [14, 80, 355, 119], + [65, 380, 304, 59], + [372, 383, 48, 81] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/line-flow-with-floats-5-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/line-flow-with-floats-5-expected.txt index fe0473b..c33ae5e 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/line-flow-with-floats-5-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/line-flow-with-floats-5-expected.txt
@@ -5,187 +5,14 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'begin again, it was very provoking to find that the'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'besides all this, there was generally a ridge or furrow in the way'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'doubled-up soldiers were always getting up and walking off to'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog had unrolled itself, and was in the act of crawling away:'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'other parts of the ground, Alice soon came to the conclusion that it'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'was a very '", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'wherever she wanted to send the hedgehog to, and, as the'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet had'", - "rect": [14, 500, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'They\u2019re dreadfully fond of beheading people here; the great'", - "rect": [14, 500, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'any dispute with the Queen, but she knew that it might happen any'", - "rect": [14, 500, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'minute, \u2018and then,\u2019 thought she, \u2018what would become of me?'", - "rect": [14, 500, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'wonder is, that there\u2018s any one left alive!\u2019'", - "rect": [14, 500, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and look up in her'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'bursting out laughing: and when she had got its head down, and was'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'face, with such a puzzled expression that she could not help'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'going to '", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in managing her'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'blow with its head, it '", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'comfortably enough, under her arm, with its legs hanging'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'down, but generally, just as she had got its neck nicely'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'flamingo: she succeeded in getting its body tucked away,'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'straightened out, and was going to give the hedgehog a'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' was'", - "rect": [14, 420, 355, 79], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'in a furious passion, and went stamping about, and'", - "rect": [14, 420, 355, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'once in a minute.'", - "rect": [14, 420, 355, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'shouting \u2018Off with his head!\u2019 or \u2018Off with her head!\u2019 about'", - "rect": [14, 420, 355, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for'", - "rect": [49, 380, 320, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehogs; and in a very short time '", - "rect": [49, 380, 320, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'turns, quarrelling all the while, and fighting for the'", - "rect": [49, 380, 320, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting '", - "rect": [49, 380, 303, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'difficult game indeed.'", - "rect": [134, 360, 128, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'difficult game indeed.'", - "rect": [118, 360, 128, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [303, 420, 66, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [275, 420, 65, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 363, 48, 65], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [151, 180, 40, 19], - "reason": "geometry" - } + "invalidations": [ + [14, 240, 407, 139], + [14, 500, 407, 99], + [14, 180, 407, 79], + [14, 80, 355, 119], + [14, 420, 355, 79], + [49, 380, 320, 59], + [14, 363, 48, 65] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/line-flow-with-floats-6-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/line-flow-with-floats-6-expected.txt index ef2364a..c8690347 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/line-flow-with-floats-6-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/line-flow-with-floats-6-expected.txt
@@ -5,182 +5,14 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'begin again, it was very provoking to find that the'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'besides all this, there was generally a ridge or furrow in the way'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'doubled-up soldiers were always getting up and walking off to'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog had unrolled itself, and was in the act of crawling away:'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'other parts of the ground, Alice soon came to the conclusion that it'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'was a very '", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'wherever she wanted to send the hedgehog to, and, as the'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet had'", - "rect": [14, 500, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'They\u2019re dreadfully fond of beheading people here; the great'", - "rect": [14, 500, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'any dispute with the Queen, but she knew that it might happen any'", - "rect": [14, 500, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'minute, \u2018and then,\u2019 thought she, \u2018what would become of me?'", - "rect": [14, 500, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'wonder is, that there\u2018s any one left alive!\u2019'", - "rect": [14, 500, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and look up in her'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'bursting out laughing: and when she had got its head down, and was'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'face, with such a puzzled expression that she could not help'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'going to '", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in managing her'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'blow with its head, it '", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'comfortably enough, under her arm, with its legs hanging'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'down, but generally, just as she had got its neck nicely'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'flamingo: she succeeded in getting its body tucked away,'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'straightened out, and was going to give the hedgehog a'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'once in a minute.'", - "rect": [14, 440, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'shouting \u2018Off with his head!\u2019 or \u2018Off with her head!\u2019 about'", - "rect": [14, 440, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'was in a furious passion, and went stamping about, and'", - "rect": [14, 440, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for'", - "rect": [65, 380, 304, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehogs; and in a very short time '", - "rect": [65, 380, 304, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'turns, quarrelling all the while, and fighting for the'", - "rect": [65, 380, 304, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting '", - "rect": [65, 380, 287, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'difficult game indeed.'", - "rect": [134, 360, 128, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [303, 420, 66, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 363, 48, 65], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 363, 48, 65], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [151, 180, 40, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'foo'", - "rect": [28, 363, 20, 20], - "reason": "appeared" - } + "invalidations": [ + [14, 240, 407, 139], + [14, 500, 407, 99], + [14, 180, 407, 79], + [14, 80, 355, 119], + [14, 440, 355, 59], + [65, 380, 304, 59], + [14, 363, 48, 65] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/line-flow-with-floats-7-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/line-flow-with-floats-7-expected.txt index 7df1015..dab71ec 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/line-flow-with-floats-7-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/line-flow-with-floats-7-expected.txt
@@ -5,167 +5,13 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'begin again, it was very provoking to find that the'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'besides all this, there was generally a ridge or furrow in the way'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'doubled-up soldiers were always getting up and walking off to'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog had unrolled itself, and was in the act of crawling away:'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'other parts of the ground, Alice soon came to the conclusion that it'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'was a very '", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'wherever she wanted to send the hedgehog to, and, as the'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet had'", - "rect": [14, 500, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'They\u2019re dreadfully fond of beheading people here; the great'", - "rect": [14, 500, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'any dispute with the Queen, but she knew that it might happen any'", - "rect": [14, 500, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'minute, \u2018and then,\u2019 thought she, \u2018what would become of me?'", - "rect": [14, 500, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'wonder is, that there\u2018s any one left alive!\u2019'", - "rect": [14, 500, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and look up in her'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'bursting out laughing: and when she had got its head down, and was'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'face, with such a puzzled expression that she could not help'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'going to '", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in managing her'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'blow with its head, it '", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'comfortably enough, under her arm, with its legs hanging'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'down, but generally, just as she had got its neck nicely'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'flamingo: she succeeded in getting its body tucked away,'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'straightened out, and was going to give the hedgehog a'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'once in a minute.'", - "rect": [14, 440, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'shouting \u2018Off with his head!\u2019 or \u2018Off with her head!\u2019 about'", - "rect": [14, 440, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'was in a furious passion, and went stamping about, and'", - "rect": [14, 440, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for'", - "rect": [65, 380, 304, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehogs; and in a very short time '", - "rect": [65, 380, 304, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'turns, quarrelling all the while, and fighting for the'", - "rect": [65, 380, 304, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting '", - "rect": [65, 380, 287, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'difficult game indeed.'", - "rect": [134, 360, 128, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [297, 420, 72, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [151, 180, 40, 19], - "reason": "geometry" - } + "invalidations": [ + [14, 240, 407, 139], + [14, 500, 407, 99], + [14, 180, 407, 79], + [14, 80, 355, 119], + [14, 440, 355, 59], + [65, 380, 304, 59] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/line-flow-with-floats-8-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/line-flow-with-floats-8-expected.txt index 059c81b..a3ebd1b6 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/line-flow-with-floats-8-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/line-flow-with-floats-8-expected.txt
@@ -5,237 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow P", - "rect": [8, 74, 418, 526], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very provoking to find that the'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'besides all this, there was generally a ridge or furrow in the way'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'doubled-up soldiers were always getting up and walking off to'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog had unrolled itself, and was in the act of crawling away:'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'other parts of the ground, Alice soon came to the conclusion that it'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'was a very '", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'wherever she wanted to send the hedgehog to, and, as the'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'They\u2019re dreadfully fond of beheading people here; the great'", - "rect": [14, 500, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'any dispute with the Queen, but she knew that it might happen any'", - "rect": [14, 500, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'minute, \u2018and then,\u2019 thought she, \u2018what would become of me?'", - "rect": [14, 500, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'wonder is, that there\u2018s any one left alive!\u2019'", - "rect": [14, 500, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'wonder is, that there\u2018s any one left alive!\u2019'", - "rect": [14, 500, 407, 99], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet had'", - "rect": [14, 480, 407, 99], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'They\u2019re dreadfully fond of beheading people here; the great'", - "rect": [14, 480, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'any dispute with the Queen, but she knew that it might happen any'", - "rect": [14, 480, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'minute, \u2018and then,\u2019 thought she, \u2018what would become of me?'", - "rect": [14, 480, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'wonder is, that there\u2018s any one left alive!\u2019'", - "rect": [14, 480, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and look up in her'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'bursting out laughing: and when she had got its head down, and was'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'face, with such a puzzled expression that she could not help'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'going to '", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in managing her'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'blow with its head, it '", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'comfortably enough, under her arm, with its legs hanging'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'down, but generally, just as she had got its neck nicely'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'flamingo: she succeeded in getting its body tucked away,'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'straightened out, and was going to give the hedgehog a'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'and went stamping about, and shouting \u2018Off with his head!\u2019'", - "rect": [14, 440, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'once in a minute.'", - "rect": [14, 440, 355, 59], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'or \u2018Off with her head!\u2019 about once in a minute.'", - "rect": [14, 440, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' was in a furious passion,'", - "rect": [14, 420, 355, 59], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'and went stamping about, and shouting \u2018Off with his head!\u2019'", - "rect": [14, 420, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'or \u2018Off with her head!\u2019 about once in a minute.'", - "rect": [14, 420, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for turns,'", - "rect": [14, 380, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'in a very short time '", - "rect": [14, 380, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'quarrelling all the while, and fighting for the hedgehogs; and'", - "rect": [14, 380, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting '", - "rect": [14, 380, 299, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting '", - "rect": [65, 380, 287, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'difficult game indeed.'", - "rect": [134, 360, 128, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'difficult game indeed.'", - "rect": [83, 360, 127, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [303, 420, 66, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [143, 420, 65, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='blueFloat'", - "rect": [14, 363, 48, 65], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [151, 180, 40, 19], - "reason": "geometry" - }, - { - "object": "VerticalScrollbar", - "rect": [485, 0, 15, 600], - "reason": "scroll control" - } + "invalidations": [ + [8, 74, 418, 526], + [485, 0, 15, 600] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/line-flow-with-floats-9-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/line-flow-with-floats-9-expected.txt index 8a62195..dab71ec 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/line-flow-with-floats-9-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/line-flow-with-floats-9-expected.txt
@@ -5,177 +5,13 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'away: besides all this, there was generally a ridge or furrow'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very provoking to find that the'", - "rect": [14, 240, 407, 139], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'hedgehog had unrolled itself, and was in the act of crawling'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'in the way wherever she wanted to send the hedgehog to, and, as'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'other parts of the ground, Alice soon came to the conclusion that it'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'the doubled-up soldiers were always getting up and walking off to'", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'was a very '", - "rect": [14, 240, 407, 139], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Alice began to feel very uneasy: to be sure, she had not as yet had'", - "rect": [14, 500, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'They\u2019re dreadfully fond of beheading people here; the great'", - "rect": [14, 500, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'any dispute with the Queen, but she knew that it might happen any'", - "rect": [14, 500, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'minute, \u2018and then,\u2019 thought she, \u2018what would become of me?'", - "rect": [14, 500, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'wonder is, that there\u2018s any one left alive!\u2019'", - "rect": [14, 500, 407, 99], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' twist itself round and look up in her'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'bursting out laughing: and when she had got its head down, and was'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'face, with such a puzzled expression that she could not help'", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'going to '", - "rect": [14, 180, 407, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'begin again, it was very provoking to find that the'", - "rect": [14, 240, 406, 139], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'The chief difficulty Alice found at first was in managing her'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'blow with its head, it '", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'comfortably enough, under her arm, with its legs hanging'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'down, but generally, just as she had got its neck nicely'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'flamingo: she succeeded in getting its body tucked away,'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'straightened out, and was going to give the hedgehog a'", - "rect": [14, 80, 355, 119], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'once in a minute.'", - "rect": [14, 440, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'shouting \u2018Off with his head!\u2019 or \u2018Off with her head!\u2019 about'", - "rect": [14, 440, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'was in a furious passion, and went stamping about, and'", - "rect": [14, 440, 355, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'for'", - "rect": [65, 380, 304, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'hedgehogs; and in a very short time '", - "rect": [65, 380, 304, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'turns, quarrelling all the while, and fighting for the'", - "rect": [65, 380, 304, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'The players all played at once without waiting '", - "rect": [65, 380, 287, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'difficult game indeed.'", - "rect": [134, 360, 128, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'the Queen'", - "rect": [303, 420, 66, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) SPAN id='yellowFloat'", - "rect": [372, 243, 48, 49], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'would'", - "rect": [151, 180, 40, 19], - "reason": "geometry" - } + "invalidations": [ + [14, 240, 407, 139], + [14, 500, 407, 99], + [14, 180, 407, 79], + [14, 80, 355, 119], + [14, 440, 355, 59], + [65, 380, 304, 59] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/lines-with-layout-delta-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/lines-with-layout-delta-expected.txt index 32ba1f7..4a06293b 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/lines-with-layout-delta-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/lines-with-layout-delta-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'PASS'", - "rect": [8, 58, 37, 19], - "reason": "full" - } + "invalidations": [ + [8, 58, 37, 19] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/list-marker-2-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/list-marker-2-expected.txt index 1638cf60..c9d9d3b 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/list-marker-2-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/list-marker-2-expected.txt
@@ -5,22 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutImage IMG id='target'", - "rect": [48, 100, 100, 100], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u2022 '", - "rect": [30, 185, 7, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u2022 '", - "rect": [30, 135, 7, 19], - "reason": "geometry" - } + "invalidations": [ + [48, 100, 100, 100], + [30, 185, 7, 19], + [30, 135, 7, 19] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/make-children-non-inline-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/make-children-non-inline-expected.txt index 5809d8b4..48979e6 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/make-children-non-inline-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/make-children-non-inline-expected.txt
@@ -5,102 +5,21 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'about all the stuff'", - "rect": [8, 264, 104, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'about all the stuff'", - "rect": [8, 164, 104, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'write a book'", - "rect": [8, 144, 77, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'write a book'", - "rect": [8, 144, 77, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'more words.'", - "rect": [8, 104, 77, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'more words.'", - "rect": [8, 104, 77, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'that comes'", - "rect": [8, 284, 65, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'that comes'", - "rect": [8, 184, 65, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'the break.'", - "rect": [8, 324, 61, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'the break.'", - "rect": [8, 224, 61, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'I could'", - "rect": [8, 124, 42, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'I could'", - "rect": [8, 124, 42, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'words,'", - "rect": [8, 84, 42, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'words,'", - "rect": [8, 84, 42, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'Word,'", - "rect": [8, 64, 39, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'Word,'", - "rect": [8, 64, 39, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'after'", - "rect": [8, 304, 27, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'after'", - "rect": [8, 204, 27, 19], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [8, 164, 10, 100], - "reason": "appeared" - } + "invalidations": [ + [8, 264, 104, 19], + [8, 164, 104, 19], + [8, 144, 77, 19], + [8, 104, 77, 19], + [8, 284, 65, 19], + [8, 184, 65, 19], + [8, 324, 61, 19], + [8, 224, 61, 19], + [8, 124, 42, 19], + [8, 84, 42, 19], + [8, 64, 39, 19], + [8, 304, 27, 19], + [8, 204, 27, 19], + [8, 164, 10, 100] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/multi-layout-one-frame-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/multi-layout-one-frame-expected.txt index bdd2570..69d58d9 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/multi-layout-one-frame-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/multi-layout-one-frame-expected.txt
@@ -5,32 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'PASSED'", - "rect": [193, 10, 53, 18], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'PASSED'", - "rect": [12, 10, 53, 18], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'FAILED'", - "rect": [193, 10, 44, 18], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'FAILED'", - "rect": [12, 10, 44, 18], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment ' '", - "rect": [185, 9, 4, 19], - "reason": "geometry" - } + "invalidations": [ + [193, 10, 53, 18], + [12, 10, 53, 18], + [185, 9, 4, 19] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/multicol/column-rules-fixed-height-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/multicol/column-rules-fixed-height-expected.txt index 1551894..d8523b9 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/multicol/column-rules-fixed-height-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/multicol/column-rules-fixed-height-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutMultiColumnSet (anonymous)", - "rect": [8, 52, 525, 315], - "reason": "style change" - } + "invalidations": [ + [8, 52, 525, 315] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/multicol/multicol-repaint-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/multicol/multicol-repaint-expected.txt index c215ce8..ed5c2fc 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/multicol/multicol-repaint-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/multicol/multicol-repaint-expected.txt
@@ -5,27 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'XXXXXX'", - "rect": [234, 15, 300, 50], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'x'", - "rect": [234, 15, 50, 50], - "reason": "disappeared" - }, - { - "object": "InlineTextBox '\u00A0'", - "rect": [9, 10, 13, 58], - "reason": "appeared" - }, - { - "object": "InlineTextBox '\u00A0'", - "rect": [9, 10, 13, 58], - "reason": "disappeared" - } + "invalidations": [ + [234, 15, 300, 50], + [9, 10, 13, 58] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/multicol/multicol-with-abspos-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/multicol/multicol-with-abspos-expected.txt index ed892a0..59ce42fc 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/multicol/multicol-with-abspos-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/multicol/multicol-with-abspos-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'PASS'", - "rect": [0, 580, 80, 20], - "reason": "appeared" - } + "invalidations": [ + [0, 580, 80, 20] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/multicol/multicol-with-text-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/multicol/multicol-with-text-expected.txt index 36ea1e6..1c10046 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/multicol/multicol-with-text-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/multicol/multicol-with-text-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutMultiColumnFlowThread (anonymous)", - "rect": [488, 8, 80, 20], - "reason": "chunk appeared" - } + "invalidations": [ + [488, 8, 80, 20] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/non-text-link-invalidation-optimization-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/non-text-link-invalidation-optimization-expected.txt index 09beef55..e9683d88 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/non-text-link-invalidation-optimization-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/non-text-link-invalidation-optimization-expected.txt
@@ -5,37 +5,13 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment ' text is invalidated and '", - "rect": [156, 8, 137, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment ' passes if '", - "rect": [72, 8, 59, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'This test '", - "rect": [8, 8, 54, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment ' images.'", - "rect": [336, 8, 49, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'only'", - "rect": [131, 8, 25, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment ' no '", - "rect": [303, 8, 23, 19], - "reason": "style change" - } + "invalidations": [ + [156, 8, 137, 19], + [72, 8, 59, 19], + [8, 8, 54, 19], + [336, 8, 49, 19], + [131, 8, 25, 19], + [303, 8, 23, 19] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/offset-change-wrong-invalidation-with-float-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/offset-change-wrong-invalidation-with-float-expected.txt index 38b41c6..ab69a94 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/offset-change-wrong-invalidation-with-float-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/offset-change-wrong-invalidation-with-float-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) UL id='submenu'", - "rect": [48, 94, 40, 20], - "reason": "chunk disappeared" - } + "invalidations": [ + [48, 94, 40, 20] ] }, {
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/outline/focus-continuations-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/outline/focus-continuations-expected.txt index e28e0ff57..2bcbb12 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/outline/focus-continuations-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/outline/focus-continuations-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalBoxFragment LayoutInline SPAN id='outer'", - "rect": [6, 86, 87, 24], - "reason": "disappeared" - } + "invalidations": [ + [6, 86, 87, 24] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/outline/focus-enable-continuations-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/outline/focus-enable-continuations-expected.txt index 5f79572..2bcbb12 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/outline/focus-enable-continuations-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/outline/focus-enable-continuations-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalBoxFragment LayoutInline SPAN id='outer'", - "rect": [6, 86, 87, 24], - "reason": "appeared" - } + "invalidations": [ + [6, 86, 87, 24] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/outline/inline-outline-repaint-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/outline/inline-outline-repaint-expected.txt index 56fec995..32568100 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/outline/inline-outline-repaint-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/outline/inline-outline-repaint-expected.txt
@@ -5,47 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutInline SPAN id='test'", - "rect": [5, 153, 92, 45], - "reason": "geometry" - }, - { - "object": "InlineTextBox ' '", - "rect": [8, 156, 86, 39], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'Lorem ipsum'", - "rect": [8, 156, 86, 39], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'dolor sit amet\u00A0'", - "rect": [8, 156, 86, 39], - "reason": "disappeared" - }, - { - "object": "InlineTextBox ' '", - "rect": [8, 156, 83, 39], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'Lorem ipsum'", - "rect": [8, 156, 83, 39], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'dolor\u00A0'", - "rect": [8, 156, 83, 39], - "reason": "appeared" - }, - { - "object": "Caret", - "rect": [44, 176, 1, 19], - "reason": "appeared" - } + "invalidations": [ + [5, 153, 92, 45] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/outline/outline-change-invalidation-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/outline/outline-change-invalidation-expected.txt index 75a0b07..7bb594ae 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/outline/outline-change-invalidation-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/outline/outline-change-invalidation-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow A id='link'", - "rect": [43, 83, 754, 30], - "reason": "appeared" - } + "invalidations": [ + [43, 83, 754, 30] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/outline/outline-continuations-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/outline/outline-continuations-expected.txt index 1e6bf0c..c10c2fea7 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/outline/outline-continuations-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/outline/outline-continuations-expected.txt
@@ -5,32 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalBoxFragment LayoutInline SPAN id='outer'", - "rect": [16, 108, 87, 63], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'CONTENTS'", - "rect": [18, 150, 83, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'CONTENTS'", - "rect": [18, 150, 83, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'CONTENTS'", - "rect": [18, 110, 83, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'CONTENTS'", - "rect": [18, 110, 83, 19], - "reason": "disappeared" - } + "invalidations": [ + [16, 108, 87, 63] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/overflow/float-overflow-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/overflow/float-overflow-expected.txt index 52700a8..643dd07 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/overflow/float-overflow-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/overflow/float-overflow-expected.txt
@@ -5,557 +5,76 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 537, 62, 37], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 531, 62, 37], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 498, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 492, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 459, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 453, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 420, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow 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": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 171, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 165, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 132, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 126, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 93, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 87, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 54, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 48, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [61, 15, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow 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": "LayoutNGBlockFlow DIV", - "rect": [67, 504, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 498, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 465, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 459, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 426, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow 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": "LayoutNGBlockFlow DIV", - "rect": [67, 177, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 171, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 138, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 132, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 99, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 93, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 60, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 54, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 21, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 15, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [69, 374, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [69, 368, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [69, 335, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [69, 329, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [69, 296, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [69, 290, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [70, 375, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [70, 369, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [70, 336, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [70, 330, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [70, 297, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [70, 291, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [67, 138, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [67, 132, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [65, 60, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [65, 54, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [65, 21, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [65, 15, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [59, 543, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [59, 537, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [59, 504, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [59, 498, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [59, 465, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [59, 459, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [59, 426, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (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": "LayoutNGBlockFlow (floating) DIV", - "rect": [59, 177, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [59, 171, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [59, 99, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [59, 93, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 543, 32, 20], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [67, 537, 32, 20], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [59, 256, 16, 18], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [59, 250, 16, 18], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [59, 217, 16, 18], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [59, 211, 16, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [66, 299, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [66, 293, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [63, 23, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [63, 17, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [59, 545, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [59, 539, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [59, 506, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [59, 500, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [59, 467, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [59, 461, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [59, 428, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [59, 422, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [59, 179, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [59, 173, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [59, 140, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [59, 134, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [58, 377, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [58, 371, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [58, 338, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [58, 332, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [57, 101, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [57, 95, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [57, 62, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [57, 56, 16, 16], - "reason": "geometry" - } + "invalidations": [ + [61, 537, 62, 37], + [61, 531, 62, 37], + [61, 498, 62, 22], + [61, 492, 62, 22], + [61, 459, 62, 22], + [61, 453, 62, 22], + [61, 420, 62, 22], + [61, 414, 62, 22], + [61, 249, 62, 22], + [61, 243, 62, 22], + [61, 210, 62, 22], + [61, 204, 62, 22], + [61, 171, 62, 22], + [61, 165, 62, 22], + [61, 132, 62, 22], + [61, 126, 62, 22], + [61, 93, 62, 22], + [61, 87, 62, 22], + [61, 54, 62, 22], + [61, 48, 62, 22], + [61, 15, 62, 22], + [61, 9, 62, 22], + [61, 366, 58, 28], + [61, 360, 58, 28], + [61, 327, 58, 28], + [61, 321, 58, 28], + [61, 288, 58, 28], + [61, 282, 58, 28], + [59, 543, 40, 10], + [59, 537, 40, 10], + [59, 504, 40, 10], + [59, 498, 40, 10], + [59, 465, 40, 10], + [59, 459, 40, 10], + [59, 426, 40, 10], + [59, 420, 40, 10], + [59, 255, 40, 10], + [59, 249, 40, 10], + [59, 216, 40, 10], + [59, 210, 40, 10], + [59, 177, 40, 10], + [59, 171, 40, 10], + [59, 99, 40, 10], + [59, 93, 40, 10], + [59, 256, 16, 18], + [59, 250, 16, 18], + [59, 217, 16, 18], + [59, 211, 16, 18], + [63, 23, 16, 16], + [59, 545, 16, 16], + [59, 539, 16, 16], + [59, 506, 16, 16], + [59, 500, 16, 16], + [59, 467, 16, 16], + [59, 461, 16, 16], + [59, 428, 16, 16], + [59, 422, 16, 16], + [59, 179, 16, 16], + [59, 173, 16, 16], + [59, 140, 16, 16], + [59, 134, 16, 16], + [58, 377, 16, 16], + [58, 371, 16, 16], + [58, 338, 16, 16], + [58, 332, 16, 16], + [57, 101, 16, 16], + [57, 95, 16, 16], + [57, 62, 16, 16], + [57, 56, 16, 16] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/overflow/float-overflow-right-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/overflow/float-overflow-right-expected.txt index 29246e5..faa36a2 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/overflow/float-overflow-right-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/overflow/float-overflow-right-expected.txt
@@ -5,557 +5,76 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 537, 62, 37], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 531, 62, 37], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 498, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 492, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 459, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 453, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 420, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow 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": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 171, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 165, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 132, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 126, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 93, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 87, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 54, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 48, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 15, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow 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": "LayoutNGBlockFlow DIV", - "rect": [683, 504, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 498, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 465, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 459, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 426, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow 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": "LayoutNGBlockFlow DIV", - "rect": [683, 177, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 171, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 138, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 132, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 99, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 93, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 60, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 54, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 21, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 15, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [689, 374, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [689, 368, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [689, 335, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [689, 329, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [689, 296, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [689, 290, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [701, 543, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [701, 537, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [701, 504, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [701, 498, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [701, 465, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [701, 459, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [701, 426, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (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": "LayoutNGBlockFlow (floating) DIV", - "rect": [701, 177, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [701, 171, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [701, 99, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [701, 93, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [695, 60, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [695, 54, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [695, 21, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [695, 15, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [693, 138, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [693, 132, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [690, 375, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [690, 369, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [690, 336, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [690, 330, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [690, 297, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [690, 291, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [701, 543, 32, 20], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [701, 537, 32, 20], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [725, 256, 16, 18], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [725, 250, 16, 18], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [725, 217, 16, 18], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [725, 211, 16, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [727, 101, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [727, 95, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [727, 62, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [727, 56, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [726, 377, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [726, 371, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [726, 338, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [726, 332, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 545, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 539, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 506, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 500, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 467, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 461, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 428, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 422, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 179, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 173, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 140, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 134, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [721, 23, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [721, 17, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [718, 299, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [718, 293, 16, 16], - "reason": "geometry" - } + "invalidations": [ + [677, 537, 62, 37], + [677, 531, 62, 37], + [677, 498, 62, 22], + [677, 492, 62, 22], + [677, 459, 62, 22], + [677, 453, 62, 22], + [677, 420, 62, 22], + [677, 414, 62, 22], + [677, 249, 62, 22], + [677, 243, 62, 22], + [677, 210, 62, 22], + [677, 204, 62, 22], + [677, 171, 62, 22], + [677, 165, 62, 22], + [677, 132, 62, 22], + [677, 126, 62, 22], + [677, 93, 62, 22], + [677, 87, 62, 22], + [677, 54, 62, 22], + [677, 48, 62, 22], + [677, 15, 62, 22], + [677, 9, 62, 22], + [681, 366, 58, 28], + [681, 360, 58, 28], + [681, 327, 58, 28], + [681, 321, 58, 28], + [681, 288, 58, 28], + [681, 282, 58, 28], + [701, 543, 40, 10], + [701, 537, 40, 10], + [701, 504, 40, 10], + [701, 498, 40, 10], + [701, 465, 40, 10], + [701, 459, 40, 10], + [701, 426, 40, 10], + [701, 420, 40, 10], + [701, 255, 40, 10], + [701, 249, 40, 10], + [701, 216, 40, 10], + [701, 210, 40, 10], + [701, 177, 40, 10], + [701, 171, 40, 10], + [701, 99, 40, 10], + [701, 93, 40, 10], + [725, 256, 16, 18], + [725, 250, 16, 18], + [725, 217, 16, 18], + [725, 211, 16, 18], + [727, 101, 16, 16], + [727, 95, 16, 16], + [727, 62, 16, 16], + [727, 56, 16, 16], + [726, 377, 16, 16], + [726, 371, 16, 16], + [726, 338, 16, 16], + [726, 332, 16, 16], + [725, 545, 16, 16], + [725, 539, 16, 16], + [725, 506, 16, 16], + [725, 500, 16, 16], + [725, 467, 16, 16], + [725, 461, 16, 16], + [725, 428, 16, 16], + [725, 422, 16, 16], + [725, 179, 16, 16], + [725, 173, 16, 16], + [725, 140, 16, 16], + [725, 134, 16, 16], + [721, 23, 16, 16] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/overflow/line-overflow-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/overflow/line-overflow-expected.txt index 6e21ed2..91417829 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/overflow/line-overflow-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/overflow/line-overflow-expected.txt
@@ -5,57 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment ' eleifend lacus, at'", - "rect": [8, 122, 196, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Integer sollicitudin nisi ut urna'", - "rect": [8, 122, 196, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'blandit convallis.'", - "rect": [8, 122, 196, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'sagittis eros leo pulvinar velit.'", - "rect": [8, 122, 196, 79], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Cras faucibus. Nunc adipiscing,'", - "rect": [8, 82, 190, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'augue '", - "rect": [8, 82, 190, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'enim in scelerisque convallis,'", - "rect": [8, 82, 190, 59], - "reason": "geometry" - }, - { - "object": "NGPhysicalBoxFragment LayoutInline SPAN id='t'", - "rect": [47, 92, 33, 49], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'purus'", - "rect": [77, 122, 33, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'purus'", - "rect": [47, 122, 33, 19], - "reason": "geometry" - } + "invalidations": [ + [8, 122, 196, 79], + [8, 82, 190, 59] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/overflow/opacity-change-on-overflow-float-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/overflow/opacity-change-on-overflow-float-expected.txt index 5303b59..afe0466 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/overflow/opacity-change-on-overflow-float-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/overflow/opacity-change-on-overflow-float-expected.txt
@@ -5,47 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow HTML", - "rect": [8, 8, 765, 59], - "reason": "chunk appeared" - }, - { - "object": "NGPhysicalTextFragment 'REGRESSION (r41203): Facebook friend suggestions disappear on update. Make sure when a layer switches'", - "rect": [8, 8, 765, 59], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'from being self-painting to non-self-painting that a layout happens to fix up the floating objects lists. You should see a 100x100'", - "rect": [8, 8, 765, 59], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'green square below. If you see any red, the test has failed.'", - "rect": [8, 8, 765, 59], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV class='green'", - "rect": [8, 84, 100, 100], - "reason": "chunk disappeared" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV class='red'", - "rect": [8, 84, 100, 100], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV class='red'", - "rect": [8, 84, 100, 100], - "reason": "chunk appeared" - }, - { - "object": "NGPhysicalTextFragment 'Repaint test for '", - "rect": [8, 8, 96, 19], - "reason": "disappeared" - } + "invalidations": [ + [8, 8, 765, 59], + [8, 84, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/overflow/overflow-delete-line-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/overflow/overflow-delete-line-expected.txt index 164acdb..290b76d 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/overflow/overflow-delete-line-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/overflow/overflow-delete-line-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='dv'", - "rect": [8, 74, 80, 19], - "reason": "chunk disappeared" - }, - { - "object": "InlineTextBox 'Lorem ipsu'", - "rect": [8, 74, 68, 19], - "reason": "appeared" - } + "invalidations": [ + [8, 74, 80, 19] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/overflow/rel-positioned-inline-with-overflow-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/overflow/rel-positioned-inline-with-overflow-expected.txt index 4dea0e3..b5c13284 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/overflow/rel-positioned-inline-with-overflow-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/overflow/rel-positioned-inline-with-overflow-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [8, 94, 100, 50], - "reason": "background" - } + "invalidations": [ + [8, 94, 100, 50] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/overflow/repaint-resized-overflow-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/overflow/repaint-resized-overflow-expected.txt index 56a5c21..403d3730 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/overflow/repaint-resized-overflow-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/overflow/repaint-resized-overflow-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='s'", - "rect": [8, 136, 108, 108], - "reason": "geometry" - } + "invalidations": [ + [8, 136, 108, 108] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/overhanging-float-detach-repaint-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/overhanging-float-detach-repaint-expected.txt index c7e3326f..5e52c808 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/overhanging-float-detach-repaint-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/overhanging-float-detach-repaint-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (floating) DIV class='float'", - "rect": [8, 68, 100, 100], - "reason": "disappeared" - } + "invalidations": [ + [8, 68, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/paint-invalidation-with-reparent-across-frame-boundaries-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/paint-invalidation-with-reparent-across-frame-boundaries-expected.txt index b4c8a23c..2f139051 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/paint-invalidation-with-reparent-across-frame-boundaries-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/paint-invalidation-with-reparent-across-frame-boundaries-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'abc'", - "rect": [18, 18, 22, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'abc'", - "rect": [8, 187, 22, 19], - "reason": "appeared" - } + "invalidations": [ + [18, 18, 22, 19], + [8, 187, 22, 19] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/position/absolute-display-block-to-none-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/position/absolute-display-block-to-none-expected.txt index afe6c54..95cc0b6 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/position/absolute-display-block-to-none-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/position/absolute-display-block-to-none-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'When an absolute positioned element is set display:none, we should not invalidate the whole body.'", - "rect": [8, 8, 588, 19], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='absolute'", - "rect": [100, 100, 100, 100], - "reason": "disappeared" - } + "invalidations": [ + [8, 8, 588, 19], + [100, 100, 100, 100] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/position/abspos-shift-image-incorrect-repaint-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/position/abspos-shift-image-incorrect-repaint-expected.txt index e82e8ab..42f3303 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/position/abspos-shift-image-incorrect-repaint-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/position/abspos-shift-image-incorrect-repaint-expected.txt
@@ -5,32 +5,12 @@ "bounds": [1250, 585], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutImage IMG", - "rect": [704, 0, 214, 232], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV class='imageWrapper'", - "rect": [454, 0, 214, 232], - "reason": "chunk appeared" - }, - { - "object": "LayoutImage IMG", - "rect": [0, 0, 214, 232], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment ' '", - "rect": [700, 217, 4, 19], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='shiftMe'", - "rect": [450, 217, 4, 19], - "reason": "chunk appeared" - } + "invalidations": [ + [704, 0, 214, 232], + [454, 0, 214, 232], + [0, 0, 214, 232], + [700, 217, 4, 19], + [450, 217, 4, 19] ] }, {
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/position/block-layout-inline-children-float-positioned-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/position/block-layout-inline-children-float-positioned-expected.txt index 8d7c7f80..a173fa2 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/position/block-layout-inline-children-float-positioned-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/position/block-layout-inline-children-float-positioned-expected.txt
@@ -5,27 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [0, 36, 602, 102], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [0, 36, 602, 102], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'the quick brown fox jumped over the lazy dog'", - "rect": [162, 37, 278, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'the quick brown fox jumped over the lazy dog'", - "rect": [324, 37, 277, 19], - "reason": "appeared" - } + "invalidations": [ + [0, 36, 602, 102] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/position/containing-block-position-change-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/position/containing-block-position-change-expected.txt index f19999d..fafd44a 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/position/containing-block-position-change-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/position/containing-block-position-change-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [158, 74, 50, 50], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [100, 74, 50, 50], - "reason": "geometry" - } + "invalidations": [ + [158, 74, 50, 50], + [100, 74, 50, 50] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/position/fixed-element-repaint-after-compositing-update-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/position/fixed-element-repaint-after-compositing-update-expected.txt index af80f095..3bdc999 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/position/fixed-element-repaint-after-compositing-update-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/position/fixed-element-repaint-after-compositing-update-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='moveMe'", - "rect": [150, 150, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='moveMe'", - "rect": [8, 88, 100, 100], - "reason": "geometry" - } + "invalidations": [ + [150, 150, 100, 100], + [8, 88, 100, 100] ] }, {
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/position/fixed-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/position/fixed-expected.txt index 35b4b37..9fcff03 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/position/fixed-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/position/fixed-expected.txt
@@ -12,12 +12,8 @@ "bounds": [100, 100], "contentsOpaque": true, "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='t'", - "rect": [0, 0, 100, 100], - "reason": "background" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 2 },
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/position/layout-state-relative-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/position/layout-state-relative-expected.txt index 85ec6b1..7b52452 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/position/layout-state-relative-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/position/layout-state-relative-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'PASS'", - "rect": [8, 152, 37, 19], - "reason": "full" - } + "invalidations": [ + [8, 152, 37, 19] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/position/positioned-document-element-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/position/positioned-document-element-expected.txt deleted file mode 100644 index acec94d3..0000000 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/position/positioned-document-element-expected.txt +++ /dev/null
@@ -1,28 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#008000", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 800, 600], - "reason": "background" - }, - { - "object": "NGPhysicalTextFragment 'Tests that the entire viewport is painted with a floated html element.'", - "rect": [108, 116, 402, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Tests that the entire viewport is painted with a floated html element.'", - "rect": [8, 16, 402, 19], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/position/positioned-great-grandparent-change-location-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/position/positioned-great-grandparent-change-location-expected.txt deleted file mode 100644 index ae7a034..0000000 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/position/positioned-great-grandparent-change-location-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [100, 200, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [100, 100, 100, 100], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Target'", - "rect": [100, 200, 38, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Target'", - "rect": [100, 100, 38, 19], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/position/positioned-list-offset-change-repaint-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/position/positioned-list-offset-change-repaint-expected.txt index f942f3f..37b4126 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/position/positioned-list-offset-change-repaint-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/position/positioned-list-offset-change-repaint-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutImage IMG", - "rect": [8, 64, 214, 232], - "reason": "geometry" - }, - { - "object": "LayoutImage IMG", - "rect": [8, 64, 114, 232], - "reason": "geometry" - } + "invalidations": [ + [8, 64, 214, 232] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/position/relative-inline-positioned-movement-repaint-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/position/relative-inline-positioned-movement-repaint-expected.txt index eb6457b8..e0990be9 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/position/relative-inline-positioned-movement-repaint-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/position/relative-inline-positioned-movement-repaint-expected.txt
@@ -11,12 +11,8 @@ "position": [68, 7], "bounds": [348, 21], "backfaceVisibility": "hidden", - "paintInvalidations": [ - { - "object": "LayoutInline (relative positioned) DIV id='block'", - "rect": [0, 0, 348, 21], - "reason": "paint property change" - } + "invalidations": [ + [0, 0, 348, 21] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/quotes-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/quotes-expected.txt index 10e5242a..2a16a7c 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/quotes-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/quotes-expected.txt
@@ -5,32 +5,12 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'quote 2'", - "rect": [17, 28, 46, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'quote 2'", - "rect": [15, 28, 46, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment '}'", - "rect": [63, 28, 9, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment '{'", - "rect": [8, 28, 9, 19], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment '}'", - "rect": [61, 28, 8, 19], - "reason": "style change" - } + "invalidations": [ + [17, 28, 46, 19], + [15, 28, 46, 19], + [63, 28, 9, 19], + [8, 28, 9, 19], + [61, 28, 8, 19] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/reflection/reflection-redraw-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/reflection/reflection-redraw-expected.txt index f1b7ae6..caa2d22 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/reflection/reflection-redraw-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/reflection/reflection-redraw-expected.txt
@@ -5,67 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'The color of this text'", - "rect": [381, 267, 284, 59], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'in the reflection'", - "rect": [381, 267, 284, 59], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'should be green'", - "rect": [381, 267, 284, 59], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'The color of this text'", - "rect": [71, 267, 284, 59], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'in the reflection'", - "rect": [71, 267, 284, 59], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'should be green'", - "rect": [71, 267, 284, 59], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'The color of this text'", - "rect": [306, 34, 124, 182], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'in the reflection'", - "rect": [306, 34, 124, 182], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'should be green'", - "rect": [306, 34, 124, 182], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'The color of this text'", - "rect": [306, 377, 124, 156], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'in the reflection'", - "rect": [306, 377, 124, 156], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'should be green'", - "rect": [306, 377, 124, 156], - "reason": "style change" - } + "invalidations": [ + [381, 267, 284, 59], + [71, 267, 284, 59], + [306, 34, 124, 182], + [306, 377, 124, 156] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/remove-block-after-layout-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/remove-block-after-layout-expected.txt deleted file mode 100644 index e52ec1ce..0000000 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/remove-block-after-layout-expected.txt +++ /dev/null
@@ -1,28 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='target'", - "rect": [8, 108, 100, 100], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'This div should'", - "rect": [8, 108, 90, 39], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'disappear.'", - "rect": [8, 108, 90, 39], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/remove-inline-after-layout-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/remove-inline-after-layout-expected.txt index 5f79ef9..7e90141 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/remove-inline-after-layout-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/remove-inline-after-layout-expected.txt
@@ -5,27 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'This span should disappear. '", - "rect": [112, 193, 170, 19], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [282, 108, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [112, 108, 100, 100], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' '", - "rect": [108, 193, 4, 19], - "reason": "geometry" - } + "invalidations": [ + [112, 193, 170, 19], + [282, 108, 100, 100], + [112, 108, 100, 100], + [108, 193, 4, 19] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/remove-inline-layer-after-layout-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/remove-inline-layer-after-layout-expected.txt index d5a84082..7e90141 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/remove-inline-layer-after-layout-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/remove-inline-layer-after-layout-expected.txt
@@ -5,27 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutInline SPAN id='target'", - "rect": [112, 193, 170, 19], - "reason": "chunk disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [282, 108, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [112, 108, 100, 100], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' '", - "rect": [108, 193, 4, 19], - "reason": "geometry" - } + "invalidations": [ + [112, 193, 170, 19], + [282, 108, 100, 100], + [112, 108, 100, 100], + [108, 193, 4, 19] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/repaint-across-writing-mode-boundary-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/repaint-across-writing-mode-boundary-expected.txt index a301268..7fc73e9a0 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/repaint-across-writing-mode-boundary-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/repaint-across-writing-mode-boundary-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment '\u7B2C\u4E00\u6BB5\u843D paragraph 1'", - "rect": [548, 191, 23, 35], - "reason": "selection" - } + "invalidations": [ + [548, 191, 23, 35] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/repaint-descandant-on-ancestor-layer-move-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/repaint-descandant-on-ancestor-layer-move-expected.txt index 326341e4..d100c351 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/repaint-descandant-on-ancestor-layer-move-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/repaint-descandant-on-ancestor-layer-move-expected.txt
@@ -5,27 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV", - "rect": [428, 38, 300, 20], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV", - "rect": [28, 38, 300, 20], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'There should only be one copy of this text.'", - "rect": [428, 38, 256, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'There should only be one copy of this text.'", - "rect": [28, 38, 256, 19], - "reason": "geometry" - } + "invalidations": [ + [428, 38, 300, 20], + [28, 38, 300, 20] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/resize-iframe-text-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/resize-iframe-text-expected.txt deleted file mode 100644 index 2314d68..0000000 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/resize-iframe-text-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [500, 400], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 200, 500, 200], - "reason": "incremental" - }, - { - "object": "LayoutNGBlockFlow HTML", - "rect": [8, 300, 64, 22], - "reason": "incremental" - }, - { - "object": "NGPhysicalTextFragment 'Success'", - "rect": [8, 300, 64, 22], - "reason": "appeared" - }, - { - "object": "VerticalScrollbar", - "rect": [485, 0, 15, 200], - "reason": "chunk disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/ruby-flipped-blocks-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/ruby-flipped-blocks-expected.txt index a3049f9..17d07aa5 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/ruby-flipped-blocks-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/ruby-flipped-blocks-expected.txt
@@ -5,32 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'b'", - "rect": [8, 28, 20, 20], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'b'", - "rect": [8, 28, 20, 20], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'a'", - "rect": [8, 8, 20, 20], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'a'", - "rect": [8, 8, 20, 20], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'c'", - "rect": [28, 33, 10, 10], - "reason": "style change" - } + "invalidations": [ + [8, 28, 20, 20], + [8, 8, 20, 20], + [28, 33, 10, 10] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/caret-invalidation-in-overflow-scroll-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/caret-invalidation-in-overflow-scroll-expected.txt index ede5997..c6100f1 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/caret-invalidation-in-overflow-scroll-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/caret-invalidation-in-overflow-scroll-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Caret", - "rect": [383, 11, 1, 16], - "reason": "caret" - }, - { - "object": "Caret", - "rect": [380, 11, 1, 16], - "reason": "caret" - } + "invalidations": [ + [383, 11, 1, 16], + [380, 11, 1, 16] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/caret-with-composited-scroll-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/caret-with-composited-scroll-expected.txt index 45ef74ca..6990c49 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/caret-with-composited-scroll-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/caret-with-composited-scroll-expected.txt
@@ -14,22 +14,8 @@ { "name": "Scrolling Contents Layer", "bounds": [205, 1022], - "paintInvalidations": [ - { - "object": "LayoutTextControl INPUT id='text'", - "rect": [0, 998, 205, 24], - "reason": "subtree" - }, - { - "object": "LayoutTextControl INPUT id='text'", - "rect": [0, 998, 205, 24], - "reason": "chunk appeared" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [3, 1003, 1, 16], - "reason": "chunk appeared" - } + "invalidations": [ + [0, 998, 205, 24] ], "transform": 2 },
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/inline-style-change-in-scrolled-view-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/inline-style-change-in-scrolled-view-expected.txt index e1e4488..2dd73463 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/inline-style-change-in-scrolled-view-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/inline-style-change-in-scrolled-view-expected.txt
@@ -5,12 +5,8 @@ "bounds": [2000, 2000], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Text Text Text Text Text Text Text Text Text Text Text Text Text'", - "rect": [0, 320, 386, 19], - "reason": "style change" - } + "invalidations": [ + [0, 320, 386, 19] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/invalidate-after-composited-scroll-of-window-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/invalidate-after-composited-scroll-of-window-expected.txt index 729db34..e604741 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/invalidate-after-composited-scroll-of-window-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/invalidate-after-composited-scroll-of-window-expected.txt
@@ -5,17 +5,9 @@ "bounds": [785, 4936], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Tests that invalidation of a div after scrolling invalidates just the div and no other area.'", - "rect": [8, 4908, 510, 19], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [8, 2408, 100, 100], - "reason": "background" - } + "invalidations": [ + [8, 4908, 510, 19], + [8, 2408, 100, 100] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/invalidate-caret-in-composited-scrolling-container-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/invalidate-caret-in-composited-scrolling-container-expected.txt index af205b0..b99943db 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/invalidate-caret-in-composited-scrolling-container-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/invalidate-caret-in-composited-scrolling-container-expected.txt
@@ -11,22 +11,8 @@ "position": [-2, -2], "bounds": [76, 26], "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTextControl INPUT id='root'", - "rect": [0, 0, 76, 26], - "reason": "full layer" - }, - { - "object": "LayoutTextControl INPUT id='root'", - "rect": [0, 0, 72, 22], - "reason": "full layer" - }, - { - "object": "Caret", - "rect": [68, 5, 1, 16], - "reason": "caret" - } + "invalidations": [ + [0, 0, 76, 26] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/invalidate-caret-in-non-composited-scrolling-container-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/invalidate-caret-in-non-composited-scrolling-container-expected.txt index af205b0..b99943db 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/invalidate-caret-in-non-composited-scrolling-container-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/invalidate-caret-in-non-composited-scrolling-container-expected.txt
@@ -11,22 +11,8 @@ "position": [-2, -2], "bounds": [76, 26], "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTextControl INPUT id='root'", - "rect": [0, 0, 76, 26], - "reason": "full layer" - }, - { - "object": "LayoutTextControl INPUT id='root'", - "rect": [0, 0, 72, 22], - "reason": "full layer" - }, - { - "object": "Caret", - "rect": [68, 5, 1, 16], - "reason": "caret" - } + "invalidations": [ + [0, 0, 76, 26] ], "transform": 1 }
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/layout-state-scrolloffset-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/layout-state-scrolloffset-expected.txt index ff5d1c42..70028fc 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/layout-state-scrolloffset-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/layout-state-scrolloffset-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'after'", - "rect": [100, 120, 39, 19], - "reason": "full" - } + "invalidations": [ + [100, 120, 39, 19] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/layout-state-scrolloffset2-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/layout-state-scrolloffset2-expected.txt index a628dae..66f1b98 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/layout-state-scrolloffset2-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/layout-state-scrolloffset2-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'after'", - "rect": [102, 122, 39, 19], - "reason": "full" - } + "invalidations": [ + [102, 122, 39, 19] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/layout-state-scrolloffset3-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/layout-state-scrolloffset3-expected.txt index 0bd36ad..40670f7 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/layout-state-scrolloffset3-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/layout-state-scrolloffset3-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'after'", - "rect": [100, 120, 34, 19], - "reason": "full" - } + "invalidations": [ + [100, 120, 34, 19] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/line-in-scrolled-clipped-block-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/line-in-scrolled-clipped-block-expected.txt index 5f786ae8..f0b83a8 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/line-in-scrolled-clipped-block-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/line-in-scrolled-clipped-block-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment ' PASS .'", - "rect": [8, 8, 100, 19], - "reason": "full" - } + "invalidations": [ + [8, 8, 100, 19] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/outline-change-in-scrollers-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/outline-change-in-scrollers-expected.txt index 8591658..bdb5a7a 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/outline-change-in-scrollers-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/outline-change-in-scrollers-expected.txt
@@ -5,37 +5,13 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='target'", - "rect": [286, 173, 75, 75], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow DIV class='target'", - "rect": [286, 18, 75, 75], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow DIV class='target'", - "rect": [172, 173, 75, 75], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow DIV class='target'", - "rect": [172, 18, 75, 75], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow DIV class='target'", - "rect": [53, 153, 75, 75], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow DIV class='target'", - "rect": [18, 18, 75, 75], - "reason": "style change" - } + "invalidations": [ + [286, 173, 75, 75], + [286, 18, 75, 75], + [172, 173, 75, 75], + [172, 18, 75, 75], + [53, 153, 75, 75], + [18, 18, 75, 75] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/overflow-scroll-body-appear-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/overflow-scroll-body-appear-expected.txt index 22e10cd..124c519a 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/overflow-scroll-body-appear-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/overflow-scroll-body-appear-expected.txt
@@ -5,32 +5,8 @@ "bounds": [2008, 2096], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 0, 2008, 2096], - "reason": "background" - }, - { - "object": "NGPhysicalTextFragment 'Bug 36461 - No vertical scrollbar after the CSS class change'", - "rect": [118, 52, 370, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'You should see both vertical and horizontal scrollbars.'", - "rect": [8, 16, 323, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'This is the test for '", - "rect": [8, 52, 110, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '.'", - "rect": [488, 52, 4, 19], - "reason": "geometry" - } + "invalidations": [ + [0, 0, 2008, 2096] ] }, { @@ -49,12 +25,8 @@ "name": "Scroll Corner Layer", "position": [785, 585], "bounds": [15, 15], - "paintInvalidations": [ - { - "object": "Scroll Corner Layer", - "rect": [0, 0, 15, 15], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 15, 15] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/overflow-scroll-delete-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/overflow-scroll-delete-expected.txt index 983cd47..106f3a8 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/overflow-scroll-delete-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/overflow-scroll-delete-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Passed'", - "rect": [8, 136, 43, 17], - "reason": "full" - } + "invalidations": [ + [8, 136, 43, 17] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/overflow-scroll-local-background-text-color-change-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/overflow-scroll-local-background-text-color-change-expected.txt index 9d6757d..d151876 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/overflow-scroll-local-background-text-color-change-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/overflow-scroll-local-background-text-color-change-expected.txt
@@ -17,12 +17,8 @@ "bounds": [185, 552], "contentsOpaque": true, "backgroundColor": "#0000FF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutNGBlockFlow DIV id='scroller'", - "rect": [0, 0, 185, 552], - "reason": "background" - } + "invalidations": [ + [0, 0, 185, 552] ], "transform": 2 },
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/repaint-during-scroll-with-zoom-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/repaint-during-scroll-with-zoom-expected.txt index 95f9a6a..d4141b1 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/repaint-during-scroll-with-zoom-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/repaint-during-scroll-with-zoom-expected.txt
@@ -5,22 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#C0C0C0", - "paintInvalidations": [ - { - "object": "HorizontalScrollbar", - "rect": [3, 300, 235, 15], - "reason": "scroll control" - }, - { - "object": "LayoutNGBlockFlow HTML", - "rect": [3, 65, 52, 17], - "reason": "paint property change" - }, - { - "object": "VerticalScrollbar", - "rect": [238, 65, 15, 235], - "reason": "scroll control" - } + "invalidations": [ + [3, 300, 235, 15], + [3, 65, 52, 17], + [238, 65, 15, 235] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/scroll-descendant-with-cached-cliprects-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/scroll-descendant-with-cached-cliprects-expected.txt index 8c58368d..995080d 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/scroll-descendant-with-cached-cliprects-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/scroll-descendant-with-cached-cliprects-expected.txt
@@ -5,24 +5,16 @@ "bounds": [785, 1895], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='ul'", - "rect": [677, 52, 100, 100], - "reason": "chunk disappeared" - } + "invalidations": [ + [677, 52, 100, 100] ], "transform": 1 }, { "name": "LayoutNGBlockFlow (positioned) DIV id='scrollpanel'", "bounds": [100, 100], - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='scrollpanel'", - "rect": [0, 0, 100, 100], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 100, 100] ], "transform": 2 },
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/sticky/invalidate-after-composited-scroll-with-sticky-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/sticky/invalidate-after-composited-scroll-with-sticky-expected.txt new file mode 100644 index 0000000..489f30b --- /dev/null +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/scroll/sticky/invalidate-after-composited-scroll-with-sticky-expected.txt
@@ -0,0 +1,70 @@ +{ + "layers": [ + { + "name": "Scrolling Contents Layer", + "bounds": [785, 656], + "contentsOpaque": true, + "backgroundColor": "#FFFFFF", + "invalidations": [ + [353, 8, 15, 640] + ] + }, + { + "name": "LayoutNGBlockFlow (sticky positioned) DIV id='sticky'", + "bounds": [345, 20], + "transform": 4 + }, + { + "name": "ContentsLayer for Vertical Scrollbar Layer", + "position": [785, 0], + "bounds": [15, 600], + "contentsOpaque": true + } + ], + "transforms": [ + { + "id": 1, + "transform": [ + [1, 0, 0, 0], + [0, 1, 0, 0], + [0, 0, 1, -0.1], + [0, 0, 0, 1] + ], + "origin": [188, 328] + }, + { + "id": 2, + "parent": 1, + "transform": [ + [1, 0, 0, 0], + [0, 1, 0, 0], + [0, 0, 1, 0], + [8, 8, 0, 1] + ], + "flattenInheritedTransform": false + }, + { + "id": 3, + "parent": 2, + "transform": [ + [1, 0, 0, 0], + [0, 1, 0, 0], + [0, 0, 1, 0], + [0, -35, 0, 1] + ], + "flattenInheritedTransform": false + }, + { + "id": 4, + "parent": 3, + "transform": [ + [1, 0, 0, 0], + [0, 1, 0, 0], + [0, 0, 1, 0], + [0, 35, 0, 1] + ], + "flattenInheritedTransform": false + } + ] +} +
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/search-field-cancel-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/search-field-cancel-expected.txt index bc5a435..176fdce 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/search-field-cancel-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/search-field-cancel-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV", - "rect": [12, 46, 58, 18], - "reason": "chunk appeared" - } + "invalidations": [ + [12, 46, 58, 18] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/selection/invalidation-rect-includes-newline-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/selection/invalidation-rect-includes-newline-expected.txt index 37a4699..f0be508 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/selection/invalidation-rect-includes-newline-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/selection/invalidation-rect-includes-newline-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'xx'", - "rect": [8, 8, 48, 32], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'y'", - "rect": [8, 8, 48, 32], - "reason": "geometry" - } + "invalidations": [ + [8, 8, 48, 32] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/selection/invalidation-rect-includes-newline-for-rtl-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/selection/invalidation-rect-includes-newline-for-rtl-expected.txt index c25782c..f0c056c 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/selection/invalidation-rect-includes-newline-for-rtl-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/selection/invalidation-rect-includes-newline-for-rtl-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'xx'", - "rect": [0, 8, 40, 32], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'y'", - "rect": [0, 8, 40, 32], - "reason": "geometry" - } + "invalidations": [ + [0, 8, 40, 32] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/selection/invalidation-rect-includes-newline-for-vertical-lr-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/selection/invalidation-rect-includes-newline-for-vertical-lr-expected.txt index b2560bc1..c4eca05 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/selection/invalidation-rect-includes-newline-for-vertical-lr-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/selection/invalidation-rect-includes-newline-for-vertical-lr-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'xx'", - "rect": [8, 8, 32, 48], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'y'", - "rect": [8, 8, 32, 48], - "reason": "geometry" - } + "invalidations": [ + [8, 8, 32, 48] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/selection/invalidation-rect-includes-newline-for-vertical-rl-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/selection/invalidation-rect-includes-newline-for-vertical-rl-expected.txt index b2560bc1..c4eca05 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/selection/invalidation-rect-includes-newline-for-vertical-rl-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/selection/invalidation-rect-includes-newline-for-vertical-rl-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'xx'", - "rect": [8, 8, 32, 48], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'y'", - "rect": [8, 8, 32, 48], - "reason": "geometry" - } + "invalidations": [ + [8, 8, 32, 48] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/selection/japanese-rl-selection-clear-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/selection/japanese-rl-selection-clear-expected.txt index b84ace1..b49a1c9 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/selection/japanese-rl-selection-clear-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/selection/japanese-rl-selection-clear-expected.txt
@@ -5,77 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment '\u3042\u3063\u305F\u304B\u5FD8\u308C\u3066\u3057\u307E\u3063\u305F\u7D4C\u9A13\u306F\u3042\u308A\u307E\u3059\u304B'", - "rect": [307, 123, 470, 404], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u3057\u305F\u30A6\u30A7\u30D6\u30DA\u30FC\u30B8\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u304B\u3089\u3082\u691C\u7D22'", - "rect": [307, 123, 470, 404], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u3059\u3002\u8A2A\u554F\u3057\u305F\u30A6\u30A7\u30D6\u30DA\u30FC\u30B8\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u304B'", - "rect": [307, 123, 470, 404], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002\u305B\u3063\u304B\u304F\u898B\u3064\u3051\u305F\u3059'", - "rect": [307, 123, 470, 404], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u305B\u3063\u304B\u304F\u898B\u3064\u3051\u305F\u3059\u3070\u3089\u3057\u3044\u8A18\u4E8B\u304C\u3069\u3053\u306B'", - "rect": [307, 123, 470, 404], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u3063\u305F\u7D4C\u9A13\u306F\u3042\u308A\u307E\u3059\u304B \u306A\u3089\u30BF\u30A4\u30C8\u30EB\u3068\u30A2'", - "rect": [307, 123, 470, 404], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u3064\u3051\u305F\u3059\u3070\u3089\u3057\u3044\u8A18\u4E8B\u304C\u3069\u3053\u306B\u3042\u3063\u305F\u304B\u5FD8'", - "rect": [307, 123, 470, 404], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u306A\u3089\u30BF\u30A4\u30C8\u30EB\u3068\u30A2\u30C9\u30EC\u30B9\u3060\u3051\u3067\u306A\u304F\u3001\u8A2A\u554F'", - "rect": [307, 123, 470, 404], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u304B\u3089\u3082\u691C\u7D22\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E'", - "rect": [307, 123, 470, 404], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u3070\u3089\u3057\u3044\u8A18\u4E8B\u304C\u3069\u3053\u306B\u3042\u3063\u305F\u304B\u5FD8\u308C\u3066\u3057\u307E'", - "rect": [307, 123, 470, 404], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u3089\u3082\u691C\u7D22\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002\u305B\u3063\u304B\u304F\u898B'", - "rect": [307, 123, 470, 404], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u308C\u3066\u3057\u307E\u3063\u305F\u7D4C\u9A13\u306F\u3042\u308A\u307E\u3059\u304B \u306A\u3089\u30BF\u30A4'", - "rect": [307, 123, 470, 404], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u30C8\u30EB\u3068\u30A2\u30C9\u30EC\u30B9\u3060\u3051\u3067\u306A\u304F\u3001\u8A2A\u554F'", - "rect": [307, 123, 470, 404], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u30C9\u30EC\u30B9\u3060\u3051\u3067\u306A\u304F\u3001\u8A2A\u554F\u3057\u305F\u30A6\u30A7\u30D6\u30DA\u30FC\u30B8'", - "rect": [307, 123, 470, 404], - "reason": "geometry" - } + "invalidations": [ + [307, 123, 470, 404] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/selection/repaint-rect-for-vertical-writing-mode-with-positioned-root-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/selection/repaint-rect-for-vertical-writing-mode-with-positioned-root-expected.txt index e7f3c82fd..2a16d40 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/selection/repaint-rect-for-vertical-writing-mode-with-positioned-root-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/selection/repaint-rect-for-vertical-writing-mode-with-positioned-root-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Some text in vertical mode'", - "rect": [184, 201, 19, 160], - "reason": "selection" - } + "invalidations": [ + [184, 201, 19, 160] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/selection/selected-replaced-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/selection/selected-replaced-expected.txt index 1a610817..1187aee9 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/selection/selected-replaced-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/selection/selected-replaced-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutImage (relative positioned) IMG id='test' class='moved'", - "rect": [8, 132, 214, 232], - "reason": "geometry" - }, - { - "object": "LayoutImage (relative positioned) IMG id='test' class='moved'", - "rect": [8, 52, 214, 232], - "reason": "geometry" - } + "invalidations": [ + [8, 132, 214, 232], + [8, 52, 214, 232] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/selection/selection-after-delete-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/selection/selection-after-delete-expected.txt index 74c26b6..1800df4 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/selection/selection-after-delete-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/selection/selection-after-delete-expected.txt
@@ -5,62 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='test'", - "rect": [38, 78, 152, 102], - "reason": "geometry" - }, - { - "object": "InlineTextBox ' '", - "rect": [39, 79, 146, 99], - "reason": "disappeared" - }, - { - "object": "InlineTextBox ' '", - "rect": [39, 79, 146, 99], - "reason": "disappeared" - }, - { - "object": "InlineTextBox ' '", - "rect": [39, 79, 146, 99], - "reason": "disappeared" - }, - { - "object": "InlineTextBox ' '", - "rect": [39, 79, 146, 99], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'hello world hello world'", - "rect": [39, 79, 146, 99], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'hello world hello world'", - "rect": [39, 79, 146, 99], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'hello world hello world'", - "rect": [39, 79, 146, 99], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'hello world hello world'", - "rect": [39, 79, 146, 99], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'hello'", - "rect": [39, 79, 146, 99], - "reason": "disappeared" - }, - { - "object": "Caret", - "rect": [39, 79, 1, 19], - "reason": "appeared" - } + "invalidations": [ + [38, 78, 152, 102] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/selection/selection-after-remove-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/selection/selection-after-remove-expected.txt index e862231..1800df4 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/selection/selection-after-remove-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/selection/selection-after-remove-expected.txt
@@ -5,77 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='test'", - "rect": [38, 78, 152, 102], - "reason": "geometry" - }, - { - "object": "InlineTextBox ' '", - "rect": [39, 79, 146, 99], - "reason": "disappeared" - }, - { - "object": "InlineTextBox ' '", - "rect": [39, 79, 146, 99], - "reason": "disappeared" - }, - { - "object": "InlineTextBox ' '", - "rect": [39, 79, 146, 99], - "reason": "disappeared" - }, - { - "object": "InlineTextBox ' '", - "rect": [39, 79, 146, 99], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'hello world hello world'", - "rect": [39, 79, 146, 99], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'hello world hello world'", - "rect": [39, 79, 146, 99], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'hello world hello world'", - "rect": [39, 79, 146, 99], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'hello'", - "rect": [39, 79, 146, 99], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'world hello world'", - "rect": [39, 79, 146, 99], - "reason": "disappeared" - }, - { - "object": "InlineTextBox ' world'", - "rect": [67, 158, 39, 20], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'world'", - "rect": [71, 79, 35, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'hello '", - "rect": [39, 79, 32, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'hello '", - "rect": [39, 79, 32, 19], - "reason": "disappeared" - } + "invalidations": [ + [38, 78, 152, 102] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/selection/selection-clear-after-move-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/selection/selection-clear-after-move-expected.txt index ef9ae23..662e8c7 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/selection/selection-clear-after-move-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/selection/selection-clear-after-move-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutImage IMG", - "rect": [100, 300, 50, 51], - "reason": "selection" - } + "invalidations": [ + [100, 300, 50, 51] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/selection/selection-clear-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/selection/selection-clear-expected.txt deleted file mode 100644 index d7915e0..0000000 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/selection/selection-clear-expected.txt +++ /dev/null
@@ -1,38 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV id='firstLine'", - "rect": [8, 8, 100, 200], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='firstLine'", - "rect": [8, 8, 100, 100], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'FAIL: Test did'", - "rect": [8, 8, 92, 200], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'not run'", - "rect": [8, 8, 92, 200], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [8, 8, 8, 100], - "reason": "appeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/selection/selection-in-composited-scrolling-container-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/selection/selection-in-composited-scrolling-container-expected.txt index 23ec0cc..40034d5b 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/selection/selection-in-composited-scrolling-container-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/selection/selection-in-composited-scrolling-container-expected.txt
@@ -5,27 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTextControl INPUT id='target'", - "rect": [6, 6, 76, 26], - "reason": "subtree" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [12, 11, 64, 16], - "reason": "paint property change" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [12, 11, 63, 16], - "reason": "paint property change" - }, - { - "object": "InlineTextBox 'test test test'", - "rect": [27, 11, 26, 16], - "reason": "selection" - } + "invalidations": [ + [6, 6, 76, 26] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/selection/selection-in-non-composited-scrolling-container-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/selection/selection-in-non-composited-scrolling-container-expected.txt index 7a70dda..40034d5b 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/selection/selection-in-non-composited-scrolling-container-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/selection/selection-in-non-composited-scrolling-container-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTextControl INPUT id='target'", - "rect": [6, 6, 76, 26], - "reason": "subtree" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [12, 11, 64, 16], - "reason": "paint property change" - }, - { - "object": "InlineTextBox 'test test test'", - "rect": [33, 11, 26, 16], - "reason": "selection" - } + "invalidations": [ + [6, 6, 76, 26] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/selection/selection-partial-invalidation-between-blocks-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/selection/selection-partial-invalidation-between-blocks-expected.txt index 1974ab2..da1228d3 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/selection/selection-partial-invalidation-between-blocks-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/selection/selection-partial-invalidation-between-blocks-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Second cell'", - "rect": [11, 35, 70, 20], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'First cell'", - "rect": [11, 11, 55, 20], - "reason": "geometry" - } + "invalidations": [ + [11, 35, 70, 20], + [11, 11, 55, 20] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/selection/selection-rl-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/selection/selection-rl-expected.txt index 41d2903..6280f17 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/selection/selection-rl-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/selection/selection-rl-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Testing both hit testing'", - "rect": [772, 8, 20, 133], - "reason": "geometry" - } + "invalidations": [ + [772, 8, 20, 133] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/selection/selection-within-composited-scroller-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/selection/selection-within-composited-scroller-expected.txt index e5057e63..8246101a 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/selection/selection-within-composited-scroller-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/selection/selection-within-composited-scroller-expected.txt
@@ -17,12 +17,8 @@ "bounds": [200, 1620], "contentsOpaque": true, "backgroundColor": "#D3D3D3", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'test'", - "rect": [0, 610, 21, 20], - "reason": "geometry" - } + "invalidations": [ + [0, 610, 21, 20] ], "transform": 2 },
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/selection/text-selection-rect-in-overflow-2-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/selection/text-selection-rect-in-overflow-2-expected.txt index 8f2514f..6315da3 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/selection/text-selection-rect-in-overflow-2-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/selection/text-selection-rect-in-overflow-2-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Should have blue, not gray, highlight'", - "rect": [18, 18, 215, 20], - "reason": "selection" - } + "invalidations": [ + [18, 18, 215, 20] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/selection/text-selection-rect-in-overflow-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/selection/text-selection-rect-in-overflow-expected.txt index d581ed47..177cb9d7 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/selection/text-selection-rect-in-overflow-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/selection/text-selection-rect-in-overflow-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Should have green background'", - "rect": [8, 8, 187, 20], - "reason": "geometry" - } + "invalidations": [ + [8, 8, 187, 20] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/stacked-diacritics-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/stacked-diacritics-expected.txt index d0b85d5..495d654 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/stacked-diacritics-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/stacked-diacritics-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment '\u1EA6\u1EA4\u1EAA\u1EA8\u1EB0'", - "rect": [18, 148, 126, 41], - "reason": "disappeared" - } + "invalidations": [ + [18, 148, 126, 41] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/subtree-root-skipped-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/subtree-root-skipped-expected.txt index e1084df..a61c7d2 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/subtree-root-skipped-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/subtree-root-skipped-expected.txt
@@ -5,22 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'PASS'", - "rect": [12, 10, 35, 18], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'FAIL'", - "rect": [12, 10, 26, 18], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='div'", - "rect": [8, 288, 10, 20], - "reason": "geometry" - } + "invalidations": [ + [12, 10, 35, 18], + [8, 288, 10, 20] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/absolute-sized-content-with-resources-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/absolute-sized-content-with-resources-expected.txt index 144962f7..36bc90a 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/absolute-sized-content-with-resources-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/absolute-sized-content-with-resources-expected.txt
@@ -5,32 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow div id='contentBox'", - "rect": [8, 52, 402, 402], - "reason": "geometry" - }, - { - "object": "LayoutSVGRect rect", - "rect": [42, 119, 334, 268], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRect rect", - "rect": [42, 119, 334, 268], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRect rect", - "rect": [17, 219, 84, 68], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRect rect", - "rect": [17, 219, 84, 68], - "reason": "paint property change" - } + "invalidations": [ + [8, 52, 402, 402] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/animated-path-inside-transformed-html-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/animated-path-inside-transformed-html-expected.txt index 3798553..328d10dc 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/animated-path-inside-transformed-html-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/animated-path-inside-transformed-html-expected.txt
@@ -5,37 +5,13 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'This is some text'", - "rect": [246, 89, 124, 45], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'This is some text'", - "rect": [203, 336, 124, 45], - "reason": "appeared" - }, - { - "object": "LayoutSVGRect rect id='rect'", - "rect": [108, 84, 105, 102], - "reason": "full" - }, - { - "object": "LayoutSVGRect rect id='rect'", - "rect": [355, 125, 104, 104], - "reason": "full" - }, - { - "object": "LayoutSVGImage image id='image'", - "rect": [352, 398, 99, 98], - "reason": "full" - }, - { - "object": "LayoutSVGImage image id='image'", - "rect": [90, 207, 98, 99], - "reason": "full" - } + "invalidations": [ + [246, 89, 124, 45], + [203, 336, 124, 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/platform/win/paint/invalidation/svg/ems-display-none-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/ems-display-none-expected.txt index bafdb66..31047ce 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/ems-display-none-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/ems-display-none-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRoot svg", - "rect": [50, 54, 560, 86], - "reason": "chunk appeared" - } + "invalidations": [ + [50, 54, 560, 86] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/exs-display-none-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/exs-display-none-expected.txt index bae98d0..44591f7 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/exs-display-none-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/exs-display-none-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRoot svg", - "rect": [50, 52, 560, 84], - "reason": "chunk appeared" - } + "invalidations": [ + [50, 52, 560, 84] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.txt deleted file mode 100644 index 4235529..0000000 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.txt +++ /dev/null
@@ -1,63 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [0, 0, 200, 200], - "reason": "full" - }, - { - "object": "LayoutSVGViewportContainer svg id='inner'", - "rect": [100, 0, 100, 200], - "reason": "incremental" - }, - { - "object": "InlineTextBox 'right-aligned text'", - "rect": [100, 85, 100, 19], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox 'right-aligned text'", - "rect": [0, 85, 100, 19], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGContainer use", - "rect": [180, 120, 20, 20], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRect rect", - "rect": [180, 60, 20, 20], - "reason": "incremental" - }, - { - "object": "LayoutSVGRect rect", - "rect": [180, 60, 20, 20], - "reason": "full" - }, - { - "object": "LayoutSVGContainer use", - "rect": [80, 120, 20, 20], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRect rect", - "rect": [80, 60, 20, 20], - "reason": "incremental" - }, - { - "object": "LayoutSVGRect rect", - "rect": [80, 60, 20, 20], - "reason": "full" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/js-late-clipPath-and-object-creation-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/js-late-clipPath-and-object-creation-expected.txt index 8d7147a..bd827066 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/js-late-clipPath-and-object-creation-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/js-late-clipPath-and-object-creation-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGContainer g id='content'", - "rect": [16, 40, 784, 173], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer g id='content'", - "rect": [16, 40, 784, 173], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [16, 40, 318, 173], - "reason": "chunk appeared" - } + "invalidations": [ + [16, 40, 784, 173] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/js-late-clipPath-creation-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/js-late-clipPath-creation-expected.txt index c5f6042..bd827066 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/js-late-clipPath-creation-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/js-late-clipPath-creation-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGContainer g id='content'", - "rect": [16, 40, 784, 173], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [16, 40, 318, 173], - "reason": "chunk appeared" - } + "invalidations": [ + [16, 40, 784, 173] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/js-late-gradient-and-object-creation-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/js-late-gradient-and-object-creation-expected.txt index b2a35ef..f99e43d79 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/js-late-gradient-and-object-creation-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/js-late-gradient-and-object-creation-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRoot svg id='svg-root'", - "rect": [0, 15, 757, 365], - "reason": "chunk appeared" - } + "invalidations": [ + [0, 15, 757, 365] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/js-late-gradient-creation-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/js-late-gradient-creation-expected.txt index b70b0835..9a95ba2 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/js-late-gradient-creation-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/js-late-gradient-creation-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGContainer g id='content'", - "rect": [33, 22, 697, 196], - "reason": "chunk appeared" - } + "invalidations": [ + [33, 22, 697, 196] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/js-late-pattern-and-object-creation-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/js-late-pattern-and-object-creation-expected.txt index 1cfbc4f..4c834a1f4 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/js-late-pattern-and-object-creation-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/js-late-pattern-and-object-creation-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRoot svg id='svg-root'", - "rect": [0, 15, 680, 365], - "reason": "chunk appeared" - } + "invalidations": [ + [0, 15, 680, 365] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/js-late-pattern-creation-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/js-late-pattern-creation-expected.txt index fb988a7..57baba2f 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/js-late-pattern-creation-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/js-late-pattern-creation-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGContainer g id='content'", - "rect": [33, 22, 622, 196], - "reason": "chunk appeared" - } + "invalidations": [ + [33, 22, 622, 196] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/marker-text-decoration-change-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/marker-text-decoration-change-expected.txt index cc4120fa..01a647e 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/marker-text-decoration-change-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/marker-text-decoration-change-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGPath path", - "rect": [8, 13, 137, 19], - "reason": "style change" - }, - { - "object": "LayoutSVGPath path", - "rect": [8, 13, 137, 19], - "reason": "style change" - } + "invalidations": [ + [8, 13, 137, 19] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/modify-transferred-listitem-different-attr-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/modify-transferred-listitem-different-attr-expected.txt index a56cb52..ff6e290 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/modify-transferred-listitem-different-attr-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/modify-transferred-listitem-different-attr-expected.txt
@@ -5,62 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox ' B C'", - "rect": [23, 8, 85, 23], - "reason": "appeared" - }, - { - "object": "InlineTextBox ' B C'", - "rect": [23, 8, 85, 23], - "reason": "appeared" - }, - { - "object": "InlineTextBox ' B C'", - "rect": [23, 8, 85, 23], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'A'", - "rect": [23, 8, 85, 23], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'A'", - "rect": [23, 8, 85, 23], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'A'", - "rect": [23, 8, 85, 23], - "reason": "disappeared" - }, - { - "object": "InlineTextBox ' B C'", - "rect": [23, 8, 80, 23], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'A'", - "rect": [23, 8, 80, 23], - "reason": "disappeared" - }, - { - "object": "InlineTextBox ' Y Z'", - "rect": [58, 45, 50, 26], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'X'", - "rect": [58, 45, 50, 26], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'X Y Z'", - "rect": [58, 45, 50, 16], - "reason": "appeared" - } + "invalidations": [ + [23, 8, 85, 23], + [58, 45, 50, 26] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/outline-offset-text-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/outline-offset-text-expected.txt index 70f4476..f5c7654 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/outline-offset-text-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/outline-offset-text-expected.txt
@@ -5,27 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Foo'", - "rect": [103, 26, 160, 113], - "reason": "disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [103, 26, 160, 113], - "reason": "full" - }, - { - "object": "InlineTextBox 'Foo'", - "rect": [63, 26, 160, 113], - "reason": "appeared" - }, - { - "object": "LayoutSVGText text", - "rect": [63, 26, 160, 113], - "reason": "full" - } + "invalidations": [ + [103, 26, 160, 113], + [63, 26, 160, 113] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/relative-sized-content-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/relative-sized-content-expected.txt index 18377b0..bb3d7192 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/relative-sized-content-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/relative-sized-content-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow div id='contentBox'", - "rect": [8, 72, 402, 402], - "reason": "geometry" - }, - { - "object": "LayoutSVGRect rect id='targetRect'", - "rect": [9, 73, 400, 400], - "reason": "geometry" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [109, 73, 300, 400], - "reason": "incremental" - } + "invalidations": [ + [8, 72, 402, 402] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/relative-sized-content-with-resources-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/relative-sized-content-with-resources-expected.txt index ff5e190d..bb3d7192 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/relative-sized-content-with-resources-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/relative-sized-content-with-resources-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow div id='contentBox'", - "rect": [8, 72, 402, 402], - "reason": "geometry" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [47, 111, 324, 324], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [8, 154, 102, 238], - "reason": "paint property change" - } + "invalidations": [ + [8, 72, 402, 402] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/relative-sized-deep-shadow-tree-content-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/relative-sized-deep-shadow-tree-content-expected.txt index c186518..bb3d7192 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/relative-sized-deep-shadow-tree-content-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/relative-sized-deep-shadow-tree-content-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow div id='contentBox'", - "rect": [8, 72, 402, 402], - "reason": "geometry" - }, - { - "object": "LayoutSVGContainer use id='targetUse'", - "rect": [209, 273, 200, 200], - "reason": "paint property change" - }, - { - "object": "LayoutSVGContainer use id='targetUse'", - "rect": [59, 273, 50, 200], - "reason": "paint property change" - } + "invalidations": [ + [8, 72, 402, 402] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/relative-sized-image-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/relative-sized-image-expected.txt index 91438268..bb3d7192 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/relative-sized-image-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/relative-sized-image-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow div id='contentBox'", - "rect": [8, 72, 402, 402], - "reason": "geometry" - }, - { - "object": "LayoutSVGImage image", - "rect": [9, 73, 400, 400], - "reason": "image" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [109, 73, 300, 400], - "reason": "incremental" - } + "invalidations": [ + [8, 72, 402, 402] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/relative-sized-inner-svg-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/relative-sized-inner-svg-expected.txt index 0cd57fc..36bc90a 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/relative-sized-inner-svg-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/relative-sized-inner-svg-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow div id='contentBox'", - "rect": [8, 52, 402, 402], - "reason": "geometry" - }, - { - "object": "LayoutSVGViewportContainer svg", - "rect": [27, 69, 364, 366], - "reason": "paint property change" - }, - { - "object": "LayoutSVGViewportContainer svg", - "rect": [13, 207, 92, 92], - "reason": "paint property change" - } + "invalidations": [ + [8, 52, 402, 402] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/relative-sized-shadow-tree-content-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/relative-sized-shadow-tree-content-expected.txt index 12c2c7b2..bb3d7192 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/relative-sized-shadow-tree-content-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/relative-sized-shadow-tree-content-expected.txt
@@ -5,32 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow div id='contentBox'", - "rect": [8, 72, 402, 402], - "reason": "geometry" - }, - { - "object": "LayoutSVGContainer use", - "rect": [209, 273, 200, 200], - "reason": "paint property change" - }, - { - "object": "LayoutSVGRect rect id='targetRect1'", - "rect": [9, 73, 200, 200], - "reason": "geometry" - }, - { - "object": "LayoutSVGRect rect id='targetRect1'", - "rect": [59, 73, 150, 200], - "reason": "incremental" - }, - { - "object": "LayoutSVGContainer use", - "rect": [59, 273, 50, 200], - "reason": "paint property change" - } + "invalidations": [ + [8, 72, 402, 402] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/relative-sized-shadow-tree-content-with-symbol-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/relative-sized-shadow-tree-content-with-symbol-expected.txt index c0fd1958..bb3d7192 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/relative-sized-shadow-tree-content-with-symbol-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/relative-sized-shadow-tree-content-with-symbol-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow div id='contentBox'", - "rect": [8, 72, 402, 402], - "reason": "geometry" - }, - { - "object": "LayoutSVGViewportContainer svg id='targetSymbol'", - "rect": [9, 73, 400, 400], - "reason": "paint property change" - }, - { - "object": "LayoutSVGViewportContainer svg id='targetSymbol'", - "rect": [9, 223, 100, 100], - "reason": "paint property change" - } + "invalidations": [ + [8, 72, 402, 402] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/relative-sized-use-on-symbol-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/relative-sized-use-on-symbol-expected.txt index c173210..36bc90a 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/relative-sized-use-on-symbol-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/relative-sized-use-on-symbol-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow div id='contentBox'", - "rect": [8, 52, 402, 402], - "reason": "geometry" - }, - { - "object": "LayoutSVGViewportContainer svg id='gamesBorder'", - "rect": [45, 87, 328, 330], - "reason": "paint property change" - }, - { - "object": "LayoutSVGViewportContainer svg id='gamesBorder'", - "rect": [18, 211, 82, 83], - "reason": "paint property change" - } + "invalidations": [ + [8, 52, 402, 402] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.txt index 1dfddb0..36bc90a 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.txt
@@ -5,22 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow div id='contentBox'", - "rect": [8, 52, 402, 402], - "reason": "geometry" - }, - { - "object": "LayoutSVGViewportContainer svg id='gamesBorder'", - "rect": [27, 69, 364, 366], - "reason": "paint property change" - }, - { - "object": "LayoutSVGViewportContainer svg id='gamesBorder'", - "rect": [13, 207, 92, 92], - "reason": "paint property change" - } + "invalidations": [ + [8, 52, 402, 402] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/repaint-non-scaling-stroke-text-decoration-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/repaint-non-scaling-stroke-text-decoration-expected.txt index a81e242..c20cd68 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/repaint-non-scaling-stroke-text-decoration-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/repaint-non-scaling-stroke-text-decoration-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGContainer g", - "rect": [9, 13, 46, 28], - "reason": "chunk appeared" - } + "invalidations": [ + [9, 13, 46, 28] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/repaint-non-scaling-stroke-text-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/repaint-non-scaling-stroke-text-expected.txt index a81e242..c20cd68 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/repaint-non-scaling-stroke-text-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/repaint-non-scaling-stroke-text-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGContainer g", - "rect": [9, 13, 46, 28], - "reason": "chunk appeared" - } + "invalidations": [ + [9, 13, 46, 28] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.txt index 08af6b64..952c224 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.txt
@@ -5,42 +5,12 @@ "bounds": [1026, 1036], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'pservers-pattern-01-b \u2190'", - "rect": [177, 1012, 202, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u2192 script-handle-01-b'", - "rect": [435, 1012, 173, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalBoxFragment LayoutInline A", - "rect": [382, 1009, 50, 25], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'index'", - "rect": [385, 1012, 44, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'index'", - "rect": [385, 1012, 44, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment ' '", - "rect": [429, 1012, 6, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment ' '", - "rect": [379, 1012, 6, 19], - "reason": "geometry" - } + "invalidations": [ + [177, 1012, 202, 19], + [435, 1012, 173, 19], + [382, 1009, 50, 25], + [429, 1012, 6, 19], + [379, 1012, 6, 19] ], "transform": 1 },
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/svg-background-partial-redraw-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/svg-background-partial-redraw-expected.txt index 24acd194..acd2b73f01 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/svg-background-partial-redraw-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/svg-background-partial-redraw-expected.txt
@@ -5,22 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='test'", - "rect": [8, 52, 200, 200], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='test' class='revealed'", - "rect": [8, 52, 200, 200], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='revealer'", - "rect": [9, 153, 200, 100], - "reason": "disappeared" - } + "invalidations": [ + [8, 52, 200, 200], + [9, 153, 200, 100] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/svg-image-change-content-size-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/svg-image-change-content-size-expected.txt index a91e533..f6f76862 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/svg-image-change-content-size-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/svg-image-change-content-size-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow div id='contentBox'", - "rect": [8, 52, 602, 422], - "reason": "geometry" - } + "invalidations": [ + [8, 52, 602, 422] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/tabgroup-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/tabgroup-expected.txt deleted file mode 100644 index 5e48d72..0000000 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/tabgroup-expected.txt +++ /dev/null
@@ -1,78 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGContainer g", - "rect": [388, 37, 318, 83], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer g", - "rect": [261, 277, 305, 305], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer g", - "rect": [5, 255, 240, 162], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGPath path", - "rect": [5, 255, 240, 162], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGPath path", - "rect": [5, 255, 240, 162], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGPath path", - "rect": [5, 255, 240, 162], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer g", - "rect": [505, 232, 240, 161], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox 'This is a tabgroup with triangular tab corners'", - "rect": [15, 291, 211, 37], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer g id='tabgroupRect'", - "rect": [37, 5, 161, 240], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGText text", - "rect": [66, 257, 57, 29], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGText text", - "rect": [11, 257, 49, 29], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGText text", - "rect": [130, 257, 44, 29], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGText text", - "rect": [181, 257, 32, 29], - "reason": "chunk appeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/text-dom-removal-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/text-dom-removal-expected.txt index e06efb8..ee74135 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/text-dom-removal-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/text-dom-removal-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'This should not be visible'", - "rect": [49, 109, 153, 21], - "reason": "disappeared" - }, - { - "object": "LayoutSVGRect rect", - "rect": [0, 0, 21, 21], - "reason": "disappeared" - } + "invalidations": [ + [49, 109, 153, 21], + [0, 0, 21, 21] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/text-mask-update-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/text-mask-update-expected.txt index 1fcd305..62d55652 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/text-mask-update-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/text-mask-update-expected.txt
@@ -5,27 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGRect rect", - "rect": [10, 3, 45, 22], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGRect rect", - "rect": [10, 3, 45, 22], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGRect rect", - "rect": [10, 33, 41, 17], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGRect rect", - "rect": [10, 33, 41, 17], - "reason": "chunk disappeared" - } + "invalidations": [ + [10, 3, 45, 22], + [10, 33, 41, 17] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/text-repaint-including-stroke-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/text-repaint-including-stroke-expected.txt index 3783fd9..fe7e039 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/text-repaint-including-stroke-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/text-repaint-including-stroke-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGText text id='bounce'", - "rect": [80, 0, 550, 117], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGRoot svg", - "rect": [30, 0, 403, 59], - "reason": "chunk disappeared" - } + "invalidations": [ + [80, 0, 550, 117], + [30, 0, 403, 59] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/text-rescale-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/text-rescale-expected.txt index 478177a..57e1502e5 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/text-rescale-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/text-rescale-expected.txt
@@ -5,57 +5,17 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'PASS '", - "rect": [0, 114, 192, 46], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGRoot (positioned) svg", - "rect": [0, 14, 192, 46], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGViewportContainer svg", - "rect": [310, 114, 91, 46], - "reason": "paint property change" - }, - { - "object": "LayoutSVGViewportContainer svg", - "rect": [310, 14, 91, 46], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGForeignObject foreignObject", - "rect": [210, 114, 91, 46], - "reason": "paint property change" - }, - { - "object": "LayoutSVGForeignObject foreignObject", - "rect": [210, 14, 91, 46], - "reason": "paint property change" - }, - { - "object": "LayoutSVGContainer g id='text3g'", - "rect": [0, 3, 8, 2], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGViewportContainer svg", - "rect": [9, 3, 4, 2], - "reason": "paint property change" - }, - { - "object": "LayoutSVGForeignObject foreignObject", - "rect": [6, 3, 4, 2], - "reason": "paint property change" - }, - { - "object": "LayoutSVGForeignObject foreignObject", - "rect": [0, 0, 1, 1], - "reason": "paint property change" - } + "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, 2], + [9, 3, 4, 2], + [6, 3, 4, 2], + [0, 0, 1, 1] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/text-selection-text-05-t-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/text-selection-text-05-t-expected.txt deleted file mode 100644 index c75f9f7..0000000 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/text-selection-text-05-t-expected.txt +++ /dev/null
@@ -1,443 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox '$Revision: 1.8 $'", - "rect": [0, 0, 800, 600], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text id='revision'", - "rect": [0, 0, 800, 600], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox 'text-anchor'", - "rect": [519, 12, 129, 36], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [519, 12, 129, 36], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'text-anchor'", - "rect": [352, 12, 129, 36], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [352, 12, 129, 36], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'text-anchor'", - "rect": [186, 12, 128, 36], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [186, 12, 128, 36], - "reason": "appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [266, 485, 113, 29], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [266, 485, 113, 29], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [266, 201, 113, 21], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [266, 201, 113, 21], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [428, 485, 104, 29], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [428, 485, 104, 29], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [428, 201, 104, 21], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [428, 201, 104, 21], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [590, 485, 94, 29], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [590, 485, 94, 29], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [590, 201, 94, 21], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [590, 201, 94, 21], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox 'middle'", - "rect": [377, 36, 79, 35], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [377, 36, 79, 35], - "reason": "appeared" - }, - { - "object": "InlineTextBox '2.x 2.y'", - "rect": [16, 491, 76, 34], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [16, 491, 76, 34], - "reason": "appeared" - }, - { - "object": "InlineTextBox '4.x 2.y'", - "rect": [16, 441, 76, 34], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [16, 441, 76, 34], - "reason": "appeared" - }, - { - "object": "InlineTextBox '1.x 2.y'", - "rect": [16, 391, 76, 34], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [16, 391, 76, 34], - "reason": "appeared" - }, - { - "object": "InlineTextBox '2.x 4.y'", - "rect": [16, 341, 76, 34], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [16, 341, 76, 34], - "reason": "appeared" - }, - { - "object": "InlineTextBox '4.x 4.y'", - "rect": [16, 291, 76, 34], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [16, 291, 76, 34], - "reason": "appeared" - }, - { - "object": "InlineTextBox '1.x 4.y'", - "rect": [16, 241, 76, 34], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [16, 241, 76, 34], - "reason": "appeared" - }, - { - "object": "InlineTextBox '2.x 1.y'", - "rect": [16, 191, 76, 34], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [16, 191, 76, 34], - "reason": "appeared" - }, - { - "object": "InlineTextBox '4.x 1.y'", - "rect": [16, 141, 76, 34], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [16, 141, 76, 34], - "reason": "appeared" - }, - { - "object": "InlineTextBox '1.x 1.y'", - "rect": [16, 91, 76, 34], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [16, 91, 76, 34], - "reason": "appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [428, 285, 61, 54], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [428, 285, 61, 54], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [266, 285, 61, 54], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [266, 285, 61, 54], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [428, 435, 61, 29], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [428, 435, 61, 29], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [266, 435, 61, 29], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [266, 435, 61, 29], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [428, 151, 61, 21], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [428, 151, 61, 21], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [266, 151, 61, 21], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [266, 151, 61, 21], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [590, 285, 60, 54], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [590, 285, 60, 54], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [590, 435, 60, 29], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [590, 435, 60, 29], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [590, 151, 60, 21], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [590, 151, 60, 21], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox 'start'", - "rect": [224, 36, 52, 35], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [224, 36, 52, 35], - "reason": "appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [428, 335, 46, 54], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [428, 335, 46, 54], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [266, 335, 46, 54], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [266, 335, 46, 54], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [590, 335, 45, 54], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [590, 335, 45, 54], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox 'end'", - "rect": [562, 36, 42, 35], - "reason": "selection" - }, - { - "object": "LayoutSVGText text", - "rect": [562, 36, 42, 35], - "reason": "appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [573, 235, 39, 54], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [573, 235, 39, 54], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [411, 235, 38, 54], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [411, 235, 38, 54], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1234'", - "rect": [546, 101, 38, 21], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [546, 101, 38, 21], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [250, 235, 37, 54], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [250, 235, 37, 54], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [250, 385, 37, 45], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [250, 385, 37, 45], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1234'", - "rect": [398, 101, 37, 21], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [398, 101, 37, 21], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1234'", - "rect": [250, 101, 37, 21], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [250, 101, 37, 21], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [565, 385, 29, 45], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [565, 385, 29, 45], - "reason": "chunk appeared" - }, - { - "object": "InlineTextBox '1'", - "rect": [411, 385, 29, 45], - "reason": "chunk disappeared" - }, - { - "object": "LayoutSVGText text", - "rect": [411, 385, 29, 45], - "reason": "chunk appeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/text-selection-update-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/text-selection-update-expected.txt index 15cc5cf..2c7e82ed 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/text-selection-update-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/text-selection-update-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'foobar'", - "rect": [22, 0, 23, 14], - "reason": "selection" - } + "invalidations": [ + [22, 0, 23, 14] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/text-xy-updates-SVGList-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/text-xy-updates-SVGList-expected.txt index 52c92d1..363d804 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/text-xy-updates-SVGList-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/text-xy-updates-SVGList-expected.txt
@@ -5,17 +5,9 @@ "bounds": [808, 621], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Passes, if text is at 200x20'", - "rect": [208, 13, 161, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'Passes, if text is at 200x20'", - "rect": [18, 193, 161, 19], - "reason": "disappeared" - } + "invalidations": [ + [208, 13, 161, 19], + [18, 193, 161, 19] ] }, {
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/tspan-dynamic-positioning-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/tspan-dynamic-positioning-expected.txt index 22222df..200d9b0 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/tspan-dynamic-positioning-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/tspan-dynamic-positioning-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'This text should be at visible at 200,200'", - "rect": [200, 185, 240, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'This text should be at visible at 200,200'", - "rect": [20, 5, 240, 19], - "reason": "disappeared" - } + "invalidations": [ + [200, 185, 240, 19], + [20, 5, 240, 19] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/use-clipped-hit-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/use-clipped-hit-expected.txt index f0ecc10..59225c4 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/use-clipped-hit-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/use-clipped-hit-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Unknown'", - "rect": [90, 115, 59, 19], - "reason": "chunk disappeared" - }, - { - "object": "InlineTextBox 'Passed'", - "rect": [90, 115, 43, 19], - "reason": "chunk appeared" - } + "invalidations": [ + [90, 115, 59, 19] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/window-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/svg/window-expected.txt deleted file mode 100644 index b4b66fe..0000000 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/svg/window-expected.txt +++ /dev/null
@@ -1,188 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutSVGContainer g id='bigWindow'", - "rect": [37, 142, 551, 394], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGRect rect id='titleBarbigWindow'", - "rect": [37, 142, 551, 17], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer g id='nestedWindow'", - "rect": [76, 181, 316, 238], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGRect rect id='titleBarnestedWindow'", - "rect": [76, 181, 316, 17], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGRect rect id='decoGroupMinimizednavWindow'", - "rect": [612, 80, 187, 18], - "reason": "appeared" - }, - { - "object": "LayoutSVGContainer g id='navWindow'", - "rect": [623, 91, 176, 160], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer g id='colourPickerWindow'", - "rect": [76, 194, 176, 144], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer g id='smallWindow'", - "rect": [311, 376, 160, 145], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer g id='statusWindow'", - "rect": [248, 343, 144, 66], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer g id='minimalWindow'", - "rect": [38, 475, 121, 50], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGRect rect", - "rect": [612, 80, 18, 160], - "reason": "appeared" - }, - { - "object": "LayoutSVGText text", - "rect": [615, 153, 14, 81], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer use id='closeButtonnavWindow'", - "rect": [615, 83, 12, 12], - "reason": "paint property change" - }, - { - "object": "LayoutSVGContainer use id='closeButtonnavWindow'", - "rect": [782, 94, 12, 11], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer use id='closeButtonnavWindow'", - "rect": [782, 94, 12, 11], - "reason": "paint property change" - }, - { - "object": "LayoutSVGContainer use id='maximizeButtonnavWindow'", - "rect": [615, 99, 12, 11], - "reason": "paint property change" - }, - { - "object": "LayoutSVGContainer use id='closeButtonbigWindow'", - "rect": [571, 145, 12, 11], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer use id='closeButtoncolourPickerWindow'", - "rect": [235, 197, 12, 11], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer use id='minimizeButtonnavWindow'", - "rect": [615, 123, 12, 3], - "reason": "paint property change" - }, - { - "object": "LayoutSVGContainer use id='minimizeButtonnestedWindow'", - "rect": [349, 192, 12, 3], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer use id='maximizeButtonstatusWindow'", - "rect": [376, 345, 11, 12], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer use id='maximizeButtonnavWindow'", - "rect": [769, 94, 11, 11], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer use id='maximizeButtonnavWindow'", - "rect": [769, 94, 11, 11], - "reason": "paint property change" - }, - { - "object": "LayoutSVGContainer use id='maximizeButtonbigWindow'", - "rect": [558, 145, 11, 11], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer use id='closeButtonsmallWindow'", - "rect": [454, 379, 11, 11], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer use id='maximizeButtonsmallWindow'", - "rect": [441, 379, 11, 11], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer use id='closeButtonnestedWindow'", - "rect": [376, 184, 11, 11], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer use id='maximizeButtonnestedWindow'", - "rect": [363, 184, 11, 11], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer use id='maximizeButtoncolourPickerWindow'", - "rect": [222, 197, 11, 11], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer use id='minimizeButtonbigWindow'", - "rect": [545, 153, 11, 3], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer use id='minimizeButtonstatusWindow'", - "rect": [363, 354, 11, 3], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer use id='minimizeButtonnavWindow'", - "rect": [756, 103, 11, 2], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer use id='minimizeButtonnavWindow'", - "rect": [756, 103, 11, 2], - "reason": "paint property change" - }, - { - "object": "LayoutSVGContainer use id='minimizeButtonsmallWindow'", - "rect": [428, 388, 11, 2], - "reason": "chunk appeared" - }, - { - "object": "LayoutSVGContainer use id='minimizeButtoncolourPickerWindow'", - "rect": [209, 206, 11, 2], - "reason": "chunk appeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/table/cached-change-cell-sl-border-color-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/table/cached-change-cell-sl-border-color-expected.txt deleted file mode 100644 index 32081dc..0000000 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/table/cached-change-cell-sl-border-color-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR", - "rect": [8, 8, 114, 54], - "reason": "style change" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='blockDiv'", - "rect": [90, 30, 20, 20], - "reason": "appeared" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV id='blockDiv'", - "rect": [90, 30, 20, 20], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'A'", - "rect": [90, 30, 11, 19], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/table/caret-contenteditable-content-after-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/table/caret-contenteditable-content-after-expected.txt index ff7a984f..e3ed9b8 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/table/caret-contenteditable-content-after-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/table/caret-contenteditable-content-after-expected.txt
@@ -5,117 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='editor'", - "rect": [6, 46, 788, 24], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV id='editor'", - "rect": [6, 46, 788, 24], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV id='editor'", - "rect": [6, 46, 788, 24], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV id='editor'", - "rect": [6, 46, 788, 24], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'abc'", - "rect": [8, 48, 22, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'ab'", - "rect": [8, 48, 15, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'ab'", - "rect": [8, 48, 15, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'x'", - "rect": [30, 48, 7, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'x'", - "rect": [23, 48, 7, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'x'", - "rect": [23, 48, 7, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'x'", - "rect": [15, 48, 7, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'x'", - "rect": [15, 48, 7, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'a'", - "rect": [8, 48, 7, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'a'", - "rect": [8, 48, 7, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'x'", - "rect": [8, 48, 7, 19], - "reason": "disappeared" - }, - { - "object": "Caret", - "rect": [8, 48, 1, 20], - "reason": "appeared" - }, - { - "object": "Caret", - "rect": [8, 48, 1, 20], - "reason": "caret" - }, - { - "object": "Caret", - "rect": [30, 48, 1, 19], - "reason": "caret" - }, - { - "object": "Caret", - "rect": [23, 48, 1, 19], - "reason": "caret" - }, - { - "object": "Caret", - "rect": [23, 48, 1, 19], - "reason": "caret" - }, - { - "object": "Caret", - "rect": [15, 48, 1, 19], - "reason": "caret" - }, - { - "object": "Caret", - "rect": [15, 48, 1, 19], - "reason": "caret" - } + "invalidations": [ + [6, 46, 788, 24] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-background-col-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-background-col-expected.txt index c0e71359..a90a2c45 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-background-col-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-background-col-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY", - "rect": [8, 28, 184, 134], - "reason": "style change" - } + "invalidations": [ + [8, 28, 184, 134] ] }, {
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-background-col-initial-empty-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-background-col-initial-empty-expected.txt index d0759f42..a90a2c45 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-background-col-initial-empty-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-background-col-initial-empty-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY", - "rect": [8, 28, 184, 134], - "reason": "appeared" - } + "invalidations": [ + [8, 28, 184, 134] ] }, {
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-background-col-span-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-background-col-span-expected.txt index ca466c6..5c40adb 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-background-col-span-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-background-col-span-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY", - "rect": [8, 28, 184, 134], - "reason": "style change" - } + "invalidations": [ + [8, 28, 184, 134] ] }, {
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-background-col-span-initial-empty-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-background-col-span-initial-empty-expected.txt index de58f158..5c40adb 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-background-col-span-initial-empty-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-background-col-span-initial-empty-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY", - "rect": [8, 28, 184, 134], - "reason": "appeared" - } + "invalidations": [ + [8, 28, 184, 134] ] }, {
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-background-colgroup-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-background-colgroup-expected.txt index 2d461ce..2193cdb 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-background-colgroup-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-background-colgroup-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY", - "rect": [8, 28, 184, 134], - "reason": "style change" - } + "invalidations": [ + [8, 28, 184, 134] ] }, {
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-background-colgroup-initial-empty-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-background-colgroup-initial-empty-expected.txt index 3363a69..2193cdb 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-background-colgroup-initial-empty-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-background-colgroup-initial-empty-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY", - "rect": [8, 28, 184, 134], - "reason": "appeared" - } + "invalidations": [ + [8, 28, 184, 134] ] }, {
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-background-composited-row-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-background-composited-row-expected.txt index b6ccea9..061f65cd 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-background-composited-row-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-background-composited-row-expected.txt
@@ -11,12 +11,8 @@ "position": [8, 96], "bounds": [184, 64], "backgroundColor": "#ADD8E6", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR id='target'", - "rect": [0, 0, 184, 64], - "reason": "background" - } + "invalidations": [ + [0, 0, 184, 64] ] }, {
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-background-composited-row-initial-empty-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-background-composited-row-initial-empty-expected.txt index 39d31f1..061f65cd 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-background-composited-row-initial-empty-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-background-composited-row-initial-empty-expected.txt
@@ -11,12 +11,8 @@ "position": [8, 96], "bounds": [184, 64], "backgroundColor": "#ADD8E6", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR id='target'", - "rect": [0, 0, 184, 64], - "reason": "appeared" - } + "invalidations": [ + [0, 0, 184, 64] ] }, {
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-background-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-background-expected.txt index 75c5c63..15eb5a1f 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-background-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-background-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR id='target'", - "rect": [8, 96, 184, 64], - "reason": "background" - } + "invalidations": [ + [8, 96, 184, 64] ] }, {
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-background-initial-empty-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-background-initial-empty-expected.txt index 12daffc..15eb5a1f 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-background-initial-empty-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-background-initial-empty-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR id='target'", - "rect": [8, 96, 184, 64], - "reason": "appeared" - } + "invalidations": [ + [8, 96, 184, 64] ] }, {
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-background-section-composited-row-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-background-section-composited-row-expected.txt index dac389de..84a782c 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-background-section-composited-row-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-background-section-composited-row-expected.txt
@@ -11,12 +11,8 @@ "position": [8, 28], "bounds": [184, 134], "backgroundColor": "#ADD8E6", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY id='target'", - "rect": [0, 0, 184, 134], - "reason": "background" - } + "invalidations": [ + [0, 0, 184, 134] ] }, {
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-background-section-composited-row-initial-empty-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-background-section-composited-row-initial-empty-expected.txt index bed1b99a1..84a782c 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-background-section-composited-row-initial-empty-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-background-section-composited-row-initial-empty-expected.txt
@@ -11,12 +11,8 @@ "position": [8, 28], "bounds": [184, 134], "backgroundColor": "#ADD8E6", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY id='target'", - "rect": [0, 0, 184, 134], - "reason": "appeared" - } + "invalidations": [ + [0, 0, 184, 134] ] }, {
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-background-section-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-background-section-expected.txt index fb190e3..bb5baed 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-background-section-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-background-section-expected.txt
@@ -11,12 +11,8 @@ "position": [8, 28], "bounds": [184, 134], "backgroundColor": "#ADD8E6", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY id='target'", - "rect": [0, 0, 184, 134], - "reason": "background" - } + "invalidations": [ + [0, 0, 184, 134] ] }, {
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-background-section-initial-empty-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-background-section-initial-empty-expected.txt index 3d3a286..bb5baed 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-background-section-initial-empty-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-background-section-initial-empty-expected.txt
@@ -11,12 +11,8 @@ "position": [8, 28], "bounds": [184, 134], "backgroundColor": "#ADD8E6", - "paintInvalidations": [ - { - "object": "LayoutTableSection TBODY id='target'", - "rect": [0, 0, 184, 134], - "reason": "appeared" - } + "invalidations": [ + [0, 0, 184, 134] ] }, {
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-row-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-row-expected.txt index 42e8201..624bb010 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-row-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/table/composited-table-row-expected.txt
@@ -11,12 +11,8 @@ "position": [8, 8], "bounds": [70, 24], "backgroundColor": "#FF0000", - "paintInvalidations": [ - { - "object": "LayoutNGTableCell TD id='target'", - "rect": [0, 0, 35, 23], - "reason": "appeared" - } + "invalidations": [ + [0, 0, 35, 23] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/table/resize-table-repaint-percent-size-cell-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/table/resize-table-repaint-percent-size-cell-expected.txt deleted file mode 100644 index eecb8ba..0000000 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/table/resize-table-repaint-percent-size-cell-expected.txt +++ /dev/null
@@ -1,48 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR", - "rect": [0, 52, 106, 238], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [0, 292, 106, 236], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [0, 102, 106, 46], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'ROW2'", - "rect": [3, 400, 45, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'ROW1'", - "rect": [3, 161, 45, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'ROW2'", - "rect": [3, 115, 45, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'ROW1'", - "rect": [3, 66, 45, 19], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/table/resize-table-repaint-vertical-align-cell-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/table/resize-table-repaint-vertical-align-cell-expected.txt index 20406dd..b1f768a2 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/table/resize-table-repaint-vertical-align-cell-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/table/resize-table-repaint-vertical-align-cell-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'MIDDLE'", - "rect": [3, 280, 59, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'MIDDLE'", - "rect": [3, 90, 59, 19], - "reason": "geometry" - } + "invalidations": [ + [3, 280, 59, 19], + [3, 90, 59, 19] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/table/resize-table-row-repaint-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/table/resize-table-row-repaint-expected.txt index a23be6420..2457d1c 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/table/resize-table-row-repaint-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/table/resize-table-row-repaint-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'MIDDLE'", - "rect": [3, 192, 59, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'MIDDLE'", - "rect": [3, 142, 59, 19], - "reason": "geometry" - } + "invalidations": [ + [3, 192, 59, 19], + [3, 142, 59, 19] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/table/single-line-cells-repeating-thead-break-inside-on-thead-only-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/table/single-line-cells-repeating-thead-break-inside-on-thead-only-expected.txt index 5f7e109..6285a2e2 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/table/single-line-cells-repeating-thead-break-inside-on-thead-only-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/table/single-line-cells-repeating-thead-break-inside-on-thead-only-expected.txt
@@ -5,27 +5,8 @@ "bounds": [1059, 585], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Col 1'", - "rect": [10, 74, 835, 19], - "reason": "style change" - }, - { - "object": "InlineTextBox 'Col 1'", - "rect": [10, 74, 835, 19], - "reason": "style change" - }, - { - "object": "InlineTextBox 'Col 1'", - "rect": [10, 74, 835, 19], - "reason": "style change" - }, - { - "object": "InlineTextBox 'Col 1'", - "rect": [10, 74, 835, 19], - "reason": "style change" - } + "invalidations": [ + [10, 74, 835, 19] ] }, {
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/table/table-cell-collapsed-border-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/table/table-cell-collapsed-border-expected.txt index f0171b57..e600a84 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/table/table-cell-collapsed-border-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/table/table-cell-collapsed-border-expected.txt
@@ -5,42 +5,11 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR", - "rect": [3, 264, 441, 110], - "reason": "style change" - }, - { - "object": "LayoutTableRow TR", - "rect": [3, 166, 441, 108], - "reason": "style change" - }, - { - "object": "LayoutTableRow TR", - "rect": [3, 364, 441, 105], - "reason": "style change" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 64, 436, 108], - "reason": "style change" - }, - { - "object": "LayoutNGTableCell TD id='t3'", - "rect": [225, 269, 112, 100], - "reason": "style change" - }, - { - "object": "LayoutNGTableCell TD id='t1'", - "rect": [225, 69, 112, 100], - "reason": "style change" - }, - { - "object": "LayoutNGTableCell TD id='t2'", - "rect": [8, 269, 110, 100], - "reason": "style change" - } + "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/platform/win/paint/invalidation/table/table-cell-move-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/table/table-cell-move-expected.txt index 96f1c1f..e6dfcb5 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/table/table-cell-move-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/table/table-cell-move-expected.txt
@@ -5,22 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGTableCell TD", - "rect": [8, 326, 60, 60], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [8, 266, 60, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [8, 206, 60, 60], - "reason": "geometry" - } + "invalidations": [ + [8, 326, 60, 60], + [8, 266, 60, 60], + [8, 206, 60, 60] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/table/table-collapsed-border-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/table/table-collapsed-border-expected.txt index 65d6397..e2acb11 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/table/table-collapsed-border-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/table/table-collapsed-border-expected.txt
@@ -5,102 +5,17 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutTableRow TR id='r2'", - "rect": [8, 224, 103, 22], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 338, 95, 30], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 286, 95, 30], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 154, 95, 30], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 102, 95, 30], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 316, 95, 22], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR id='r'", - "rect": [8, 132, 95, 22], - "reason": "geometry" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 62, 91, 30], - "reason": "style change" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 10, 91, 30], - "reason": "style change" - }, - { - "object": "LayoutTableRow TR", - "rect": [8, 40, 91, 22], - "reason": "style change" - }, - { - "object": "NGPhysicalTextFragment 'ipsum dolor'", - "rect": [23, 317, 71, 19], - "reason": "appeared" - }, - { - "object": "NGPhysicalTextFragment 'ipsum dolor'", - "rect": [23, 133, 71, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'sit amet'", - "rect": [23, 339, 46, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'sit amet'", - "rect": [23, 155, 46, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Lorem'", - "rect": [23, 295, 40, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'Lorem'", - "rect": [23, 111, 40, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'dolor'", - "rect": [23, 225, 32, 19], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [17, 225, 4, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u00A0'", - "rect": [17, 133, 4, 19], - "reason": "geometry" - } + "invalidations": [ + [8, 224, 103, 22], + [8, 338, 95, 30], + [8, 286, 95, 30], + [8, 154, 95, 30], + [8, 102, 95, 30], + [8, 316, 95, 22], + [8, 132, 95, 22], + [8, 62, 91, 30], + [8, 10, 91, 30], + [8, 40, 91, 22] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/table/table-shrink-row-repaint-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/table/table-shrink-row-repaint-expected.txt index a5933b70..64fd16967 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/table/table-shrink-row-repaint-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/table/table-shrink-row-repaint-expected.txt
@@ -5,222 +5,26 @@ "bounds": [785, 850], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGTableCell TD id='resizeMe'", - "rect": [8, 112, 769, 210], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 782, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 742, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 722, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 682, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 662, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 622, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 602, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 562, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 542, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 502, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 482, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 442, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 422, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 382, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 362, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 322, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 302, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 242, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 182, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 122, 769, 60], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [8, 802, 769, 48], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '10'", - "rect": [13, 822, 16, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '13'", - "rect": [13, 802, 16, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '12'", - "rect": [13, 742, 16, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '10'", - "rect": [13, 622, 16, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '11'", - "rect": [13, 682, 15, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '9'", - "rect": [13, 762, 8, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '8'", - "rect": [13, 702, 8, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '7'", - "rect": [13, 642, 8, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '6'", - "rect": [13, 582, 8, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '9'", - "rect": [13, 562, 8, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '5'", - "rect": [13, 522, 8, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '8'", - "rect": [13, 502, 8, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '4'", - "rect": [13, 462, 8, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '7'", - "rect": [13, 442, 8, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '3'", - "rect": [13, 402, 8, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '6'", - "rect": [13, 382, 8, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '2'", - "rect": [13, 342, 8, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '5'", - "rect": [13, 322, 8, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '4'", - "rect": [13, 262, 8, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '3'", - "rect": [13, 202, 8, 19], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '2'", - "rect": [13, 142, 8, 19], - "reason": "geometry" - } + "invalidations": [ + [8, 112, 769, 210], + [8, 782, 769, 60], + [8, 742, 769, 60], + [8, 722, 769, 60], + [8, 682, 769, 60], + [8, 662, 769, 60], + [8, 622, 769, 60], + [8, 602, 769, 60], + [8, 562, 769, 60], + [8, 542, 769, 60], + [8, 502, 769, 60], + [8, 482, 769, 60], + [8, 442, 769, 60], + [8, 422, 769, 60], + [8, 382, 769, 60], + [8, 362, 769, 60], + [8, 322, 769, 60], + [8, 302, 769, 60], + [8, 802, 769, 48] ] }, {
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/text-append-dirty-lines-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/text-append-dirty-lines-expected.txt index bf5d1394..49144a8 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/text-append-dirty-lines-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/text-append-dirty-lines-expected.txt
@@ -5,37 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse placerat. Morbi tristique. Mauris eu lacus sed felis'", - "rect": [8, 44, 780, 119], - "reason": "full" - }, - { - "object": "NGPhysicalTextFragment 'Quisque enim metus, luctus tincidunt, vestibulum eu, vestibulum eu, libero. Mauris sagittis aliquam nunc. Nullam pharetra molestie'", - "rect": [8, 44, 780, 119], - "reason": "full" - }, - { - "object": "NGPhysicalTextFragment 'eros. Donec tempus purus ut ligula. Phasellus non nisl. Etiam eu mauris. Curabitur a velit.'", - "rect": [8, 44, 780, 119], - "reason": "full" - }, - { - "object": "NGPhysicalTextFragment 'feugiat. Phasellus mollis pulvinar mi. Etiam ut neque sed eros egestas laoreet. Vestibulum ullamcorper, nulla non feugiat molestie, mi'", - "rect": [8, 44, 780, 119], - "reason": "full" - }, - { - "object": "NGPhysicalTextFragment 'lorem bibendum leo, ac gravida orci nunc nec nulla. Nunc nunc lorem, rhoncus et, rutrum ac, fermentum ut, tortor. Sed rhoncus.'", - "rect": [8, 44, 780, 119], - "reason": "full" - }, - { - "object": "NGPhysicalTextFragment 'pellentesque cursus. Proin vitae nulla. Vivamus in ipsum. Etiam mi. Nam malesuada purus in sem. Sed eget elit vel erat laoreet'", - "rect": [8, 44, 780, 119], - "reason": "full" - } + "invalidations": [ + [8, 44, 780, 119] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/text-line-clamp-truncation-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/text-line-clamp-truncation-expected.txt index 2c35ef0..81a7194 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/text-line-clamp-truncation-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/text-line-clamp-truncation-expected.txt
@@ -5,22 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutDeprecatedFlexibleBox DIV id='container' class='folded'", - "rect": [8, 8, 285, 24], - "reason": "chunk disappeared" - }, - { - "object": "InlineTextBox '___these_two_lines_should_be_identical___'", - "rect": [8, 10, 271, 43], - "reason": "appeared" - }, - { - "object": "InlineTextBox '___these_two_lines_should_be_identical___'", - "rect": [8, 10, 271, 43], - "reason": "appeared" - } + "invalidations": [ + [8, 8, 285, 24], + [8, 10, 271, 43] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/text-match-document-change-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/text-match-document-change-expected.txt index febde0d0..147608b 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/text-match-document-change-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/text-match-document-change-expected.txt
@@ -5,27 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'Find-in-page 'findme', then click here)'", - "rect": [18, 130, 235, 39], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'To be changed: findme (Manual testing:'", - "rect": [18, 130, 235, 39], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'After change'", - "rect": [18, 130, 77, 19], - "reason": "appeared" - }, - { - "object": "VerticalScrollbar", - "rect": [295, 102, 15, 400], - "reason": "scroll control" - } + "invalidations": [ + [18, 130, 235, 39], + [295, 102, 15, 400] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/transform/caret-with-transformation-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/transform/caret-with-transformation-expected.txt index 8fa718d..e5e39e0 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/transform/caret-with-transformation-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/transform/caret-with-transformation-expected.txt
@@ -5,17 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Caret", - "rect": [42, 36, 11, 18], - "reason": "caret" - }, - { - "object": "Caret", - "rect": [324, 199, 11, 17], - "reason": "caret" - } + "invalidations": [ + [42, 36, 11, 18], + [324, 199, 11, 17] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/transform/subtree-layoutstate-transform-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/transform/subtree-layoutstate-transform-expected.txt index bb648b9a..1418bfe 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/transform/subtree-layoutstate-transform-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/transform/subtree-layoutstate-transform-expected.txt
@@ -5,17 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow DIV class='layoutroot'", - "rect": [28, 48, 200, 200], - "reason": "disappeared" - }, - { - "object": "LayoutNGBlockFlow DIV id='target'", - "rect": [128, 48, 100, 200], - "reason": "incremental" - } + "invalidations": [ + [28, 48, 200, 200] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/transform/transform-inline-layered-child-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/transform/transform-inline-layered-child-expected.txt index 280b0d4..d740213 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/transform/transform-inline-layered-child-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/transform/transform-inline-layered-child-expected.txt
@@ -5,57 +5,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV id='box'", - "rect": [135, 361, 159, 194], - "reason": "chunk appeared" - }, - { - "object": "NGPhysicalTextFragment 'A B C'", - "rect": [300, 302, 80, 176], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'D E F'", - "rect": [300, 302, 80, 176], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'G H I'", - "rect": [300, 302, 80, 176], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'J K L'", - "rect": [300, 302, 80, 176], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'M N O'", - "rect": [300, 302, 80, 176], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'P Q R'", - "rect": [300, 302, 80, 176], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'S T U'", - "rect": [300, 302, 80, 176], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'V W X'", - "rect": [300, 302, 80, 176], - "reason": "disappeared" - }, - { - "object": "NGPhysicalTextFragment 'Y Z'", - "rect": [300, 302, 80, 176], - "reason": "disappeared" - } + "invalidations": [ + [135, 361, 159, 194], + [300, 302, 80, 176] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/transform/transform-layout-repaint-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/transform/transform-layout-repaint-expected.txt index 9d6c282b..ab11815 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/transform/transform-layout-repaint-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/transform/transform-layout-repaint-expected.txt
@@ -5,12 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment 'PASS'", - "rect": [52, 51, 42, 31], - "reason": "full" - } + "invalidations": [ + [52, 51, 42, 31] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/transform/transform-repaint-descendants-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/transform/transform-repaint-descendants-expected.txt index d94a900..f4bf83ca 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/transform/transform-repaint-descendants-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/transform/transform-repaint-descendants-expected.txt
@@ -5,27 +5,10 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [176, 220, 394, 185], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (positioned) DIV", - "rect": [176, 220, 388, 203], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='box'", - "rect": [76, 120, 266, 266], - "reason": "paint property change" - }, - { - "object": "LayoutNGBlockFlow (relative positioned) DIV id='box'", - "rect": [79, 123, 260, 260], - "reason": "paint property change" - } + "invalidations": [ + [176, 220, 394, 185], + [176, 220, 388, 203], + [76, 120, 266, 266] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/window-resize/window-resize-vertical-writing-mode-expected.txt b/third_party/blink/web_tests/platform/win/paint/invalidation/window-resize/window-resize-vertical-writing-mode-expected.txt index 62f907e..4b47a61e 100644 --- a/third_party/blink/web_tests/platform/win/paint/invalidation/window-resize/window-resize-vertical-writing-mode-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/invalidation/window-resize/window-resize-vertical-writing-mode-expected.txt
@@ -5,12 +5,8 @@ "bounds": [939, 235], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling Contents Layer", - "rect": [0, 0, 939, 235], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 939, 235] ], "transform": 1 }, @@ -40,12 +36,8 @@ "bounds": [939, 235], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling Contents Layer", - "rect": [0, 0, 939, 235], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 939, 235] ], "transform": 1 }, @@ -75,12 +67,8 @@ "bounds": [400, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling Contents Layer", - "rect": [0, 0, 400, 600], - "reason": "full layer" - } + "invalidations": [ + [0, 0, 400, 600] ] } ] @@ -92,62 +80,9 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [400, 0, 400, 600], - "reason": "incremental" - }, - { - "object": "NGPhysicalTextFragment 'AAAA BBBB CCCC'", - "rect": [439, 7, 352, 554], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'DDDD EEEE FFFF'", - "rect": [439, 7, 352, 554], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'GGGG HHHH IIII JJJJ'", - "rect": [439, 7, 352, 554], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'KKKK LLLL MMMM'", - "rect": [439, 7, 352, 554], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'NNNN'", - "rect": [439, 7, 352, 554], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'AAAA BBBB CCCC'", - "rect": [39, 7, 352, 554], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'DDDD EEEE FFFF'", - "rect": [39, 7, 352, 554], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'GGGG HHHH IIII JJJJ'", - "rect": [39, 7, 352, 554], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'KKKK LLLL MMMM'", - "rect": [39, 7, 352, 554], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'NNNN'", - "rect": [39, 7, 352, 554], - "reason": "geometry" - } + "invalidations": [ + [400, 0, 400, 600], + [39, 7, 352, 554] ] } ]
diff --git a/third_party/blink/web_tests/platform/win/paint/pagination/pagination-change-clip-crash-expected.txt b/third_party/blink/web_tests/platform/win/paint/pagination/pagination-change-clip-crash-expected.txt index 061822f..ede866b5 100644 --- a/third_party/blink/web_tests/platform/win/paint/pagination/pagination-change-clip-crash-expected.txt +++ b/third_party/blink/web_tests/platform/win/paint/pagination/pagination-change-clip-crash-expected.txt
@@ -5,12 +5,8 @@ "bounds": [785, 736], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "Scrolling background of LayoutView #document", - "rect": [0, 636, 785, 100], - "reason": "incremental" - } + "invalidations": [ + [0, 636, 785, 100] ] }, {
diff --git a/third_party/blink/web_tests/platform/win/virtual/controls-refresh-hc/virtual/controls-refresh/color-scheme/color/color-picker-appearance-expected.png b/third_party/blink/web_tests/platform/win/virtual/controls-refresh-hc/virtual/controls-refresh/color-scheme/color/color-picker-appearance-expected.png index dc121bd..b3fa85b 100644 --- a/third_party/blink/web_tests/platform/win/virtual/controls-refresh-hc/virtual/controls-refresh/color-scheme/color/color-picker-appearance-expected.png +++ b/third_party/blink/web_tests/platform/win/virtual/controls-refresh-hc/virtual/controls-refresh/color-scheme/color/color-picker-appearance-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color-scheme/color/color-picker-appearance-expected.png b/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color-scheme/color/color-picker-appearance-expected.png index 6e1ade8..d22ab5b8 100644 --- a/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color-scheme/color/color-picker-appearance-expected.png +++ b/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color-scheme/color/color-picker-appearance-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-color-well-click-expected.png b/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-color-well-click-expected.png index f5485f7..96d5083 100644 --- a/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-color-well-click-expected.png +++ b/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-color-well-click-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-color-well-down-keyboard-navigation-from-top-left-corner-expected.png b/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-color-well-down-keyboard-navigation-from-top-left-corner-expected.png index f9e88c3..52f96e6 100644 --- a/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-color-well-down-keyboard-navigation-from-top-left-corner-expected.png +++ b/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-color-well-down-keyboard-navigation-from-top-left-corner-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-color-well-down-keyboard-navigation-from-top-right-corner-expected.png b/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-color-well-down-keyboard-navigation-from-top-right-corner-expected.png index 130e821..fd5ee94 100644 --- a/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-color-well-down-keyboard-navigation-from-top-right-corner-expected.png +++ b/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-color-well-down-keyboard-navigation-from-top-right-corner-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-color-well-drag-expected.png b/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-color-well-drag-expected.png index f5485f7..96d5083 100644 --- a/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-color-well-drag-expected.png +++ b/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-color-well-drag-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-color-well-keyboard-navigation-expected.png b/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-color-well-keyboard-navigation-expected.png index d95ad3a..46edcad 100644 --- a/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-color-well-keyboard-navigation-expected.png +++ b/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-color-well-keyboard-navigation-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-color-well-left-keyboard-navigation-from-bottom-right-corner-expected.png b/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-color-well-left-keyboard-navigation-from-bottom-right-corner-expected.png index 8aff3d4..d25761b 100644 --- a/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-color-well-left-keyboard-navigation-from-bottom-right-corner-expected.png +++ b/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-color-well-left-keyboard-navigation-from-bottom-right-corner-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-color-well-left-keyboard-navigation-from-top-right-corner-expected.png b/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-color-well-left-keyboard-navigation-from-top-right-corner-expected.png index 8e07417..ee4780b 100644 --- a/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-color-well-left-keyboard-navigation-from-top-right-corner-expected.png +++ b/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-color-well-left-keyboard-navigation-from-top-right-corner-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-color-well-right-keyboard-navigation-from-bottom-left-corner-expected.png b/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-color-well-right-keyboard-navigation-from-bottom-left-corner-expected.png index 953cbd07..5675ecd 100644 --- a/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-color-well-right-keyboard-navigation-from-bottom-left-corner-expected.png +++ b/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-color-well-right-keyboard-navigation-from-bottom-left-corner-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-color-well-right-keyboard-navigation-from-top-left-corner-expected.png b/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-color-well-right-keyboard-navigation-from-top-left-corner-expected.png index 3a9f46d..95e5cfb 100644 --- a/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-color-well-right-keyboard-navigation-from-top-left-corner-expected.png +++ b/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-color-well-right-keyboard-navigation-from-top-left-corner-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-color-well-up-keyboard-navigation-from-bottom-left-corner-expected.png b/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-color-well-up-keyboard-navigation-from-bottom-left-corner-expected.png index 81e745c..85e9cc8d 100644 --- a/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-color-well-up-keyboard-navigation-from-bottom-left-corner-expected.png +++ b/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-color-well-up-keyboard-navigation-from-bottom-left-corner-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-color-well-up-keyboard-navigation-from-bottom-right-corner-expected.png b/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-color-well-up-keyboard-navigation-from-bottom-right-corner-expected.png index 01ac452..1256eeb 100644 --- a/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-color-well-up-keyboard-navigation-from-bottom-right-corner-expected.png +++ b/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-color-well-up-keyboard-navigation-from-bottom-right-corner-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-hex-format-expected.png b/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-hex-format-expected.png index ca23238..d9793da 100644 --- a/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-hex-format-expected.png +++ b/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-hex-format-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-hsl-format-expected.png b/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-hsl-format-expected.png index 13d9a9f5..7987e680 100644 --- a/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-hsl-format-expected.png +++ b/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-hsl-format-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-hue-slider-accelerated-keyboard-navigation-expected.png b/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-hue-slider-accelerated-keyboard-navigation-expected.png index c81ff06..b273435 100644 --- a/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-hue-slider-accelerated-keyboard-navigation-expected.png +++ b/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-hue-slider-accelerated-keyboard-navigation-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-hue-slider-click-expected.png b/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-hue-slider-click-expected.png index cb75933a..f7bb77f 100644 --- a/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-hue-slider-click-expected.png +++ b/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-hue-slider-click-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-hue-slider-drag-expected.png b/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-hue-slider-drag-expected.png index cb75933a..f7bb77f 100644 --- a/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-hue-slider-drag-expected.png +++ b/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-hue-slider-drag-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-hue-slider-keyboard-navigation-expected.png b/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-hue-slider-keyboard-navigation-expected.png index b3ca9505..09d9e81 100644 --- a/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-hue-slider-keyboard-navigation-expected.png +++ b/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-hue-slider-keyboard-navigation-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-hue-slider-left-edge-zero-hue-expected.png b/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-hue-slider-left-edge-zero-hue-expected.png index 2feb6bb..5ec1a2f 100644 --- a/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-hue-slider-left-edge-zero-hue-expected.png +++ b/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-hue-slider-left-edge-zero-hue-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-hue-slider-right-edge-zero-hue-expected.png b/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-hue-slider-right-edge-zero-hue-expected.png index 1b56b72..29ce98e 100644 --- a/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-hue-slider-right-edge-zero-hue-expected.png +++ b/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-hue-slider-right-edge-zero-hue-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-imperfect-match-expected.png b/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-imperfect-match-expected.png index 36aabd7..089e7f9a 100644 --- a/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-imperfect-match-expected.png +++ b/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-imperfect-match-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-manual-color-change-expected.png b/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-manual-color-change-expected.png index bbbd79c..3f33068 100644 --- a/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-manual-color-change-expected.png +++ b/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-manual-color-change-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-set-value-expected.png b/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-set-value-expected.png index 7db157a..73d9674 100644 --- a/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-set-value-expected.png +++ b/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-set-value-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-value-attribute-expected.png b/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-value-attribute-expected.png index b5b27b0..9137fd82 100644 --- a/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-value-attribute-expected.png +++ b/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-value-attribute-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-zoom125-expected.png b/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-zoom125-expected.png index 17678218..82347db 100644 --- a/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-zoom125-expected.png +++ b/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-zoom125-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-zoom200-expected.png b/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-zoom200-expected.png index 902ac5dc..8017d58 100644 --- a/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-zoom200-expected.png +++ b/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-appearance-zoom200-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-top-left-selection-position-after-reopen-expected.png b/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-top-left-selection-position-after-reopen-expected.png index 0dfa063..eba62bf 100644 --- a/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-top-left-selection-position-after-reopen-expected.png +++ b/third_party/blink/web_tests/platform/win/virtual/controls-refresh/color/color-picker-top-left-selection-position-after-reopen-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/paint/invalidation/overflow/float-overflow-right-expected.txt b/third_party/blink/web_tests/platform/win7/paint/invalidation/overflow/float-overflow-right-expected.txt deleted file mode 100644 index 29246e5..0000000 --- a/third_party/blink/web_tests/platform/win7/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": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 537, 62, 37], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 531, 62, 37], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 498, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 492, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 459, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 453, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 420, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow 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": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 171, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 165, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 132, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 126, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 93, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 87, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 54, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 48, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV class='outer'", - "rect": [677, 15, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow 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": "LayoutNGBlockFlow DIV", - "rect": [683, 504, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 498, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 465, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 459, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 426, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow 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": "LayoutNGBlockFlow DIV", - "rect": [683, 177, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 171, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 138, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 132, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 99, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 93, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 60, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 54, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 21, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [683, 15, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [689, 374, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [689, 368, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [689, 335, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [689, 329, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [689, 296, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGTableCell TD", - "rect": [689, 290, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [701, 543, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [701, 537, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [701, 504, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [701, 498, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [701, 465, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [701, 459, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [701, 426, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (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": "LayoutNGBlockFlow (floating) DIV", - "rect": [701, 177, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [701, 171, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [701, 99, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [701, 93, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [695, 60, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [695, 54, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [695, 21, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [695, 15, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [693, 138, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [693, 132, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [690, 375, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [690, 369, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [690, 336, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [690, 330, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [690, 297, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow (floating) DIV", - "rect": [690, 291, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [701, 543, 32, 20], - "reason": "geometry" - }, - { - "object": "LayoutNGBlockFlow DIV", - "rect": [701, 537, 32, 20], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [725, 256, 16, 18], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [725, 250, 16, 18], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [725, 217, 16, 18], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [725, 211, 16, 18], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [727, 101, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [727, 95, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [727, 62, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [727, 56, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [726, 377, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [726, 371, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [726, 338, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [726, 332, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 545, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 539, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 506, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 500, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 467, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 461, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 428, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 422, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 179, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 173, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 140, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [725, 134, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [721, 23, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [721, 17, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [718, 299, 16, 16], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment 'x'", - "rect": [718, 293, 16, 16], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/platform/win7/paint/invalidation/selection/japanese-rl-selection-clear-expected.txt b/third_party/blink/web_tests/platform/win7/paint/invalidation/selection/japanese-rl-selection-clear-expected.txt index b027fe31..1fc5e11 100644 --- a/third_party/blink/web_tests/platform/win7/paint/invalidation/selection/japanese-rl-selection-clear-expected.txt +++ b/third_party/blink/web_tests/platform/win7/paint/invalidation/selection/japanese-rl-selection-clear-expected.txt
@@ -5,77 +5,8 @@ "bounds": [800, 600], "contentsOpaque": true, "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "NGPhysicalTextFragment '\u3042\u3063\u305F\u304B\u5FD8\u308C\u3066\u3057\u307E\u3063\u305F\u7D4C\u9A13\u306F\u3042\u308A\u307E\u3059\u304B'", - "rect": [334, 123, 443, 404], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u3057\u305F\u30A6\u30A7\u30D6\u30DA\u30FC\u30B8\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u304B\u3089\u3082\u691C\u7D22'", - "rect": [334, 123, 443, 404], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u3059\u3002\u8A2A\u554F\u3057\u305F\u30A6\u30A7\u30D6\u30DA\u30FC\u30B8\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u304B'", - "rect": [334, 123, 443, 404], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002\u305B\u3063\u304B\u304F\u898B\u3064\u3051\u305F\u3059'", - "rect": [334, 123, 443, 404], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u305B\u3063\u304B\u304F\u898B\u3064\u3051\u305F\u3059\u3070\u3089\u3057\u3044\u8A18\u4E8B\u304C\u3069\u3053\u306B'", - "rect": [334, 123, 443, 404], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u3063\u305F\u7D4C\u9A13\u306F\u3042\u308A\u307E\u3059\u304B \u306A\u3089\u30BF\u30A4\u30C8\u30EB\u3068\u30A2'", - "rect": [334, 123, 443, 404], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u3064\u3051\u305F\u3059\u3070\u3089\u3057\u3044\u8A18\u4E8B\u304C\u3069\u3053\u306B\u3042\u3063\u305F\u304B\u5FD8'", - "rect": [334, 123, 443, 404], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u306A\u3089\u30BF\u30A4\u30C8\u30EB\u3068\u30A2\u30C9\u30EC\u30B9\u3060\u3051\u3067\u306A\u304F\u3001\u8A2A\u554F'", - "rect": [334, 123, 443, 404], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u304B\u3089\u3082\u691C\u7D22\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E'", - "rect": [334, 123, 443, 404], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u3070\u3089\u3057\u3044\u8A18\u4E8B\u304C\u3069\u3053\u306B\u3042\u3063\u305F\u304B\u5FD8\u308C\u3066\u3057\u307E'", - "rect": [334, 123, 443, 404], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u3089\u3082\u691C\u7D22\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002\u305B\u3063\u304B\u304F\u898B'", - "rect": [334, 123, 443, 404], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u308C\u3066\u3057\u307E\u3063\u305F\u7D4C\u9A13\u306F\u3042\u308A\u307E\u3059\u304B \u306A\u3089\u30BF\u30A4'", - "rect": [334, 123, 443, 404], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u30C8\u30EB\u3068\u30A2\u30C9\u30EC\u30B9\u3060\u3051\u3067\u306A\u304F\u3001\u8A2A\u554F'", - "rect": [334, 123, 443, 404], - "reason": "geometry" - }, - { - "object": "NGPhysicalTextFragment '\u30C9\u30EC\u30B9\u3060\u3051\u3067\u306A\u304F\u3001\u8A2A\u554F\u3057\u305F\u30A6\u30A7\u30D6\u30DA\u30FC\u30B8'", - "rect": [334, 123, 443, 404], - "reason": "geometry" - } + "invalidations": [ + [334, 123, 443, 404] ] } ]
diff --git a/third_party/blink/web_tests/platform/win7/virtual/controls-refresh-hc/virtual/controls-refresh/color-scheme/color/color-picker-appearance-expected.png b/third_party/blink/web_tests/platform/win7/virtual/controls-refresh-hc/virtual/controls-refresh/color-scheme/color/color-picker-appearance-expected.png new file mode 100644 index 0000000..b3fa85b --- /dev/null +++ b/third_party/blink/web_tests/platform/win7/virtual/controls-refresh-hc/virtual/controls-refresh/color-scheme/color/color-picker-appearance-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/std-switch/a11y.html b/third_party/blink/web_tests/std-switch/a11y.html deleted file mode 100644 index 362c7bc..0000000 --- a/third_party/blink/web_tests/std-switch/a11y.html +++ /dev/null
@@ -1,50 +0,0 @@ -<!DOCTYPE html> -<script src="../resources/testharness.js"></script> -<script src="../resources/testharnessreport.js"></script> -<body> -<script type="module"> -import 'std:elements/switch'; - -test(t => { - assert_own_property(window, 'accessibilityController'); - - let switchElement = document.createElement('std-switch'); - switchElement.id = 'switch'; - switchElement.textContent = 'child text'; - document.body.appendChild(switchElement); - - let axSwitch = accessibilityController.accessibleElementById('switch'); - assert_equals(axSwitch.role, 'AXRole: AXSwitch'); - assert_equals(axSwitch.name, '', 'has no "child text"'); - assert_equals(axSwitch.checked, 'false'); - - switchElement.on = true; - // Need to get AccessibleNode again - axSwitch = accessibilityController.accessibleElementById('switch'); - assert_equals(axSwitch.checked, 'true'); -}, 'Check accessibility behavior'); - -test(t => { - let switchElement = document.createElement('std-switch'); - document.body.appendChild(switchElement); - switchElement.on = true; - - assert_false(switchElement.hasAttribute('role'), 'role'); - assert_false(switchElement.hasAttribute('aria-checked'), 'aria-checked'); -}, 'Should have no a11y attributes'); - -test(t => { - assert_own_property(window, 'accessibilityController'); - - let switchElement = document.createElement('std-switch'); - switchElement.id = 'switch3'; - switchElement.setAttribute('role', 'checkbox'); - switchElement.setAttribute('aria-checked', 'true'); - document.body.appendChild(switchElement); - - let axSwitch = accessibilityController.accessibleElementById('switch3'); - assert_equals(axSwitch.role, 'AXRole: AXCheckBox'); - assert_equals(axSwitch.checked, 'true'); -}, 'Adding role=/aria-checked= should override the default'); -</script> -</body>
diff --git a/third_party/blink/web_tests/std-switch/click-transition.html b/third_party/blink/web_tests/std-switch/click-transition.html deleted file mode 100644 index ba18df2..0000000 --- a/third_party/blink/web_tests/std-switch/click-transition.html +++ /dev/null
@@ -1,84 +0,0 @@ -<!DOCTYPE html> -<script src="../resources/testharness.js"></script> -<script src="../resources/testharnessreport.js"></script> -<script src="../resources/testdriver.js"></script> -<script src="../resources/testdriver-vendor.js"></script> -<body> -<p>Some text</p> -<script type="module"> -import 'std:elements/switch'; - -function singleFrame() { - return new Promise((resolve, reject) => { - requestAnimationFrame(resolve); - }); -} - -function setupSwitchElement() { - let element = document.createElement('std-switch'); - document.body.appendChild(element); - - let thumb = internals.shadowRoot(element).getElementById('thumb'); - element.transitionStartCounter = 0; - element.transitionEndCounter = 0; - thumb.addEventListener('transitionstart', e => { - ++element.transitionStartCounter; - }); - thumb.addEventListener('transitionend', e => { - ++element.transitionEndCounter; - }); - return element; -} - -async function assertClickTransition(element) { - assert_false(element.on); - await test_driver.click(element); - assert_true(element.on, 'click'); - await singleFrame(); - assert_true(element.transitionStartCounter > 0, 'A transition starts'); - if (element.transitionStartCounter > element.transitionEndCounter) { - await new Promise((resolve, reject) => { - let thumb = internals.shadowRoot(element).getElementById('thumb'); - thumb.addEventListener('transitionend', () => { - if (element.transitionStartCounter == element.transitionEndCounter) { - resolve(); - } - }); - }); - } -} - -// This should be called just after an operation which should not start -// transition. element.transitionStartCounter must be 0 before the operation. -async function assertNoTransition(element) { - await singleFrame(); - assert_equals(element.transitionStartCounter, 0, 'No transitionstart events'); -} - -promise_test(async () => { - let switchElement = setupSwitchElement(); - await assertClickTransition(switchElement); - - // Changing the state with an IDL attribute should not animate even after - // click transition. - switchElement.transitionStartCounter = 0; - switchElement.on = false; - await assertNoTransition(switchElement); -}, 'Click event handler should start transition'); - -promise_test(async () => { - let switchElement = setupSwitchElement(); - switchElement.on = !switchElement.on; - await assertNoTransition(switchElement); -}, 'Changing the state with an IDL attribute should not start transition'); - -promise_test(async () => { - // crbug.com/992454 Transition didn't start if there is a text selection. - const range = document.createRange(); - range.selectNodeContents(document.querySelector('p')); - window.getSelection().addRange(range); - - await assertClickTransition(setupSwitchElement()); -}, 'Click event handler should start transition even with text selection'); -</script> -</body>
diff --git a/third_party/blink/web_tests/std-switch/resources/state-combo.js b/third_party/blink/web_tests/std-switch/resources/state-combo.js deleted file mode 100644 index 90e7ab3..0000000 --- a/third_party/blink/web_tests/std-switch/resources/state-combo.js +++ /dev/null
@@ -1,47 +0,0 @@ -function generateSwitchElements(callback) { - const MASK_ON = 1; - const MASK_FOCUS = 1 << 1; - const MASK_HOVER = 1 << 2; - const MASK_ACTIVE = 1 << 3; - const MASK_DISABLED = 1 << 4; - const MASK_END = 1 << 5; - for (let mask = 0; mask < MASK_END; ++mask) { - let indicator = ''; - let switchElement = document.createElement('std-switch'); - if (mask & MASK_ON) { - switchElement.on = true; - indicator += 'o'; - } else { - indicator += '-'; - } - if (mask & MASK_FOCUS) { - internals.setPseudoClassState(switchElement, ':focus', true); - indicator += 'f'; - } else { - indicator += '-'; - } - if (mask & MASK_HOVER) { - internals.setPseudoClassState(switchElement, ':hover', true); - indicator += 'h'; - } else { - indicator += '-'; - } - if (mask & MASK_ACTIVE) { - internals.setPseudoClassState(switchElement, ':active', true); - indicator += 'a'; - } else { - indicator += '-'; - } - if (mask & MASK_DISABLED) { - switchElement.disabled = true; - indicator += 'd'; - } else { - indicator += '-'; - } - // Skip some impossible combinations - if (mask & MASK_DISABLED && (mask & MASK_FOCUS || mask & MASK_ACTIVE)) { - continue; - } - callback(indicator, switchElement); - } -}
diff --git a/third_party/blink/web_tests/std-switch/switch-appearance-customization.html b/third_party/blink/web_tests/std-switch/switch-appearance-customization.html deleted file mode 100644 index 35d65b3..0000000 --- a/third_party/blink/web_tests/std-switch/switch-appearance-customization.html +++ /dev/null
@@ -1,212 +0,0 @@ -<!DOCTYPE html> -<body> -<style> -std-switch { - margin: 0.5em; -} - -/* ---------------------------------------------------------------- */ - -.material std-switch { - block-size: 20px; - inline-size: 36px; - - --thumb-size: 20px; - --ripple-color: rgba(100,100,100,0.3); - --ripple-max-size: 48px; -} - -.material std-switch::part(track) { - background: rgba(0,0,0,0.4); - block-size: 14px; - border: none; - box-shadow: none; -} - -.material std-switch::part(track-fill) { - background: rgba(63,81,181,0.5); -} - -.material std-switch::part(thumb) { - block-size: var(--thumb-size); - border-radius: calc(var(--thumb-size) / 2); - border: none; - box-shadow: 0 1px 5px 0 rgba(0,0,0,0.6); - inline-size: var(--thumb-size); - margin-inline-start: -100%; -} - -.material std-switch[on]::part(thumb) { - background: rgb(63,81,181); - margin-inline-start: calc(0px - 20px); -} - -.material std-switch:hover::part(thumb) { - inline-size: var(--thumb-size); -} - -/* - * Ripple effect - * - * Translucent circle is painted on the thumb if the element is :active or - * :focus-visible. It has - * - Size transition when it appears - * - Opacity transition when it disappears - * part(thumb)::before represents the former, and part(thumb)::after represents - * the latter. - */ -.material std-switch::part(thumb)::before { - background: var(--ripple-color); - block-size: 0px; - border-radius: 0px; - content: ""; - display: inline-block; - inline-size: 0px; - left: calc(var(--thumb-size) / 2); - position: relative; - top: calc(var(--thumb-size) / 2); - transition: none; -} - -.material std-switch:active::part(thumb)::before, -.material std-switch:focus-visible::part(thumb)::before { - block-size: var(--ripple-max-size); - border-radius: calc(var(--ripple-max-size) / 2); - inline-size: var(--ripple-max-size); - left: calc((var(--thumb-size) - var(--ripple-max-size)) / 2); - top: calc((var(--thumb-size) - var(--ripple-max-size)) / 2); - /* transition: all linear 0.1s; transition is harmful in pixel tests. */ -} - -.material std-switch::part(thumb)::after { - background: var(--ripple-color); - block-size: var(--ripple-max-size); - border-radius: calc(var(--ripple-max-size) / 2); - content: ""; - display: inline-block; - inline-size: var(--ripple-max-size); - left: calc((var(--thumb-size) - var(--ripple-max-size)) / 2); - opacity: 0; - position: relative; - /* Why 18px? */ - top: calc((var(--thumb-size) - var(--ripple-max-size)) / 2 - 18px); - /* transition: opacity linear 0.3s; transition is harmful in pixel tests. */ -} - -.material std-switch:active::part(thumb)::after, -.material std-switch:focus-visible::part(thumb)::after { - block-size: 0px; - content: ""; - inline-size: 0px; - opacity: 1; - transition: none; -} - -/* ---------------------------------------------------------------- */ - -.cocoa std-switch { - block-size: 31px; - inline-size: 51px; -} - -.cocoa std-switch::part(track) { - border-radius: 15px; - border: 1px solid lightgray; - box-shadow: none; -} - -.cocoa std-switch::part(track-fill) { - background: #4ad963; -} - -.cocoa std-switch[on]::part(track) { - border: 1px solid #4ad963; -} - -.cocoa std-switch::part(thumb) { - block-size: 29px; - border-radius: 14.5px; - border: none; - box-shadow: 0px 3px 4px 1px rgba(0,0,0,0.2); - inline-size: 29px; - margin-inline-start: calc(-100% + 1px); -} - -.cocoa std-switch[on]::part(thumb) { - margin-inline-start: calc(0px - 29px - 1px); -} - -/* ---------------------------------------------------------------- */ - -.fluent std-switch { - block-size: 20px; - inline-size: 44px; -} - -.fluent std-switch::part(track) { - border: 2px solid #333333; - box-shadow: none; -} - -.fluent std-switch[on]::part(track) { - border: 2px solid #4cafff; -} - -.fluent std-switch::part(track-fill) { - background: #4cafff; -} - -.fluent std-switch::part(thumb) { - background: #333333; - block-size: 10px; - border-radius: 5px; - border: none; - inline-size: 10px; - margin-inline-start: calc(-100% + 5px); -} - -.fluent std-switch[on]::part(thumb) { - background: white; - margin-inline-start: calc(0px - 10px - 5px); -} - -.fluent std-switch:active::part(track) { - background: darkgray; - border: 2px solid darkgray; -} - -.fluent std-switch:active::part(thumb) { - background: white; -} - -/* ---------------------------------------------------------------- */ - -div.material, div.cocoa, div.fluent { - overflow: auto; -} - -.container { - float: left; - font-family: monospace; -} -</style> -<div class="material"><h2>Material-like</h2></div> -<div class="cocoa"><h2>Cocoa-like</h2></div> -<div class="fluent"><h2>Fluent-like</h2></div> -<script src="resources/state-combo.js"></script> -<script type="module"> -import 'std:elements/switch'; - -function wrapAndConnect(query, indicator, element) { - let container = document.createElement('div'); - container.className = 'container'; - container.appendChild(document.createTextNode(indicator)); - container.appendChild(element); - document.querySelector(query).appendChild(container); -} - -generateSwitchElements(wrapAndConnect.bind(null, 'div.material')); -generateSwitchElements(wrapAndConnect.bind(null, 'div.cocoa')); -generateSwitchElements(wrapAndConnect.bind(null, 'div.fluent')); -</script> -</body>
diff --git a/third_party/blink/web_tests/std-switch/switch-appearance-theme.html b/third_party/blink/web_tests/std-switch/switch-appearance-theme.html deleted file mode 100644 index c226ca5..0000000 --- a/third_party/blink/web_tests/std-switch/switch-appearance-theme.html +++ /dev/null
@@ -1,38 +0,0 @@ -<!DOCTYPE html> -<body> -<script type="module"> -import 'std:elements/switch'; - -document.body.insertAdjacentHTML('beforeend', ` -<h2>Attribute on the element</h2> -<std-switch theme="platform-agnostic"></std-switch> -<std-switch theme="match-platform"></std-switch>`); - -document.body.insertAdjacentHTML('beforeend', ` -<h2>Attribute on an ancestor</h2> -<span theme="platform-agnostic"><std-switch></std-switch></span> -<i theme="match-platform"><b><std-switch></std-switch></b></i>`); - -document.body.insertAdjacentHTML('beforeend', ` -<h2>Nested attributes</h2> -<s theme="match-platform"><span theme="platform-agnostic"><code theme="foo" -><std-switch></std-switch></code></span></s> -<kbd theme="platform-agnostic"><i theme="match-platform"><b><std-switch></std-switch></b></i></kbd>`); - -document.body.insertAdjacentHTML('beforeend', ` -<h2>Attribute over shadow-boundary</h2> -<span theme="platform-agnostic"><span id="host1"></span></span> -<i theme="match-platform"><b><span id="host2"></span></b></i>`); -let root1 = document.querySelector('#host1').attachShadow({mode:'open'}); -root1.innerHTML = '<std-switch></std-switch>'; -let root2 = document.querySelector('#host2').attachShadow({mode:'closed'}); -root2.innerHTML = '<std-switch></std-switch>'; - -document.body.insertAdjacentHTML('beforeend', ` -<h2>NO support for updating attribute values for now</h2> -<std-switch id="update1" theme="match-platform"></std-switch> -<std-switch id="update2" theme="platform-agnostic"></std-switch>`); -document.querySelector('#update1').setAttribute('theme', 'platform-agnostic'); -document.querySelector('#update2').setAttribute('theme', 'match-platform'); -</script> -</body>
diff --git a/third_party/blink/web_tests/std-switch/switch-appearance.html b/third_party/blink/web_tests/std-switch/switch-appearance.html deleted file mode 100644 index a4fde1a..0000000 --- a/third_party/blink/web_tests/std-switch/switch-appearance.html +++ /dev/null
@@ -1,33 +0,0 @@ -<!DOCTYPE html> -<body> -<style> -std-switch { - /* TODO(tkent): Should have margin in UA style? */ - margin: 0.5em; -} - -.container { - float: left; - font-family: monospace; -} -</style> -<script type="module"> -import 'std:elements/switch'; - - -</script> - -<div><std-switch><div style="display:inline-block; text-align:right; width:100%;">off</div></std-switch></div> -<div><std-switch on>on</std-switch></div> -<div>Hidden attribute: <std-switch hidden></std-switch> <std-switch on hidden></std-switch></div> -<script src="resources/state-combo.js"></script> -<script type="module"> -generateSwitchElements((indicator, element) => { - let container = document.createElement('div'); - container.className = 'container'; - container.appendChild(document.createTextNode(indicator)); - container.appendChild(element); - document.body.appendChild(container); -}); -</script> -</body>
diff --git a/third_party/blink/web_tests/virtual/import-maps-without-builtin-modules/external/wpt/import-maps/builtin-support.tentative/imported/parsing-addresses.tentative-expected.txt b/third_party/blink/web_tests/virtual/import-maps-without-builtin-modules/external/wpt/import-maps/builtin-support.tentative/imported/parsing-addresses.tentative-expected.txt deleted file mode 100644 index 9140933..0000000 --- a/third_party/blink/web_tests/virtual/import-maps-without-builtin-modules/external/wpt/import-maps/builtin-support.tentative/imported/parsing-addresses.tentative-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -This is a testharness.js-based test. -PASS Relative URL-like addresses / should accept strings prefixed with ./, ../, or / -FAIL Relative URL-like addresses / should not accept strings prefixed with ./, ../, or / for data: base URLs assert_equals: expected "{\"dotDotSlash\":[],\"dotSlash\":[],\"slash\":[]}" but got "{\"dotDotSlash\":[\"http://web-platform.test:8001/import-maps/foo\"],\"dotSlash\":[\"http://web-platform.test:8001/import-maps/imported/foo\"],\"slash\":[\"http://web-platform.test:8001/foo\"]}" -PASS Relative URL-like addresses / should accept the literal strings ./, ../, or / with no suffix -PASS Relative URL-like addresses / should ignore percent-encoded variants of ./, ../, or / -PASS Built-in module addresses / should accept URLs using the built-in module scheme -PASS Built-in module addresses / should ignore percent-encoded variants of the built-in module scheme -FAIL Built-in module addresses / should allow built-in module URLs that contain "/" or "\" assert_equals: expected "{\"backslash\":[\"std:foo\\\baz\"],\"slashEnd\":[\"std:foo/\"],\"slashMiddle\":[\"std:foo/bar\"]}" but got "{\"backslash\":[\"std:foo\\baz\"],\"slashEnd\":[\"std:foo/\"],\"slashMiddle\":[\"std:foo/bar\"]}" -FAIL Absolute URL addresses / should only accept absolute URL addresses with fetch schemes assert_equals: expected "{\"about\":[\"about:good\"],\"blob\":[\"blob:good\"],\"data\":[\"data:good\"],\"file\":[\"file:///good\"],\"filesystem\":[\"filesystem:good\"],\"ftp\":[\"ftp://good/\"],\"http\":[\"http://good/\"],\"https\":[\"https://good/\"],\"import\":[],\"javascript\":[],\"mailto\":[],\"wss\":[]}" but got "{\"about\":[\"about:good\"],\"blob\":[\"blob:good\"],\"data\":[\"data:good\"],\"file\":[\"file:///good\"],\"filesystem\":[],\"ftp\":[\"ftp://good/\"],\"http\":[\"http://good/\"],\"https\":[\"https://good/\"],\"import\":[\"import:bad\"],\"javascript\":[\"javascript:bad\"],\"mailto\":[\"mailto:bad\"],\"wss\":[\"wss://bad/\"]}" -FAIL Absolute URL addresses / should only accept absolute URL addresses with fetch schemes inside arrays assert_equals: expected "{\"about\":[\"about:good\"],\"blob\":[\"blob:good\"],\"data\":[\"data:good\"],\"file\":[\"file:///good\"],\"filesystem\":[\"filesystem:good\"],\"ftp\":[\"ftp://good/\"],\"http\":[\"http://good/\"],\"https\":[\"https://good/\"],\"import\":[],\"javascript\":[],\"mailto\":[],\"wss\":[]}" but got "{}" -FAIL Absolute URL addresses / should parse absolute URLs, ignoring unparseable ones assert_equals: expected "{\"invalidButParseable1\":[\"https://example.org/\"],\"invalidButParseable2\":[\"https://example.com///\"],\"noPercentDecoding\":[\"https://example.com/%41\"],\"percentDecoding\":[\"https://example.com/\"],\"prettyNormal\":[\"https://example.net/\"],\"unparseable1\":[],\"unparseable2\":[],\"unparseable3\":[]}" but got "{\"invalidButParseable1\":[\"https://example.org/\"],\"invalidButParseable2\":[\"https://example.com///\"],\"noPercentDecoding\":[\"https://example.com/A\"],\"percentDecoding\":[\"https://example.com/\"],\"prettyNormal\":[\"https://example.net/\"],\"unparseable1\":[\"https://ex%20ample.org/\"],\"unparseable2\":[],\"unparseable3\":[]}" -FAIL Absolute URL addresses / should parse absolute URLs, ignoring unparseable ones inside arrays assert_equals: expected "{\"invalidButParseable1\":[\"https://example.org/\"],\"invalidButParseable2\":[\"https://example.com///\"],\"noPercentDecoding\":[\"https://example.com/%41\"],\"percentDecoding\":[\"https://example.com/\"],\"prettyNormal\":[\"https://example.net/\"],\"unparseable1\":[],\"unparseable2\":[],\"unparseable3\":[]}" but got "{}" -PASS Failing addresses: mismatched trailing slashes / should warn for the simple case -FAIL Failing addresses: mismatched trailing slashes / should warn for a mismatch alone in an array assert_equals: expected "{\"std:trailer/\":[],\"trailer/\":[]}" but got "{}" -FAIL Failing addresses: mismatched trailing slashes / should warn for a mismatch alongside non-mismatches in an array assert_equals: expected "{\"std:trailer/\":[\"https://base.example/bim-atrailer/\"],\"trailer/\":[\"https://base.example/atrailer/\"]}" but got "{}" -PASS Other invalid addresses / should ignore unprefixed strings that are not absolute URLs -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/virtual/import-maps-without-builtin-modules/external/wpt/import-maps/builtin-support.tentative/imported/parsing-schema.tentative-expected.txt b/third_party/blink/web_tests/virtual/import-maps-without-builtin-modules/external/wpt/import-maps/builtin-support.tentative/imported/parsing-schema.tentative-expected.txt deleted file mode 100644 index f767dd2..0000000 --- a/third_party/blink/web_tests/virtual/import-maps-without-builtin-modules/external/wpt/import-maps/builtin-support.tentative/imported/parsing-schema.tentative-expected.txt +++ /dev/null
@@ -1,16 +0,0 @@ -This is a testharness.js-based test. -PASS Invalid JSON -PASS Mismatching the top-level schema / should throw for top-level non-objects -PASS Mismatching the top-level schema / should throw if imports is a non-object -PASS Mismatching the top-level schema / should throw if scopes is a non-object -PASS Mismatching the top-level schema / should ignore unspecified top-level entries -FAIL Mismatching the specifier map schema / should ignore entries where the address is not a string, array, or null assert_equals: expected "{\"bar\":[\"https://example.com/\"]}" but got "{}" -PASS Mismatching the specifier map schema / should ignore entries where the specifier key is an empty string -FAIL Mismatching the specifier map schema / should ignore members of an address array that are not strings assert_equals: expected "{\"bar\":[\"https://example.com/\"],\"foo\":[\"https://example.com/\"]}" but got "{}" -PASS Mismatching the specifier map schema / should throw if a scope's value is not an object -PASS Normalization / should normalize empty import maps to have imports and scopes keys -PASS Normalization / should normalize an import map without imports to have imports -PASS Normalization / should normalize an import map without scopes to have scopes -FAIL Normalization / should normalize addresses to arrays assert_equals: expected "{\"bar\":[\"https://example.com/2\"],\"baz\":[],\"foo\":[\"https://example.com/1\"]}" but got "{\"foo\":[\"https://example.com/1\"]}" -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/virtual/import-maps-without-builtin-modules/external/wpt/import-maps/builtin-support.tentative/imported/resolving-builtins.tentative-expected.txt b/third_party/blink/web_tests/virtual/import-maps-without-builtin-modules/external/wpt/import-maps/builtin-support.tentative/imported/resolving-builtins.tentative-expected.txt deleted file mode 100644 index d0359d6..0000000 --- a/third_party/blink/web_tests/virtual/import-maps-without-builtin-modules/external/wpt/import-maps/builtin-support.tentative/imported/resolving-builtins.tentative-expected.txt +++ /dev/null
@@ -1,16 +0,0 @@ -This is a testharness.js-based test. -PASS Unmapped built-in module specifiers / should resolve "std:blank" to "std:blank" -FAIL Unmapped built-in module specifiers / should error resolving "std:none" assert_throws: function "() => resolveUnderTest(NONE)" did not throw -PASS Remapping built-in module specifiers / should remap built-in modules -PASS Remapping built-in module specifiers / should remap built-in modules with slashes -FAIL Remapping built-in module specifiers / should remap built-in modules with fallbacks assert_equals: expected "https://example.com/app/none.mjs" but got "std:none" -FAIL Remapping built-in module specifiers / should remap built-in modules with slashes and fallbacks assert_equals: expected "https://example.com/app/blank/" but got "std:blank/" -PASS Remapping to built-in modules / should remap to "std:blank" -FAIL Remapping to built-in modules / should fail when remapping to "std:blank/" assert_throws: function "() => resolveUnderTest('/blank/')" did not throw -FAIL Remapping to built-in modules / should remap to "std:blank/for-testing" Failed to resolve module specifier /blank/for-testing: Import Map: "https://example.com/blank/for-testing" matches with "https://example.com/blank/" and is mapped to -PASS Remapping to built-in modules / should remap to "std:blank" for URL-like specifiers -FAIL Remapping to built-in modules / should fail when remapping to "std:none" assert_throws: function "() => resolveUnderTest('none')" did not throw -FAIL Fallbacks with built-in module addresses / should resolve to "std:blank" Failed to resolve module specifier blank: Relative references must start with either "/", "./", or "../". -FAIL Fallbacks with built-in module addresses / should fall back past "std:none" Failed to resolve module specifier none: Relative references must start with either "/", "./", or "../". -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/virtual/import-maps-without-builtin-modules/external/wpt/import-maps/builtin-support.tentative/imported/resolving.tentative-expected.txt b/third_party/blink/web_tests/virtual/import-maps-without-builtin-modules/external/wpt/import-maps/builtin-support.tentative/imported/resolving.tentative-expected.txt deleted file mode 100644 index f28a00f..0000000 --- a/third_party/blink/web_tests/virtual/import-maps-without-builtin-modules/external/wpt/import-maps/builtin-support.tentative/imported/resolving.tentative-expected.txt +++ /dev/null
@@ -1,26 +0,0 @@ -This is a testharness.js-based test. -PASS Unmapped / should resolve ./ specifiers as URLs -PASS Unmapped / should resolve ../ specifiers as URLs -PASS Unmapped / should resolve / specifiers as URLs -PASS Unmapped / should parse absolute fetch-scheme URLs -FAIL Unmapped / should fail for absolute non-fetch-scheme URLs assert_throws: function "() => resolveUnderTest('mailto:bad')" did not throw -FAIL Unmapped / should fail for strings not parseable as absolute URLs and not starting with ./ ../ or / assert_throws: function "() => resolveUnderTest('https://ex ample.org/')" did not throw -PASS Mapped using the "imports" key only (no scopes) / should fail when the mapping is to an empty array -PASS Mapped using the "imports" key only (no scopes) / Package-like scenarios / should work for package main modules -PASS Mapped using the "imports" key only (no scopes) / Package-like scenarios / should work for package submodules -PASS Mapped using the "imports" key only (no scopes) / Package-like scenarios / should work for package names that end in a slash by just passing through -PASS Mapped using the "imports" key only (no scopes) / Package-like scenarios / should still fail for package modules that are not declared -PASS Mapped using the "imports" key only (no scopes) / Package-like scenarios / should fail for package submodules that map to nowhere -PASS Mapped using the "imports" key only (no scopes) / Tricky specifiers / should work for explicitly-mapped specifiers that happen to have a slash -PASS Mapped using the "imports" key only (no scopes) / Tricky specifiers / should work when the specifier has punctuation -PASS Mapped using the "imports" key only (no scopes) / Tricky specifiers / should fail for attempting to get a submodule of something not declared with a trailing slash -PASS Mapped using the "imports" key only (no scopes) / URL-like specifiers / should remap to other URLs -FAIL Mapped using the "imports" key only (no scopes) / URL-like specifiers / should fail for URLs that remap to empty arrays assert_throws: function "() => resolveUnderTest('https://example.com/lib/no.mjs')" did not throw -PASS Mapped using the "imports" key only (no scopes) / URL-like specifiers / should remap URLs that are just composed from / and . -PASS Mapped using the "imports" key only (no scopes) / URL-like specifiers / should remap URLs that are prefix-matched by keys with trailing slashes -PASS Mapped using the "imports" key only (no scopes) / URL-like specifiers / should use the last entry's address when URL-like specifiers parse to the same absolute URL -PASS Mapped using the "imports" key only (no scopes) / Overlapping entries with trailing slashes / should favor the most-specific key (no empty arrays) -PASS Mapped using the "imports" key only (no scopes) / Overlapping entries with trailing slashes / should favor the most-specific key when empty arrays are involved for less-specific keys -FAIL Mapped using the "imports" key only (no scopes) / Overlapping entries with trailing slashes / should favor the most-specific key when empty arrays are involved for more-specific keys assert_throws: function "() => resolveUnderTest('a/b')" did not throw -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/webexposed/feature-policy-features-expected.txt b/third_party/blink/web_tests/webexposed/feature-policy-features-expected.txt index fd3ee81..91012413 100644 --- a/third_party/blink/web_tests/webexposed/feature-policy-features-expected.txt +++ b/third_party/blink/web_tests/webexposed/feature-policy-features-expected.txt
@@ -13,6 +13,7 @@ ch-rtt ch-ua ch-ua-arch +ch-ua-full-version ch-ua-mobile ch-ua-model ch-ua-platform
diff --git a/third_party/blink/web_tests/wpt_internal/std-switch/README.md b/third_party/blink/web_tests/wpt_internal/std-switch/README.md deleted file mode 100644 index e8a6d127..0000000 --- a/third_party/blink/web_tests/wpt_internal/std-switch/README.md +++ /dev/null
@@ -1,5 +0,0 @@ -# Tests for std-switch - -https://github.com/tkent-google/std-switch/blob/master/README.md - -Tests in tentative/ should be upstreamed to WPT in the future.
diff --git a/third_party/blink/web_tests/wpt_internal/std-switch/tentative/click.html b/third_party/blink/web_tests/wpt_internal/std-switch/tentative/click.html deleted file mode 100644 index a20a7bd4..0000000 --- a/third_party/blink/web_tests/wpt_internal/std-switch/tentative/click.html +++ /dev/null
@@ -1,98 +0,0 @@ -<!DOCTYPE html> -<script src="/resources/testharness.js"></script> -<script src="/resources/testharnessreport.js"></script> -<script src="/resources/testdriver.js"></script> -<script src="/resources/testdriver-vendor.js"></script> -<body> -<script type="module"> -import 'std:elements/switch'; - -promise_test(async t => { - let switchElement = document.createElement('std-switch'); - document.body.appendChild(switchElement); - assert_false(switchElement.on); - - let inputEventCounter = 0; - let changeEventCounter = 0; - switchElement.oninput = t.step_func(e => { - ++inputEventCounter; - assert_true(e.bubbles); - assert_false(e.cancelable); - assert_false(e.composed); - assert_false(e.isTrusted); - }); - switchElement.onchange = t.step_func(e => { - ++changeEventCounter; - assert_true(e.bubbles); - assert_false(e.cancelable); - assert_false(e.composed); - assert_false(e.isTrusted); - }); - - await test_driver.click(switchElement); - assert_true(switchElement.on); - assert_equals(inputEventCounter, 1); - assert_equals(changeEventCounter, 1); - - await test_driver.click(switchElement); - assert_false(switchElement.on); - assert_equals(inputEventCounter, 2); - assert_equals(changeEventCounter, 2); - - switchElement.disabled = true; - await test_driver.click(switchElement); - // No changes - assert_false(switchElement.on); - assert_equals(inputEventCounter, 2); - assert_equals(changeEventCounter, 2); -}, 'Click should change the status, and dispatch input/change events.'); - -test(() => { - let switchElement = document.createElement('std-switch'); - let inputEventCounter = 0; - let changeEventCounter = 0; - switchElement.oninput = e => { - ++inputEventCounter; - }; - switchElement.onchange = e => { - ++changeEventCounter; - }; - switchElement.click(); - assert_equals(inputEventCounter, 1); - assert_equals(changeEventCounter, 1); -}, 'input/change events should be synchronous.'); - -promise_test(async t => { - let switchElement = document.createElement('std-switch'); - document.body.appendChild(switchElement); - assert_false(switchElement.on); - - let inputEventCounter = 0; - let changeEventCounter = 0; - switchElement.oninput = t.step_func(e => { - ++inputEventCounter; - assert_true(e.bubbles); - assert_false(e.cancelable); - assert_false(e.composed); - assert_false(e.isTrusted); - }); - switchElement.onchange = t.step_func(e => { - ++changeEventCounter; - assert_true(e.bubbles); - assert_false(e.cancelable); - assert_false(e.composed); - assert_false(e.isTrusted); - }); - - await test_driver.send_keys(switchElement, ' '); - assert_true(switchElement.on, 'on'); - assert_equals(inputEventCounter, 1); - assert_equals(changeEventCounter, 1); - - await test_driver.send_keys(switchElement, ' '); - assert_false(switchElement.on, 'off'); - assert_equals(inputEventCounter, 2); - assert_equals(changeEventCounter, 2); -}, 'Space key is equivalent to click.'); -</script> -</body>
diff --git a/third_party/blink/web_tests/wpt_internal/std-switch/tentative/extend.html b/third_party/blink/web_tests/wpt_internal/std-switch/tentative/extend.html deleted file mode 100644 index 94804350..0000000 --- a/third_party/blink/web_tests/wpt_internal/std-switch/tentative/extend.html +++ /dev/null
@@ -1,30 +0,0 @@ -<!DOCTYPE html> -<script src="/resources/testharness.js"></script> -<script src="/resources/testharnessreport.js"></script> -<body> -<script type="module"> -import { StdSwitchElement } from 'std:elements/switch'; - -setup({allow_uncaught_exception:true}); - -test(()=> { - class MySwitchElement extends StdSwitchElement { - } - customElements.define('my-switch', MySwitchElement); - let uncaughtError = null; - window.addEventListener('error', e => { - uncaughtError = e.error; - }, {once: true}); - document.createElement('my-switch'); - assert_true(uncaughtError instanceof TypeError); -}, 'Should not be able to create an autonomous custom element extending StdSwitchElement'); - -test(()=> { - class MySwitchElement2 extends StdSwitchElement { - } - assert_throws_dom('NotSupportedError', () => { - customElements.define('my-switch2', MySwitchElement2, {extends: 'std-switch'}); - }); -}, 'Should not be able to define a customized built-in element for std-switch'); -</script> -</body>
diff --git a/third_party/blink/web_tests/wpt_internal/std-switch/tentative/focus-expected.txt b/third_party/blink/web_tests/wpt_internal/std-switch/tentative/focus-expected.txt deleted file mode 100644 index 515d03a..0000000 --- a/third_party/blink/web_tests/wpt_internal/std-switch/tentative/focus-expected.txt +++ /dev/null
@@ -1,7 +0,0 @@ -This is a testharness.js-based test. -PASS should be focus()-able by default -FAIL should have no tabindex by default assert_false: expected false got true -PASS should not be focusable with invalid tabindex -PASS should not be focusable if disabled -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/wpt_internal/std-switch/tentative/focus.html b/third_party/blink/web_tests/wpt_internal/std-switch/tentative/focus.html deleted file mode 100644 index 82d4721c..0000000 --- a/third_party/blink/web_tests/wpt_internal/std-switch/tentative/focus.html +++ /dev/null
@@ -1,38 +0,0 @@ -<!DOCTYPE html> -<script src="/resources/testharness.js"></script> -<script src="/resources/testharnessreport.js"></script> -<body> -<script type="module"> -import 'std:elements/switch'; - -test(() => { - let switchElement = document.createElement('std-switch'); - document.body.appendChild(switchElement); - switchElement.focus(); - assert_equals(document.activeElement, switchElement); - assert_true(switchElement.matches(':focus')); -}, 'should be focus()-able by default'); - -test(() => { - let switchElement = document.createElement('std-switch'); - document.body.appendChild(switchElement); - assert_false(switchElement.hasAttribute('tabindex')); -}, 'should have no tabindex by default'); - -test(() => { - let switchElement = document.createElement('std-switch'); - switchElement.setAttribute('tabindex', 'parse-error'); - document.body.appendChild(switchElement); - switchElement.focus(); - assert_not_equals(document.activeElement, switchElement); -}, 'should not be focusable with invalid tabindex'); - -test(() => { - let switchElement = document.createElement('std-switch'); - switchElement.disabled = true; - document.body.appendChild(switchElement); - switchElement.focus(); - assert_not_equals(document.activeElement, switchElement); -}, 'should not be focusable if disabled'); -</script> -</body>
diff --git a/third_party/blink/web_tests/wpt_internal/std-switch/tentative/form-associated-basic.js b/third_party/blink/web_tests/wpt_internal/std-switch/tentative/form-associated-basic.js deleted file mode 100644 index e468f630..0000000 --- a/third_party/blink/web_tests/wpt_internal/std-switch/tentative/form-associated-basic.js +++ /dev/null
@@ -1,118 +0,0 @@ -const HTML_DOM = '/html/dom/'; - -function loadScript(src) { - return new Promise((resolve, reject) => { - let script = document.createElement('script'); - script.src = src; - script.addEventListener('load', e => resolve(), {once: true}); - script.addEventListener('error', e => reject(), {once: true}); - document.body.appendChild(script); - }); -} - -function formAssociatedTests(tag, reflectionDict) { - test(() => { - // TODO(tkent): Move the following checks to idlharness.js? - let interface = document.createElement(tag).constructor; - assert_not_own_property(interface, 'disabledFeatures'); - assert_not_own_property(interface, 'formAssociated'); - assert_not_own_property(interface, 'observedAttributes'); - assert_not_own_property(interface.prototype, 'adoptedCallback'); - assert_not_own_property(interface.prototype, 'attributeChangedCallback'); - assert_not_own_property(interface.prototype, 'connectedCallback'); - assert_not_own_property(interface.prototype, 'disconnectedCallback'); - assert_not_own_property(interface.prototype, 'formAssociatedCallback'); - assert_not_own_property(interface.prototype, 'formDisabledCallback'); - assert_not_own_property(interface.prototype, 'formResetCallback'); - assert_not_own_property(interface.prototype, 'formStateRestoreCallback'); - }, `Interface for ${tag} should not have custom-element-like properties`); - - test(() => { - let control = document.createElement(tag); - assert_array_equals(Object.getOwnPropertySymbols(control), []); - }, `A ${tag} instance should not have Symbol properties`); - - test(() => { - let control = document.createElement(tag); - assert_equals(control.type, tag); - }, `${tag} supports type property`); - - test(() => { - let control = document.createElement(tag); - assert_equals(control.form, null); - - let form1 = document.createElement('form'); - form1.appendChild(control); - assert_equals(control.form, form1); - - let form2 = document.createElement('form'); - form2.id = 'connected-form'; - document.body.appendChild(form2); - control.setAttribute('form', 'connected-form'); - control.remove(); - assert_equals(control.form, null); - document.body.appendChild(control); - assert_equals(control.form, document.getElementById('connected-form')); - }, `${tag} supports form property`); - - test(() => { - let control = document.createElement(tag); - assert_true(control.willValidate); - control.setAttribute('disabled', ''); - assert_false(control.willValidate); - control.removeAttribute('disabled'); - let datalist = document.createElement('datalist'); - datalist.appendChild(control); - assert_false(control.willValidate); - }, `${tag} supports willValidate property`); - - test(() => { - let control = document.createElement(tag); - assert_true(control.validity.valid); - assert_false(control.validity.customError); - assert_equals(control.validationMessage, ''); - assert_true(control.checkValidity(), '1: ' + control); - assert_true(control.reportValidity()); - - control.setCustomValidity('Invalid!'); - assert_false(control.validity.valid); - assert_true(control.validity.customError); - assert_equals(control.validationMessage, 'Invalid!'); - assert_false(control.checkValidity(), '2: ' + control); - assert_false(control.reportValidity()); - }, `${tag} supports form validation`); - - test(() => { - let control = document.createElement(tag); - assert_equals(control.labels.length, 0); - - let label = document.createElement('label'); - document.body.appendChild(label); - label.appendChild(control); - assert_array_equals(control.labels, [label], 'descendant association'); - assert_equals(label.control, control); - - document.body.appendChild(control); - document.body.appendChild(label); - assert_equals(control.labels.length, 0); - control.id = 'control'; - label.htmlFor = 'control'; - assert_array_equals(control.labels, [label], 'for= association'); - assert_equals(label.control, control); - }, `${tag} supports labels property`); - - promise_test(async () => { - await loadScript(HTML_DOM + 'original-harness.js'); - await loadScript(HTML_DOM + 'new-harness.js'); - let targetElements = {}; - targetElements[tag] = { - disabled: 'boolean', - name: 'string', - }; - for (let [key, value] of Object.entries(reflectionDict)) { - targetElements[tag][key] = value; - } - mergeElements(targetElements); - await loadScript(HTML_DOM + 'reflection.js'); - }, 'Setup reflection tests'); -}
diff --git a/third_party/blink/web_tests/wpt_internal/std-switch/tentative/form-reset.html b/third_party/blink/web_tests/wpt_internal/std-switch/tentative/form-reset.html deleted file mode 100644 index 2e1e3e0..0000000 --- a/third_party/blink/web_tests/wpt_internal/std-switch/tentative/form-reset.html +++ /dev/null
@@ -1,42 +0,0 @@ -<!DOCTYPE html> -<script src="/resources/testharness.js"></script> -<script src="/resources/testharnessreport.js"></script> -<body> -<div id="container"></div> -<script type=module> -import 'std:elements/switch'; - -const $ = document.querySelector.bind(document); - -function resetAndAssertOnIs(expected) { - $('form').reset(); - assert_equals($('std-switch').on, expected); -} - -test(() => { - $('#container').innerHTML = ` - <form><std-switch></std-switch></form>`; - $('std-switch').on = true; - resetAndAssertOnIs(false); -}, 'no "on" and no "defaulton"'); - -test(() => { - $('#container').innerHTML = ` - <form><std-switch defaulton></std-switch></form>`; - resetAndAssertOnIs(true); -}, 'no "on" and "defaulton"'); - -test(() => { - $('#container').innerHTML = ` - <form><std-switch on></std-switch></form>`; - resetAndAssertOnIs(false); -}, '"on" and no "defaulton"'); - -test(() => { - $('#container').innerHTML = ` - <form><std-switch on defaulton></std-switch></form>`; - $('std-switch').on = false; - resetAndAssertOnIs(true); -}, '"on" and "defaulton"'); -</script> -</body>
diff --git a/third_party/blink/web_tests/wpt_internal/std-switch/tentative/form-submission.html b/third_party/blink/web_tests/wpt_internal/std-switch/tentative/form-submission.html deleted file mode 100644 index 1c68fca..0000000 --- a/third_party/blink/web_tests/wpt_internal/std-switch/tentative/form-submission.html +++ /dev/null
@@ -1,26 +0,0 @@ -<!DOCTYPE html> -<script src="/resources/testharness.js"></script> -<script src="/resources/testharnessreport.js"></script> -<script src="/html/semantics/forms/form-submission-0/resources/targetted-form.js"></script> -<body> -<div id="container"></div> -<script type="module"> -import 'std:elements/switch'; - -promise_test(async () => { - const form = populateForm('<std-switch on></std-switch>'); - const query = await submitPromise(form, form.previousSibling); - assert_equals(query.indexOf('on'), -1); -}, 'No "name" attribute'); - -promise_test(async () => { - const form = populateForm('<std-switch name=switch1></std-switch>' + - '<std-switch name=switch2 on></std-switch>'); - const query = await submitPromise(form, form.previousSibling); - assert_not_equals(query.indexOf('switch1=off'), -1, - `${query} should contain "switch1=off".`); - assert_not_equals(query.indexOf('switch2=on'), -1, - `${query} should contain "switch2=on".`); -}, 'Normal case'); -</script> -</body>
diff --git a/third_party/blink/web_tests/wpt_internal/std-switch/tentative/import.html b/third_party/blink/web_tests/wpt_internal/std-switch/tentative/import.html deleted file mode 100644 index 33feb40e..0000000 --- a/third_party/blink/web_tests/wpt_internal/std-switch/tentative/import.html +++ /dev/null
@@ -1,22 +0,0 @@ -<!DOCTYPE html> -<script src="/resources/testharness.js"></script> -<script src="/resources/testharnessreport.js"></script> -<body> -<script> -test(() => { - assert_not_own_property(window, 'StdSwitchElement'); - assert_true(document.createElement('std-switch') instanceof HTMLElement); -}, 'StdSwitchElement should not be available before import'); - -let t = async_test('StdSwitchElement should be available after import'); -</script> -<script type="module"> -import { StdSwitchElement } from 'std:elements/switch'; - -t.step(() => { - assert_not_own_property(window, 'StdSwitchElement'); - assert_true(document.createElement('std-switch') instanceof StdSwitchElement); - t.done(); -}); -</script> -</body>
diff --git a/third_party/blink/web_tests/wpt_internal/std-switch/tentative/interface-expected.txt b/third_party/blink/web_tests/wpt_internal/std-switch/tentative/interface-expected.txt deleted file mode 100644 index 1690a96e3..0000000 --- a/third_party/blink/web_tests/wpt_internal/std-switch/tentative/interface-expected.txt +++ /dev/null
@@ -1,4 +0,0 @@ -This is a testharness.js-based test. -FAIL interface promise_test: Unhandled rejection with value: object "StdSwitchElement inherits HTMLElement, but HTMLElement is undefined." -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/wpt_internal/std-switch/tentative/interface.html b/third_party/blink/web_tests/wpt_internal/std-switch/tentative/interface.html deleted file mode 100644 index d0aabcd5..0000000 --- a/third_party/blink/web_tests/wpt_internal/std-switch/tentative/interface.html +++ /dev/null
@@ -1,51 +0,0 @@ -<!DOCTYPE html> -<script src="/resources/testharness.js"></script> -<script src="/resources/testharnessreport.js"></script> -<script src="/resources/webidl2/lib/webidl2.js"></script> -<script src="/resources/idlharness.js"></script> -<script type="module"> -import { StdSwitchElement } from 'std:elements/switch'; - -const DEPS = ['html', 'SVG', 'cssom', 'touch-events', 'uievents', 'dom', 'xhr']; - -// WebIDL and idlharness.js are not capable of interfaces in a module. -const SWITCH_IDL = ` -[Exposed=Window, - Constructor()] -interface StdSwitchElement : HTMLElement { - [CEReactions] attribute boolean defaultOn; - [CEReactions] attribute boolean on; - - [CEReactions] attribute boolean disabled; - readonly attribute HTMLFormElement? form; - [CEReactions] attribute DOMString name; - readonly attribute DOMString type; - - readonly attribute boolean willValidate; - readonly attribute ValidityState validity; - readonly attribute DOMString validationMessage; - boolean checkValidity(); - boolean reportValidity(); - void setCustomValidity(DOMString error); - - readonly attribute NodeList labels; -};`; - -Object.defineProperty(window, 'StdSwitchElement', { - configurable: true, - enumerable: false, - value: StdSwitchElement, - writable: true, -}); - -promise_test(async () => { - let idlArray = new IdlArray(); - let dependentIdls = await Promise.all(DEPS.map(spec => { return fetch_spec(spec); })); - idlArray.add_idls(SWITCH_IDL); - for (let dep of dependentIdls) { - idlArray.add_dependency_idls(dep); - } - idlArray.add_objects({StdSwitchElement: ['document.createElement("std-switch")']}); - idlArray.test(); -}); -</script>
diff --git a/third_party/blink/web_tests/wpt_internal/std-switch/tentative/properties-functions.html b/third_party/blink/web_tests/wpt_internal/std-switch/tentative/properties-functions.html deleted file mode 100644 index 4f07751803..0000000 --- a/third_party/blink/web_tests/wpt_internal/std-switch/tentative/properties-functions.html +++ /dev/null
@@ -1,14 +0,0 @@ -<!DOCTYPE html> -<script src="/resources/testharness.js"></script> -<script src="/resources/testharnessreport.js"></script> -<body> -<script src="form-associated-basic.js"></script> -<script type=module> -import 'std:elements/switch'; - -formAssociatedTests('std-switch', { - defaultOn: {type: 'boolean', domAttrName: 'defaulton'}, - on: 'boolean' -}); -</script> -</body>
diff --git a/third_party/boringssl/BUILD.gn b/third_party/boringssl/BUILD.gn index e2b2a8ea..b435499 100644 --- a/third_party/boringssl/BUILD.gn +++ b/third_party/boringssl/BUILD.gn
@@ -4,6 +4,7 @@ import("//build/config/android/config.gni") import("//build/config/arm.gni") +import("//build/config/compiler/compiler.gni") import("//build/config/sanitizers/sanitizers.gni") import("//build_overrides/build.gni") import("//testing/libfuzzer/fuzzer_test.gni") @@ -126,6 +127,11 @@ if (is_nacl) { deps += [ "//native_client_sdk/src/libraries/nacl_io" ] } + + if (!is_debug && !optimize_for_size) { + configs -= [ "//build/config/compiler:default_optimization" ] + configs += [ "//build/config/compiler:optimize_max" ] + } } if (build_with_chromium) {
diff --git a/tools/android/eclipse/.classpath b/tools/android/eclipse/.classpath index 0b1fae7..85f1a17 100644 --- a/tools/android/eclipse/.classpath +++ b/tools/android/eclipse/.classpath
@@ -98,6 +98,7 @@ <classpathentry kind="src" path="chrome/android/webapk/shell_apk/javatests/src"/> <classpathentry kind="src" path="chrome/android/webapk/shell_apk/junit/src"/> <classpathentry kind="src" path="chrome/android/webapk/shell_apk/src"/> + <classpathentry kind="src" path="chrome/browser/android/lifecycle/java/src"/> <classpathentry kind="src" path="chrome/browser/android/metrics/javatests/src"/> <classpathentry kind="src" path="chrome/browser/android/thin_webview/internal/java/src"/> <classpathentry kind="src" path="chrome/browser/android/thin_webview/java/src"/> @@ -129,7 +130,6 @@ <classpathentry kind="src" path="chrome/browser/ui/messages/android/java/src"/> <classpathentry kind="src" path="chrome/browser/util/android/java/src"/> <classpathentry kind="src" path="chrome/browser/xsurface/android/java/src"/> - <classpathentry kind="src" path="chrome/lib/lifecycle/public/android/java/src"/> <classpathentry kind="src" path="chrome/test/android/cast_emulator/src"/> <classpathentry kind="src" path="chrome/test/android/javatests/src"/> <classpathentry kind="src" path="chrome/test/chromedriver/test/webview_shell/java/src"/>
diff --git a/tools/binary_size/libsupersize/archive.py b/tools/binary_size/libsupersize/archive.py index 78641f0..ae53af4 100644 --- a/tools/binary_size/libsupersize/archive.py +++ b/tools/binary_size/libsupersize/archive.py
@@ -705,6 +705,11 @@ return sizes_by_module +def _ExtendSectionRange(section_range_by_name, section_name, delta_size): + (prev_address, prev_size) = section_range_by_name.get(section_name, (0, 0)) + section_range_by_name[section_name] = (prev_address, prev_size + delta_size) + + def CreateMetadata(map_path, elf_path, apk_path, minimal_apks_path, tool_prefix, output_directory, linker_name): """Creates metadata dict. @@ -834,7 +839,7 @@ def _ParseElfInfo(map_path, elf_path, tool_prefix, track_string_literals, outdir_context=None, linker_name=None): - """Adds ELF section sizes and symbols.""" + """Adds ELF section ranges and symbols.""" if elf_path: # Run nm on the elf file to retrieve the list of symbol names per-address. # This list is required because the .map file contains only a single name @@ -859,7 +864,7 @@ logging.info('Parsing Linker Map') with _OpenMaybeGz(map_path) as map_file: - map_section_sizes, raw_symbols, linker_map_extras = ( + map_section_ranges, raw_symbols, linker_map_extras = ( linker_map_parser.MapFileParser().Parse(linker_name, map_file)) if outdir_context and outdir_context.thin_archives: @@ -867,13 +872,16 @@ if elf_path: logging.debug('Validating section sizes') - _, elf_section_sizes = _SectionInfoFromElf(elf_path, tool_prefix) + elf_section_ranges = _SectionInfoFromElf(elf_path, tool_prefix) differing_elf_section_sizes = {} differing_map_section_sizes = {} - for k, v in elf_section_sizes.iteritems(): - if k not in _SECTION_SIZE_BLACKLIST and v != map_section_sizes.get(k): - differing_map_section_sizes[k] = map_section_sizes.get(k) - differing_elf_section_sizes[k] = v + for k, (_, elf_size) in elf_section_ranges.iteritems(): + if k in _SECTION_SIZE_BLACKLIST: + continue + (_, map_size) = map_section_ranges.get(k) + if map_size != elf_size: + differing_map_section_sizes[k] = map_size + differing_elf_section_sizes[k] = elf_size if differing_map_section_sizes: logging.error('ELF file and .map file do not agree on section sizes.') logging.error('readelf: %r', differing_elf_section_sizes) @@ -947,9 +955,9 @@ if elf_path: _NameStringLiterals(raw_symbols, elf_path, tool_prefix) - # If we have an ELF file, use its sizes as the source of truth, since some + # If we have an ELF file, use its ranges as the source of truth, since some # sections can differ from the .map. - return (elf_section_sizes if elf_path else map_section_sizes, raw_symbols, + return (elf_section_ranges if elf_path else map_section_ranges, raw_symbols, object_paths_by_name) @@ -1086,10 +1094,10 @@ return raw_symbols -def _ParseApkElfSectionSize(section_sizes, metadata, apk_elf_result): +def _ParseApkElfSectionRanges(section_ranges, metadata, apk_elf_result): if metadata: logging.debug('Extracting section sizes from .so within .apk') - apk_build_id, _, apk_section_sizes, elf_overhead_size = apk_elf_result.get() + apk_build_id, apk_section_ranges, elf_overhead_size = apk_elf_result.get() assert apk_build_id == metadata[models.METADATA_ELF_BUILD_ID], ( 'BuildID from apk_elf_result did not match') @@ -1102,15 +1110,16 @@ packed_section_name = '.rela.dyn' if packed_section_name: - unpacked_size = section_sizes.get(packed_section_name) - if unpacked_size is None: + unpacked_range = section_ranges.get(packed_section_name) + if unpacked_range is None: logging.warning('Packed section not present: %s', packed_section_name) - elif unpacked_size != apk_section_sizes.get(packed_section_name): - # These sizes are different only when using relocation_packer, which + elif unpacked_range != apk_section_ranges.get(packed_section_name): + # These ranges are different only when using relocation_packer, which # hasn't been used since switching from gold -> lld. - apk_section_sizes['%s (unpacked)' % packed_section_name] = unpacked_size - return apk_section_sizes, elf_overhead_size - return section_sizes, 0 + apk_section_ranges['%s (unpacked)' % + packed_section_name] = unpacked_range + return apk_section_ranges, elf_overhead_size + return section_ranges, 0 class _ResourcePathDeobfuscator: @@ -1151,7 +1160,7 @@ return path -def _ParseApkOtherSymbols(section_sizes, apk_path, apk_so_path, +def _ParseApkOtherSymbols(section_ranges, apk_path, apk_so_path, resources_pathmap_path, size_info_prefix, knobs): res_source_mapper = _ResourceSourceMapper(size_info_prefix, knobs) resource_deobfuscator = _ResourcePathDeobfuscator(resources_pathmap_path) @@ -1185,9 +1194,8 @@ zip_overhead_symbol = models.Symbol( models.SECTION_OTHER, overhead_size, full_name='Overhead: APK file') apk_symbols.append(zip_overhead_symbol) - prev = section_sizes.setdefault(models.SECTION_OTHER, 0) - section_sizes[models.SECTION_OTHER] = prev + sum(s.size for s in apk_symbols) - + _ExtendSectionRange(section_ranges, models.SECTION_OTHER, + sum(s.size for s in apk_symbols)) return dex_size, apk_symbols @@ -1206,7 +1214,7 @@ return object_paths_by_pak_id -def _FindPakSymbolsFromApk(section_sizes, apk_path, size_info_prefix, knobs): +def _FindPakSymbolsFromApk(section_ranges, apk_path, size_info_prefix, knobs): with zipfile.ZipFile(apk_path) as z: pak_zip_infos = (f for f in z.infolist() if f.filename.endswith('.pak')) pak_info_path = size_info_prefix + '.pak.info' @@ -1224,8 +1232,7 @@ section_name = _ComputePakFileSymbols( zip_info.filename, contents, res_info, symbols_by_id, compression_ratio=compression_ratio) - prev_size = section_sizes.get(section_name, 0) - section_sizes[section_name] = prev_size + zip_info.compress_size + _ExtendSectionRange(section_ranges, section_name, zip_info.compress_size) if total_uncompressed_size > 0: actual_ratio = ( @@ -1237,8 +1244,8 @@ return symbols_by_id -def _FindPakSymbolsFromFiles( - section_sizes, pak_files, pak_info_path, output_directory): +def _FindPakSymbolsFromFiles(section_ranges, pak_files, pak_info_path, + output_directory): """Uses files from args to find and add pak symbols.""" res_info = _ParsePakInfoFile(pak_info_path) symbols_by_id = {} @@ -1248,15 +1255,16 @@ section_name = _ComputePakFileSymbols( os.path.relpath(pak_file_path, output_directory), contents, res_info, symbols_by_id) - prev_size = section_sizes.get(section_name, 0) - section_sizes[section_name] = prev_size + os.path.getsize(pak_file_path) + _ExtendSectionRange(section_ranges, section_name, + os.path.getsize(pak_file_path)) return symbols_by_id -def _CalculateElfOverhead(section_sizes, elf_path): +def _CalculateElfOverhead(section_ranges, elf_path): if elf_path: section_sizes_total_without_bss = sum( - s for k, s in section_sizes.iteritems() if k not in models.BSS_SECTIONS) + size for k, (address, size) in section_ranges.iteritems() + if k not in models.BSS_SECTIONS) elf_overhead_size = ( os.path.getsize(elf_path) - section_sizes_total_without_bss) assert elf_overhead_size >= 0, ( @@ -1306,22 +1314,22 @@ raw_symbols[:] = [sym for sym in raw_symbols if sym.size or sym.IsNative()] -def _AddUnattributedSectionSymbols(raw_symbols, section_sizes, elf_result): +def _AddUnattributedSectionSymbols(raw_symbols, section_ranges, elf_result): # Create symbols for ELF sections not covered by existing symbols. logging.info('Searching for symbol gaps...') - section_addresses = elf_result.get()[1] + _, section_ranges, _ = elf_result.get() last_symbol_ends = collections.defaultdict(int) for sym in raw_symbols: if sym.end_address > last_symbol_ends[sym.section_name]: last_symbol_ends[sym.section_name] = sym.end_address for section_name, last_symbol_end in last_symbol_ends.iteritems(): - size_from_syms = last_symbol_end - section_addresses[section_name] - overhead = section_sizes[section_name] - size_from_syms + size_from_syms = last_symbol_end - section_ranges[section_name][0] + overhead = section_ranges[section_name][1] - size_from_syms assert overhead >= 0, ( ('End of last symbol (%x) in section %s is %d bytes after the end of ' - 'section from readelf (%x).') % - (last_symbol_end, section_name, -overhead, - section_sizes[section_name] + section_addresses[section_name])) + 'section from readelf (%x).') % (last_symbol_end, section_name, + -overhead, + sum(section_ranges[section_name]))) if overhead > 0 and section_name not in models.BSS_SECTIONS: raw_symbols.append( models.Symbol( @@ -1332,19 +1340,20 @@ logging.info('Last symbol in %s does not reach end of section, gap=%d', section_name, overhead) - for section_name in section_addresses: + # Sort keys to ensure consistent order (> 1 sections may have address = 0). + for section_name in sorted(section_ranges.keys()): # Handle sections that don't appear in |raw_symbols|. if section_name not in last_symbol_ends: - section_size = section_sizes[section_name] + address, section_size = section_ranges[section_name] logging.info('All bytes in %s are unattributed, gap=%d', section_name, overhead) raw_symbols.append( models.Symbol( models.SECTION_OTHER, section_size, - full_name='** ELF Section: {}'.format(section_name))) - prev = section_sizes.setdefault(models.SECTION_OTHER, 0) - section_sizes[models.SECTION_OTHER] = prev + section_size + full_name='** ELF Section: {}'.format(section_name), + address=address)) + _ExtendSectionRange(section_ranges, models.SECTION_OTHER, section_size) def CreateSectionSizesAndSymbols(map_path=None, @@ -1386,8 +1395,8 @@ Returns: A tuple of (section_sizes, raw_symbols). - section_sizes is a dict mapping section names to their size - raw_symbols is a list of Symbol objects + section_ranges is a dict mapping section names to their (address, size). + raw_symbols is a list of Symbol objects. """ knobs = knobs or SectionSizeKnobs() if apk_path and elf_path: @@ -1444,7 +1453,7 @@ thin_archives=thin_archives) if knobs.analyze_native: - section_sizes, raw_symbols, object_paths_by_name = _ParseElfInfo( + section_ranges, raw_symbols, object_paths_by_name = _ParseElfInfo( map_path, elf_path, tool_prefix, @@ -1452,22 +1461,25 @@ outdir_context=outdir_context, linker_name=linker_name) else: - section_sizes, raw_symbols, object_paths_by_name = {}, [], None + section_ranges, raw_symbols, object_paths_by_name = {}, [], None - elf_overhead_size = _CalculateElfOverhead(section_sizes, elf_path) + elf_overhead_size = _CalculateElfOverhead(section_ranges, elf_path) pak_symbols_by_id = None if apk_path and size_info_prefix: if elf_path: - section_sizes, elf_overhead_size = _ParseApkElfSectionSize( - section_sizes, metadata, apk_elf_result) - _AddUnattributedSectionSymbols(raw_symbols, section_sizes, apk_elf_result) + section_ranges, elf_overhead_size = _ParseApkElfSectionRanges( + section_ranges, metadata, apk_elf_result) + _AddUnattributedSectionSymbols(raw_symbols, section_ranges, + apk_elf_result) - pak_symbols_by_id = _FindPakSymbolsFromApk( - section_sizes, apk_path, size_info_prefix, knobs) + # Can modify |section_ranges|. + pak_symbols_by_id = _FindPakSymbolsFromApk(section_ranges, apk_path, + size_info_prefix, knobs) + # Can modify |section_ranges|. dex_size, other_symbols = _ParseApkOtherSymbols( - section_sizes, apk_path, apk_so_path, resources_pathmap_path, + section_ranges, apk_path, apk_so_path, resources_pathmap_path, size_info_prefix, knobs) if knobs.analyze_java: @@ -1482,14 +1494,14 @@ round( sum(s.pss for s in dex_symbols if s.section_name == models.SECTION_DEX_METHOD))) - section_sizes[models.SECTION_DEX_METHOD] = dex_method_size - section_sizes[models.SECTION_DEX] = dex_size - dex_method_size + section_ranges[models.SECTION_DEX_METHOD] = (0, dex_method_size) + section_ranges[models.SECTION_DEX] = (0, dex_size - dex_method_size) dex_other_size = int( round( sum(s.pss for s in dex_symbols if s.section_name == models.SECTION_DEX))) - unattributed_dex = section_sizes[models.SECTION_DEX] - dex_other_size + unattributed_dex = section_ranges[models.SECTION_DEX][1] - dex_other_size # Compare against -5 instead of 0 to guard against round-off errors. assert unattributed_dex >= -5, ('Dex symbols take up more space than ' 'the dex sections have available') @@ -1503,14 +1515,14 @@ raw_symbols.extend(other_symbols) elif pak_files and pak_info_file: + # Can modify |section_ranges|. pak_symbols_by_id = _FindPakSymbolsFromFiles( - section_sizes, pak_files, pak_info_file, output_directory) + section_ranges, pak_files, pak_info_file, output_directory) if elf_path: elf_overhead_symbol = models.Symbol( models.SECTION_OTHER, elf_overhead_size, full_name='Overhead: ELF file') - prev = section_sizes.setdefault(models.SECTION_OTHER, 0) - section_sizes[models.SECTION_OTHER] = prev + elf_overhead_size + _ExtendSectionRange(section_ranges, models.SECTION_OTHER, elf_overhead_size) raw_symbols.append(elf_overhead_symbol) if pak_symbols_by_id: @@ -1532,6 +1544,7 @@ if elf_path and knobs.relocations_mode: _OverwriteSymbolSizesWithRelocationCount(raw_symbols, tool_prefix, elf_path) + section_sizes = {k: size for k, (address, size) in section_ranges.items()} return section_sizes, raw_symbols @@ -1581,19 +1594,17 @@ def _SectionInfoFromElf(elf_path, tool_prefix): args = [path_util.GetReadElfPath(tool_prefix), '-S', '--wide', elf_path] stdout = subprocess.check_output(args) - section_addresses = {} - section_sizes = {} + section_ranges = {} # Matches [ 2] .hash HASH 00000000006681f0 0001f0 003154 04 A 3 0 8 for match in re.finditer(r'\[[\s\d]+\] (\..*)$', stdout, re.MULTILINE): items = match.group(1).split() - section_addresses[items[0]] = int(items[2], 16) - section_sizes[items[0]] = int(items[4], 16) - return section_addresses, section_sizes + section_ranges[items[0]] = (int(items[2], 16), int(items[4], 16)) + return section_ranges def _ElfIsMainPartition(elf_path, tool_prefix): - _, section_sizes = _SectionInfoFromElf(elf_path, tool_prefix) - return models.SECTION_PART_END in section_sizes.keys() + section_ranges = _SectionInfoFromElf(elf_path, tool_prefix) + return models.SECTION_PART_END in section_ranges.keys() def _ArchFromElf(elf_path, tool_prefix): @@ -1637,15 +1648,15 @@ def _ElfInfoFromApk(apk_path, apk_so_path, tool_prefix): - """Returns a tuple of (build_id, section_sizes, elf_overhead_size).""" + """Returns a tuple of (build_id, section_ranges, elf_overhead_size).""" with zipfile.ZipFile(apk_path) as apk, \ tempfile.NamedTemporaryFile() as f: f.write(apk.read(apk_so_path)) f.flush() build_id = BuildIdFromElf(f.name, tool_prefix) - section_addresses, section_sizes = _SectionInfoFromElf(f.name, tool_prefix) - elf_overhead_size = _CalculateElfOverhead(section_sizes, f.name) - return build_id, section_addresses, section_sizes, elf_overhead_size + section_ranges = _SectionInfoFromElf(f.name, tool_prefix) + elf_overhead_size = _CalculateElfOverhead(section_ranges, f.name) + return build_id, section_ranges, elf_overhead_size def _AutoIdentifyInputFile(args):
diff --git a/tools/binary_size/libsupersize/dbg.py b/tools/binary_size/libsupersize/dbg.py new file mode 100644 index 0000000..914d39b --- /dev/null +++ b/tools/binary_size/libsupersize/dbg.py
@@ -0,0 +1,38 @@ +# Copyright 2020 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. +"""Simple utilities for printf debugging.""" + +import sys + + +def _joinArgs(args): + return ' '.join(str(t) for t in args) + '\n' + + +def out(*args): + sys.stderr.write(_joinArgs(args)) + + +def outR(*args): + sys.stderr.write('\x1b[91m%s\x1b[0m' % _joinArgs(args)) + + +def outG(*args): + sys.stderr.write('\x1b[92m%s\x1b[0m' % _joinArgs(args)) + + +def outY(*args): + sys.stderr.write('\x1b[93m%s\x1b[0m' % _joinArgs(args)) + + +def outB(*args): + sys.stderr.write('\x1b[94m%s\x1b[0m' % _joinArgs(args)) + + +def outM(*args): + sys.stderr.write('\x1b[95m%s\x1b[0m' % _joinArgs(args)) + + +def outC(*args): + sys.stderr.write('\x1b[96m%s\x1b[0m' % _joinArgs(args))
diff --git a/tools/binary_size/libsupersize/linker_map_parser.py b/tools/binary_size/libsupersize/linker_map_parser.py index 21870d7..b684dea 100755 --- a/tools/binary_size/libsupersize/linker_map_parser.py +++ b/tools/binary_size/libsupersize/linker_map_parser.py
@@ -87,7 +87,7 @@ def __init__(self): self._common_symbols = [] self._symbols = [] - self._section_sizes = {} + self._section_ranges = {} self._lines = None def Parse(self, lines): @@ -98,7 +98,7 @@ identify file type. Returns: - A tuple of (section_sizes, symbols, extras). + A tuple of (section_ranges, symbols, extras). """ self._lines = iter(lines) logging.debug('Scanning for Header') @@ -112,7 +112,7 @@ elif line.startswith('Memory map'): self._ParseSections() break - return self._section_sizes, self._symbols, {} + return self._section_ranges, self._symbols, {} def _SkipToLineWithPrefix(self, prefix, prefix2=None): for l in self._lines: @@ -192,7 +192,7 @@ section_name, section_address_str, section_size_str = parts section_address = int(section_address_str[2:], 16) section_size = int(section_size_str[2:], 16) - self._section_sizes[section_name] = section_size + self._section_ranges[section_name] = (section_address, section_size) if (section_name in models.BSS_SECTIONS or section_name in (models.SECTION_RODATA, models.SECTION_TEXT) or section_name.startswith(models.SECTION_DATA)): @@ -338,7 +338,7 @@ def __init__(self, linker_name): self._linker_name = linker_name self._common_symbols = [] - self._section_sizes = {} + self._section_ranges = {} @staticmethod def ParseArmAnnotations(tok): @@ -428,7 +428,7 @@ identify file type. Returns: - A tuple of (section_sizes, symbols). + A tuple of (section_ranges, symbols). """ # Newest format: # VMA LMA Size Align Out In Symbol @@ -513,7 +513,7 @@ cur_section_is_useful = False else: if not tok.startswith('PROVIDE_HIDDEN'): - self._section_sizes[tok] = size + self._section_ranges[tok] = (address, size) cur_section = tok # E.g., Want to convert "(.text._name)" -> "_name" later. mangled_start_idx = len(cur_section) + 2 @@ -657,7 +657,7 @@ if jump_tables_count: logging.info('Found %d CFI jump tables with %d total entries', jump_tables_count, jump_entries_count) - return self._section_sizes, syms, {'thin_map': thin_map} + return self._section_ranges, syms, {'thin_map': thin_map} def _DetectLto(lines): @@ -727,7 +727,7 @@ lines: Iterable of lines from the linker map. Returns: - A tuple of (section_sizes, symbols, extras). + A tuple of (section_ranges, symbols, extras). """ next(lines) # Consume the first line of headers. if linker_name.startswith('lld'): @@ -737,13 +737,13 @@ else: raise Exception('.map file is from a unsupported linker.') - section_sizes, syms, extras = inner_parser.Parse(lines) + section_ranges, syms, extras = inner_parser.Parse(lines) for sym in syms: if sym.object_path and not sym.object_path.endswith(')'): # Don't want '' to become '.'. # Thin archives' paths will get fixed in |ar.CreateThinObjectPath|. sym.object_path = os.path.normpath(sym.object_path) - return (section_sizes, syms, extras) + return (section_ranges, syms, extras) def DeduceObjectPathsFromThinMap(raw_symbols, extras): @@ -820,20 +820,24 @@ print('Linker type: %s' % linker_name) with open(args.linker_file, 'r') as map_file: - section_sizes, syms, extras = MapFileParser().Parse(linker_name, map_file) + section_ranges, syms, extras = MapFileParser().Parse(linker_name, map_file) if args.dump: - print(section_sizes) + print(section_ranges) for sym in syms: print(sym) else: # Enter interactive shell. readline.parse_and_bind('tab: complete') - variables = {'section_sizes': section_sizes, 'syms': syms, 'extras': extras} + variables = { + 'section_ranges': section_ranges, + 'syms': syms, + 'extras': extras + } banner_lines = [ '*' * 80, 'Variables:', - ' section_sizes: Map from section to sizes.', + ' section_ranges: Map from section name to (address, size).', ' syms: Raw symbols parsed from the linker map file.', ' extras: Format-specific extra data.', '*' * 80,
diff --git a/tools/binary_size/libsupersize/linker_map_parser_test.py b/tools/binary_size/libsupersize/linker_map_parser_test.py index e44c470..c35b1f05 100755 --- a/tools/binary_size/libsupersize/linker_map_parser_test.py +++ b/tools/binary_size/libsupersize/linker_map_parser_test.py
@@ -51,8 +51,9 @@ def _RenderSectionSizesAndRawSymbols(section_sizes, raw_symbols): ret = [] ret.append('******** section_sizes ********') - for k, v in sorted(section_sizes.iteritems()): - ret.append('%-24s %d' % (k, v)) + for k, (address, size) in sorted(section_sizes.items()): + address_text = '@%x' % address + ret.append('%-24s %-9s %d' % (k, address_text, size)) ret.append('') ret.append('******** raw_symbols ********') for sym in raw_symbols:
diff --git a/tools/binary_size/libsupersize/testdata/Archive_Apk.golden b/tools/binary_size/libsupersize/testdata/Archive_Apk.golden index a20e2ff..85e22d6 100644 --- a/tools/binary_size/libsupersize/testdata/Archive_Apk.golden +++ b/tools/binary_size/libsupersize/testdata/Archive_Apk.golden
@@ -289,33 +289,33 @@ .dex.method@0(size_without_padding=79,padding=0,full_name=org.chromium.chrome.browser.compositor.layouts.phone.stack.StackAnimationLandscape#getScreenPositionInScrollDirection(org.chromium.chrome.browser.compositor.layouts.phone.stack.StackTab): float,object_path=$APK/org/chromium/chrome/browser/compositor/layouts/phone/stack/StackAnimationLandscape,source_path=,flags={},num_aliases=1,component=) .dex.method@0(size_without_padding=54,padding=0,full_name=org.chromium.chrome.browser.compositor.layouts.phone.stack.StackAnimationLandscape#getScreenSizeInScrollDirection(): float,object_path=$APK/org/chromium/chrome/browser/compositor/layouts/phone/stack/StackAnimationLandscape,source_path=,flags={},num_aliases=1,component=) .dex.method@0(size_without_padding=52,padding=0,full_name=org.chromium.chrome.browser.compositor.layouts.phone.stack.StackAnimationLandscape#isDefaultDiscardDirectionPositive(): boolean,object_path=$APK/org/chromium/chrome/browser/compositor/layouts/phone/stack/StackAnimationLandscape,source_path=,flags={},num_aliases=1,component=) -.other@0(size_without_padding=2655384,padding=0,full_name=** ELF Section: .rel.dyn,object_path=,source_path=,flags={},num_aliases=1,component=) -.other@0(size_without_padding=2816,padding=0,full_name=** ELF Section: .rel.plt,object_path=,source_path=,flags={},num_aliases=1,component=) -.other@0(size_without_padding=19,padding=0,full_name=** ELF Section: .interp,object_path=,source_path=,flags={},num_aliases=1,component=) -.other@0(size_without_padding=28,padding=0,full_name=** ELF Section: .note.gnu.gold-version,object_path=,source_path=,flags={},num_aliases=1,component=) -.other@0(size_without_padding=6496,padding=0,full_name=** ELF Section: .dynsym,object_path=,source_path=,flags={},num_aliases=1,component=) -.other@0(size_without_padding=42956,padding=0,full_name=** ELF Section: .got,object_path=,source_path=,flags={},num_aliases=1,component=) -.other@0(size_without_padding=812,padding=0,full_name=** ELF Section: .gnu.version,object_path=,source_path=,flags={},num_aliases=1,component=) -.other@0(size_without_padding=28,padding=0,full_name=** ELF Section: .gnu.version_d,object_path=,source_path=,flags={},num_aliases=1,component=) -.other@0(size_without_padding=436,padding=0,full_name=** ELF Section: .shstrtab,object_path=,source_path=,flags={},num_aliases=1,component=) -.other@0(size_without_padding=36,padding=0,full_name=** ELF Section: .note.gnu.build-id,object_path=,source_path=,flags={},num_aliases=1,component=) -.other@0(size_without_padding=17166112,padding=0,full_name=** ELF Section: .symtab,object_path=,source_path=,flags={},num_aliases=1,component=) -.other@0(size_without_padding=96,padding=0,full_name=** ELF Section: .gnu.version_r,object_path=,source_path=,flags={},num_aliases=1,component=) -.other@0(size_without_padding=4025,padding=0,full_name=** ELF Section: .dynstr,object_path=,source_path=,flags={},num_aliases=1,component=) -.other@0(size_without_padding=2684,padding=0,full_name=** ELF Section: .hash,object_path=,source_path=,flags={},num_aliases=1,component=) -.other@0(size_without_padding=183632,padding=0,full_name=** ELF Section: .ARM.extab,object_path=,source_path=,flags={},num_aliases=1,component=) -.other@0(size_without_padding=1536456,padding=0,full_name=** ELF Section: .ARM.exidx,object_path=,source_path=,flags={},num_aliases=1,component=) -.other@0(size_without_padding=8,padding=0,full_name=** ELF Section: .fini_array,object_path=,source_path=,flags={},num_aliases=1,component=) -.other@0(size_without_padding=8,padding=0,full_name=** ELF Section: .init_array,object_path=,source_path=,flags={},num_aliases=1,component=) -.other@0(size_without_padding=304,padding=0,full_name=** ELF Section: .dynamic,object_path=,source_path=,flags={},num_aliases=1,component=) -.other@0(size_without_padding=4244,padding=0,full_name=** ELF Section: .plt,object_path=,source_path=,flags={},num_aliases=1,component=) -.other@0(size_without_padding=34841854,padding=0,full_name=** ELF Section: .strtab,object_path=,source_path=,flags={},num_aliases=1,component=) .other@0(size_without_padding=60,padding=0,full_name=** ELF Section: .ARM.attributes,object_path=,source_path=,flags={},num_aliases=1,component=) +.other@0(size_without_padding=28,padding=0,full_name=** ELF Section: .note.gnu.gold-version,object_path=,source_path=,flags={},num_aliases=1,component=) +.other@0(size_without_padding=436,padding=0,full_name=** ELF Section: .shstrtab,object_path=,source_path=,flags={},num_aliases=1,component=) +.other@0(size_without_padding=34841854,padding=0,full_name=** ELF Section: .strtab,object_path=,source_path=,flags={},num_aliases=1,component=) +.other@0(size_without_padding=17166112,padding=0,full_name=** ELF Section: .symtab,object_path=,source_path=,flags={},num_aliases=1,component=) .other@0(size_without_padding=4194304,padding=0,full_name=smalltest.so,object_path=,source_path=$APK/smalltest.so,flags={gen},num_aliases=1,component=) .other@0(size_without_padding=1048576,padding=0,full_name=assets/icudtl.dat,object_path=,source_path=third_party/icu/android/icudtl.dat,flags={},num_aliases=1,component=Internal>Android) .other@0(size_without_padding=1024,padding=0,full_name=res/drawable-v13/test.xml,object_path=,source_path=chrome/android/res/drawable/test.xml,flags={},num_aliases=1,component=) .other@0(size_without_padding=0,padding=764,full_name=Overhead: APK file,object_path=,source_path=,flags={},num_aliases=1,component=) .other@0(size_without_padding=0,padding=33902635,full_name=Overhead: ELF file,object_path=,source_path=,flags={},num_aliases=1,component=) +.other@154(size_without_padding=19,padding=0,full_name=** ELF Section: .interp,object_path=,source_path=,flags={},num_aliases=1,component=) +.other@168(size_without_padding=36,padding=0,full_name=** ELF Section: .note.gnu.build-id,object_path=,source_path=,flags={},num_aliases=1,component=) +.other@18c(size_without_padding=6496,padding=0,full_name=** ELF Section: .dynsym,object_path=,source_path=,flags={},num_aliases=1,component=) +.other@1b0c(size_without_padding=4025,padding=0,full_name=** ELF Section: .dynstr,object_path=,source_path=,flags={},num_aliases=1,component=) +.other@2ad4(size_without_padding=2684,padding=0,full_name=** ELF Section: .hash,object_path=,source_path=,flags={},num_aliases=1,component=) +.other@3558(size_without_padding=812,padding=0,full_name=** ELF Section: .gnu.version,object_path=,source_path=,flags={},num_aliases=1,component=) +.other@3888(size_without_padding=28,padding=0,full_name=** ELF Section: .gnu.version_d,object_path=,source_path=,flags={},num_aliases=1,component=) +.other@38a4(size_without_padding=96,padding=0,full_name=** ELF Section: .gnu.version_r,object_path=,source_path=,flags={},num_aliases=1,component=) +.other@3904(size_without_padding=2655384,padding=0,full_name=** ELF Section: .rel.dyn,object_path=,source_path=,flags={},num_aliases=1,component=) +.other@29fbec(size_without_padding=2816,padding=0,full_name=** ELF Section: .rel.plt,object_path=,source_path=,flags={},num_aliases=1,component=) +.other@2a06ec(size_without_padding=4244,padding=0,full_name=** ELF Section: .plt,object_path=,source_path=,flags={},num_aliases=1,component=) +.other@2bd3d10(size_without_padding=1536456,padding=0,full_name=** ELF Section: .ARM.exidx,object_path=,source_path=,flags={},num_aliases=1,component=) +.other@2bd5858(size_without_padding=183632,padding=0,full_name=** ELF Section: .ARM.extab,object_path=,source_path=,flags={},num_aliases=1,component=) +.other@2ddc608(size_without_padding=8,padding=0,full_name=** ELF Section: .init_array,object_path=,source_path=,flags={},num_aliases=1,component=) +.other@2ddc6f4(size_without_padding=8,padding=0,full_name=** ELF Section: .fini_array,object_path=,source_path=,flags={},num_aliases=1,component=) +.other@2ddc6fc(size_without_padding=304,padding=0,full_name=** ELF Section: .dynamic,object_path=,source_path=,flags={},num_aliases=1,component=) +.other@2ddc834(size_without_padding=42956,padding=0,full_name=** ELF Section: .got,object_path=,source_path=,flags={},num_aliases=1,component=) .rodata@266e600(size_without_padding=5,padding=0,full_name="Str1",object_path=base/base/page_allocator.o,source_path=base/page_allocator.cc,flags={},num_aliases=2,component=Blink>Internal) .rodata@266e600(size_without_padding=5,padding=0,full_name="Str1",object_path=third_party/icu/icuuc/ucnv_ext.o,source_path=third_party/icu/ucnv_ext.c,flags={gen},num_aliases=2,component=Internal>Android) .rodata@266e605(size_without_padding=16,padding=0,full_name="String literal2",object_path=third_party/icu/icuuc/ucnv_ext.o,source_path=third_party/icu/ucnv_ext.c,flags={gen},num_aliases=1,component=Internal>Android)
diff --git a/tools/binary_size/libsupersize/testdata/Archive_MinimalApks.golden b/tools/binary_size/libsupersize/testdata/Archive_MinimalApks.golden index da296f3..76239933 100644 --- a/tools/binary_size/libsupersize/testdata/Archive_MinimalApks.golden +++ b/tools/binary_size/libsupersize/testdata/Archive_MinimalApks.golden
@@ -290,33 +290,33 @@ .dex.method@0(size_without_padding=79,padding=0,full_name=org.chromium.chrome.browser.compositor.layouts.phone.stack.StackAnimationLandscape#getScreenPositionInScrollDirection(org.chromium.chrome.browser.compositor.layouts.phone.stack.StackTab): float,object_path=$APK/org/chromium/chrome/browser/compositor/layouts/phone/stack/StackAnimationLandscape,source_path=,flags={},num_aliases=1,component=) .dex.method@0(size_without_padding=54,padding=0,full_name=org.chromium.chrome.browser.compositor.layouts.phone.stack.StackAnimationLandscape#getScreenSizeInScrollDirection(): float,object_path=$APK/org/chromium/chrome/browser/compositor/layouts/phone/stack/StackAnimationLandscape,source_path=,flags={},num_aliases=1,component=) .dex.method@0(size_without_padding=52,padding=0,full_name=org.chromium.chrome.browser.compositor.layouts.phone.stack.StackAnimationLandscape#isDefaultDiscardDirectionPositive(): boolean,object_path=$APK/org/chromium/chrome/browser/compositor/layouts/phone/stack/StackAnimationLandscape,source_path=,flags={},num_aliases=1,component=) -.other@0(size_without_padding=2655384,padding=0,full_name=** ELF Section: .rel.dyn,object_path=,source_path=,flags={},num_aliases=1,component=) -.other@0(size_without_padding=2816,padding=0,full_name=** ELF Section: .rel.plt,object_path=,source_path=,flags={},num_aliases=1,component=) -.other@0(size_without_padding=19,padding=0,full_name=** ELF Section: .interp,object_path=,source_path=,flags={},num_aliases=1,component=) -.other@0(size_without_padding=28,padding=0,full_name=** ELF Section: .note.gnu.gold-version,object_path=,source_path=,flags={},num_aliases=1,component=) -.other@0(size_without_padding=6496,padding=0,full_name=** ELF Section: .dynsym,object_path=,source_path=,flags={},num_aliases=1,component=) -.other@0(size_without_padding=42956,padding=0,full_name=** ELF Section: .got,object_path=,source_path=,flags={},num_aliases=1,component=) -.other@0(size_without_padding=812,padding=0,full_name=** ELF Section: .gnu.version,object_path=,source_path=,flags={},num_aliases=1,component=) -.other@0(size_without_padding=28,padding=0,full_name=** ELF Section: .gnu.version_d,object_path=,source_path=,flags={},num_aliases=1,component=) -.other@0(size_without_padding=436,padding=0,full_name=** ELF Section: .shstrtab,object_path=,source_path=,flags={},num_aliases=1,component=) -.other@0(size_without_padding=36,padding=0,full_name=** ELF Section: .note.gnu.build-id,object_path=,source_path=,flags={},num_aliases=1,component=) -.other@0(size_without_padding=17166112,padding=0,full_name=** ELF Section: .symtab,object_path=,source_path=,flags={},num_aliases=1,component=) -.other@0(size_without_padding=96,padding=0,full_name=** ELF Section: .gnu.version_r,object_path=,source_path=,flags={},num_aliases=1,component=) -.other@0(size_without_padding=4025,padding=0,full_name=** ELF Section: .dynstr,object_path=,source_path=,flags={},num_aliases=1,component=) -.other@0(size_without_padding=2684,padding=0,full_name=** ELF Section: .hash,object_path=,source_path=,flags={},num_aliases=1,component=) -.other@0(size_without_padding=183632,padding=0,full_name=** ELF Section: .ARM.extab,object_path=,source_path=,flags={},num_aliases=1,component=) -.other@0(size_without_padding=1536456,padding=0,full_name=** ELF Section: .ARM.exidx,object_path=,source_path=,flags={},num_aliases=1,component=) -.other@0(size_without_padding=8,padding=0,full_name=** ELF Section: .fini_array,object_path=,source_path=,flags={},num_aliases=1,component=) -.other@0(size_without_padding=8,padding=0,full_name=** ELF Section: .init_array,object_path=,source_path=,flags={},num_aliases=1,component=) -.other@0(size_without_padding=304,padding=0,full_name=** ELF Section: .dynamic,object_path=,source_path=,flags={},num_aliases=1,component=) -.other@0(size_without_padding=4244,padding=0,full_name=** ELF Section: .plt,object_path=,source_path=,flags={},num_aliases=1,component=) -.other@0(size_without_padding=34841854,padding=0,full_name=** ELF Section: .strtab,object_path=,source_path=,flags={},num_aliases=1,component=) .other@0(size_without_padding=60,padding=0,full_name=** ELF Section: .ARM.attributes,object_path=,source_path=,flags={},num_aliases=1,component=) +.other@0(size_without_padding=28,padding=0,full_name=** ELF Section: .note.gnu.gold-version,object_path=,source_path=,flags={},num_aliases=1,component=) +.other@0(size_without_padding=436,padding=0,full_name=** ELF Section: .shstrtab,object_path=,source_path=,flags={},num_aliases=1,component=) +.other@0(size_without_padding=34841854,padding=0,full_name=** ELF Section: .strtab,object_path=,source_path=,flags={},num_aliases=1,component=) +.other@0(size_without_padding=17166112,padding=0,full_name=** ELF Section: .symtab,object_path=,source_path=,flags={},num_aliases=1,component=) .other@0(size_without_padding=4194304,padding=0,full_name=smalltest.so,object_path=,source_path=$APK/smalltest.so,flags={gen},num_aliases=1,component=) .other@0(size_without_padding=1048576,padding=0,full_name=assets/icudtl.dat,object_path=,source_path=third_party/icu/android/icudtl.dat,flags={},num_aliases=1,component=Internal>Android) .other@0(size_without_padding=1024,padding=0,full_name=res/drawable-v13/test.xml,object_path=,source_path=chrome/android/res/drawable/test.xml,flags={},num_aliases=1,component=) .other@0(size_without_padding=0,padding=764,full_name=Overhead: APK file,object_path=,source_path=,flags={},num_aliases=1,component=) .other@0(size_without_padding=0,padding=33902635,full_name=Overhead: ELF file,object_path=,source_path=,flags={},num_aliases=1,component=) +.other@154(size_without_padding=19,padding=0,full_name=** ELF Section: .interp,object_path=,source_path=,flags={},num_aliases=1,component=) +.other@168(size_without_padding=36,padding=0,full_name=** ELF Section: .note.gnu.build-id,object_path=,source_path=,flags={},num_aliases=1,component=) +.other@18c(size_without_padding=6496,padding=0,full_name=** ELF Section: .dynsym,object_path=,source_path=,flags={},num_aliases=1,component=) +.other@1b0c(size_without_padding=4025,padding=0,full_name=** ELF Section: .dynstr,object_path=,source_path=,flags={},num_aliases=1,component=) +.other@2ad4(size_without_padding=2684,padding=0,full_name=** ELF Section: .hash,object_path=,source_path=,flags={},num_aliases=1,component=) +.other@3558(size_without_padding=812,padding=0,full_name=** ELF Section: .gnu.version,object_path=,source_path=,flags={},num_aliases=1,component=) +.other@3888(size_without_padding=28,padding=0,full_name=** ELF Section: .gnu.version_d,object_path=,source_path=,flags={},num_aliases=1,component=) +.other@38a4(size_without_padding=96,padding=0,full_name=** ELF Section: .gnu.version_r,object_path=,source_path=,flags={},num_aliases=1,component=) +.other@3904(size_without_padding=2655384,padding=0,full_name=** ELF Section: .rel.dyn,object_path=,source_path=,flags={},num_aliases=1,component=) +.other@29fbec(size_without_padding=2816,padding=0,full_name=** ELF Section: .rel.plt,object_path=,source_path=,flags={},num_aliases=1,component=) +.other@2a06ec(size_without_padding=4244,padding=0,full_name=** ELF Section: .plt,object_path=,source_path=,flags={},num_aliases=1,component=) +.other@2bd3d10(size_without_padding=1536456,padding=0,full_name=** ELF Section: .ARM.exidx,object_path=,source_path=,flags={},num_aliases=1,component=) +.other@2bd5858(size_without_padding=183632,padding=0,full_name=** ELF Section: .ARM.extab,object_path=,source_path=,flags={},num_aliases=1,component=) +.other@2ddc608(size_without_padding=8,padding=0,full_name=** ELF Section: .init_array,object_path=,source_path=,flags={},num_aliases=1,component=) +.other@2ddc6f4(size_without_padding=8,padding=0,full_name=** ELF Section: .fini_array,object_path=,source_path=,flags={},num_aliases=1,component=) +.other@2ddc6fc(size_without_padding=304,padding=0,full_name=** ELF Section: .dynamic,object_path=,source_path=,flags={},num_aliases=1,component=) +.other@2ddc834(size_without_padding=42956,padding=0,full_name=** ELF Section: .got,object_path=,source_path=,flags={},num_aliases=1,component=) .rodata@266e600(size_without_padding=5,padding=0,full_name="Str1",object_path=base/base/page_allocator.o,source_path=base/page_allocator.cc,flags={},num_aliases=2,component=Blink>Internal) .rodata@266e600(size_without_padding=5,padding=0,full_name="Str1",object_path=third_party/icu/icuuc/ucnv_ext.o,source_path=third_party/icu/ucnv_ext.c,flags={gen},num_aliases=2,component=Internal>Android) .rodata@266e605(size_without_padding=16,padding=0,full_name="String literal2",object_path=third_party/icu/icuuc/ucnv_ext.o,source_path=third_party/icu/ucnv_ext.c,flags={gen},num_aliases=1,component=Internal>Android)
diff --git a/tools/binary_size/libsupersize/testdata/linker_map_parser/Parser.golden b/tools/binary_size/libsupersize/testdata/linker_map_parser/Parser.golden index 0c3fbb435..76f1f560 100644 --- a/tools/binary_size/libsupersize/testdata/linker_map_parser/Parser.golden +++ b/tools/binary_size/libsupersize/testdata/linker_map_parser/Parser.golden
@@ -1,34 +1,34 @@ ******** section_sizes ******** -.ARM.attributes 35 -.ARM.exidx 1975928 -.ARM.extab 36860 -.bss 1089404 -.comment 168 -.data 118728 -.data.rel.ro 2013024 -.dynamic 240 -.dynstr 3947 -.dynsym 6256 -.fini_array 8 -.gnu.hash 28 -.gnu.version 782 -.gnu.version_r 96 -.got 1452 -.got.plt 1528 -.init_array 16 -.interp 19 -.note.android.ident 152 -.note.crashpad.info 28 -.note.gnu.build-id 36 -.part.end 4096 -.plt 6096 -.rel.dyn 184789 -.rel.plt 3032 -.rodata 6364747 -.shstrtab 452 -.strtab 49754930 -.symtab 18626064 -.text 38909928 +.ARM.attributes @0 35 +.ARM.exidx @188 1975928 +.ARM.extab @82504c 36860 +.bss @2f56000 1089404 +.comment @0 168 +.data @2d4c000 118728 +.data.rel.ro @2d69000 2013024 +.dynamic @2f54778 240 +.dynstr @1e43fc 3947 +.dynsym @1e2800 6256 +.fini_array @2f54760 8 +.gnu.hash @1e43e0 28 +.gnu.version @1e4070 782 +.gnu.version_r @1e4380 96 +.got @2f54868 1452 +.got.plt @2f54e14 1528 +.init_array @2f54768 16 +.interp @174 19 +.note.android.ident @213134 152 +.note.crashpad.info @213118 28 +.note.gnu.build-id @2131cc 36 +.part.end @0 4096 +.plt @2d4a7f0 6096 +.rel.dyn @1e5368 184789 +.rel.plt @212540 3032 +.rodata @213200 6364747 +.shstrtab @0 452 +.strtab @0 49754930 +.symtab @0 18626064 +.text @82f000 38909928 ******** raw_symbols ******** .rodata@213200(size_without_padding=4,padding=0,full_name=v8_Default_embedded_blob_size_,object_path=obj/v8/v8_external_snapshot/embedded.o,source_path=,flags={},num_aliases=1,component=)
diff --git a/tools/binary_size/libsupersize/testdata/linker_map_parser/ParserCfi.golden b/tools/binary_size/libsupersize/testdata/linker_map_parser/ParserCfi.golden index 9368733..67f76df 100644 --- a/tools/binary_size/libsupersize/testdata/linker_map_parser/ParserCfi.golden +++ b/tools/binary_size/libsupersize/testdata/linker_map_parser/ParserCfi.golden
@@ -1,8 +1,8 @@ ******** section_sizes ******** -.ARM.extab 24100 -.data.rel.ro 2430180 -.rodata 6759914 -.text 43636188 +.ARM.extab @8b02ec 24100 +.data.rel.ro @3255000 2430180 +.rodata @23dd00 6759914 +.text @8b6140 43636188 ******** raw_symbols ******** .rodata@23dd00(size_without_padding=4,padding=0,full_name=v8_Default_embedded_blob_size_,object_path=obj/v8/v8_external_snapshot/embedded.o,source_path=,flags={},num_aliases=1,component=)
diff --git a/tools/mb/mb.py b/tools/mb/mb.py index 138e246..59d2316 100755 --- a/tools/mb/mb.py +++ b/tools/mb/mb.py
@@ -99,6 +99,8 @@ self.masters = {} self.buckets = {} self.mixins = {} + self.isolate_exe = 'isolate.exe' if self.platform.startswith( + 'win') else 'isolate' def Main(self, args): self.ParseArgs(args) @@ -564,11 +566,10 @@ try: zip_dir = self.TempDir() remap_cmd = [ - self.executable, - self.PathJoin(self.chromium_src_dir, 'tools', 'swarming_client', - 'isolate.py'), 'remap', '--collapse_symlinks', '-s', - self.PathJoin(self.args.path, self.args.target + '.isolated'), '-o', - zip_dir + self.PathJoin(self.chromium_src_dir, 'tools', 'luci-go', + self.isolate_exe), 'remap', '-i', + self.PathJoin(self.args.path, self.args.target + '.isolate'), + '-outdir', zip_dir ] self.Run(remap_cmd) @@ -647,13 +648,16 @@ dimensions += ['-d', k, v] cmd = [ - self.executable, - self.PathJoin('tools', 'swarming_client', 'isolate.py'), + self.PathJoin(self.chromium_src_dir, 'tools', 'luci-go', + self.isolate_exe), 'archive', - '-s', self.ToSrcRelPath('%s/%s.isolated' % (build_dir, target)), - '-I', isolate_server, - '--namespace', namespace, - ] + '-s', + self.ToSrcRelPath('%s/%s.isolated' % (build_dir, target)), + '-I', + isolate_server, + '-namespace', + namespace, + ] # Talking to the isolateserver may fail because we're not logged in. # We trap the command explicitly and rewrite the error output so that @@ -694,12 +698,12 @@ def _RunLocallyIsolated(self, build_dir, target): cmd = [ - self.executable, - self.PathJoin('tools', 'swarming_client', 'isolate.py'), + self.PathJoin(self.chromium_src_dir, 'tools', 'luci-go', + self.isolate_exe), 'run', - '-s', - self.ToSrcRelPath('%s/%s.isolated' % (build_dir, target)), - ] + '-i', + self.ToSrcRelPath('%s/%s.isolate' % (build_dir, target)), + ] if self.args.extra_args: cmd += ['--'] + self.args.extra_args ret, _, _ = self.Run(cmd, force_verbose=True, buffer_output=False) @@ -1287,14 +1291,13 @@ return ret ret, _, _ = self.Run([ - self.executable, - self.PathJoin('tools', 'swarming_client', 'isolate.py'), + self.PathJoin(self.chromium_src_dir, 'tools', 'luci-go', + self.isolate_exe), 'check', '-i', self.ToSrcRelPath('%s/%s.isolate' % (build_dir, target)), - '-s', - self.ToSrcRelPath('%s/%s.isolated' % (build_dir, target))], - buffer_output=False) + ], + buffer_output=False) return ret
diff --git a/tools/mb/mb_unittest.py b/tools/mb/mb_unittest.py index bfe19a6..a4ad252 100755 --- a/tools/mb/mb_unittest.py +++ b/tools/mb/mb_unittest.py
@@ -842,7 +842,7 @@ } def run_stub(cmd, **_kwargs): - if 'isolate.py' in cmd[1]: + if os.path.join('tools', 'luci-go', 'isolate') in cmd[0]: return 0, 'fake_hash base_unittests', '' else: return 0, '', ''
diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml index 696edd7b..ff667012 100644 --- a/tools/metrics/histograms/enums.xml +++ b/tools/metrics/histograms/enums.xml
@@ -26791,6 +26791,7 @@ <int value="3186" label="QuicTransportDatagramApis"/> <int value="3187" label="V8Document_GetAnimations_Method"/> <int value="3188" label="V8ShadowRoot_GetAnimations_Method"/> + <int value="3189" label="ClientHintsUAFullVersion"/> </enum> <enum name="FeaturePolicyAllowlistType"> @@ -26805,7 +26806,8 @@ </enum> <enum name="FeaturePolicyFeature"> -<!-- Generated from third_party/blink/public/mojom/feature_policy/feature_policy_feature.mojom.--> +<!-- Generated from third_party/blink/public/mojom/feature_policy/feature_policy_feature.mojom. +Called by update_feature_policy_enum.py.--> <!-- Obsolete / deprecated features in this enum should be prefixed with "Deprecated: " --> @@ -26881,6 +26883,7 @@ <int value="68" label="Clipboard"/> <int value="69" label="ClientHintUAMobile"/> <int value="70" label="StorageAccessAPI"/> + <int value="71" label="ClientHintUAFullVersion"/> </enum> <enum name="FeaturePolicyImageCompressionFormat"> @@ -40452,6 +40455,7 @@ <int value="1717987538" label="NTPTilesLowerResolutionFavicons:enabled"/> <int value="1718341860" label="NTPButton:enabled"/> <int value="1719189460" label="EnablePasswordSelection:disabled"/> + <int value="1719958026" label="QueryTiles:enabled"/> <int value="1722748383" label="EnableAppReinstallZeroState:disabled"/> <int value="1723601083" label="enable-app-window-controls"/> <int value="1724800383" label="AsmJsToWebAssembly:disabled"/> @@ -40737,6 +40741,7 @@ <int value="2058439723" label="CalculateNativeWinOcclusion:disabled"/> <int value="2059322877" label="new-avatar-menu"/> <int value="2063091429" label="OfflinePagesSharing:enabled"/> + <int value="2066015302" label="QueryTiles:disabled"/> <int value="2067634730" label="LsdPermissionPrompt:disabled"/> <int value="2067735898" label="WebVrAutopresentFromIntent:enabled"/> <int value="2067903732" @@ -54955,6 +54960,27 @@ <int value="2" label="Will retry"/> </enum> +<enum name="ReasonToShowShelfNavigationButtons"> + <int value="0" label="None"/> + <int value="1" label="Navigation buttons"/> + <int value="2" label="Spoken feedback"/> + <int value="3" label="Navigation buttons + spoken feedback"/> + <int value="4" label="Switch access enabled"/> + <int value="5" label="Navigation buttons + switch access"/> + <int value="6" label="Spoken feedback + switch access"/> + <int value="7" label="Navigation buttons + spoken feedback + switch acecss"/> + <int value="8" label="Auto-click"/> + <int value="9" label="Shelf navigation buttons + auto-click"/> + <int value="10" label="Spoken feedback + auto-click"/> + <int value="11" label="Navigation buttons + spoken feedback + auto-click"/> + <int value="12" label="Switch access + auto-click"/> + <int value="13" label="Navigation buttons + switch access + auto-click"/> + <int value="14" label="Spoken feedback + switch access + auto-click"/> + <int value="15" + label="Navigation buttons + spoken feedback + switch access + + auto-click"/> +</enum> + <enum name="RecentTabsAction"> <int value="0" label="Local Session Tab"/> <int value="1" label="Other Device Tab"/>
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml index 3553bcb..eb5f2f6 100644 --- a/tools/metrics/histograms/histograms.xml +++ b/tools/metrics/histograms/histograms.xml
@@ -9175,6 +9175,20 @@ </summary> </histogram> +<histogram name="Ash.Shelf.NavigationButtonsInTabletMode.ReasonShown" + enum="ReasonToShowShelfNavigationButtons" expires_after="M84"> + <owner>tbarzic@chromium.org</owner> + <owner>gzadina@google.com</owner> + <summary> + The reason shelf navigation buttons are shown in tablet mode. The buttons + are shown when the device is in tablet mode only if certain accessibility + settings are enabled. This histogram records which accessibility setting + caused the buttons to be shown. Shown when navigation buttons visibility + changes in tablet mode, and only if HideShelfControlsInTabletMode feature is + enabled. + </summary> +</histogram> + <histogram name="Ash.Shelf.NumberOfItems" units="Icons" expires_after="2020-07-13"> <owner>anasalazar@google.com</owner>
diff --git a/ui/aura/test/aura_test_base.cc b/ui/aura/test/aura_test_base.cc index d3d6862b..dec8059 100644 --- a/ui/aura/test/aura_test_base.cc +++ b/ui/aura/test/aura_test_base.cc
@@ -13,7 +13,6 @@ #include "ui/base/ime/init/input_method_initializer.h" #include "ui/base/ui_base_features.h" #include "ui/base/ui_base_switches.h" -#include "ui/compositor/test/test_context_factories.h" #include "ui/events/event_dispatcher.h" #include "ui/events/event_sink.h" #include "ui/events/gesture_detection/gesture_configuration.h" @@ -66,15 +65,8 @@ gesture_config->set_velocity_tracker_strategy( ui::VelocityTracker::Strategy::LSQ2_RESTRICTED); - // The ContextFactory must exist before any Compositors are created. - ui::ContextFactory* context_factory = nullptr; - const bool enable_pixel_output = false; - context_factories_ = - std::make_unique<ui::TestContextFactories>(enable_pixel_output); - context_factory = context_factories_->GetContextFactory(); - helper_ = std::make_unique<AuraTestHelper>(); - helper_->SetUp(context_factory); + helper_->SetUp(); } void AuraTestBase::TearDown() { @@ -85,7 +77,6 @@ RunAllPendingInMessageLoop(); helper_->TearDown(); - context_factories_.reset(); testing::Test::TearDown(); }
diff --git a/ui/aura/test/aura_test_base.h b/ui/aura/test/aura_test_base.h index 1251c61b8..8f215fb 100644 --- a/ui/aura/test/aura_test_base.h +++ b/ui/aura/test/aura_test_base.h
@@ -19,10 +19,6 @@ #include "base/win/scoped_com_initializer.h" #endif -namespace ui { -class TestContextFactories; -} - namespace aura { class Window; class WindowDelegate; @@ -74,7 +70,6 @@ bool setup_called_ = false; bool teardown_called_ = false; - std::unique_ptr<ui::TestContextFactories> context_factories_; std::unique_ptr<AuraTestHelper> helper_; std::unique_ptr<AuraTestContextFactory> mus_context_factory_;
diff --git a/ui/aura/test/aura_test_helper.cc b/ui/aura/test/aura_test_helper.cc index b9c73b1..a1775c2 100644 --- a/ui/aura/test/aura_test_helper.cc +++ b/ui/aura/test/aura_test_helper.cc
@@ -25,6 +25,7 @@ #include "ui/compositor/compositor.h" #include "ui/compositor/layer_animator.h" #include "ui/compositor/scoped_animation_duration_scale_mode.h" +#include "ui/compositor/test/test_context_factories.h" #include "ui/display/screen.h" #include "ui/wm/core/wm_state.h" @@ -96,6 +97,10 @@ env_helper.ResetEnvForTesting(); context_factory_to_restore_ = env->context_factory(); + if (!context_factory) { + context_factories_ = std::make_unique<ui::TestContextFactories>(false); + context_factory = context_factories_->GetContextFactory(); + } env->set_context_factory(context_factory); // Unit tests generally don't want to query the system, rather use the state // from RootWindow. @@ -146,6 +151,8 @@ ui::ShutdownInputMethodForTesting(); + context_factories_.reset(); + if (env_) { env_.reset(); } else { @@ -181,5 +188,11 @@ return env_ ? env_.get() : Env::HasInstance() ? Env::GetInstance() : nullptr; } +ui::ContextFactory* AuraTestHelper::GetContextFactory() { + Env* env = GetEnv(); + DCHECK(env); + return env->context_factory(); +} + } // namespace test } // namespace aura
diff --git a/ui/aura/test/aura_test_helper.h b/ui/aura/test/aura_test_helper.h index ecd59aa..83b758fe 100644 --- a/ui/aura/test/aura_test_helper.h +++ b/ui/aura/test/aura_test_helper.h
@@ -15,6 +15,7 @@ namespace ui { class ContextFactory; class ScopedAnimationDurationScaleMode; +class TestContextFactories; } namespace wm { @@ -47,7 +48,7 @@ static AuraTestHelper* GetInstance(); // Creates and initializes (shows and sizes) the RootWindow for use in tests. - void SetUp(ui::ContextFactory* context_factory); + void SetUp(ui::ContextFactory* context_factory = nullptr); // Clean up objects that are created for tests. This also deletes the Env // object. @@ -67,12 +68,16 @@ Env* GetEnv(); + // May only be called between SetUp() and TearDown(). + ui::ContextFactory* GetContextFactory(); + private: bool setup_called_ = false; bool teardown_called_ = false; ui::ContextFactory* context_factory_to_restore_ = nullptr; std::unique_ptr<Env> env_; std::unique_ptr<wm::WMState> wm_state_; + std::unique_ptr<ui::TestContextFactories> context_factories_; std::unique_ptr<WindowTreeHost> host_; std::unique_ptr<TestWindowParentingClient> parenting_client_; std::unique_ptr<client::DefaultCaptureClient> capture_client_;
diff --git a/ui/base/ui_base_features.cc b/ui/base/ui_base_features.cc index 70f19c7..3698c2f 100644 --- a/ui/base/ui_base_features.cc +++ b/ui/base/ui_base_features.cc
@@ -124,6 +124,16 @@ }; #endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +// Enables forced colors mode for web content. +const base::Feature kForcedColors{"ForcedColors", + base::FEATURE_DISABLED_BY_DEFAULT}; + +bool IsForcedColorsEnabled() { + static const bool forced_colors_enabled = + base::FeatureList::IsEnabled(features::kForcedColors); + return forced_colors_enabled; +} + // Enable the FormControlsRefresh feature for Windows, ChromeOS, Linux, and Mac. // This feature will be released for Android in later milestones. See // crbug.com/1012106 for the Windows launch bug, and crbug.com/1012108 for the
diff --git a/ui/base/ui_base_features.h b/ui/base/ui_base_features.h index 077269a..ccfef3e 100644 --- a/ui/base/ui_base_features.h +++ b/ui/base/ui_base_features.h
@@ -63,6 +63,10 @@ extern const base::Feature kDirectManipulationStylus; #endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +// Used to enable forced colors mode for web content. +COMPONENT_EXPORT(UI_BASE_FEATURES) extern const base::Feature kForcedColors; +COMPONENT_EXPORT(UI_BASE_FEATURES) bool IsForcedColorsEnabled(); + // Used to enable the new controls UI. COMPONENT_EXPORT(UI_BASE_FEATURES) extern const base::Feature kFormControlsRefresh;
diff --git a/ui/events/blink/input_handler_proxy_unittest.cc b/ui/events/blink/input_handler_proxy_unittest.cc index 5cb4da6..e710be8 100644 --- a/ui/events/blink/input_handler_proxy_unittest.cc +++ b/ui/events/blink/input_handler_proxy_unittest.cc
@@ -165,6 +165,11 @@ void MouseLeave() override {} + cc::ElementId FindFrameElementIdAtPoint( + const gfx::PointF& mouse_position) override { + return cc::ElementId(); + } + cc::InputHandlerPointerResult MouseMoveAt( const gfx::Point& mouse_position) override { return cc::InputHandlerPointerResult();
diff --git a/ui/events/keycodes/dom/dom_keyboard_layout_map_win.cc b/ui/events/keycodes/dom/dom_keyboard_layout_map_win.cc index 001cacda..025a030 100644 --- a/ui/events/keycodes/dom/dom_keyboard_layout_map_win.cc +++ b/ui/events/keycodes/dom/dom_keyboard_layout_map_win.cc
@@ -103,7 +103,7 @@ base::size(char_buffer), /*wFlags=*/0, keyboard_layout); // Handle special cases for Japanese keyboard layout. - if (0x04110411 == reinterpret_cast<unsigned int>(keyboard_layout)) { + if (0x04110411 == reinterpret_cast<uintptr_t>(keyboard_layout)) { // Fix value for Japanese yen currency symbol. // Windows returns '\' for both IntlRo and IntlYen, even though IntlYen // should be the yen symbol. @@ -121,7 +121,7 @@ } // Handle special cases for Korean keyboard layout. - if (0x04120412 == reinterpret_cast<unsigned int>(keyboard_layout)) { + if (0x04120412 == reinterpret_cast<uintptr_t>(keyboard_layout)) { // Fix value for Korean won currency symbol. // Windows returns '\' for both Backslash and IntlBackslash, even though // IntlBackslash should be the won symbol.
diff --git a/ui/file_manager/file_manager/foreground/css/file_manager.css b/ui/file_manager/file_manager/foreground/css/file_manager.css index cdccad1..1c488e5 100644 --- a/ui/file_manager/file_manager/foreground/css/file_manager.css +++ b/ui/file_manager/file_manager/foreground/css/file_manager.css
@@ -137,7 +137,8 @@ top: 0; } -html.col-resize #directory-tree { +html.col-resize #directory-tree, +html.breadcrumb-elider-expanded #directory-tree { overflow-y: hidden; } @@ -486,6 +487,7 @@ border-bottom: 1px solid var(--cr-separator-color, rgb(224, 224, 224)); color: var(--google-grey-700); height: 56px; + overflow-x: hidden; } body.check-select .dialog-header { @@ -1487,6 +1489,10 @@ top: 40px; } +body.files-ng .loading-indicator { + --paper-progress-active-color: var(--google-blue-600); +} + body.files-ng .list-view .loading-indicator { top: 48px; }
diff --git a/ui/file_manager/file_manager/foreground/js/mock_directory_model.js b/ui/file_manager/file_manager/foreground/js/mock_directory_model.js index 6c6145a..0ae06d7 100644 --- a/ui/file_manager/file_manager/foreground/js/mock_directory_model.js +++ b/ui/file_manager/file_manager/foreground/js/mock_directory_model.js
@@ -54,6 +54,25 @@ getFileFilter() { return this.fileFilter_; } + + /** + * @return {DirectoryEntry|FakeEntry|FilesAppDirEntry} Current directory. + */ + getCurrentDirEntry() { + return null; + } + + /** + * @param {!DirectoryEntry|!FilesAppDirEntry} dirEntry The entry of the new + * directory to be changed to. + * @param {function()=} opt_callback Executed if the directory loads + * successfully. + */ + changeDirectoryEntry(dirEntry, opt_callback) { + if (opt_callback) { + opt_callback(); + } + } } const model = /** @type {!Object} */ (new FakeDirectoryModel());
diff --git a/ui/file_manager/file_manager/foreground/js/mock_navigation_list_model.js b/ui/file_manager/file_manager/foreground/js/mock_navigation_list_model.js index d323457..25139d9 100644 --- a/ui/file_manager/file_manager/foreground/js/mock_navigation_list_model.js +++ b/ui/file_manager/file_manager/foreground/js/mock_navigation_list_model.js
@@ -3,6 +3,25 @@ // found in the LICENSE file. /** + * Container for a NavigationModelVolumeItem, allowing it to be reused for a + * given volumeInfo. + */ +class MockNavigationListItem { + constructor(volumeInfo) { + this.volumeInfo_ = volumeInfo; + this.item_ = new NavigationModelVolumeItem(volumeInfo.label, volumeInfo); + } + + get volumeInfo() { + return this.volumeInfo_; + } + + get item() { + return this.item_; + } +} + +/** * Mock class for NavigationListModel. * Current implementation of mock class cannot handle shortcut list. */ @@ -13,16 +32,25 @@ constructor(volumeManager) { super(); this.volumeManager_ = volumeManager; + this.entries_ = []; } /** * Returns the item at the given index. - * @param {number} index The index of the entry to get. + * @param {number} index The index of the item to get. * @return {NavigationModelItem} The item at the given index. */ item(index) { + // DirectoryTree expects these NavigationModelVolumeItem objects to be long + // lived. So cache them and only change if the underlying volumeInfoList has + // changed. + let item = this.entries_[index]; const volumeInfo = this.volumeManager_.volumeInfoList.item(index); - return new NavigationModelVolumeItem(volumeInfo.label, volumeInfo); + if (!item || item.volumeInfo !== volumeInfo) { + item = new MockNavigationListItem(volumeInfo); + this.entries_[index] = item; + } + return item.item; } /**
diff --git a/ui/file_manager/file_manager/foreground/js/ui/breadcrumb.js b/ui/file_manager/file_manager/foreground/js/ui/breadcrumb.js index 699ff51..18fe71b 100644 --- a/ui/file_manager/file_manager/foreground/js/ui/breadcrumb.js +++ b/ui/file_manager/file_manager/foreground/js/ui/breadcrumb.js
@@ -28,7 +28,8 @@ background-color: currentColor; display: inline-flex; height: 20px; - margin: 8px 0; + padding: 8px 0; + min-width: 20px; width: 20px; } @@ -43,14 +44,14 @@ border-radius: 4px; color: var(--google-grey-700); cursor: pointer; - display: inline-flex; + display: inline-block; /* don't use browser's button font. */ font: inherit; margin: 0; /* text rendering debounce: fix a minimum width. */ - min-width: 1.2em; + min-width: calc(12px + 1em); /* elide wide text */ max-width: 200px; @@ -70,6 +71,7 @@ color: var(--google-grey-900); cursor: default; font-weight: 500; + margin-inline-end: 4px; } span[elider] { @@ -84,12 +86,15 @@ min-width: 48px; position: relative; transform: rotate(90deg); + width: 48px; } button[elider] { border-radius: 50%; box-sizing: border-box; + display: inline-flex; height: 36px; + min-width: 36px; padding: 0; width: 36px; } @@ -403,9 +408,12 @@ dialog.style['overflow'] = 'hidden auto'; dialog.style['max-height'] = '40vh'; - // Update state and emit rendered signal. + // Update global <html> and |this| element state. + document.documentElement.classList.add('breadcrumb-elider-expanded'); elider.setAttribute('aria-expanded', 'true'); this.setAttribute('checked', ''); + + // Emit rendered signal. this.signal_('path-rendered'); } @@ -415,9 +423,13 @@ * @private */ closeMenu_() { + // Update global <html> and |this| element state. + document.documentElement.classList.remove('breadcrumb-elider-expanded'); const elider = this.shadowRoot.querySelector('button[elider]'); elider.setAttribute('aria-expanded', 'false'); this.removeAttribute('checked'); + + // Close the drop-down <dialog> if needed. const menu = this.shadowRoot.querySelector('cr-action-menu'); if (menu.getDialog().hasAttribute('open')) { menu.close();
diff --git a/ui/file_manager/file_manager/foreground/js/ui/directory_tree.js b/ui/file_manager/file_manager/foreground/js/ui/directory_tree.js index ede04322..9252f65 100644 --- a/ui/file_manager/file_manager/foreground/js/ui/directory_tree.js +++ b/ui/file_manager/file_manager/foreground/js/ui/directory_tree.js
@@ -1137,10 +1137,17 @@ this.setContextMenu_(tree.contextMenuForRootItems); } + /** + * Whether the display root has been resolved. + * @private {boolean} + */ + this.resolved_ = false; + // Populate children of this volume using resolved display root. For SMB // shares, avoid prefetching sub directories to delay authentication. if (modelItem.volumeInfo_.providerId !== '@smb') { this.volumeInfo_.resolveDisplayRoot((displayRoot) => { + this.resolved_ = true; this.updateSubDirectories(false /* recursive */); }); } @@ -1150,6 +1157,10 @@ * @override */ updateSubDirectories(recursive, opt_successCallback, opt_errorCallback) { + if (!this.resolved_) { + return; + } + if (this.volumeInfo.volumeType === VolumeManagerCommon.VolumeType.MEDIA_VIEW) { // If this is a media-view volume, we don't show child directories. @@ -1168,6 +1179,7 @@ activate() { const directoryModel = this.parentTree_.directoryModel; const onEntryResolved = (entry) => { + this.resolved_ = true; // Changes directory to the model item's root directory if needed. if (!util.isSameEntry(directoryModel.getCurrentDirEntry(), entry)) { directoryModel.changeDirectoryEntry(entry);
diff --git a/ui/file_manager/file_manager/foreground/js/ui/directory_tree_unittest.js b/ui/file_manager/file_manager/foreground/js/ui/directory_tree_unittest.js index 13e9fb6..b57e76b 100644 --- a/ui/file_manager/file_manager/foreground/js/ui/directory_tree_unittest.js +++ b/ui/file_manager/file_manager/foreground/js/ui/directory_tree_unittest.js
@@ -936,6 +936,62 @@ callback); } +/** + * Test sub directories are not fetched for SMB, until the directory is + * clicked. + * @param {!function(boolean)} callback A callback function which is called with + * test result. + */ +function testSmbNotFetchedUntilClick(callback) { + // Add a volume representing an Smb provider to the mock filesystem. + volumeManager.createVolumeInfo( + VolumeManagerCommon.VolumeType.PROVIDED, 'smb', 'SMB_LABEL', '@smb'); + + // Add a sub directory to the Smb provider. + const smbProvider = assert(volumeManager.volumeInfoList.item(2).fileSystem); + fakeFileSystemURLEntries['filesystem:smb/child'] = + MockDirectoryEntry.create(smbProvider, '/smb_child'); + + // Populate the directory tree with the mock filesystem. + let directoryTree = createElements(); + const metadataModel = createMockMetadataModel(); + directoryTree.metadataModel = metadataModel; + DirectoryTree.decorate( + directoryTree, directoryModel, volumeManager, metadataModel, + fileOperationManager, true); + directoryTree.dataModel = new MockNavigationListModel(volumeManager); + + // Coerce to DirectoryTree type and draw the tree. + directoryTree = /** @type {!DirectoryTree} */ (directoryTree); + directoryTree.redraw(true); + // Draw the tree again, as this triggers a different code path which tries to + // refresh the sub directory list. + directoryTree.redraw(true); + + // At top level, Drive and downloads should be listed. + assertEquals(3, directoryTree.items.length); + assertEquals(str('DRIVE_DIRECTORY_LABEL'), directoryTree.items[0].label); + assertEquals(str('DOWNLOADS_DIRECTORY_LABEL'), directoryTree.items[1].label); + assertEquals('SMB_LABEL', directoryTree.items[2].label); + + // Expect the SMB share has no children. + const smbItem = directoryTree.items[2]; + assertEquals(0, smbItem.items.length); + + // Click on the SMB volume. + smbItem.click(); + + reportPromise( + waitUntil(() => { + // Wait until the SMB share item has been updated with its sub + // directories. + return smbItem.items.length == 1; + }).then(() => { + assertEquals('smb_child', smbItem.items[0].label); + }), + callback); +} + /** Test EntryListItem.sortEntries doesn't fail sorting empty array. */ function testEntryListItemSortEntriesEmpty() { const rootType = VolumeManagerCommon.RootType.MY_FILES;
diff --git a/ui/file_manager/file_manager/foreground/js/ui/file_manager_ui.js b/ui/file_manager/file_manager/foreground/js/ui/file_manager_ui.js index bae48d48..f604b0fa 100644 --- a/ui/file_manager/file_manager/foreground/js/ui/file_manager_ui.js +++ b/ui/file_manager/file_manager/foreground/js/ui/file_manager_ui.js
@@ -123,6 +123,9 @@ */ this.dialogContainer = queryRequiredElement('.dialog-container', this.element); + this.dialogContainer.addEventListener('relayout', (event) => { + this.layoutChanged_(); + }); /** * Context menu for texts. @@ -397,9 +400,6 @@ e.stopPropagation(); }); } - - /** @private {?number} */ - this.focusBodyCallbackId_ = null; } /** @@ -451,31 +451,6 @@ if (targetElement) { targetElement.focus(); } - - /** If focus lands in the <body> we move to the file list. */ - const focusList = () => { - if (this.focusBodyCallbackId_) { - return; - } - this.focusBodyCallbackId_ = window.requestIdleCallback(() => { - if (document.activeElement && - document.activeElement.tagName === 'BODY') { - this.focusDefaultElement_(); - } - this.focusBodyCallbackId_ = null; - }); - }; - - document.body.addEventListener('focusin', focusList); - document.body.addEventListener('focusout', focusList); - } - - /** - * Sets the focus in the default UI element. - * @private - */ - focusDefaultElement_() { - this.listContainer.currentList && this.listContainer.currentList.focus(); } /** @@ -557,6 +532,48 @@ } /** + * Handles the 'relayout' event to set sizing of the dialog main panel. + * + * @private + */ + layoutChanged_() { + if (this.scrollRAFActive_ === true) { + return; + } + + /** + * True if a scroll RAF is active: scroll events are frequent and serviced + * using RAF to throttle our processing of these events. + * @type {boolean} + */ + this.scrollRAFActive_ = true; + + window.requestAnimationFrame(() => { + this.scrollRAFActive_ = false; + + const mainWindow = document.querySelector('.dialog-container'); + const navigationList = document.querySelector('.dialog-navigation-list'); + const splitter = document.querySelector('.splitter'); + const dialogMain = document.querySelector('.dialog-main'); + + // Check the width of the tree and splitter and set the main panel width + // to the remainder if it's too wide. + const mainWindowWidth = mainWindow.offsetWidth; + const navListWidth = navigationList.offsetWidth; + const splitStyle = window.getComputedStyle(splitter); + const splitMargin = parseInt(splitStyle.marginRight, 10) + + parseInt(splitStyle.marginLeft, 10); + const splitWidth = splitter.offsetWidth + splitMargin; + const dialogMainWidth = dialogMain.offsetWidth; + if (!dialogMain.style.width || + (navListWidth + splitWidth + dialogMainWidth) > mainWindowWidth) { + dialogMain.style.width = + (mainWindowWidth - navListWidth - splitWidth) + 'px'; + } + }); + } + + /** * Sets the current list type. * @param {ListContainer.ListType} listType New list type. */
diff --git a/ui/file_manager/integration_tests/file_manager/breadcrumbs.js b/ui/file_manager/integration_tests/file_manager/breadcrumbs.js index 25e417f..a61506a 100644 --- a/ui/file_manager/integration_tests/file_manager/breadcrumbs.js +++ b/ui/file_manager/integration_tests/file_manager/breadcrumbs.js
@@ -121,12 +121,6 @@ const appId = await setupAndWaitUntilReady( RootPath.DOWNLOADS, nestedFolderTestEntries, []); - // files-ng bail out: it does not have breadcrumb tooltips. - const body = await remoteCall.waitForElement(appId, 'body'); - if (body.attributes['class'] === 'files-ng') { - return; - } - // Navigate to deepest folder. const breadcrumb = '/My files/Downloads/' + nestedFolderTestEntries.map(e => e.nameText).join('/');
diff --git a/ui/file_manager/integration_tests/file_manager/tab_index.js b/ui/file_manager/integration_tests/file_manager/tab_index.js index fae2c2f..23a2baf 100644 --- a/ui/file_manager/integration_tests/file_manager/tab_index.js +++ b/ui/file_manager/integration_tests/file_manager/tab_index.js
@@ -401,20 +401,3 @@ 'new-folder-button', 'filename-input-textbox' ]); }; - -/** - * Tests that focus doesn't stay on <body>, it's moved to the file list. - */ -testcase.tabindexFocusBody = async () => { - // Open Files app on Downloads. - const appId = await setupAndWaitUntilReady(RootPath.DOWNLOADS); - - // Check that the file list. - await remoteCall.waitForElement(appId, ['#file-list:focus']); - - // Force focus on <body>. - await remoteCall.focus(appId, ['body']); - - // Check that the file list. - await remoteCall.waitForElement(appId, ['#file-list:focus']); -};
diff --git a/ui/gfx/render_text.cc b/ui/gfx/render_text.cc index 7d5fb0c..dcaacc8 100644 --- a/ui/gfx/render_text.cc +++ b/ui/gfx/render_text.cc
@@ -1598,7 +1598,8 @@ EnsureLayoutTextUpdated(); // TODO(krb): Consider other elision modes for multiline. - if ((multiline_ && (!max_lines_ || elide_behavior() != ELIDE_TAIL)) || + if ((multiline_ && (!max_lines_ || (elide_behavior() != ELIDE_TAIL && + elide_behavior() != TRUNCATE_HEAD))) || elide_behavior() == NO_ELIDE || elide_behavior() == FADE_TAIL || (text_width > 0 && text_width < display_rect_.width()) || layout_text_.empty()) { @@ -1627,18 +1628,31 @@ render_text->EnsureLayout(); if (render_text->GetShapedText()->lines().size() > max_lines_) { - // Find the start and end index of the line to be elided. - Range line_range = GetLineRange( - layout_text_, render_text->GetShapedText()->lines()[max_lines_ - 1]); - // Add an ellipsis character in case the last line is short enough to fit - // on a single line. Otherwise that character will be elided anyway. - base::string16 text_to_elide = - layout_text_.substr(line_range.start(), line_range.length()) + - base::string16(kEllipsisUTF16); - display_text_.assign(layout_text_.substr(0, line_range.start()) + - Elide(text_to_elide, 0, - static_cast<float>(display_rect_.width()), - ELIDE_TAIL)); + if (elide_behavior() == TRUNCATE_HEAD) { + size_t num_lines = render_text->GetShapedText()->lines().size(); + if (num_lines > max_lines_) { + internal::Line line = + render_text->GetShapedText()->lines()[num_lines - max_lines_]; + int start_index = line.segments[0].char_range.GetMin(); + int end_index = render_text->text().size(); + display_text_.assign(layout_text_.substr(start_index, end_index)); + } + } else { + DCHECK_EQ(ELIDE_TAIL, elide_behavior()); + // Find the start and end index of the line to be elided. + Range line_range = + GetLineRange(layout_text_, + render_text->GetShapedText()->lines()[max_lines_ - 1]); + // Add an ellipsis character in case the last line is short enough to + // fit on a single line. Otherwise that character will be elided anyway. + base::string16 text_to_elide = + layout_text_.substr(line_range.start(), line_range.length()) + + base::string16(kEllipsisUTF16); + display_text_.assign(layout_text_.substr(0, line_range.start()) + + Elide(text_to_elide, 0, + static_cast<float>(display_rect_.width()), + ELIDE_TAIL)); + } // Have GetLineBreaks() re-calculate. line_breaks_.SetMax(0); } else {
diff --git a/ui/gfx/render_text.h b/ui/gfx/render_text.h index 892b329..3e554d2 100644 --- a/ui/gfx/render_text.h +++ b/ui/gfx/render_text.h
@@ -291,7 +291,7 @@ void SetMultiline(bool multiline); // If multiline, a non-zero value will cap the number of lines rendered, - // and elide the rest (currently only ELIDE_TAIL supported.) + // and elide the rest (currently only ELIDE_TAIL and TRUNCATE_HEAD supported.) void SetMaxLines(size_t max_lines); size_t max_lines() const { return max_lines_; }
diff --git a/ui/gfx/render_text_api_fuzzer.cc b/ui/gfx/render_text_api_fuzzer.cc index 834a6fc8..7c0f972 100644 --- a/ui/gfx/render_text_api_fuzzer.cc +++ b/ui/gfx/render_text_api_fuzzer.cc
@@ -146,14 +146,16 @@ case 1: return gfx::TRUNCATE; case 2: - return gfx::ELIDE_HEAD; + return gfx::TRUNCATE_HEAD; case 3: - return gfx::ELIDE_MIDDLE; + return gfx::ELIDE_HEAD; case 4: - return gfx::ELIDE_TAIL; + return gfx::ELIDE_MIDDLE; case 5: - return gfx::ELIDE_EMAIL; + return gfx::ELIDE_TAIL; case 6: + return gfx::ELIDE_EMAIL; + case 7: return gfx::FADE_TAIL; default: return gfx::NO_ELIDE;
diff --git a/ui/gfx/render_text_harfbuzz.cc b/ui/gfx/render_text_harfbuzz.cc index 23ab119..262b0b4e 100644 --- a/ui/gfx/render_text_harfbuzz.cc +++ b/ui/gfx/render_text_harfbuzz.cc
@@ -1364,7 +1364,9 @@ const base::string16& RenderTextHarfBuzz::GetDisplayText() { // TODO(krb): Consider other elision modes for multiline. - if ((multiline() && (max_lines() == 0 || elide_behavior() != ELIDE_TAIL)) || + if ((multiline() && + (max_lines() == 0 || (elide_behavior() != ELIDE_TAIL && + elide_behavior() != TRUNCATE_HEAD))) || elide_behavior() == NO_ELIDE || elide_behavior() == FADE_TAIL) { // Call UpdateDisplayText to clear |display_text_| and |text_elided_| // on the RenderText class.
diff --git a/ui/gfx/render_text_unittest.cc b/ui/gfx/render_text_unittest.cc index 6748a0c..2e06591 100644 --- a/ui/gfx/render_text_unittest.cc +++ b/ui/gfx/render_text_unittest.cc
@@ -2172,6 +2172,61 @@ EXPECT_EQ(render_text->GetNumLines(), 1U); } +TEST_F(RenderTextTest, MultilineTruncateHead) { + RenderText* render_text = GetRenderText(); + base::string16 input_text; + // Aim for 3 lines of text. + for (int i = 0; i < 20; ++i) { + std::string str = base::StringPrintf("hello%dworld ", i); + input_text.append(UTF8ToUTF16(str)); + } + render_text->SetText(input_text); + // Apply a style that tweaks the layout to make sure elision is calculated + // with these styles. This can expose a behavior in layout where text is + // slightly different width. This must be done after |SetText()|. + render_text->ApplyWeight(Font::Weight::BOLD, Range(1, 20)); + render_text->ApplyStyle(TEXT_STYLE_ITALIC, true, Range(1, 20)); + render_text->SetMultiline(true); + render_text->SetElideBehavior(TRUNCATE_HEAD); + render_text->SetMaxLines(3); + const Size size = render_text->GetStringSize(); + // Fit in 3 lines. (If we knew the width of a word, we could + // anticipate word wrap better.) + render_text->SetDisplayRect(Rect((size.width() + 96) / 3, 0)); + // Trigger rendering. + render_text->GetStringSize(); + EXPECT_EQ(input_text, render_text->GetDisplayText()); + + base::string16 actual_text; + // Try widening the space gradually, one pixel at a time, trying + // to trigger a failure in layout. There was an issue where, right at + // the edge of a word getting truncated, the estimate would be wrong + // and it would wrap instead. + for (int i = (size.width() - 12) / 3; i < (size.width() + 30) / 3; ++i) { + render_text->SetDisplayRect(Rect(i, 0)); + // Trigger rendering. + render_text->GetStringSize(); + actual_text = render_text->GetDisplayText(); + EXPECT_LT(actual_text.size(), input_text.size()); + EXPECT_EQ(actual_text, + input_text.substr(input_text.size() - actual_text.size(), + input_text.size())); + EXPECT_EQ(3U, render_text->GetNumLines()); + } + // Now remove line restriction. + render_text->SetMaxLines(0); + render_text->GetStringSize(); + EXPECT_EQ(input_text, render_text->GetDisplayText()); + + // And put it back. + render_text->SetMaxLines(3); + render_text->GetStringSize(); + EXPECT_LT(actual_text.size(), input_text.size()); + EXPECT_EQ(actual_text, + input_text.substr(input_text.size() - actual_text.size(), + input_text.size())); +} + TEST_F(RenderTextTest, ElidedStyledTextRtl) { static const char* kInputTexts[] = { "http://ar.wikipedia.com/فحص",
diff --git a/ui/gfx/text_constants.h b/ui/gfx/text_constants.h index f22a5d2..aaceb7ad 100644 --- a/ui/gfx/text_constants.h +++ b/ui/gfx/text_constants.h
@@ -115,13 +115,14 @@ // Elision behaviors of text that exceeds constrained dimensions. enum ElideBehavior { - NO_ELIDE = 0, // Do not modify the text, it may overflow its available bounds. - TRUNCATE, // Do not elide or fade, just truncate at the end of the string. - ELIDE_HEAD, // Add an ellipsis at the start of the string. - ELIDE_MIDDLE, // Add an ellipsis in the middle of the string. - ELIDE_TAIL, // Add an ellipsis at the end of the string. - ELIDE_EMAIL, // Add ellipses to username and domain substrings. - FADE_TAIL, // Fade the string's end opposite of its horizontal alignment. + NO_ELIDE = 0, // Don't modify the text, it may overflow its bounds. + TRUNCATE, // Truncate text at the end of the string. + TRUNCATE_HEAD, // Truncate text at the start of the string. + ELIDE_HEAD, // Add an ellipsis at the start of the string. + ELIDE_MIDDLE, // Add an ellipsis in the middle of the string. + ELIDE_TAIL, // Add an ellipsis at the end of the string. + ELIDE_EMAIL, // Add ellipses to username and domain substrings. + FADE_TAIL, // Fade the string's end opposite of its horizontal alignment. }; } // namespace gfx
diff --git a/ui/native_theme/native_theme_base.cc b/ui/native_theme/native_theme_base.cc index 907adfec..fba6e54 100644 --- a/ui/native_theme/native_theme_base.cc +++ b/ui/native_theme/native_theme_base.cc
@@ -1568,7 +1568,7 @@ SkColor NativeThemeBase::GetControlColor(ControlColorId color_id, ColorScheme color_scheme) const { #if defined(OS_WIN) - if (UsesHighContrastColors()) + if (UsesHighContrastColors() && features::IsForcedColorsEnabled()) return GetHighContrastControlColor(color_id, color_scheme); #endif
diff --git a/ui/views/controls/label.cc b/ui/views/controls/label.cc index c15c27a..7749c52c 100644 --- a/ui/views/controls/label.cc +++ b/ui/views/controls/label.cc
@@ -233,7 +233,8 @@ void Label::SetMultiLine(bool multi_line) { DCHECK(!multi_line || (elide_behavior_ == gfx::ELIDE_TAIL || - elide_behavior_ == gfx::NO_ELIDE)); + elide_behavior_ == gfx::NO_ELIDE || + elide_behavior_ == gfx::TRUNCATE_HEAD)); if (this->GetMultiLine() == multi_line) return; multi_line_ = multi_line; @@ -297,7 +298,8 @@ void Label::SetElideBehavior(gfx::ElideBehavior elide_behavior) { DCHECK(!GetMultiLine() || (elide_behavior == gfx::ELIDE_TAIL || - elide_behavior == gfx::NO_ELIDE)); + elide_behavior == gfx::NO_ELIDE || + elide_behavior == gfx::TRUNCATE_HEAD)); if (elide_behavior_ == elide_behavior) return; elide_behavior_ = elide_behavior; @@ -565,11 +567,14 @@ } std::unique_ptr<gfx::RenderText> Label::CreateRenderText() const { - // Multi-line labels only support NO_ELIDE and ELIDE_TAIL for now. + // Multi-line labels only support NO_ELIDE, ELIDE_TAIL, and TRUNCATE_HEAD + // for now. // TODO(warx): Investigate more elide text support. - gfx::ElideBehavior elide_behavior = - GetMultiLine() && (elide_behavior_ != gfx::NO_ELIDE) ? gfx::ELIDE_TAIL - : elide_behavior_; + gfx::ElideBehavior elide_behavior = elide_behavior_; + if (GetMultiLine() && elide_behavior_ != gfx::NO_ELIDE && + elide_behavior_ != gfx::TRUNCATE_HEAD) { + elide_behavior = gfx::ELIDE_TAIL; + } std::unique_ptr<gfx::RenderText> render_text = gfx::RenderText::CreateRenderText();
diff --git a/ui/views/controls/label_unittest.cc b/ui/views/controls/label_unittest.cc index e971fdfc..9df56eb 100644 --- a/ui/views/controls/label_unittest.cc +++ b/ui/views/controls/label_unittest.cc
@@ -414,6 +414,12 @@ EXPECT_LT(size.width(), label()->size().width()); EXPECT_GT(text.length(), label()->GetDisplayTextForTesting().length()); + label()->SetElideBehavior(gfx::TRUNCATE_HEAD); + label()->SetSize(gfx::Size(10, 10)); + size = label()->GetMinimumSize(); + EXPECT_LT(size.width(), label()->size().width()); + EXPECT_GT(text.length(), label()->GetDisplayTextForTesting().length()); + // Non-elidable single-line labels should take up their full text size, since // this behavior implies the text should not be cut off. EXPECT_FALSE(label()->GetMultiLine()); @@ -791,6 +797,10 @@ EXPECT_GT(required_size.width(), kMinTextDimension); label()->SetBoundsRect(gfx::Rect(required_size)); + label()->SetElideBehavior(gfx::TRUNCATE_HEAD); + EXPECT_EQ(required_size, label()->GetPreferredSize()); + EXPECT_EQ(text, label()->GetDisplayTextForTesting()); + label()->SetElideBehavior(gfx::ELIDE_TAIL); EXPECT_EQ(required_size, label()->GetPreferredSize()); EXPECT_EQ(text, label()->GetDisplayTextForTesting()); @@ -1002,6 +1012,9 @@ label()->SetBoundsRect(gfx::Rect(zero_size)); EXPECT_TRUE(label()->IsDisplayTextTruncated()); + label()->SetElideBehavior(gfx::TRUNCATE_HEAD); + EXPECT_TRUE(label()->IsDisplayTextTruncated()); + label()->SetElideBehavior(gfx::NO_ELIDE); EXPECT_TRUE(label()->IsDisplayTextTruncated());
diff --git a/ui/views/metadata/type_conversion.cc b/ui/views/metadata/type_conversion.cc index 1ca8954d..7eda23e 100644 --- a/ui/views/metadata/type_conversion.cc +++ b/ui/views/metadata/type_conversion.cc
@@ -271,6 +271,7 @@ gfx::ElideBehavior, {gfx::ElideBehavior::NO_ELIDE, base::ASCIIToUTF16("NO_ELIDE")}, {gfx::ElideBehavior::TRUNCATE, base::ASCIIToUTF16("TRUNCATE")}, + {gfx::ElideBehavior::TRUNCATE_HEAD, base::ASCIIToUTF16("TRUNCATE_HEAD")}, {gfx::ElideBehavior::ELIDE_HEAD, base::ASCIIToUTF16("ELIDE_HEAD")}, {gfx::ElideBehavior::ELIDE_MIDDLE, base::ASCIIToUTF16("ELIDE_MIDDLE")}, {gfx::ElideBehavior::ELIDE_TAIL, base::ASCIIToUTF16("ELIDE_TAIL")},
diff --git a/ui/views/test/scoped_views_test_helper.cc b/ui/views/test/scoped_views_test_helper.cc index 7049fca..ab3fe46 100644 --- a/ui/views/test/scoped_views_test_helper.cc +++ b/ui/views/test/scoped_views_test_helper.cc
@@ -21,9 +21,8 @@ ScopedViewsTestHelper::ScopedViewsTestHelper( std::unique_ptr<TestViewsDelegate> test_views_delegate) : test_views_delegate_(std::move(test_views_delegate)) { - ui::ContextFactory* context_factory = context_factories_.GetContextFactory(); - test_views_delegate_->set_context_factory(context_factory); - test_helper_ = ViewsTestHelper::Create(context_factory); + test_helper_ = ViewsTestHelper::Create(); + test_views_delegate_->set_context_factory(test_helper_->GetContextFactory()); ui::InitializeInputMethodForTesting(); ui::TestClipboard::CreateForCurrentThread();
diff --git a/ui/views/test/scoped_views_test_helper.h b/ui/views/test/scoped_views_test_helper.h index 907bfb94..7752673 100644 --- a/ui/views/test/scoped_views_test_helper.h +++ b/ui/views/test/scoped_views_test_helper.h
@@ -8,7 +8,6 @@ #include <memory> #include "base/macros.h" -#include "ui/compositor/test/test_context_factories.h" #include "ui/gfx/native_widget_types.h" namespace views { @@ -23,8 +22,7 @@ // by ViewsTestBase. class ScopedViewsTestHelper { public: - // Initialize with the given TestViewsDelegate instance, after setting the - // ContextFactory. + // Initialize with the given TestViewsDelegate instance. explicit ScopedViewsTestHelper( std::unique_ptr<TestViewsDelegate> test_views_delegate = std::make_unique<TestViewsDelegate>()); @@ -43,7 +41,6 @@ } private: - ui::TestContextFactories context_factories_{false}; std::unique_ptr<TestViewsDelegate> test_views_delegate_; std::unique_ptr<ViewsTestHelper> test_helper_;
diff --git a/ui/views/test/views_test_helper.h b/ui/views/test/views_test_helper.h index 49db215..7cb0462 100644 --- a/ui/views/test/views_test_helper.h +++ b/ui/views/test/views_test_helper.h
@@ -10,7 +10,7 @@ namespace ui { class ContextFactory; -} // namespace ui +} namespace views { @@ -19,15 +19,16 @@ class ViewsTestHelper { public: // Create a platform specific instance. - static std::unique_ptr<ViewsTestHelper> Create( - ui::ContextFactory* context_factory); + static std::unique_ptr<ViewsTestHelper> Create(); virtual ~ViewsTestHelper() = default; - // Returns a context view. In aura builds, this will be the - // RootWindow. Everywhere else, NULL. + // Returns a context view. In aura builds, this will be the RootWindow. + // Everywhere else, null. virtual gfx::NativeWindow GetContext(); + virtual ui::ContextFactory* GetContextFactory() = 0; + protected: ViewsTestHelper() = default;
diff --git a/ui/views/test/views_test_helper_aura.cc b/ui/views/test/views_test_helper_aura.cc index 28b9cc34..46210a9 100644 --- a/ui/views/test/views_test_helper_aura.cc +++ b/ui/views/test/views_test_helper_aura.cc
@@ -4,7 +4,6 @@ #include "ui/views/test/views_test_helper_aura.h" -#include "base/memory/ptr_util.h" #include "ui/aura/client/screen_position_client.h" #include "ui/wm/core/capture_controller.h" #include "ui/wm/core/default_activation_client.h" @@ -13,14 +12,12 @@ namespace views { // static -std::unique_ptr<ViewsTestHelper> ViewsTestHelper::Create( - ui::ContextFactory* context_factory) { - return base::WrapUnique(new ViewsTestHelperAura(context_factory)); +std::unique_ptr<ViewsTestHelper> ViewsTestHelper::Create() { + return std::make_unique<ViewsTestHelperAura>(); } -ViewsTestHelperAura::ViewsTestHelperAura(ui::ContextFactory* context_factory) - : context_factory_(context_factory) { - aura_test_helper_.SetUp(context_factory_); +ViewsTestHelperAura::ViewsTestHelperAura() { + aura_test_helper_.SetUp(); gfx::NativeWindow root_window = GetContext(); if (root_window) { @@ -61,4 +58,8 @@ return aura_test_helper_.root_window(); } +ui::ContextFactory* ViewsTestHelperAura::GetContextFactory() { + return aura_test_helper_.GetContextFactory(); +} + } // namespace views
diff --git a/ui/views/test/views_test_helper_aura.h b/ui/views/test/views_test_helper_aura.h index 79c5b24..0125b61 100644 --- a/ui/views/test/views_test_helper_aura.h +++ b/ui/views/test/views_test_helper_aura.h
@@ -21,14 +21,14 @@ class ViewsTestHelperAura : public ViewsTestHelper { public: - explicit ViewsTestHelperAura(ui::ContextFactory* context_factory); + ViewsTestHelperAura(); ~ViewsTestHelperAura() override; // ViewsTestHelper: gfx::NativeWindow GetContext() override; + ui::ContextFactory* GetContextFactory() override; private: - ui::ContextFactory* context_factory_; aura::test::AuraTestHelper aura_test_helper_; std::unique_ptr<aura::client::ScreenPositionClient> screen_position_client_;
diff --git a/ui/views/test/views_test_helper_mac.h b/ui/views/test/views_test_helper_mac.h index e593d03..f3cd6c6 100644 --- a/ui/views/test/views_test_helper_mac.h +++ b/ui/views/test/views_test_helper_mac.h
@@ -10,6 +10,7 @@ #include "base/macros.h" #include "ui/base/test/scoped_fake_full_keyboard_access.h" #include "ui/compositor/scoped_animation_duration_scale_mode.h" +#include "ui/compositor/test/test_context_factories.h" #include "ui/views/test/views_test_helper.h" namespace ui { @@ -26,7 +27,12 @@ ViewsTestHelperMac(); ~ViewsTestHelperMac() override; + // ViewsTestHelper: + ui::ContextFactory* GetContextFactory() override; + private: + ui::TestContextFactories context_factories_{false}; + // Disable animations during tests. ui::ScopedAnimationDurationScaleMode zero_duration_mode_{ ui::ScopedAnimationDurationScaleMode::ZERO_DURATION};
diff --git a/ui/views/test/views_test_helper_mac.mm b/ui/views/test/views_test_helper_mac.mm index ff0d7e7..7483832 100644 --- a/ui/views/test/views_test_helper_mac.mm +++ b/ui/views/test/views_test_helper_mac.mm
@@ -7,7 +7,6 @@ #import <Cocoa/Cocoa.h> #include "base/bind.h" -#include "base/memory/ptr_util.h" #include "ui/base/test/scoped_fake_nswindow_focus.h" #include "ui/base/test/scoped_fake_nswindow_fullscreen.h" #include "ui/base/test/ui_controls.h" @@ -18,9 +17,8 @@ namespace views { // static -std::unique_ptr<ViewsTestHelper> ViewsTestHelper::Create( - ui::ContextFactory* context_factory) { - return base::WrapUnique(new ViewsTestHelperMac()); +std::unique_ptr<ViewsTestHelper> ViewsTestHelper::Create() { + return std::make_unique<ViewsTestHelperMac>(); } ViewsTestHelperMac::ViewsTestHelperMac() { @@ -60,4 +58,8 @@ } } +ui::ContextFactory* ViewsTestHelperMac::GetContextFactory() { + return context_factories_.GetContextFactory(); +} + } // namespace views