diff --git a/AUTHORS b/AUTHORS index 86efccc..5db4407 100644 --- a/AUTHORS +++ b/AUTHORS
@@ -1119,6 +1119,7 @@ Taeyeon Kim <ssg9732@gmail.com> Tae Shin <taeshindev@gmail.com> Takaaki Suzuki <takaakisuzuki.14@gmail.com> +Takahiro Aoyagi <hogehoge@gachapin.jp> Takashi Fujita <tgfjt.mail@gmail.com> Takeshi Kurosawa <taken.spc@gmail.com> Tanay Chowdhury <tanay.c@samsung.com>
diff --git a/DEPS b/DEPS index 25868c9..300d882cb 100644 --- a/DEPS +++ b/DEPS
@@ -245,11 +245,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': '61d0fbbca7950bf54c4219217a957149d57d2271', + 'skia_revision': '4981c921c6d7da880b577adc7da5cdb1d95a9410', # 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': 'a1bab7ff2ad5e19baa056a0c7e694a94536f4815', + 'v8_revision': 'cb7eff8560ec2ce0e51e4668e25eec5bd3435546', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling ANGLE # and whatever else without interference from each other. @@ -257,11 +257,11 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling SwiftShader # and whatever else without interference from each other. - 'swiftshader_revision': 'd111ae28dd57fd3c484a3b18b5039764dbc37c91', + 'swiftshader_revision': 'c73969d73ff90a54487df765f0fdb12d3583b344', # 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': '68bba80440f03d5830f1b522ebce829cfdb9d370', + 'pdfium_revision': '9606a2fc6ff09357cf7e82b078c2efba6a483cca', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling BoringSSL # and whatever else without interference from each other. @@ -312,7 +312,7 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling catapult # and whatever else without interference from each other. - 'catapult_revision': '4311fd4f16c22f87e17b9443a7b4622f5ce693c7', + 'catapult_revision': 'ec88714291e603916469e9baca8ee24188a0c1bd', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling libFuzzer # and whatever else without interference from each other. @@ -320,7 +320,7 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling devtools-frontend # and whatever else without interference from each other. - 'devtools_frontend_revision': '805c1e9f351c42b9a0dbc07b328e9b441105aefe', + 'devtools_frontend_revision': 'd50009d80244f6fe730de630b9573e0e591a47fa', # 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. @@ -360,7 +360,7 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling feed # and whatever else without interference from each other. - 'dawn_revision': '622bc9732af20372f63d3969bce8fe59ca21263e', + 'dawn_revision': '1f3ad49cbcd5cffa65b631d865dc85c25353c48c', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling feed # and whatever else without interference from each other. @@ -617,7 +617,7 @@ Var('chromium_git') + '/external/github.com/toji/webvr.info.git' + '@' + 'c58ae99b9ff9e2aa4c524633519570bf33536248', 'src/docs/website': { - 'url': Var('chromium_git') + '/website.git' + '@' + '49c80953d6af12159ab6ca4060beb5b0e89c7fa5', + 'url': Var('chromium_git') + '/website.git' + '@' + '08d439231d43f9b1dfc72e701c17c4840652e356', }, 'src/ios/third_party/earl_grey2/src': { @@ -805,7 +805,7 @@ 'packages': [ { 'package': 'chromium/third_party/androidx', - 'version': 'auifkWa894Hu2TGfbC-0qFprVHM2Lwfx4dnvSIbn3ZIC', + 'version': 'dSc90B4LnlIq7u5ZXhFf4wYqYTtSCSfLt81QOie5IfMC', }, ], 'condition': 'checkout_android', @@ -1044,7 +1044,7 @@ }, 'src/third_party/depot_tools': - Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '4f141d10c1207a9cc7c6e4e5094021df0fe8c129', + Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + 'aae6725ff0466e1f12555bf21a87b070b068ed27', 'src/third_party/devtools-frontend/src': Var('chromium_git') + '/devtools/devtools-frontend' + '@' + Var('devtools_frontend_revision'), @@ -1566,7 +1566,7 @@ Var('chromium_git') + '/external/github.com/google/snappy.git' + '@' + '65dc7b383985eb4f63cd3e752136db8d9b4be8c0', 'src/third_party/sqlite/src': - Var('chromium_git') + '/chromium/deps/sqlite.git' + '@' + '369afe94faeeeac33fca2e478aaab8bb85813d79', + Var('chromium_git') + '/chromium/deps/sqlite.git' + '@' + '9ccd3058ec6dcfa5b0ebd2edb3e88c9b97813025', 'src/third_party/sqlite4java': { 'packages': [ @@ -1648,7 +1648,7 @@ Var('chromium_git') + '/external/github.com/gpuweb/cts.git' + '@' + 'fca7b339442bd70c5dc49bb33ee7f9466b560a97', 'src/third_party/webrtc': - Var('webrtc_git') + '/src.git' + '@' + 'e7cc8830ef53558fb8a691e5f8837ee2dedb5940', + Var('webrtc_git') + '/src.git' + '@' + '4ef6aaff42a5bbe2b922ff7fc8082d8a09103954', 'src/third_party/libgifcodec': Var('skia_git') + '/libgifcodec' + '@'+ Var('libgifcodec_revision'), @@ -1730,7 +1730,7 @@ Var('chromium_git') + '/v8/v8.git' + '@' + Var('v8_revision'), 'src-internal': { - 'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@bd69c5875bdc23e55424d924e6549cbb3323ab11', + 'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@9e9d49e0d06770658847c5cdc41c13e712c41781', 'condition': 'checkout_src_internal', },
diff --git a/ash/app_list/views/apps_grid_view.cc b/ash/app_list/views/apps_grid_view.cc index 3ca767f..86209f2 100644 --- a/ash/app_list/views/apps_grid_view.cc +++ b/ash/app_list/views/apps_grid_view.cc
@@ -1785,11 +1785,19 @@ SetSelectedView(original_parent_item_view); const GridIndex target_index = GetTargetGridIndexForKeyboardReparent( GetIndexOfView(original_parent_item_view), key_code); - AnnounceReorder(target_index); ReparentItemForReorder(reparented_view->item(), target_index); + view_structure_.SaveToMetadata(); + + // Update paging because the move could have resulted in a + // page getting created. + UpdatePaging(); + Layout(); + EnsureViewVisible(target_index); GetViewAtIndex(target_index)->RequestFocus(); + AnnounceReorder(target_index); + RecordAppMovingTypeMetrics(kMoveByKeyboardOutOfFolder); } @@ -1918,6 +1926,27 @@ } } +bool AppsGridView::IsMoveTargetOnNewPage(const GridIndex& target) const { + // This is used to determine whether move should create a page break item, + // which is only relevant for page structure with partial pages. + DCHECK_EQ(view_structure_.mode(), PagedViewStructure::Mode::kPartialPages); + + return target.page == GetTotalPages() || + (target.page == GetTotalPages() - 1 && + view_structure_.GetLastTargetIndexOfPage(target.page).slot == 0); +} + +void AppsGridView::EnsurePageBreakBeforeItem(const std::string& item_id) { + DCHECK_EQ(view_structure_.mode(), PagedViewStructure::Mode::kPartialPages); + + size_t item_list_index = 0; + if (item_list_->FindItemIndex(item_id, &item_list_index) && + item_list_index > 0 && + !item_list_->item_at(item_list_index - 1)->is_page_break()) { + model_->AddPageBreakItemAfter(item_list_->item_at(item_list_index - 1)); + } +} + void AppsGridView::MoveItemInModel(AppListItem* item, const GridIndex& target) { const std::string item_id = item->id(); @@ -1930,9 +1959,7 @@ const bool moving_to_new_page = view_structure_.mode() == PagedViewStructure::Mode::kPartialPages && - (target.page == GetTotalPages() || - (target.page == GetTotalPages() - 1 && - view_structure_.GetLastTargetIndexOfPage(target.page).slot == 0)); + IsMoveTargetOnNewPage(target); { ScopedModelUpdate update(this); @@ -1940,15 +1967,8 @@ // If the item is being moved to a new page, ensure that it's preceded by a // page break. - if (moving_to_new_page) { - size_t final_item_list_index = 0; - if (item_list_->FindItemIndex(item_id, &final_item_list_index) && - final_item_list_index > 0 && - !item_list_->item_at(final_item_list_index - 1)->is_page_break()) { - model_->AddPageBreakItemAfter( - item_list_->item_at(final_item_list_index - 1)); - } - } + if (moving_to_new_page) + EnsurePageBreakBeforeItem(item_id); } } @@ -1995,6 +2015,7 @@ const GridIndex& target) { DCHECK(item->IsInFolder()); + const std::string item_id = item->id(); const std::string source_folder_id = item->folder_id(); int target_item_index = view_structure_.GetTargetItemListIndexForMove(item, target); @@ -2005,9 +2026,18 @@ if (target_item_index < static_cast<int>(item_list_->item_count())) target_position = item_list_->item_at(target_item_index)->position(); + const bool moving_to_new_page = + view_structure_.mode() == PagedViewStructure::Mode::kPartialPages && + IsMoveTargetOnNewPage(target); + { ScopedModelUpdate update(this); model_->MoveItemToRootAt(item, target_position); + + // If the item is being moved to a new page, ensure that it's preceded by a + // page break. + if (moving_to_new_page) + EnsurePageBreakBeforeItem(item_id); } } @@ -2392,15 +2422,14 @@ } // Ensure the item is placed on the same page as the folder when possible. - if (target_index.page < folder_index.page) { - target_index.page = folder_index.page; - target_index.slot = 0; - } else if (target_index.page > folder_index.page) { - // Prefer the last slot of the page over the next page. If the page is full - // the item will still end up being pushed off the page. - target_index = folder_index; - ++target_index.slot; + if (target_index.page < folder_index.page) + return folder_index; + const int folder_page_size = TilesPerPage(folder_index.page); + if (target_index.page > folder_index.page && + folder_index.slot + 1 < folder_page_size) { + return GridIndex(folder_index.page, folder_index.slot + 1); } + return target_index; }
diff --git a/ash/app_list/views/apps_grid_view.h b/ash/app_list/views/apps_grid_view.h index 1ed7ed9..967b0d6 100644 --- a/ash/app_list/views/apps_grid_view.h +++ b/ash/app_list/views/apps_grid_view.h
@@ -596,6 +596,16 @@ void DispatchDragEventToDragAndDropHost( const gfx::Point& location_in_screen_coordinates); + // Returns whether the target grid index for item move operation is on a new + // apps grid page - i.e. if the move operation will create a new apps grid + // page. Used to determine whether a new page break should be created after + // app list item move. + bool IsMoveTargetOnNewPage(const GridIndex& target) const; + + // Creates a page break just before the item in top level item list if the + // item is not already preceded by a page break. + void EnsurePageBreakBeforeItem(const std::string& item_id); + // Updates `model_` to move `item` to `target` slot. void MoveItemInModel(AppListItem* item, const GridIndex& target);
diff --git a/ash/app_list/views/apps_grid_view_unittest.cc b/ash/app_list/views/apps_grid_view_unittest.cc index 1d6b6c3..83969bf 100644 --- a/ash/app_list/views/apps_grid_view_unittest.cc +++ b/ash/app_list/views/apps_grid_view_unittest.cc
@@ -2599,7 +2599,7 @@ // Tests that foldering an item that is on a different page fails. TEST_P(AppsGridViewTabletTest, ControlShiftArrowFailsToFolderAcrossPages) { - model_->PopulateApps(2 * GetTilesPerPage(0)); + model_->PopulateApps(GetTilesPerPage(0) + GetTilesPerPage(1)); UpdateLayout(); // For every item on the last row of the first page, test that foldering to @@ -2657,6 +2657,185 @@ } } +TEST_P(AppsGridViewClamshellAndTabletTest, + KeyboardReparentFromFolderInLastVisibleSlot) { + // Create grid with a folder on the last slot in a page (or for scrollable + // grid, the last slot in the page with enough items that the slot is + // initially not in the visible part of the grid). + const int kTopLevelItemCount = paged_apps_grid_view_ + ? GetTilesPerPage(0) + GetTilesPerPage(1) + : apps_grid_view_->cols() * 8; + model_->PopulateApps(kTopLevelItemCount - 1); + const AppListFolderItem* folder_item = + model_->CreateAndPopulateFolderWithApps(3); + const std::string folder_id = folder_item->id(); + apps_grid_view_->UpdatePagedViewStructure(); + UpdateLayout(); + + AppListItemView* folder_view = apps_grid_view_->view_model()->view_at( + apps_grid_view_->view_model()->view_size() - 1); + ASSERT_TRUE(folder_view->is_folder()); + EXPECT_FALSE(apps_grid_view_->GetWidget()->GetWindowBoundsInScreen().Contains( + folder_view->GetBoundsInScreen())); + + folder_view->RequestFocus(); + EXPECT_TRUE(apps_grid_view_->GetWidget()->GetWindowBoundsInScreen().Contains( + folder_view->GetBoundsInScreen())); + + // Open the folder. + ui::test::EventGenerator* const event_generator = GetEventGenerator(); + event_generator->PressAndReleaseKey(ui::VKEY_RETURN); + ASSERT_TRUE(GetAppListTestHelper()->IsInFolderView()); + + const AppListItemView* reparented_item_view = + folder_apps_grid_view()->view_model()->view_at(0); + ASSERT_TRUE(reparented_item_view); + ASSERT_TRUE(reparented_item_view->item()); + + std::string reparented_item_id = reparented_item_view->item()->id(); + EXPECT_EQ(base::StringPrintf("Item %d", kTopLevelItemCount - 1), + reparented_item_id); + ASSERT_TRUE(reparented_item_view->HasFocus()); + + // Reparent the item to the slot after the folder view, which should be the + // last spot in the grid. + const ui::KeyboardCode forward_key = is_rtl_ ? ui::VKEY_LEFT : ui::VKEY_RIGHT; + event_generator->PressAndReleaseKey(forward_key, + ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN); + ASSERT_FALSE(GetAppListTestHelper()->IsInFolderView()); + ASSERT_EQ(folder_item, model_->FindItem(folder_id)); + EXPECT_EQ(2u, folder_item->ChildItemCount()); + + const AppListItemView* last_top_level_item_view = + apps_grid_view_->view_model()->view_at( + apps_grid_view_->view_model()->view_size() - 1); + // Verify the view is within visible grid bounds, and that it has focus. + EXPECT_EQ(reparented_item_id, last_top_level_item_view->item()->id()); + EXPECT_TRUE(apps_grid_view_->GetWidget()->GetWindowBoundsInScreen().Contains( + last_top_level_item_view->GetBoundsInScreen())); + EXPECT_TRUE(last_top_level_item_view->HasFocus()); + + // In paged apps grid, the item should have been moved to a new page. + if (paged_apps_grid_view_) { + EXPECT_EQ(2, GetPaginationModel()->selected_page()); + EXPECT_EQ(3, GetPaginationModel()->total_pages()); + } +} + +TEST_P(AppsGridViewClamshellAndTabletTest, + KeyboardReparentFromFolderInLastVisibleSlotUsingDownKey) { + // Create grid with a folder on the last slot in a page (or for scrollable + // grid, the last slot in the page with enough items that the slot is + // initially not in the visible part of the grid). + const int kTopLevelItemCount = paged_apps_grid_view_ + ? GetTilesPerPage(0) + GetTilesPerPage(1) + : apps_grid_view_->cols() * 8; + model_->PopulateApps(kTopLevelItemCount - 1); + const AppListFolderItem* folder_item = + model_->CreateAndPopulateFolderWithApps(3); + const std::string folder_id = folder_item->id(); + apps_grid_view_->UpdatePagedViewStructure(); + UpdateLayout(); + + AppListItemView* folder_view = apps_grid_view_->view_model()->view_at( + apps_grid_view_->view_model()->view_size() - 1); + ASSERT_TRUE(folder_view->is_folder()); + EXPECT_FALSE(apps_grid_view_->GetWidget()->GetWindowBoundsInScreen().Contains( + folder_view->GetBoundsInScreen())); + + folder_view->RequestFocus(); + EXPECT_TRUE(apps_grid_view_->GetWidget()->GetWindowBoundsInScreen().Contains( + folder_view->GetBoundsInScreen())); + + // Open the folder. + ui::test::EventGenerator* const event_generator = GetEventGenerator(); + event_generator->PressAndReleaseKey(ui::VKEY_RETURN); + ASSERT_TRUE(GetAppListTestHelper()->IsInFolderView()); + + const AppListItemView* reparented_item_view = + folder_apps_grid_view()->view_model()->view_at(0); + ASSERT_TRUE(reparented_item_view); + ASSERT_TRUE(reparented_item_view->item()); + + std::string reparented_item_id = reparented_item_view->item()->id(); + EXPECT_EQ(base::StringPrintf("Item %d", kTopLevelItemCount - 1), + reparented_item_id); + ASSERT_TRUE(reparented_item_view->HasFocus()); + + // Reparent the item to the slot after the folder view, which should be the + // last spot in the grid. + event_generator->PressAndReleaseKey(ui::VKEY_DOWN, + ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN); + ASSERT_FALSE(GetAppListTestHelper()->IsInFolderView()); + ASSERT_EQ(folder_item, model_->FindItem(folder_id)); + EXPECT_EQ(2u, folder_item->ChildItemCount()); + + const AppListItemView* last_top_level_item_view = + apps_grid_view_->view_model()->view_at( + apps_grid_view_->view_model()->view_size() - 1); + // Verify the view is within visible grid bounds, and that it has focus. + EXPECT_EQ(reparented_item_id, last_top_level_item_view->item()->id()); + EXPECT_TRUE(apps_grid_view_->GetWidget()->GetWindowBoundsInScreen().Contains( + last_top_level_item_view->GetBoundsInScreen())); + EXPECT_TRUE(last_top_level_item_view->HasFocus()); + + // In paged apps grid, the item should have been moved to a new page. + if (paged_apps_grid_view_) { + EXPECT_EQ(2, GetPaginationModel()->selected_page()); + EXPECT_EQ(3, GetPaginationModel()->total_pages()); + } +} + +TEST_P(AppsGridViewTabletTest, + KeyboardReparentFromFolderPrefersLeavingMovedItemOnCurrentPage) { + model_->PopulateApps(GetTilesPerPage(0) - 2); + const AppListFolderItem* folder_item = + model_->CreateAndPopulateFolderWithApps(3); + model_->PopulateApps(GetTilesPerPage(1)); + const std::string folder_id = folder_item->id(); + apps_grid_view_->UpdatePagedViewStructure(); + UpdateLayout(); + + AppListItemView* folder_view = + test_api_->GetViewAtIndex(GridIndex(0, GetTilesPerPage(0) - 2)); + ASSERT_TRUE(folder_view->is_folder()); + folder_view->RequestFocus(); + + // Open the folder. + ui::test::EventGenerator* const event_generator = GetEventGenerator(); + event_generator->PressAndReleaseKey(ui::VKEY_RETURN); + ASSERT_TRUE(GetAppListTestHelper()->IsInFolderView()); + + const AppListItemView* reparented_item_view = + folder_apps_grid_view()->view_model()->view_at(0); + ASSERT_TRUE(reparented_item_view); + ASSERT_TRUE(reparented_item_view->item()); + + std::string reparented_item_id = reparented_item_view->item()->id(); + EXPECT_EQ(base::StringPrintf("Item %d", GetTilesPerPage(0) - 2), + reparented_item_id); + ASSERT_TRUE(reparented_item_view->HasFocus()); + + // Reparent the item to the slot after the folder view, which should be the + // last spot in the grid. + event_generator->PressAndReleaseKey(ui::VKEY_DOWN, + ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN); + ASSERT_FALSE(GetAppListTestHelper()->IsInFolderView()); + ASSERT_EQ(folder_item, model_->FindItem(folder_id)); + EXPECT_EQ(2u, folder_item->ChildItemCount()); + + const AppListItemView* last_item_on_first_page = + test_api_->GetViewAtIndex(GridIndex(0, GetTilesPerPage(0) - 1)); + // Verify the view is within visible grid bounds, and that it has focus. + EXPECT_EQ(reparented_item_id, last_item_on_first_page->item()->id()); + EXPECT_TRUE(apps_grid_view_->GetWidget()->GetWindowBoundsInScreen().Contains( + last_item_on_first_page->GetBoundsInScreen())); + EXPECT_TRUE(last_item_on_first_page->HasFocus()); + + EXPECT_EQ(0, GetPaginationModel()->selected_page()); + EXPECT_EQ(2, GetPaginationModel()->total_pages()); +} + // Tests that foldering the item on the last slot of a page doesn't crash. TEST_P(AppsGridViewClamshellAndTabletTest, ControlShiftArrowFolderLastItemOnPage) {
diff --git a/ash/app_list/views/scrollable_apps_grid_view.cc b/ash/app_list/views/scrollable_apps_grid_view.cc index 08a9ebb..f6c4ac31 100644 --- a/ash/app_list/views/scrollable_apps_grid_view.cc +++ b/ash/app_list/views/scrollable_apps_grid_view.cc
@@ -299,6 +299,10 @@ } void ScrollableAppsGridView::EnsureViewVisible(const GridIndex& index) { + // If called after usesr action that changes the grid size, make sure grid + // view ancestor layout is up to date before attempting scroll. + GetWidget()->LayoutRootViewIfNecessary(); + AppListItemView* view = GetViewAtIndex(index); if (view) view->ScrollViewToVisible();
diff --git a/ash/components/peripheral_notification/peripheral_notification_manager.cc b/ash/components/peripheral_notification/peripheral_notification_manager.cc index 54c09ea..0354a1c 100644 --- a/ash/components/peripheral_notification/peripheral_notification_manager.cc +++ b/ash/components/peripheral_notification/peripheral_notification_manager.cc
@@ -130,9 +130,14 @@ void PeripheralNotificationManager::OnCableWarning( typecd::CableWarningType cable_warning_type) { - // Adding function as stub. Will be enabled with flag CL. - // TODO: Add a flag to block this function. And behind the flag, call - // NotifyInvalidDpCable if the kInvalidDpCable CableWarningType is received. + if (!base::FeatureList::IsEnabled(features::kUsbNotificationController)) + return; + + // Decode cable warnging signal. + if (cable_warning_type == typecd::CableWarningType::kInvalidDpCable) { + NotifyInvalidDpCable(); + RecordConnectivityMetric(PeripheralConnectivityResults::kInvalidDpCable); + } } void PeripheralNotificationManager::NotifyInvalidDpCable() {
diff --git a/ash/components/peripheral_notification/peripheral_notification_manager_unittest.cc b/ash/components/peripheral_notification/peripheral_notification_manager_unittest.cc index 259c90d..8d23229 100644 --- a/ash/components/peripheral_notification/peripheral_notification_manager_unittest.cc +++ b/ash/components/peripheral_notification/peripheral_notification_manager_unittest.cc
@@ -450,4 +450,31 @@ 1); } +TEST_F(PeripheralNotificationManagerTest, InvalidDpCableWarning) { + base::test::ScopedFeatureList feature_list; + feature_list.InitAndEnableFeature(features::kUsbNotificationController); + + InitializeManager(/*is_guest_profile=*/false, + /*is_pcie_tunneling_allowed=*/false); + + EXPECT_EQ(0u, GetInvalidDpCableNotificationObserverCalls()); + histogram_tester_.ExpectBucketCount( + "Ash.Peripheral.ConnectivityResults", + PeripheralNotificationManager::PeripheralConnectivityResults:: + kInvalidDpCable, + 0); + + // Simulate emitting D-Bus signal for an invalid dp cable. + typecd::CableWarningType cable_warning_type = + typecd::CableWarningType::kInvalidDpCable; + fake_typecd_client()->EmitCableWarningSignal(cable_warning_type); + + EXPECT_EQ(1u, GetInvalidDpCableNotificationObserverCalls()); + histogram_tester_.ExpectBucketCount( + "Ash.Peripheral.ConnectivityResults", + PeripheralNotificationManager::PeripheralConnectivityResults:: + kInvalidDpCable, + 1); +} + } // namespace ash
diff --git a/ash/components/phonehub/camera_roll_manager_impl.cc b/ash/components/phonehub/camera_roll_manager_impl.cc index 62958363..cd7024a5 100644 --- a/ash/components/phonehub/camera_roll_manager_impl.cc +++ b/ash/components/phonehub/camera_roll_manager_impl.cc
@@ -17,7 +17,9 @@ #include "ash/components/phonehub/util/histogram_util.h" #include "base/bind.h" #include "base/memory/weak_ptr.h" +#include "base/metrics/histogram_functions.h" #include "base/observer_list.h" +#include "base/time/time.h" #include "chromeos/services/secure_channel/public/cpp/client/connection_manager.h" #include "chromeos/services/secure_channel/public/mojom/secure_channel_types.mojom.h" #include "components/prefs/pref_registry_simple.h" @@ -201,6 +203,14 @@ // thumbnails will be invalidated anyway when the new response is received. CancelPendingThumbnailRequests(); + // Do not update the timestamp if it is already set. It means that there's an + // in-progress request. We want to measure the time it takes from the first + // time we request an update to when the UI is updated. This is the time the + // user spends waiting. + if (!fetch_items_request_start_timestamp_) { + fetch_items_request_start_timestamp_ = base::TimeTicks::Now(); + } + proto::FetchCameraRollItemsRequest request; request.set_max_item_count(kMaxCameraRollItemCount); for (const CameraRollItem& current_item : current_items()) { @@ -214,6 +224,12 @@ const std::vector<CameraRollItem>& items) { resetViewRefreshingFlagIfNeeded(); if (result == CameraRollThumbnailDecoder::BatchDecodeResult::kCompleted) { + if (fetch_items_request_start_timestamp_) { + base::UmaHistogramMediumTimes( + "PhoneHub.CameraRoll.Latency.RefreshItems", + base::TimeTicks::Now() - *fetch_items_request_start_timestamp_); + fetch_items_request_start_timestamp_.reset(); + } SetCurrentItems(items); } }
diff --git a/ash/components/phonehub/camera_roll_manager_impl.h b/ash/components/phonehub/camera_roll_manager_impl.h index 5456dfa..8dee04f2 100644 --- a/ash/components/phonehub/camera_roll_manager_impl.h +++ b/ash/components/phonehub/camera_roll_manager_impl.h
@@ -15,6 +15,7 @@ #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "base/observer_list_types.h" +#include "base/time/time.h" #include "chromeos/services/multidevice_setup/public/cpp/multidevice_setup_client.h" #include "chromeos/services/multidevice_setup/public/mojom/multidevice_setup.mojom.h" #include "chromeos/services/secure_channel/public/cpp/client/connection_manager.h" @@ -103,6 +104,8 @@ bool is_android_feature_enabled_ = false; bool is_android_storage_granted_ = false; bool is_refreshing_after_user_opt_in_ = false; + absl::optional<base::TimeTicks> fetch_items_request_start_timestamp_; + PrefService* pref_service_; MessageReceiver* message_receiver_; MessageSender* message_sender_;
diff --git a/ash/components/phonehub/camera_roll_manager_impl_unittest.cc b/ash/components/phonehub/camera_roll_manager_impl_unittest.cc index 4b7bc9d..508478d6 100644 --- a/ash/components/phonehub/camera_roll_manager_impl_unittest.cc +++ b/ash/components/phonehub/camera_roll_manager_impl_unittest.cc
@@ -13,6 +13,9 @@ #include "ash/components/phonehub/proto/phonehub_api.pb.h" #include "base/callback.h" #include "base/strings/utf_string_conversions.h" +#include "base/test/metrics/histogram_tester.h" +#include "base/test/task_environment.h" +#include "base/time/time.h" #include "chromeos/services/multidevice_setup/public/cpp/fake_multidevice_setup_client.h" #include "chromeos/services/multidevice_setup/public/mojom/multidevice_setup.mojom.h" #include "chromeos/services/secure_channel/public/cpp/client/fake_connection_manager.h" @@ -220,6 +223,29 @@ feature_state); } + void UngrantAndroidStoragePermission() { + android_storage_permission_granted_ = false; + } + + void SendPhoneStatusSnapshot() { + proto::PhoneStatusSnapshot snapshot; + proto::CameraRollAccessState* access_state = + snapshot.mutable_properties()->mutable_camera_roll_access_state(); + access_state->set_storage_permission_granted( + android_storage_permission_granted_); + fake_message_receiver_.NotifyPhoneStatusSnapshotReceived(snapshot); + } + + void SendPhoneStatusUpdate(bool has_camera_roll_updates) { + proto::PhoneStatusUpdate update; + update.set_has_camera_roll_updates(has_camera_roll_updates); + proto::CameraRollAccessState* access_state = + update.mutable_properties()->mutable_camera_roll_access_state(); + access_state->set_storage_permission_granted( + android_storage_permission_granted_); + fake_message_receiver_.NotifyPhoneStatusUpdateReceived(update); + } + void SendFetchCameraRollItemDataResponse( const proto::CameraRollItemMetadata& item_metadata, proto::FetchCameraRollItemDataResponse::FileAvailability @@ -271,6 +297,9 @@ FakeMessageReceiver fake_message_receiver_; std::unique_ptr<multidevice_setup::FakeMultiDeviceSetupClient> fake_multidevice_setup_client_; + base::test::TaskEnvironment task_environment_{ + base::test::TaskEnvironment::TimeSource::MOCK_TIME}; + base::HistogramTester histogram_tester_; private: TestingPrefServiceSimple pref_service_; @@ -280,9 +309,14 @@ FakeCameraRollDownloadManager* fake_camera_roll_download_manager_; std::unique_ptr<CameraRollManagerImpl> camera_roll_manager_; FakeObserver fake_observer_; + + bool android_storage_permission_granted_ = true; }; TEST_F(CameraRollManagerImplTest, OnCameraRollItemsReceived) { + SendPhoneStatusSnapshot(); + + task_environment_.FastForwardBy(base::Seconds(10)); proto::FetchCameraRollItemsResponse response; PopulateItemProto(response.add_items(), "key3"); PopulateItemProto(response.add_items(), "key2"); @@ -291,12 +325,18 @@ fake_message_receiver_.NotifyFetchCameraRollItemsResponseReceived(response); CompleteThumbnailDecoding(BatchDecodeResult::kCompleted); - EXPECT_EQ(1, GetOnCameraRollViewUiStateUpdatedCallCount()); + EXPECT_EQ(2, GetOnCameraRollViewUiStateUpdatedCallCount()); VerifyCurrentItemsMatchResponse(response); + histogram_tester_.ExpectUniqueTimeSample( + "PhoneHub.CameraRoll.Latency.RefreshItems", base::Seconds(10), + /*expected_bucket_count=*/1); } TEST_F(CameraRollManagerImplTest, OnCameraRollItemsReceivedWithCancelledThumbnailDecodingRequest) { + SendPhoneStatusSnapshot(); + + task_environment_.FastForwardBy(base::Seconds(10)); proto::FetchCameraRollItemsResponse response; PopulateItemProto(response.add_items(), "key3"); PopulateItemProto(response.add_items(), "key2"); @@ -305,18 +345,25 @@ fake_message_receiver_.NotifyFetchCameraRollItemsResponseReceived(response); CompleteThumbnailDecoding(BatchDecodeResult::kCancelled); - EXPECT_EQ(0, GetOnCameraRollViewUiStateUpdatedCallCount()); + EXPECT_EQ(1, GetOnCameraRollViewUiStateUpdatedCallCount()); EXPECT_EQ(0, GetCurrentItemsCount()); + EXPECT_TRUE(histogram_tester_ + .GetAllSamples("PhoneHub.CameraRoll.Latency.RefreshItems") + .empty()); } TEST_F(CameraRollManagerImplTest, OnCameraRollItemsReceivedWithPendingThumbnailDecodedRequest) { + SendPhoneStatusSnapshot(); + + task_environment_.FastForwardBy(base::Seconds(10)); proto::FetchCameraRollItemsResponse first_response; PopulateItemProto(first_response.add_items(), "key2"); PopulateItemProto(first_response.add_items(), "key1"); fake_message_receiver_.NotifyFetchCameraRollItemsResponseReceived( first_response); + task_environment_.FastForwardBy(base::Seconds(5)); proto::FetchCameraRollItemsResponse second_response; PopulateItemProto(second_response.add_items(), "key4"); PopulateItemProto(second_response.add_items(), "key3"); @@ -326,11 +373,16 @@ // The first thumbnail decode request should be cancelled and the current item // set should be updated only once after the second request completes. - EXPECT_EQ(1, GetOnCameraRollViewUiStateUpdatedCallCount()); + EXPECT_EQ(2, GetOnCameraRollViewUiStateUpdatedCallCount()); VerifyCurrentItemsMatchResponse(second_response); + histogram_tester_.ExpectUniqueTimeSample( + "PhoneHub.CameraRoll.Latency.RefreshItems", base::Seconds(15), + /*expected_bucket_count=*/1); } TEST_F(CameraRollManagerImplTest, OnCameraRollItemsReceivedWithExistingItems) { + SendPhoneStatusSnapshot(); + task_environment_.FastForwardBy(base::Seconds(10)); proto::FetchCameraRollItemsResponse first_response; PopulateItemProto(first_response.add_items(), "key3"); PopulateItemProto(first_response.add_items(), "key2"); @@ -341,6 +393,8 @@ CompleteThumbnailDecoding(BatchDecodeResult::kCompleted); VerifyCurrentItemsMatchResponse(first_response); + SendPhoneStatusUpdate(/*has_camera_roll_updates=*/true); + task_environment_.FastForwardBy(base::Seconds(5)); proto::FetchCameraRollItemsResponse second_response; PopulateItemProto(second_response.add_items(), "key4"); // Thumbnails won't be sent with the proto if an item's data is already @@ -353,18 +407,19 @@ fake_message_receiver_.NotifyFetchCameraRollItemsResponseReceived( second_response); CompleteThumbnailDecoding(BatchDecodeResult::kCompleted); - EXPECT_EQ(2, GetOnCameraRollViewUiStateUpdatedCallCount()); + EXPECT_EQ(3, GetOnCameraRollViewUiStateUpdatedCallCount()); VerifyCurrentItemsMatchResponse(second_response); + histogram_tester_.ExpectTimeBucketCount( + "PhoneHub.CameraRoll.Latency.RefreshItems", base::Seconds(10), + /*count=*/1); + histogram_tester_.ExpectTimeBucketCount( + "PhoneHub.CameraRoll.Latency.RefreshItems", base::Seconds(5), + /*count=*/1); } TEST_F(CameraRollManagerImplTest, OnPhoneStatusUpdateReceivedWithoutCameraRollUpdates) { - proto::PhoneStatusUpdate update; - update.set_has_camera_roll_updates(false); - proto::CameraRollAccessState* access_state = - update.mutable_properties()->mutable_camera_roll_access_state(); - access_state->set_storage_permission_granted(true); - fake_message_receiver_.NotifyPhoneStatusUpdateReceived(update); + SendPhoneStatusUpdate(/*has_camera_roll_updates=*/false); EXPECT_EQ(0UL, GetSentFetchCameraRollItemsRequestCount()); EXPECT_EQ(CameraRollManager::CameraRollUiState::SHOULD_HIDE, @@ -374,12 +429,7 @@ TEST_F(CameraRollManagerImplTest, OnPhoneStatusUpdateReceivedWithCameraRollUpdates) { - proto::PhoneStatusUpdate update; - update.set_has_camera_roll_updates(true); - proto::CameraRollAccessState* access_state = - update.mutable_properties()->mutable_camera_roll_access_state(); - access_state->set_storage_permission_granted(true); - fake_message_receiver_.NotifyPhoneStatusUpdateReceived(update); + SendPhoneStatusUpdate(/*has_camera_roll_updates=*/true); EXPECT_EQ(1UL, GetSentFetchCameraRollItemsRequestCount()); EXPECT_EQ(0, @@ -398,12 +448,7 @@ fake_message_receiver_.NotifyFetchCameraRollItemsResponseReceived(response); CompleteThumbnailDecoding(BatchDecodeResult::kCompleted); - proto::PhoneStatusUpdate update; - update.set_has_camera_roll_updates(true); - proto::CameraRollAccessState* access_state = - update.mutable_properties()->mutable_camera_roll_access_state(); - access_state->set_storage_permission_granted(true); - fake_message_receiver_.NotifyPhoneStatusUpdateReceived(update); + SendPhoneStatusUpdate(/*has_camera_roll_updates=*/true); EXPECT_EQ(1UL, GetSentFetchCameraRollItemsRequestCount()); EXPECT_EQ(CameraRollManager::CameraRollUiState::ITEMS_VISIBLE, @@ -431,12 +476,7 @@ fake_message_receiver_.NotifyFetchCameraRollItemsResponseReceived(response); CompleteThumbnailDecoding(BatchDecodeResult::kCompleted); - proto::PhoneStatusUpdate update; - update.set_has_camera_roll_updates(true); - proto::CameraRollAccessState* access_state = - update.mutable_properties()->mutable_camera_roll_access_state(); - access_state->set_storage_permission_granted(true); - fake_message_receiver_.NotifyPhoneStatusUpdateReceived(update); + SendPhoneStatusUpdate(/*has_camera_roll_updates=*/true); EXPECT_EQ(0UL, GetSentFetchCameraRollItemsRequestCount()); EXPECT_EQ(CameraRollManager::CameraRollUiState::CAN_OPT_IN, @@ -453,11 +493,8 @@ fake_message_receiver_.NotifyFetchCameraRollItemsResponseReceived(response); CompleteThumbnailDecoding(BatchDecodeResult::kCompleted); - proto::PhoneStatusUpdate update; - proto::CameraRollAccessState* access_state = - update.mutable_properties()->mutable_camera_roll_access_state(); - access_state->set_storage_permission_granted(false); - fake_message_receiver_.NotifyPhoneStatusUpdateReceived(update); + UngrantAndroidStoragePermission(); + SendPhoneStatusUpdate(/*has_camera_roll_updates=*/false); EXPECT_EQ(0UL, GetSentFetchCameraRollItemsRequestCount()); EXPECT_EQ(CameraRollManager::CameraRollUiState::NO_STORAGE_PERMISSION, @@ -467,11 +504,7 @@ } TEST_F(CameraRollManagerImplTest, OnPhoneStatusSnapshotReceived) { - proto::PhoneStatusSnapshot snapshot; - proto::CameraRollAccessState* access_state = - snapshot.mutable_properties()->mutable_camera_roll_access_state(); - access_state->set_storage_permission_granted(true); - fake_message_receiver_.NotifyPhoneStatusSnapshotReceived(snapshot); + SendPhoneStatusSnapshot(); EXPECT_EQ(1UL, GetSentFetchCameraRollItemsRequestCount()); EXPECT_EQ(CameraRollManager::CameraRollUiState::SHOULD_HIDE, @@ -488,11 +521,7 @@ fake_message_receiver_.NotifyFetchCameraRollItemsResponseReceived(response); CompleteThumbnailDecoding(BatchDecodeResult::kCompleted); - proto::PhoneStatusSnapshot snapshot; - proto::CameraRollAccessState* access_state = - snapshot.mutable_properties()->mutable_camera_roll_access_state(); - access_state->set_storage_permission_granted(true); - fake_message_receiver_.NotifyPhoneStatusSnapshotReceived(snapshot); + SendPhoneStatusSnapshot(); EXPECT_EQ(0UL, GetSentFetchCameraRollItemsRequestCount()); EXPECT_EQ(CameraRollManager::CameraRollUiState::CAN_OPT_IN, @@ -509,11 +538,8 @@ fake_message_receiver_.NotifyFetchCameraRollItemsResponseReceived(response); CompleteThumbnailDecoding(BatchDecodeResult::kCompleted); - proto::PhoneStatusSnapshot snapshot; - proto::CameraRollAccessState* access_state = - snapshot.mutable_properties()->mutable_camera_roll_access_state(); - access_state->set_storage_permission_granted(false); - fake_message_receiver_.NotifyPhoneStatusSnapshotReceived(snapshot); + UngrantAndroidStoragePermission(); + SendPhoneStatusSnapshot(); EXPECT_EQ(0UL, GetSentFetchCameraRollItemsRequestCount()); EXPECT_EQ(CameraRollManager::CameraRollUiState::NO_STORAGE_PERMISSION, @@ -523,11 +549,7 @@ } TEST_F(CameraRollManagerImplTest, OnFeatureOnFeatureStatesChangedToDisabled) { - proto::PhoneStatusSnapshot snapshot; - proto::CameraRollAccessState* access_state = - snapshot.mutable_properties()->mutable_camera_roll_access_state(); - access_state->set_storage_permission_granted(true); - fake_message_receiver_.NotifyPhoneStatusSnapshotReceived(snapshot); + SendPhoneStatusSnapshot(); proto::FetchCameraRollItemsResponse response; PopulateItemProto(response.add_items(), "key2"); PopulateItemProto(response.add_items(), "key1");
diff --git a/ash/constants/ash_features.cc b/ash/constants/ash_features.cc index c02b2e4..31202a6 100644 --- a/ash/constants/ash_features.cc +++ b/ash/constants/ash_features.cc
@@ -1218,6 +1218,11 @@ const base::Feature kTrilinearFiltering{"TrilinearFiltering", base::FEATURE_DISABLED_BY_DEFAULT}; +// Unblock the UsbPeripheralNotificationController class in ash to display +// USB related notifications from the type-c daemon in Chrome OS. +const base::Feature kUsbNotificationController{ + "UsbNotificationController", base::FEATURE_DISABLED_BY_DEFAULT}; + // Uses new AuthSession-based API in cryptohome to authenticate users during // sign-in. const base::Feature kUseAuthsessionAuthentication{
diff --git a/ash/constants/ash_features.h b/ash/constants/ash_features.h index 3852ff0..77495763 100644 --- a/ash/constants/ash_features.h +++ b/ash/constants/ash_features.h
@@ -463,6 +463,8 @@ extern const base::Feature kTrafficCountersSettingsUi; COMPONENT_EXPORT(ASH_CONSTANTS) extern const base::Feature kTrilinearFiltering; COMPONENT_EXPORT(ASH_CONSTANTS) +extern const base::Feature kUsbNotificationController; +COMPONENT_EXPORT(ASH_CONSTANTS) extern const base::Feature kUseAuthsessionAuthentication; COMPONENT_EXPORT(ASH_CONSTANTS) extern const base::Feature kUseBluetoothSystemInAsh;
diff --git a/ash/display/cros_display_config_unittest.cc b/ash/display/cros_display_config_unittest.cc index 80a4451..8c147bd 100644 --- a/ash/display/cros_display_config_unittest.cc +++ b/ash/display/cros_display_config_unittest.cc
@@ -366,16 +366,16 @@ EXPECT_EQ(96, info_0.dpi_y); EXPECT_EQ(mojom::DisplayRotationOptions::kZeroDegrees, info_0.rotation_options); - EXPECT_EQ("0,0 500x600", info_0.bounds.ToString()); - EXPECT_EQ("0,0,0,0", info_0.overscan.ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 500, 600), info_0.bounds); + EXPECT_EQ(gfx::Insets(), info_0.overscan); ASSERT_TRUE(base::StringToInt64(result[1]->id, &display_id)); ASSERT_TRUE(DisplayExists(display_id)); const mojom::DisplayUnitInfo& info_1 = *result[1]; EXPECT_EQ(display_manager()->GetDisplayNameForId(display_id), info_1.name); // Second display is left of the primary display whose width 500. - EXPECT_EQ("500,0 400x520", info_1.bounds.ToString()); - EXPECT_EQ("0,0,0,0", info_1.overscan.ToString()); + EXPECT_EQ(gfx::Rect(500, 0, 400, 520), info_1.bounds); + EXPECT_EQ(gfx::Insets(), info_1.overscan); EXPECT_EQ(mojom::DisplayRotationOptions::kZeroDegrees, info_1.rotation_options); EXPECT_FALSE(info_1.is_primary); @@ -436,7 +436,7 @@ mojom::DisplayConfigResult result = SetDisplayProperties( base::NumberToString(secondary.id()), std::move(properties)); EXPECT_EQ(mojom::DisplayConfigResult::kSuccess, result); - EXPECT_EQ("1200,0 150x250", secondary.bounds().ToString()); + EXPECT_EQ(gfx::Rect(1200, 0, 150, 250), secondary.bounds()); const gfx::Insets overscan = display_manager()->GetOverscanInsets(secondary.id()); EXPECT_EQ(199, overscan.top()); @@ -459,7 +459,7 @@ result = SetDisplayProperties(base::NumberToString(secondary.id()), std::move(properties)); EXPECT_EQ(mojom::DisplayConfigResult::kSuccess, result); - EXPECT_EQ("1200,0 500x300", secondary.bounds().ToString()); + EXPECT_EQ(gfx::Rect(1200, 0, 500, 300), secondary.bounds()); EXPECT_EQ(display::Display::ROTATE_90, secondary.rotation()); properties = mojom::DisplayConfigProperties::New(); @@ -468,7 +468,7 @@ result = SetDisplayProperties(base::NumberToString(secondary.id()), std::move(properties)); EXPECT_EQ(mojom::DisplayConfigResult::kSuccess, result); - EXPECT_EQ("1200,0 500x300", secondary.bounds().ToString()); + EXPECT_EQ(gfx::Rect(1200, 0, 500, 300), secondary.bounds()); EXPECT_EQ(display::Display::ROTATE_270, secondary.rotation()); // Test setting primary and rotating. @@ -482,7 +482,7 @@ const display::Display& primary = display::Screen::GetScreen()->GetPrimaryDisplay(); EXPECT_EQ(secondary.id(), primary.id()); - EXPECT_EQ("0,0 300x500", primary.bounds().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 300, 500), primary.bounds()); EXPECT_EQ(display::Display::ROTATE_180, primary.rotation()); } @@ -499,28 +499,28 @@ result = SetDisplayProperties(base::NumberToString(secondary.id()), std::move(properties)); EXPECT_EQ(mojom::DisplayConfigResult::kSuccess, result); - EXPECT_EQ("-520,50 520x400", secondary.bounds().ToString()); + EXPECT_EQ(gfx::Rect(-520, 50, 520, 400), secondary.bounds()); properties = mojom::DisplayConfigProperties::New(); properties->bounds_origin = gfx::Point({1200, 100}); result = SetDisplayProperties(base::NumberToString(secondary.id()), std::move(properties)); EXPECT_EQ(mojom::DisplayConfigResult::kSuccess, result); - EXPECT_EQ("1200,100 520x400", secondary.bounds().ToString()); + EXPECT_EQ(gfx::Rect(1200, 100, 520, 400), secondary.bounds()); properties = mojom::DisplayConfigProperties::New(); properties->bounds_origin = gfx::Point({1100, -400}); result = SetDisplayProperties(base::NumberToString(secondary.id()), std::move(properties)); EXPECT_EQ(mojom::DisplayConfigResult::kSuccess, result); - EXPECT_EQ("1100,-400 520x400", secondary.bounds().ToString()); + EXPECT_EQ(gfx::Rect(1100, -400, 520, 400), secondary.bounds()); properties = mojom::DisplayConfigProperties::New(); properties->bounds_origin = gfx::Point({-350, 600}); result = SetDisplayProperties(base::NumberToString(secondary.id()), std::move(properties)); EXPECT_EQ(mojom::DisplayConfigResult::kSuccess, result); - EXPECT_EQ("-350,600 520x400", secondary.bounds().ToString()); + EXPECT_EQ(gfx::Rect(-350, 600, 520, 400), secondary.bounds()); } TEST_F(CrosDisplayConfigTest, SetDisplayPropertiesDisplayZoomFactor) {
diff --git a/ash/display/cursor_window_controller_unittest.cc b/ash/display/cursor_window_controller_unittest.cc index 6d85f6d..77fec1f 100644 --- a/ash/display/cursor_window_controller_unittest.cc +++ b/ash/display/cursor_window_controller_unittest.cc
@@ -110,7 +110,7 @@ EXPECT_EQ(primary_display_id, GetCursorDisplayId()); EXPECT_EQ(ui::mojom::CursorType::kNull, GetCursorType()); gfx::Point hot_point = GetCursorHotPoint(); - EXPECT_EQ("4,4", hot_point.ToString()); + EXPECT_EQ(gfx::Point(4, 4), hot_point); gfx::Rect cursor_bounds = GetCursorWindow()->GetBoundsInScreen(); EXPECT_EQ(20, cursor_bounds.x() + hot_point.x()); EXPECT_EQ(50, cursor_bounds.y() + hot_point.y()); @@ -134,7 +134,7 @@ EXPECT_EQ(secondary_display_id, GetCursorDisplayId()); EXPECT_EQ(ui::mojom::CursorType::kNull, GetCursorType()); hot_point = GetCursorHotPoint(); - EXPECT_EQ("3,3", hot_point.ToString()); + EXPECT_EQ(gfx::Point(3, 3), hot_point); cursor_bounds = GetCursorWindow()->GetBoundsInScreen(); EXPECT_EQ(320, cursor_bounds.x() + hot_point.x()); EXPECT_EQ(50, cursor_bounds.y() + hot_point.y());
diff --git a/ash/display/display_manager_unittest.cc b/ash/display/display_manager_unittest.cc index 56b24d20..d6b4486d 100644 --- a/ash/display/display_manager_unittest.cc +++ b/ash/display/display_manager_unittest.cc
@@ -205,8 +205,8 @@ // Update primary and add seconary. UpdateDisplay("100+0-500x400,0+501-400x300"); EXPECT_EQ(2U, display_manager()->GetNumDisplays()); - EXPECT_EQ("0,0 500x400", - display_manager()->GetDisplayAt(0).bounds().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 500, 400), + display_manager()->GetDisplayAt(0).bounds()); EXPECT_EQ("2 1 0 1 1", GetCountSummary()); // Metrics change immediately when new displays set shelf work area insets. @@ -215,12 +215,12 @@ EXPECT_EQ(display_manager()->GetDisplayAt(0).id(), changed()[1].id()); EXPECT_EQ(display_manager()->GetDisplayAt(1).id(), changed()[0].id()); EXPECT_EQ(display_manager()->GetDisplayAt(1).id(), added()[0].id()); - EXPECT_EQ("0,0 500x400", changed()[1].bounds().ToString()); - EXPECT_EQ("500,0 400x300", changed()[0].bounds().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 500, 400), changed()[1].bounds()); + EXPECT_EQ(gfx::Rect(500, 0, 400, 300), changed()[0].bounds()); // Secondary display is on right. - EXPECT_EQ("500,0 400x300", added()[0].bounds().ToString()); - EXPECT_EQ("0,501 400x300", - GetDisplayInfo(added()[0]).bounds_in_native().ToString()); + EXPECT_EQ(gfx::Rect(500, 0, 400, 300), added()[0].bounds()); + EXPECT_EQ(gfx::Rect(0, 501, 400, 300), + GetDisplayInfo(added()[0]).bounds_in_native()); reset(); // Delete secondary. @@ -232,7 +232,7 @@ UpdateDisplay("1+1-1000x600"); EXPECT_EQ("1 0 0 1 1", GetCountSummary()); EXPECT_EQ(display_manager()->GetDisplayAt(0).id(), changed()[0].id()); - EXPECT_EQ("0,0 1000x600", changed()[0].bounds().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 1000, 600), changed()[0].bounds()); reset(); // Add secondary. @@ -242,9 +242,9 @@ EXPECT_EQ(display_manager()->GetDisplayAt(1).id(), changed()[0].id()); EXPECT_EQ(display_manager()->GetDisplayAt(1).id(), added()[0].id()); // Secondary display is on right. - EXPECT_EQ("1000,0 600x400", added()[0].bounds().ToString()); - EXPECT_EQ("1002,0 600x400", - GetDisplayInfo(added()[0]).bounds_in_native().ToString()); + EXPECT_EQ(gfx::Rect(1000, 0, 600, 400), added()[0].bounds()); + EXPECT_EQ(gfx::Rect(1002, 0, 600, 400), + GetDisplayInfo(added()[0]).bounds_in_native()); reset(); // Secondary removed, primary changed. @@ -252,7 +252,7 @@ EXPECT_EQ(1U, display_manager()->GetNumDisplays()); EXPECT_EQ("1 0 1 1 1", GetCountSummary()); EXPECT_EQ(display_manager()->GetDisplayAt(0).id(), changed()[0].id()); - EXPECT_EQ("0,0 800x300", changed()[0].bounds().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 800, 300), changed()[0].bounds()); reset(); // # of display can go to zero when screen is off. @@ -264,8 +264,8 @@ EXPECT_EQ("0 0 0 0 0", GetCountSummary()); EXPECT_FALSE(root_window_destroyed()); // Display configuration stays the same - EXPECT_EQ("0,0 800x300", - display_manager()->GetDisplayAt(0).bounds().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 800, 300), + display_manager()->GetDisplayAt(0).bounds()); reset(); // Connect to display again @@ -273,9 +273,9 @@ EXPECT_EQ(1U, display_manager()->GetNumDisplays()); EXPECT_EQ("1 0 0 1 1", GetCountSummary()); EXPECT_FALSE(root_window_destroyed()); - EXPECT_EQ("0,0 500x400", changed()[0].bounds().ToString()); - EXPECT_EQ("100,100 500x400", - GetDisplayInfo(changed()[0]).bounds_in_native().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 500, 400), changed()[0].bounds()); + EXPECT_EQ(gfx::Rect(100, 100, 500, 400), + GetDisplayInfo(changed()[0]).bounds_in_native()); reset(); // Go back to zero and wake up with multiple displays. @@ -287,23 +287,23 @@ // Add secondary. UpdateDisplay("0+0-1000x600,1000+1000-600x400"); EXPECT_EQ(2U, display_manager()->GetNumDisplays()); - EXPECT_EQ("0,0 1000x600", - display_manager()->GetDisplayAt(0).bounds().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 1000, 600), + display_manager()->GetDisplayAt(0).bounds()); // Secondary display is on right. - EXPECT_EQ("1000,0 600x400", - display_manager()->GetDisplayAt(1).bounds().ToString()); - EXPECT_EQ("1000,1000 600x400", - GetDisplayInfoAt(1).bounds_in_native().ToString()); + EXPECT_EQ(gfx::Rect(1000, 0, 600, 400), + display_manager()->GetDisplayAt(1).bounds()); + EXPECT_EQ(gfx::Rect(1000, 1000, 600, 400), + GetDisplayInfoAt(1).bounds_in_native()); reset(); // Changing primary will update secondary as well. UpdateDisplay("0+0-800x600,1000+1000-600x400"); EXPECT_EQ("2 0 0 1 1", GetCountSummary()); reset(); - EXPECT_EQ("0,0 800x600", - display_manager()->GetDisplayAt(0).bounds().ToString()); - EXPECT_EQ("800,0 600x400", - display_manager()->GetDisplayAt(1).bounds().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 800, 600), + display_manager()->GetDisplayAt(0).bounds()); + EXPECT_EQ(gfx::Rect(800, 0, 600, 400), + display_manager()->GetDisplayAt(1).bounds()); } // Test in emulation mode (use_fullscreen_host_window=false) @@ -335,12 +335,12 @@ UpdateDisplay("0+0-640x480,1000+0-320x200,2000+0-400x300"); EXPECT_EQ(3U, display_manager()->GetNumDisplays()); - EXPECT_EQ("0,0 640x480", - display_manager()->GetDisplayAt(0).bounds().ToString()); - EXPECT_EQ("640,0 320x200", - display_manager()->GetDisplayAt(1).bounds().ToString()); - EXPECT_EQ("960,0 400x300", - display_manager()->GetDisplayAt(2).bounds().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 640, 480), + display_manager()->GetDisplayAt(0).bounds()); + EXPECT_EQ(gfx::Rect(640, 0, 320, 200), + display_manager()->GetDisplayAt(1).bounds()); + EXPECT_EQ(gfx::Rect(960, 0, 400, 300), + display_manager()->GetDisplayAt(2).bounds()); EXPECT_EQ("3 2 0 1 1", GetCountSummary()); // Metrics change immediately when new displays set shelf work area insets. @@ -351,26 +351,26 @@ EXPECT_EQ(display_manager()->GetDisplayAt(2).id(), changed()[1].id()); EXPECT_EQ(display_manager()->GetDisplayAt(1).id(), added()[0].id()); EXPECT_EQ(display_manager()->GetDisplayAt(2).id(), added()[1].id()); - EXPECT_EQ("0,0 640x480", changed()[2].bounds().ToString()); - EXPECT_EQ("640,0 320x200", changed()[0].bounds().ToString()); - EXPECT_EQ("960,0 400x300", changed()[1].bounds().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 640, 480), changed()[2].bounds()); + EXPECT_EQ(gfx::Rect(640, 0, 320, 200), changed()[0].bounds()); + EXPECT_EQ(gfx::Rect(960, 0, 400, 300), changed()[1].bounds()); // Secondary and terniary displays are on right. - EXPECT_EQ("640,0 320x200", added()[0].bounds().ToString()); - EXPECT_EQ("1000,0 320x200", - GetDisplayInfo(added()[0]).bounds_in_native().ToString()); - EXPECT_EQ("960,0 400x300", added()[1].bounds().ToString()); - EXPECT_EQ("2000,0 400x300", - GetDisplayInfo(added()[1]).bounds_in_native().ToString()); + EXPECT_EQ(gfx::Rect(640, 0, 320, 200), added()[0].bounds()); + EXPECT_EQ(gfx::Rect(1000, 0, 320, 200), + GetDisplayInfo(added()[0]).bounds_in_native()); + EXPECT_EQ(gfx::Rect(960, 0, 400, 300), added()[1].bounds()); + EXPECT_EQ(gfx::Rect(2000, 0, 400, 300), + GetDisplayInfo(added()[1]).bounds_in_native()); // Verify calling ReconfigureDisplays doesn't change anything. display_manager()->ReconfigureDisplays(); EXPECT_EQ(3U, display_manager()->GetNumDisplays()); - EXPECT_EQ("0,0 640x480", - display_manager()->GetDisplayAt(0).bounds().ToString()); - EXPECT_EQ("640,0 320x200", - display_manager()->GetDisplayAt(1).bounds().ToString()); - EXPECT_EQ("960,0 400x300", - display_manager()->GetDisplayAt(2).bounds().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 640, 480), + display_manager()->GetDisplayAt(0).bounds()); + EXPECT_EQ(gfx::Rect(640, 0, 320, 200), + display_manager()->GetDisplayAt(1).bounds()); + EXPECT_EQ(gfx::Rect(960, 0, 400, 300), + display_manager()->GetDisplayAt(2).bounds()); display::DisplayPlacement default_placement(display::DisplayPlacement::BOTTOM, 10); @@ -381,12 +381,12 @@ UpdateDisplay("640x480"); UpdateDisplay("640x480,320x200,400x300"); - EXPECT_EQ("0,0 640x480", - display_manager()->GetDisplayAt(0).bounds().ToString()); - EXPECT_EQ("10,480 320x200", - display_manager()->GetDisplayAt(1).bounds().ToString()); - EXPECT_EQ("20,680 400x300", - display_manager()->GetDisplayAt(2).bounds().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 640, 480), + display_manager()->GetDisplayAt(0).bounds()); + EXPECT_EQ(gfx::Rect(10, 480, 320, 200), + display_manager()->GetDisplayAt(1).bounds()); + EXPECT_EQ(gfx::Rect(20, 680, 400, 300), + display_manager()->GetDisplayAt(2).bounds()); } TEST_F(DisplayManagerTest, LayoutMorethanThreeDisplaysTest) { @@ -408,16 +408,16 @@ EXPECT_EQ(3U, display_manager()->GetNumDisplays()); - EXPECT_EQ("0,0 640x480", - display_manager()->GetDisplayAt(0).bounds().ToString()); - EXPECT_EQ("-320,10 320x200", - display_manager()->GetDisplayAt(1).bounds().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 640, 480), + display_manager()->GetDisplayAt(0).bounds()); + EXPECT_EQ(gfx::Rect(-320, 10, 320, 200), + display_manager()->GetDisplayAt(1).bounds()); // The above layout causes an overlap between [P] and [2], making [2]'s // bounds be "-310,-290 400x300" if the overlap is not fixed. The overlap // must be detected and fixed and [2] is shifted up to remove the overlap. - EXPECT_EQ("-310,-300 400x300", - display_manager()->GetDisplayAt(2).bounds().ToString()); + EXPECT_EQ(gfx::Rect(-310, -300, 400, 300), + display_manager()->GetDisplayAt(2).bounds()); } { // Layout: [1] @@ -434,12 +434,12 @@ EXPECT_EQ(3U, display_manager()->GetNumDisplays()); - EXPECT_EQ("0,0 640x480", - display_manager()->GetDisplayAt(0).bounds().ToString()); - EXPECT_EQ("10,-200 320x200", - display_manager()->GetDisplayAt(1).bounds().ToString()); - EXPECT_EQ("640,10 400x300", - display_manager()->GetDisplayAt(2).bounds().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 640, 480), + display_manager()->GetDisplayAt(0).bounds()); + EXPECT_EQ(gfx::Rect(10, -200, 320, 200), + display_manager()->GetDisplayAt(1).bounds()); + EXPECT_EQ(gfx::Rect(640, 10, 400, 300), + display_manager()->GetDisplayAt(2).bounds()); } { // Layout: [P] @@ -457,12 +457,12 @@ EXPECT_EQ(3U, display_manager()->GetNumDisplays()); - EXPECT_EQ("0,0 640x480", - display_manager()->GetDisplayAt(0).bounds().ToString()); - EXPECT_EQ("20,780 320x200", - display_manager()->GetDisplayAt(1).bounds().ToString()); - EXPECT_EQ("10,480 400x300", - display_manager()->GetDisplayAt(2).bounds().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 640, 480), + display_manager()->GetDisplayAt(0).bounds()); + EXPECT_EQ(gfx::Rect(20, 780, 320, 200), + display_manager()->GetDisplayAt(1).bounds()); + EXPECT_EQ(gfx::Rect(10, 480, 400, 300), + display_manager()->GetDisplayAt(2).bounds()); } { @@ -486,20 +486,20 @@ EXPECT_EQ(5U, display_manager()->GetNumDisplays()); - EXPECT_EQ("0,0 640x480", - display_manager()->GetDisplayAt(0).bounds().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 640, 480), + display_manager()->GetDisplayAt(0).bounds()); // 2nd is right of the primary. - EXPECT_EQ("640,10 400x300", - display_manager()->GetDisplayAt(2).bounds().ToString()); + EXPECT_EQ(gfx::Rect(640, 10, 400, 300), + display_manager()->GetDisplayAt(2).bounds()); // 4th is bottom of the primary. - EXPECT_EQ("10,480 200x100", - display_manager()->GetDisplayAt(4).bounds().ToString()); + EXPECT_EQ(gfx::Rect(10, 480, 200, 100), + display_manager()->GetDisplayAt(4).bounds()); // 3rd is the left of 4th. - EXPECT_EQ("-290,480 300x200", - display_manager()->GetDisplayAt(3).bounds().ToString()); + EXPECT_EQ(gfx::Rect(-290, 480, 300, 200), + display_manager()->GetDisplayAt(3).bounds()); // 1st is the bottom of 3rd. - EXPECT_EQ("-280,680 320x200", - display_manager()->GetDisplayAt(1).bounds().ToString()); + EXPECT_EQ(gfx::Rect(-280, 680, 320, 200), + display_manager()->GetDisplayAt(1).bounds()); } } @@ -1032,42 +1032,43 @@ std::vector<display::Display> changed_displays = changed(); ASSERT_EQ(1u, changed_displays.size()); EXPECT_EQ(display_info2.id(), changed_displays[0].id()); - EXPECT_EQ("0,0 500x400", GetDisplayInfoAt(0).bounds_in_native().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 500, 400), GetDisplayInfoAt(0).bounds_in_native()); display::ManagedDisplayInfo updated_display_info2 = GetDisplayInfoAt(1); - EXPECT_EQ("0,501 400x300", - updated_display_info2.bounds_in_native().ToString()); - EXPECT_EQ("378x276", updated_display_info2.size_in_pixel().ToString()); - EXPECT_EQ("13,12,11,10", - updated_display_info2.overscan_insets_in_dip().ToString()); + EXPECT_EQ(gfx::Rect(0, 501, 400, 300), + updated_display_info2.bounds_in_native()); + EXPECT_EQ(gfx::Size(378, 276), updated_display_info2.size_in_pixel()); + EXPECT_EQ(gfx::Insets(13, 12, 11, 10), + updated_display_info2.overscan_insets_in_dip()); display::test::DisplayManagerTestApi display_manager_test(display_manager()); - EXPECT_EQ("500,0 378x276", - display_manager_test.GetSecondaryDisplay().bounds().ToString()); + EXPECT_EQ(gfx::Rect(500, 0, 378, 276), + display_manager_test.GetSecondaryDisplay().bounds()); // Make sure that SetOverscanInsets() is idempotent. display_manager()->SetOverscanInsets(display_info1.id(), gfx::Insets()); display_manager()->SetOverscanInsets(display_info2.id(), gfx::Insets(13, 12, 11, 10)); - EXPECT_EQ("0,0 500x400", GetDisplayInfoAt(0).bounds_in_native().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 500, 400), GetDisplayInfoAt(0).bounds_in_native()); updated_display_info2 = GetDisplayInfoAt(1); - EXPECT_EQ("0,501 400x300", - updated_display_info2.bounds_in_native().ToString()); - EXPECT_EQ("378x276", updated_display_info2.size_in_pixel().ToString()); - EXPECT_EQ("13,12,11,10", - updated_display_info2.overscan_insets_in_dip().ToString()); + EXPECT_EQ(gfx::Rect(0, 501, 400, 300), + updated_display_info2.bounds_in_native()); + EXPECT_EQ(gfx::Size(378, 276), updated_display_info2.size_in_pixel()); + EXPECT_EQ(gfx::Insets(13, 12, 11, 10), + updated_display_info2.overscan_insets_in_dip()); display_manager()->SetOverscanInsets(display_info2.id(), gfx::Insets(10, 11, 12, 13)); - EXPECT_EQ("0,0 500x400", GetDisplayInfoAt(0).bounds_in_native().ToString()); - EXPECT_EQ("376x278", GetDisplayInfoAt(1).size_in_pixel().ToString()); - EXPECT_EQ("10,11,12,13", - GetDisplayInfoAt(1).overscan_insets_in_dip().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 500, 400), GetDisplayInfoAt(0).bounds_in_native()); + EXPECT_EQ(gfx::Size(376, 278), GetDisplayInfoAt(1).size_in_pixel()); + EXPECT_EQ(gfx::Insets(10, 11, 12, 13), + GetDisplayInfoAt(1).overscan_insets_in_dip()); // Recreate a new 2nd display. It won't apply the overscan inset because the // new display has a different ID. UpdateDisplay("0+0-500x400"); UpdateDisplay("0+0-500x400,0+501-400x300"); - EXPECT_EQ("0,0 500x400", GetDisplayInfoAt(0).bounds_in_native().ToString()); - EXPECT_EQ("0,501 400x300", GetDisplayInfoAt(1).bounds_in_native().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 500, 400), GetDisplayInfoAt(0).bounds_in_native()); + EXPECT_EQ(gfx::Rect(0, 501, 400, 300), + GetDisplayInfoAt(1).bounds_in_native()); // Recreate the displays with the same ID. It should apply the overscan // inset. @@ -1078,68 +1079,62 @@ display_info_list.push_back(display_info2); display_manager()->OnNativeDisplaysChanged(display_info_list); - EXPECT_EQ("0,0 500x400", GetDisplayInfoAt(0).bounds_in_native().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 500, 400), GetDisplayInfoAt(0).bounds_in_native()); updated_display_info2 = GetDisplayInfoAt(1); - EXPECT_EQ("376x278", updated_display_info2.size_in_pixel().ToString()); - EXPECT_EQ("10,11,12,13", - updated_display_info2.overscan_insets_in_dip().ToString()); + EXPECT_EQ(gfx::Size(376, 278), updated_display_info2.size_in_pixel()); + EXPECT_EQ(gfx::Insets(10, 11, 12, 13), + updated_display_info2.overscan_insets_in_dip()); // HiDPI but overscan display. The specified insets size should be doubled. UpdateDisplay("0+0-500x400,0+501-400x300*2"); display_manager()->SetOverscanInsets(display_manager()->GetDisplayAt(1).id(), gfx::Insets(4, 5, 6, 7)); - EXPECT_EQ("0,0 500x400", GetDisplayInfoAt(0).bounds_in_native().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 500, 400), GetDisplayInfoAt(0).bounds_in_native()); updated_display_info2 = GetDisplayInfoAt(1); - EXPECT_EQ("0,501 400x300", - updated_display_info2.bounds_in_native().ToString()); - EXPECT_EQ("376x280", updated_display_info2.size_in_pixel().ToString()); - EXPECT_EQ("4,5,6,7", - updated_display_info2.overscan_insets_in_dip().ToString()); - EXPECT_EQ("8,10,12,14", - updated_display_info2.GetOverscanInsetsInPixel().ToString()); + EXPECT_EQ(gfx::Rect(0, 501, 400, 300), + updated_display_info2.bounds_in_native()); + EXPECT_EQ(gfx::Size(376, 280), updated_display_info2.size_in_pixel()); + EXPECT_EQ(gfx::Insets(4, 5, 6, 7), + updated_display_info2.overscan_insets_in_dip()); + EXPECT_EQ(gfx::Insets(8, 10, 12, 14), + updated_display_info2.GetOverscanInsetsInPixel()); // Make sure switching primary display applies the overscan offset only once. Shell::Get()->window_tree_host_manager()->SetPrimaryDisplayId( display_manager_test.GetSecondaryDisplay().id()); - EXPECT_EQ("-500,0 500x400", - display_manager_test.GetSecondaryDisplay().bounds().ToString()); - EXPECT_EQ("0,0 500x400", + EXPECT_EQ(gfx::Rect(-500, 0, 500, 400), + display_manager_test.GetSecondaryDisplay().bounds()); + EXPECT_EQ(gfx::Rect(0, 0, 500, 400), GetDisplayInfo(display_manager_test.GetSecondaryDisplay()) - .bounds_in_native() - .ToString()); - EXPECT_EQ("0,501 400x300", + .bounds_in_native()); + EXPECT_EQ(gfx::Rect(0, 501, 400, 300), GetDisplayInfo(display::Screen::GetScreen()->GetPrimaryDisplay()) - .bounds_in_native() - .ToString()); - EXPECT_EQ( - "0,0 188x140", - display::Screen::GetScreen()->GetPrimaryDisplay().bounds().ToString()); + .bounds_in_native()); + EXPECT_EQ(gfx::Rect(0, 0, 188, 140), + display::Screen::GetScreen()->GetPrimaryDisplay().bounds()); // Make sure just moving the overscan area should property notify observers. UpdateDisplay("0+0-500x400"); int64_t primary_id = display::Screen::GetScreen()->GetPrimaryDisplay().id(); display_manager()->SetOverscanInsets(primary_id, gfx::Insets(0, 0, 20, 20)); - EXPECT_EQ( - "0,0 480x380", - display::Screen::GetScreen()->GetPrimaryDisplay().bounds().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 480, 380), + display::Screen::GetScreen()->GetPrimaryDisplay().bounds()); reset(); display_manager()->SetOverscanInsets(primary_id, gfx::Insets(10, 10, 10, 10)); EXPECT_TRUE(changed_metrics() & display::DisplayObserver::DISPLAY_METRIC_BOUNDS); EXPECT_TRUE(changed_metrics() & display::DisplayObserver::DISPLAY_METRIC_WORK_AREA); - EXPECT_EQ( - "0,0 480x380", - display::Screen::GetScreen()->GetPrimaryDisplay().bounds().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 480, 380), + display::Screen::GetScreen()->GetPrimaryDisplay().bounds()); reset(); display_manager()->SetOverscanInsets(primary_id, gfx::Insets(0, 0, 0, 0)); EXPECT_TRUE(changed_metrics() & display::DisplayObserver::DISPLAY_METRIC_BOUNDS); EXPECT_TRUE(changed_metrics() & display::DisplayObserver::DISPLAY_METRIC_WORK_AREA); - EXPECT_EQ( - "0,0 500x400", - display::Screen::GetScreen()->GetPrimaryDisplay().bounds().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 500, 400), + display::Screen::GetScreen()->GetPrimaryDisplay().bounds()); } TEST_F(DisplayManagerTest, ZeroOverscanInsets) { @@ -1467,15 +1462,15 @@ UpdateDisplay("1000x600"); aura::WindowTreeHost* host = Shell::GetPrimaryRootWindow()->GetHost(); EXPECT_EQ(1, host->compositor()->device_scale_factor()); - EXPECT_EQ("1000x600", - Shell::GetPrimaryRootWindow()->bounds().size().ToString()); + EXPECT_EQ(gfx::Size(1000, 600), + Shell::GetPrimaryRootWindow()->bounds().size()); EXPECT_EQ("1 0 0 1 1", GetCountSummary()); UpdateDisplay("1000x600*2"); EXPECT_EQ(2, host->compositor()->device_scale_factor()); EXPECT_EQ("2 0 0 2 2", GetCountSummary()); - EXPECT_EQ("500x300", - Shell::GetPrimaryRootWindow()->bounds().size().ToString()); + EXPECT_EQ(gfx::Size(500, 300), + Shell::GetPrimaryRootWindow()->bounds().size()); } TEST_F(DisplayManagerTest, TestNativeDisplaysChanged) { @@ -1499,15 +1494,13 @@ EXPECT_EQ(1U, display_manager()->GetNumDisplays()); EXPECT_EQ(1U, display_manager()->num_connected_displays()); - std::string default_bounds = - display_manager()->GetDisplayAt(0).bounds().ToString(); + gfx::Rect default_bounds = display_manager()->GetDisplayAt(0).bounds(); std::vector<display::ManagedDisplayInfo> display_info_list; // Primary disconnected. display_manager()->OnNativeDisplaysChanged(display_info_list); EXPECT_EQ(1U, display_manager()->GetNumDisplays()); - EXPECT_EQ(default_bounds, - display_manager()->GetDisplayAt(0).bounds().ToString()); + EXPECT_EQ(default_bounds, display_manager()->GetDisplayAt(0).bounds()); EXPECT_EQ(1U, display_manager()->num_connected_displays()); EXPECT_FALSE(display_manager()->IsInMirrorMode()); @@ -1517,8 +1510,8 @@ EXPECT_EQ(1U, display_manager()->GetNumDisplays()); EXPECT_EQ(invalid_id, GetDisplayForId(internal_display_id).id()); - EXPECT_EQ("1,1 200x100", - GetDisplayInfoForId(external_id).bounds_in_native().ToString()); + EXPECT_EQ(gfx::Rect(1, 1, 200, 100), + GetDisplayInfoForId(external_id).bounds_in_native()); EXPECT_EQ(1U, display_manager()->num_connected_displays()); EXPECT_FALSE(display_manager()->IsInMirrorMode()); EXPECT_EQ(external_id, @@ -1536,10 +1529,10 @@ display::Screen::GetScreen()->GetPrimaryDisplay().id()); // This combinatino is new, so internal display becomes primary. - EXPECT_EQ("0,0 500x400", - GetDisplayForId(internal_display_id).bounds().ToString()); - EXPECT_EQ("1,1 200x100", - GetDisplayInfoForId(10).bounds_in_native().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 500, 400), + GetDisplayForId(internal_display_id).bounds()); + EXPECT_EQ(gfx::Rect(1, 1, 200, 100), + GetDisplayInfoForId(10).bounds_in_native()); EXPECT_EQ(2U, display_manager()->num_connected_displays()); EXPECT_FALSE(display_manager()->IsInMirrorMode()); EXPECT_EQ(ToDisplayName(internal_display_id), @@ -1549,10 +1542,10 @@ display_info_list.clear(); display_manager()->OnNativeDisplaysChanged(display_info_list); EXPECT_EQ(2U, display_manager()->GetNumDisplays()); - EXPECT_EQ("0,0 500x400", - GetDisplayForId(internal_display_id).bounds().ToString()); - EXPECT_EQ("1,1 200x100", - GetDisplayInfoForId(10).bounds_in_native().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 500, 400), + GetDisplayForId(internal_display_id).bounds()); + EXPECT_EQ(gfx::Rect(1, 1, 200, 100), + GetDisplayInfoForId(10).bounds_in_native()); EXPECT_EQ(2U, display_manager()->num_connected_displays()); EXPECT_FALSE(display_manager()->IsInMirrorMode()); EXPECT_EQ(ToDisplayName(internal_display_id), @@ -1562,8 +1555,8 @@ display_info_list.push_back(internal_display_info); display_manager()->OnNativeDisplaysChanged(display_info_list); EXPECT_EQ(1U, display_manager()->GetNumDisplays()); - EXPECT_EQ("0,0 500x400", - GetDisplayForId(internal_display_id).bounds().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 500, 400), + GetDisplayForId(internal_display_id).bounds()); EXPECT_EQ(1U, display_manager()->num_connected_displays()); EXPECT_FALSE(display_manager()->IsInMirrorMode()); @@ -1597,8 +1590,8 @@ display_info_list.push_back(mirroring_display_info); display_manager()->OnNativeDisplaysChanged(display_info_list); EXPECT_EQ(1U, display_manager()->GetNumDisplays()); - EXPECT_EQ("0,0 500x400", - GetDisplayForId(internal_display_id).bounds().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 500, 400), + GetDisplayForId(internal_display_id).bounds()); EXPECT_EQ(2U, display_manager()->num_connected_displays()); EXPECT_EQ(11U, display_manager()->GetMirroringDestinationDisplayIdList()[0]); EXPECT_TRUE(display_manager()->IsInMirrorMode()); @@ -1620,9 +1613,9 @@ EXPECT_EQ(2U, display_manager()->GetNumDisplays()); EXPECT_EQ(2U, display_manager()->num_connected_displays()); EXPECT_FALSE(display_manager()->IsInMirrorMode()); - EXPECT_EQ("0,0 500x400", - GetDisplayForId(internal_display_id).bounds().ToString()); - EXPECT_EQ("500,0 200x100", GetDisplayForId(10).bounds().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 500, 400), + GetDisplayForId(internal_display_id).bounds()); + EXPECT_EQ(gfx::Rect(500, 0, 200, 100), GetDisplayForId(10).bounds()); // Turn off internal display_info_list.clear(); @@ -1630,8 +1623,8 @@ display_manager()->OnNativeDisplaysChanged(display_info_list); EXPECT_EQ(1U, display_manager()->GetNumDisplays()); EXPECT_EQ(invalid_id, GetDisplayForId(internal_display_id).id()); - EXPECT_EQ("1,1 200x100", - GetDisplayInfoForId(external_id).bounds_in_native().ToString()); + EXPECT_EQ(gfx::Rect(1, 1, 200, 100), + GetDisplayInfoForId(external_id).bounds_in_native()); EXPECT_EQ(1U, display_manager()->num_connected_displays()); EXPECT_FALSE(display_manager()->IsInMirrorMode()); @@ -1640,9 +1633,8 @@ display_info_list.push_back(internal_display_info); display_manager()->OnNativeDisplaysChanged(display_info_list); EXPECT_EQ(1U, display_manager()->GetNumDisplays()); - EXPECT_EQ( - "0,0 500x400", - GetDisplayInfoForId(internal_display_id).bounds_in_native().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 500, 400), + GetDisplayInfoForId(internal_display_id).bounds_in_native()); EXPECT_EQ(1U, display_manager()->num_connected_displays()); EXPECT_FALSE(display_manager()->IsInMirrorMode()); @@ -1677,7 +1669,7 @@ // Secondary seconary_id becomes the primary as it has smaller output index. EXPECT_EQ(secondary_id, WindowTreeHostManager::GetPrimaryDisplayId()); EXPECT_EQ(third_id, display_manager_test.GetSecondaryDisplay().id()); - EXPECT_EQ("600x500", GetDisplayForId(third_id).size().ToString()); + EXPECT_EQ(gfx::Size(600, 500), GetDisplayForId(third_id).size()); } TEST_F(DisplayManagerTest, TestNativeDisplaysChangedNoInternal) { @@ -1694,13 +1686,11 @@ display_info_list.push_back(external_display_info); display_manager()->OnNativeDisplaysChanged(display_info_list); EXPECT_EQ(1U, display_manager()->GetNumDisplays()); - EXPECT_EQ("1,1 200x100", - GetDisplayInfoForId(10).bounds_in_native().ToString()); - EXPECT_EQ("200x100", Shell::GetPrimaryRootWindow() - ->GetHost() - ->GetBoundsInPixels() - .size() - .ToString()); + EXPECT_EQ(gfx::Rect(1, 1, 200, 100), + GetDisplayInfoForId(10).bounds_in_native()); + EXPECT_EQ( + gfx::Size(200, 100), + Shell::GetPrimaryRootWindow()->GetHost()->GetBoundsInPixels().size()); } TEST_F(DisplayManagerTest, NativeDisplaysChangedAfterPrimaryChange) { @@ -1718,22 +1708,22 @@ display_info_list.push_back(secondary_display_info); display_manager()->OnNativeDisplaysChanged(display_info_list); EXPECT_EQ(2U, display_manager()->GetNumDisplays()); - EXPECT_EQ("0,0 500x400", - GetDisplayForId(internal_display_id).bounds().ToString()); - EXPECT_EQ("500,0 200x100", GetDisplayForId(10).bounds().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 500, 400), + GetDisplayForId(internal_display_id).bounds()); + EXPECT_EQ(gfx::Rect(500, 0, 200, 100), GetDisplayForId(10).bounds()); Shell::Get()->window_tree_host_manager()->SetPrimaryDisplayId( secondary_display_info.id()); - EXPECT_EQ("-500,0 500x400", - GetDisplayForId(internal_display_id).bounds().ToString()); - EXPECT_EQ("0,0 200x100", GetDisplayForId(10).bounds().ToString()); + EXPECT_EQ(gfx::Rect(-500, 0, 500, 400), + GetDisplayForId(internal_display_id).bounds()); + EXPECT_EQ(gfx::Rect(0, 0, 200, 100), GetDisplayForId(10).bounds()); // OnNativeDisplaysChanged may change the display bounds. Here makes sure // nothing changed if the exactly same displays are specified. display_manager()->OnNativeDisplaysChanged(display_info_list); - EXPECT_EQ("-500,0 500x400", - GetDisplayForId(internal_display_id).bounds().ToString()); - EXPECT_EQ("0,0 200x100", GetDisplayForId(10).bounds().ToString()); + EXPECT_EQ(gfx::Rect(-500, 0, 500, 400), + GetDisplayForId(internal_display_id).bounds()); + EXPECT_EQ(gfx::Rect(0, 0, 200, 100), GetDisplayForId(10).bounds()); } TEST_F(DisplayManagerTest, DontRememberBestResolution) { @@ -1779,7 +1769,7 @@ gfx::Size(800, 300)); EXPECT_TRUE( display_manager()->GetSelectedModeForDisplayId(display_id, &mode)); - EXPECT_EQ("800x300", mode.size().ToString()); + EXPECT_EQ(gfx::Size(800, 300), mode.size()); EXPECT_EQ(59.0f, mode.refresh_rate()); EXPECT_FALSE(mode.native()); @@ -1795,7 +1785,7 @@ gfx::Size(1000, 500)); EXPECT_TRUE( display_manager()->GetSelectedModeForDisplayId(display_id, &mode)); - EXPECT_EQ("1000x500", mode.size().ToString()); + EXPECT_EQ(gfx::Size(1000, 500), mode.size()); EXPECT_EQ(58.0f, mode.refresh_rate()); EXPECT_TRUE(mode.native()); @@ -1839,7 +1829,7 @@ display::ManagedDisplayMode mode; EXPECT_TRUE( display_manager()->GetSelectedModeForDisplayId(display_id, &mode)); - EXPECT_EQ("400x500", mode.size().ToString()); + EXPECT_EQ(gfx::Size(400, 500), mode.size()); EXPECT_EQ(60.0f, mode.refresh_rate()); EXPECT_FALSE(mode.native()); } @@ -1859,7 +1849,7 @@ display::ManagedDisplayMode mode; EXPECT_TRUE( display_manager()->GetSelectedModeForDisplayId(display_id, &mode)); - EXPECT_EQ("1000x500", mode.size().ToString()); + EXPECT_EQ(gfx::Size(1000, 500), mode.size()); EXPECT_EQ(60.0f, mode.refresh_rate()); EXPECT_TRUE(mode.native()); } @@ -1913,21 +1903,23 @@ TEST_F(DisplayManagerTest, Rotate) { UpdateDisplay("100x200/r,300x400/l"); - EXPECT_EQ("1,1 100x200", GetDisplayInfoAt(0).bounds_in_native().ToString()); - EXPECT_EQ("200x100", GetDisplayInfoAt(0).size_in_pixel().ToString()); + EXPECT_EQ(gfx::Rect(1, 1, 100, 200), GetDisplayInfoAt(0).bounds_in_native()); + EXPECT_EQ(gfx::Size(200, 100), GetDisplayInfoAt(0).size_in_pixel()); - EXPECT_EQ("1,201 300x400", GetDisplayInfoAt(1).bounds_in_native().ToString()); - EXPECT_EQ("400x300", GetDisplayInfoAt(1).size_in_pixel().ToString()); + EXPECT_EQ(gfx::Rect(1, 201, 300, 400), + GetDisplayInfoAt(1).bounds_in_native()); + EXPECT_EQ(gfx::Size(400, 300), GetDisplayInfoAt(1).size_in_pixel()); reset(); UpdateDisplay("100x200/b,300x400"); EXPECT_EQ("2 0 0 1 1", GetCountSummary()); reset(); - EXPECT_EQ("1,1 100x200", GetDisplayInfoAt(0).bounds_in_native().ToString()); - EXPECT_EQ("100x200", GetDisplayInfoAt(0).size_in_pixel().ToString()); + EXPECT_EQ(gfx::Rect(1, 1, 100, 200), GetDisplayInfoAt(0).bounds_in_native()); + EXPECT_EQ(gfx::Size(100, 200), GetDisplayInfoAt(0).size_in_pixel()); - EXPECT_EQ("1,201 300x400", GetDisplayInfoAt(1).bounds_in_native().ToString()); - EXPECT_EQ("300x400", GetDisplayInfoAt(1).size_in_pixel().ToString()); + EXPECT_EQ(gfx::Rect(1, 201, 300, 400), + GetDisplayInfoAt(1).bounds_in_native()); + EXPECT_EQ(gfx::Size(300, 400), GetDisplayInfoAt(1).size_in_pixel()); // Just Rotating display will change the bounds on both display. UpdateDisplay("100x200/l,300x400"); @@ -2009,37 +2001,34 @@ display::ManagedDisplayInfo info = display_manager()->GetDisplayInfo(unified_id); ASSERT_EQ(2u, info.display_modes().size()); - EXPECT_EQ("600x200", info.display_modes()[0].size().ToString()); + EXPECT_EQ(gfx::Size(600, 200), info.display_modes()[0].size()); EXPECT_TRUE(info.display_modes()[0].native()); - EXPECT_EQ("1200x400", info.display_modes()[1].size().ToString()); + EXPECT_EQ(gfx::Size(1200, 400), info.display_modes()[1].size()); EXPECT_FALSE(info.display_modes()[1].native()); - EXPECT_EQ( - "600x200", - display::Screen::GetScreen()->GetPrimaryDisplay().size().ToString()); + EXPECT_EQ(gfx::Size(600, 200), + display::Screen::GetScreen()->GetPrimaryDisplay().size()); display::ManagedDisplayMode active_mode; EXPECT_TRUE( display_manager()->GetActiveModeForDisplayId(unified_id, &active_mode)); - EXPECT_EQ("600x200", active_mode.size().ToString()); + EXPECT_EQ(gfx::Size(600, 200), active_mode.size()); EXPECT_TRUE(display::test::SetDisplayResolution(display_manager(), unified_id, gfx::Size(1200, 400))); - EXPECT_EQ( - "1200x400", - display::Screen::GetScreen()->GetPrimaryDisplay().size().ToString()); + EXPECT_EQ(gfx::Size(1200, 400), + display::Screen::GetScreen()->GetPrimaryDisplay().size()); EXPECT_TRUE( display_manager()->GetActiveModeForDisplayId(unified_id, &active_mode)); - EXPECT_EQ("1200x400", active_mode.size().ToString()); + EXPECT_EQ(gfx::Size(1200, 400), active_mode.size()); // resolution change will not persist in unified desktop mode. UpdateDisplay("600x400, 300x200"); - EXPECT_EQ( - "1200x400", - display::Screen::GetScreen()->GetPrimaryDisplay().size().ToString()); + EXPECT_EQ(gfx::Size(1200, 400), + display::Screen::GetScreen()->GetPrimaryDisplay().size()); EXPECT_TRUE( display_manager()->GetActiveModeForDisplayId(unified_id, &active_mode)); EXPECT_TRUE(active_mode.native()); - EXPECT_EQ("1200x400", active_mode.size().ToString()); + EXPECT_EQ(gfx::Size(1200, 400), active_mode.size()); } TEST_F(DisplayManagerTest, RotateExternalDisplayWithNonNativeMode) { @@ -2118,41 +2107,41 @@ // Test on 1st display. generator1.MoveMouseToInHost(150, 50); - EXPECT_EQ("150,50", env->last_mouse_location().ToString()); + EXPECT_EQ(gfx::Point(150, 50), env->last_mouse_location()); UpdateDisplay("300x200/r,200x150"); - EXPECT_EQ("50,150", env->last_mouse_location().ToString()); + EXPECT_EQ(gfx::Point(50, 150), env->last_mouse_location()); // Test on 2nd display. generator2.MoveMouseToInHost(50, 100); - EXPECT_EQ("250,100", env->last_mouse_location().ToString()); + EXPECT_EQ(gfx::Point(250, 100), env->last_mouse_location()); UpdateDisplay("300x200/r,200x150/l"); - EXPECT_EQ("250,50", env->last_mouse_location().ToString()); + EXPECT_EQ(gfx::Point(250, 50), env->last_mouse_location()); // The native location is now outside, so move to the center // of closest display. UpdateDisplay("300x200/r,100x50/l"); - EXPECT_EQ("225,50", env->last_mouse_location().ToString()); + EXPECT_EQ(gfx::Point(225, 50), env->last_mouse_location()); // Make sure just zooming will not change native location. UpdateDisplay("600x400*2,400x300"); // Test on 1st display. generator1.MoveMouseToInHost(200, 300); - EXPECT_EQ("100,150", env->last_mouse_location().ToString()); + EXPECT_EQ(gfx::Point(100, 150), env->last_mouse_location()); UpdateDisplay("600x400*2@1.5,400x300"); - EXPECT_EQ("66,100", env->last_mouse_location().ToString()); + EXPECT_EQ(gfx::Point(66, 100), env->last_mouse_location()); // Test on 2nd display. UpdateDisplay("600x400,400x300*2"); generator2.MoveMouseToInHost(200, 250); - EXPECT_EQ("700,125", env->last_mouse_location().ToString()); + EXPECT_EQ(gfx::Point(700, 125), env->last_mouse_location()); UpdateDisplay("600x400,400x300*2@1.5"); - EXPECT_EQ("666,83", env->last_mouse_location().ToString()); + EXPECT_EQ(gfx::Point(666, 83), env->last_mouse_location()); // The native location is now outside, so move to the // center of closest display. UpdateDisplay("600x400,400x200*2@1.5"); - EXPECT_EQ("666,67", env->last_mouse_location().ToString()); + EXPECT_EQ(gfx::Point(666, 67), env->last_mouse_location()); } class TestDisplayObserver : public display::DisplayObserver { @@ -2204,13 +2193,12 @@ base::RunLoop().RunUntilIdle(); EXPECT_TRUE(display_observer.changed_and_reset()); EXPECT_EQ(1U, display_manager()->GetNumDisplays()); - EXPECT_EQ( - "0,0 300x400", - display::Screen::GetScreen()->GetPrimaryDisplay().bounds().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 300, 400), + display::Screen::GetScreen()->GetPrimaryDisplay().bounds()); std::vector<aura::WindowTreeHost*> hosts = test_api.GetHosts(); ASSERT_EQ(1U, hosts.size()); - EXPECT_EQ("400x500", hosts[0]->GetBoundsInPixels().size().ToString()); - EXPECT_EQ("300x400", hosts[0]->window()->bounds().size().ToString()); + EXPECT_EQ(gfx::Size(400, 500), hosts[0]->GetBoundsInPixels().size()); + EXPECT_EQ(gfx::Size(300, 400), hosts[0]->window()->bounds().size()); EXPECT_TRUE(display_manager()->IsInMirrorMode()); SetSoftwareMirrorMode(false); @@ -2226,29 +2214,29 @@ UpdateDisplay("300x400@0.5,400x500"); EXPECT_FALSE(display_observer.changed_and_reset()); - EXPECT_EQ("300x400", - test_api.GetHosts()[0]->window()->bounds().size().ToString()); + EXPECT_EQ(gfx::Size(300, 400), + test_api.GetHosts()[0]->window()->bounds().size()); UpdateDisplay("310x410*2,400x500"); EXPECT_FALSE(display_observer.changed_and_reset()); - EXPECT_EQ("310x410", - test_api.GetHosts()[0]->window()->bounds().size().ToString()); + EXPECT_EQ(gfx::Size(310, 410), + test_api.GetHosts()[0]->window()->bounds().size()); UpdateDisplay("320x420/r,400x500"); EXPECT_FALSE(display_observer.changed_and_reset()); - EXPECT_EQ("420x320", - test_api.GetHosts()[0]->window()->bounds().size().ToString()); + EXPECT_EQ(gfx::Size(420, 320), + test_api.GetHosts()[0]->window()->bounds().size()); UpdateDisplay("330x440/r,400x500"); EXPECT_FALSE(display_observer.changed_and_reset()); - EXPECT_EQ("440x330", - test_api.GetHosts()[0]->window()->bounds().size().ToString()); + EXPECT_EQ(gfx::Size(440, 330), + test_api.GetHosts()[0]->window()->bounds().size()); // Overscan insets are ignored. UpdateDisplay("400x600/o,600x800/o"); EXPECT_FALSE(display_observer.changed_and_reset()); - EXPECT_EQ("400x600", - test_api.GetHosts()[0]->window()->bounds().size().ToString()); + EXPECT_EQ(gfx::Size(400, 600), + test_api.GetHosts()[0]->window()->bounds().size()); display::Screen::GetScreen()->RemoveObserver(&display_observer); } @@ -2367,32 +2355,32 @@ aura::WindowTreeHost* host0 = root_windows[0]->GetHost(); aura::WindowTreeHost* host1 = root_windows[1]->GetHost(); - EXPECT_EQ("1,1", host0->GetBoundsInPixels().origin().ToString()); - EXPECT_EQ("100x200", host0->GetBoundsInPixels().size().ToString()); + EXPECT_EQ(gfx::Point(1, 1), host0->GetBoundsInPixels().origin()); + EXPECT_EQ(gfx::Size(100, 200), host0->GetBoundsInPixels().size()); // UpdateDisplay set the origin if it's not set. - EXPECT_NE("1,1", host1->GetBoundsInPixels().origin().ToString()); - EXPECT_EQ("300x400", host1->GetBoundsInPixels().size().ToString()); + EXPECT_NE(gfx::Point(1, 1), host1->GetBoundsInPixels().origin()); + EXPECT_EQ(gfx::Size(300, 400), host1->GetBoundsInPixels().size()); UpdateDisplay("100x200,200+300-300x400"); ASSERT_EQ(2, display::Screen::GetScreen()->GetNumDisplays()); - EXPECT_EQ("0,0", host0->GetBoundsInPixels().origin().ToString()); - EXPECT_EQ("100x200", host0->GetBoundsInPixels().size().ToString()); - EXPECT_EQ("200,300", host1->GetBoundsInPixels().origin().ToString()); - EXPECT_EQ("300x400", host1->GetBoundsInPixels().size().ToString()); + EXPECT_EQ(gfx::Point(0, 0), host0->GetBoundsInPixels().origin()); + EXPECT_EQ(gfx::Size(100, 200), host0->GetBoundsInPixels().size()); + EXPECT_EQ(gfx::Point(200, 300), host1->GetBoundsInPixels().origin()); + EXPECT_EQ(gfx::Size(300, 400), host1->GetBoundsInPixels().size()); UpdateDisplay("400+500-200x300,300x400"); ASSERT_EQ(2, display::Screen::GetScreen()->GetNumDisplays()); - EXPECT_EQ("400,500", host0->GetBoundsInPixels().origin().ToString()); - EXPECT_EQ("200x300", host0->GetBoundsInPixels().size().ToString()); - EXPECT_EQ("0,0", host1->GetBoundsInPixels().origin().ToString()); - EXPECT_EQ("300x400", host1->GetBoundsInPixels().size().ToString()); + EXPECT_EQ(gfx::Point(400, 500), host0->GetBoundsInPixels().origin()); + EXPECT_EQ(gfx::Size(200, 300), host0->GetBoundsInPixels().size()); + EXPECT_EQ(gfx::Point(0, 0), host1->GetBoundsInPixels().origin()); + EXPECT_EQ(gfx::Size(300, 400), host1->GetBoundsInPixels().size()); UpdateDisplay("100+200-100x200,300+500-200x300"); ASSERT_EQ(2, display::Screen::GetScreen()->GetNumDisplays()); - EXPECT_EQ("100,200", host0->GetBoundsInPixels().origin().ToString()); - EXPECT_EQ("100x200", host0->GetBoundsInPixels().size().ToString()); - EXPECT_EQ("300,500", host1->GetBoundsInPixels().origin().ToString()); - EXPECT_EQ("200x300", host1->GetBoundsInPixels().size().ToString()); + EXPECT_EQ(gfx::Point(100, 200), host0->GetBoundsInPixels().origin()); + EXPECT_EQ(gfx::Size(100, 200), host0->GetBoundsInPixels().size()); + EXPECT_EQ(gfx::Point(300, 500), host1->GetBoundsInPixels().origin()); + EXPECT_EQ(gfx::Size(200, 300), host1->GetBoundsInPixels().size()); } TEST_F(DisplayManagerTest, UnifiedDesktopBasic) { @@ -2523,92 +2511,92 @@ display::ManagedDisplayInfo info = display_manager()->GetDisplayInfo(screen->GetPrimaryDisplay().id()); ASSERT_EQ(2u, info.display_modes().size()); - EXPECT_EQ("1640x800", info.display_modes()[0].size().ToString()); + EXPECT_EQ(gfx::Size(1640, 800), info.display_modes()[0].size()); EXPECT_EQ(2.0f, info.display_modes()[0].device_scale_factor()); - EXPECT_EQ("1025x500", info.display_modes()[1].size().ToString()); + EXPECT_EQ(gfx::Size(1025, 500), info.display_modes()[1].size()); EXPECT_EQ(1.0f, info.display_modes()[1].device_scale_factor()); // For 1x, 400 + 500 / 800 * 100 = 1025. - EXPECT_EQ("1025x500", screen->GetPrimaryDisplay().size().ToString()); - EXPECT_EQ("1025x500", - Shell::GetPrimaryRootWindow()->bounds().size().ToString()); + EXPECT_EQ(gfx::Size(1025, 500), screen->GetPrimaryDisplay().size()); + EXPECT_EQ(gfx::Size(1025, 500), + Shell::GetPrimaryRootWindow()->bounds().size()); accelerators::ZoomDisplay(false); // (800 / 500 * 400 + 500) /2 = 820 - EXPECT_EQ("820x400", screen->GetPrimaryDisplay().size().ToString()); - EXPECT_EQ("820x400", - Shell::GetPrimaryRootWindow()->bounds().size().ToString()); + EXPECT_EQ(gfx::Size(820, 400), screen->GetPrimaryDisplay().size()); + EXPECT_EQ(gfx::Size(820, 400), + Shell::GetPrimaryRootWindow()->bounds().size()); // 1st display is 2x. UpdateDisplay("1200x800*2,1100x1000"); info = display_manager()->GetDisplayInfo(screen->GetPrimaryDisplay().id()); ASSERT_EQ(2u, info.display_modes().size()); - EXPECT_EQ("2080x800", info.display_modes()[0].size().ToString()); + EXPECT_EQ(gfx::Size(2080, 800), info.display_modes()[0].size()); EXPECT_EQ(2.0f, info.display_modes()[0].device_scale_factor()); - EXPECT_EQ("2600x1000", info.display_modes()[1].size().ToString()); + EXPECT_EQ(gfx::Size(2600, 1000), info.display_modes()[1].size()); EXPECT_EQ(1.0f, info.display_modes()[1].device_scale_factor()); // For 2x, (800 / 1000 * 1100 + 1200) / 2 = 1040 - EXPECT_EQ("1040x400", screen->GetPrimaryDisplay().size().ToString()); - EXPECT_EQ("1040x400", - Shell::GetPrimaryRootWindow()->bounds().size().ToString()); + EXPECT_EQ(gfx::Size(1040, 400), screen->GetPrimaryDisplay().size()); + EXPECT_EQ(gfx::Size(1040, 400), + Shell::GetPrimaryRootWindow()->bounds().size()); accelerators::ZoomDisplay(true); // 1000 / 800 * 1200 + 1100 = 2600 - EXPECT_EQ("2600x1000", screen->GetPrimaryDisplay().size().ToString()); - EXPECT_EQ("2600x1000", - Shell::GetPrimaryRootWindow()->bounds().size().ToString()); + EXPECT_EQ(gfx::Size(2600, 1000), screen->GetPrimaryDisplay().size()); + EXPECT_EQ(gfx::Size(2600, 1000), + Shell::GetPrimaryRootWindow()->bounds().size()); // Both displays are 2x. // 1st display is 2x. UpdateDisplay("1200x800*2,1100x1000*2"); info = display_manager()->GetDisplayInfo(screen->GetPrimaryDisplay().id()); ASSERT_EQ(2u, info.display_modes().size()); - EXPECT_EQ("2080x800", info.display_modes()[0].size().ToString()); + EXPECT_EQ(gfx::Size(2080, 800), info.display_modes()[0].size()); EXPECT_EQ(2.0f, info.display_modes()[0].device_scale_factor()); - EXPECT_EQ("2600x1000", info.display_modes()[1].size().ToString()); + EXPECT_EQ(gfx::Size(2600, 1000), info.display_modes()[1].size()); EXPECT_EQ(2.0f, info.display_modes()[1].device_scale_factor()); - EXPECT_EQ("1040x400", screen->GetPrimaryDisplay().size().ToString()); - EXPECT_EQ("1040x400", - Shell::GetPrimaryRootWindow()->bounds().size().ToString()); + EXPECT_EQ(gfx::Size(1040, 400), screen->GetPrimaryDisplay().size()); + EXPECT_EQ(gfx::Size(1040, 400), + Shell::GetPrimaryRootWindow()->bounds().size()); accelerators::ZoomDisplay(true); - EXPECT_EQ("1300x500", screen->GetPrimaryDisplay().size().ToString()); - EXPECT_EQ("1300x500", - Shell::GetPrimaryRootWindow()->bounds().size().ToString()); + EXPECT_EQ(gfx::Size(1300, 500), screen->GetPrimaryDisplay().size()); + EXPECT_EQ(gfx::Size(1300, 500), + Shell::GetPrimaryRootWindow()->bounds().size()); // Both displays have the same physical height, with the first display // being 2x. UpdateDisplay("1000x800*2,300x800"); info = display_manager()->GetDisplayInfo(screen->GetPrimaryDisplay().id()); ASSERT_EQ(2u, info.display_modes().size()); - EXPECT_EQ("1300x800", info.display_modes()[0].size().ToString()); + EXPECT_EQ(gfx::Size(1300, 800), info.display_modes()[0].size()); EXPECT_EQ(2.0f, info.display_modes()[0].device_scale_factor()); - EXPECT_EQ("1300x800", info.display_modes()[1].size().ToString()); + EXPECT_EQ(gfx::Size(1300, 800), info.display_modes()[1].size()); EXPECT_EQ(1.0f, info.display_modes()[1].device_scale_factor()); - EXPECT_EQ("650x400", screen->GetPrimaryDisplay().size().ToString()); - EXPECT_EQ("650x400", - Shell::GetPrimaryRootWindow()->bounds().size().ToString()); + EXPECT_EQ(gfx::Size(650, 400), screen->GetPrimaryDisplay().size()); + EXPECT_EQ(gfx::Size(650, 400), + Shell::GetPrimaryRootWindow()->bounds().size()); accelerators::ZoomDisplay(true); - EXPECT_EQ("1300x800", screen->GetPrimaryDisplay().size().ToString()); - EXPECT_EQ("1300x800", - Shell::GetPrimaryRootWindow()->bounds().size().ToString()); + EXPECT_EQ(gfx::Size(1300, 800), screen->GetPrimaryDisplay().size()); + EXPECT_EQ(gfx::Size(1300, 800), + Shell::GetPrimaryRootWindow()->bounds().size()); // Both displays have the same physical height, with the second display // being 2x. UpdateDisplay("1000x800,300x800*2"); ASSERT_EQ(2u, info.display_modes().size()); - EXPECT_EQ("1300x800", info.display_modes()[0].size().ToString()); + EXPECT_EQ(gfx::Size(1300, 800), info.display_modes()[0].size()); EXPECT_EQ(2.0f, info.display_modes()[0].device_scale_factor()); - EXPECT_EQ("1300x800", info.display_modes()[1].size().ToString()); + EXPECT_EQ(gfx::Size(1300, 800), info.display_modes()[1].size()); EXPECT_EQ(1.0f, info.display_modes()[1].device_scale_factor()); - EXPECT_EQ("1300x800", screen->GetPrimaryDisplay().size().ToString()); - EXPECT_EQ("1300x800", - Shell::GetPrimaryRootWindow()->bounds().size().ToString()); + EXPECT_EQ(gfx::Size(1300, 800), screen->GetPrimaryDisplay().size()); + EXPECT_EQ(gfx::Size(1300, 800), + Shell::GetPrimaryRootWindow()->bounds().size()); accelerators::ZoomDisplay(false); - EXPECT_EQ("650x400", screen->GetPrimaryDisplay().size().ToString()); - EXPECT_EQ("650x400", - Shell::GetPrimaryRootWindow()->bounds().size().ToString()); + EXPECT_EQ(gfx::Size(650, 400), screen->GetPrimaryDisplay().size()); + EXPECT_EQ(gfx::Size(650, 400), + Shell::GetPrimaryRootWindow()->bounds().size()); } // Updating displays again in unified desktop mode should not crash. @@ -2635,18 +2623,18 @@ display::Screen* screen = display::Screen::GetScreen(); const display::Display& display = screen->GetPrimaryDisplay(); - EXPECT_EQ("1150x500", display.size().ToString()); + EXPECT_EQ(gfx::Size(1150, 500), display.size()); display_manager()->SetDisplayRotation( display.id(), display::Display::ROTATE_90, display::Display::RotationSource::ACTIVE); - EXPECT_EQ("1150x500", screen->GetPrimaryDisplay().size().ToString()); + EXPECT_EQ(gfx::Size(1150, 500), screen->GetPrimaryDisplay().size()); display_manager()->SetDisplayRotation( display.id(), display::Display::ROTATE_0, display::Display::RotationSource::ACTIVE); - EXPECT_EQ("1150x500", screen->GetPrimaryDisplay().size().ToString()); + EXPECT_EQ(gfx::Size(1150, 500), screen->GetPrimaryDisplay().size()); UpdateDisplay("400x500"); - EXPECT_EQ("400x500", screen->GetPrimaryDisplay().size().ToString()); + EXPECT_EQ(gfx::Size(400, 500), screen->GetPrimaryDisplay().size()); } // Validate that setting an invalid matrix will fall back to the default @@ -3295,10 +3283,10 @@ display::Screen* screen = display::Screen::GetScreen(); EXPECT_NE(orig_screen, screen); EXPECT_EQ(2, screen->GetNumDisplays()); - EXPECT_EQ("500x300", screen->GetPrimaryDisplay().size().ToString()); + EXPECT_EQ(gfx::Size(500, 300), screen->GetPrimaryDisplay().size()); std::vector<display::Display> all = screen->GetAllDisplays(); - EXPECT_EQ("500x300", all[0].size().ToString()); - EXPECT_EQ("800x400", all[1].size().ToString()); + EXPECT_EQ(gfx::Size(500, 300), all[0].size()); + EXPECT_EQ(gfx::Size(800, 400), all[1].size()); } };
diff --git a/ash/display/display_prefs_unittest.cc b/ash/display/display_prefs_unittest.cc index 690bb1a2e..31f3c81 100644 --- a/ash/display/display_prefs_unittest.cc +++ b/ash/display/display_prefs_unittest.cc
@@ -819,7 +819,7 @@ EXPECT_EQ(display::DisplayPlacement::BOTTOM, placement.position); EXPECT_EQ(-10, placement.offset); const display::Display& primary_display = screen->GetPrimaryDisplay(); - EXPECT_EQ("178x276", primary_display.bounds().size().ToString()); + EXPECT_EQ(gfx::Size(178, 276), primary_display.bounds().size()); EXPECT_EQ(display::Display::ROTATE_90, primary_display.rotation()); const display::ManagedDisplayInfo& info1 = @@ -895,7 +895,7 @@ EXPECT_EQ(display::DisplayPlacement::BOTTOM, placement.position); EXPECT_EQ(-10, placement.offset); const display::Display& primary_display = screen->GetPrimaryDisplay(); - EXPECT_EQ("178x276", primary_display.bounds().size().ToString()); + EXPECT_EQ(gfx::Size(178, 276), primary_display.bounds().size()); EXPECT_EQ(display::Display::ROTATE_90, primary_display.rotation()); const display::ManagedDisplayInfo& info1 = @@ -1157,9 +1157,8 @@ UpdateDisplay("300x200,200x100"); display::DisplayIdList list = display_manager()->GetCurrentDisplayIdList(); - EXPECT_EQ( - "700x200", - display::Screen::GetScreen()->GetPrimaryDisplay().size().ToString()); + EXPECT_EQ(gfx::Size(700, 200), + display::Screen::GetScreen()->GetPrimaryDisplay().size()); const base::Value* secondary_displays = local_state()->GetDictionary(prefs::kSecondaryDisplays); @@ -1179,9 +1178,8 @@ display::test::SetDisplayResolution(display_manager(), unified_id, gfx::Size(350, 100)); - EXPECT_EQ( - "350x100", - display::Screen::GetScreen()->GetPrimaryDisplay().size().ToString()); + EXPECT_EQ(gfx::Size(350, 100), + display::Screen::GetScreen()->GetPrimaryDisplay().size()); EXPECT_FALSE(displays->FindDictKey(base::NumberToString(unified_id))); // Mirror mode should remember if the default mode was unified.
diff --git a/ash/display/display_util_unittest.cc b/ash/display/display_util_unittest.cc index 45a2013..15be0aaf 100644 --- a/ash/display/display_util_unittest.cc +++ b/ash/display/display_util_unittest.cc
@@ -23,8 +23,8 @@ RootWindowController::ForWindow(root_windows[1])->ash_host(); gfx::Rect rect0 = GetNativeEdgeBounds(host0, gfx::Rect(499, 10, 1, 300)); gfx::Rect rect1 = GetNativeEdgeBounds(host1, gfx::Rect(500, 10, 1, 300)); - EXPECT_EQ("509,20 1x300", rect0.ToString()); - EXPECT_EQ("1290,10 300x1", rect1.ToString()); + EXPECT_EQ(gfx::Rect(509, 20, 1, 300), rect0); + EXPECT_EQ(gfx::Rect(1290, 10, 300, 1), rect1); } { UpdateDisplay("10+10-500x400,600+10-1000x600/l"); @@ -35,8 +35,8 @@ RootWindowController::ForWindow(root_windows[1])->ash_host(); gfx::Rect rect0 = GetNativeEdgeBounds(host0, gfx::Rect(499, 10, 1, 300)); gfx::Rect rect1 = GetNativeEdgeBounds(host1, gfx::Rect(500, 10, 1, 300)); - EXPECT_EQ("509,20 1x300", rect0.ToString()); - EXPECT_EQ("610,609 300x1", rect1.ToString()); + EXPECT_EQ(gfx::Rect(509, 20, 1, 300), rect0); + EXPECT_EQ(gfx::Rect(610, 609, 300, 1), rect1); } { UpdateDisplay("10+10-500x400,600+10-1000x600/u"); @@ -47,8 +47,8 @@ RootWindowController::ForWindow(root_windows[1])->ash_host(); gfx::Rect rect0 = GetNativeEdgeBounds(host0, gfx::Rect(499, 10, 1, 300)); gfx::Rect rect1 = GetNativeEdgeBounds(host1, gfx::Rect(500, 10, 1, 300)); - EXPECT_EQ("509,20 1x300", rect0.ToString()); - EXPECT_EQ("1599,300 1x300", rect1.ToString()); + EXPECT_EQ(gfx::Rect(509, 20, 1, 300), rect0); + EXPECT_EQ(gfx::Rect(1599, 300, 1, 300), rect1); } { @@ -60,8 +60,8 @@ RootWindowController::ForWindow(root_windows[1])->ash_host(); gfx::Rect rect0 = GetNativeEdgeBounds(host0, gfx::Rect(399, 10, 1, 300)); gfx::Rect rect1 = GetNativeEdgeBounds(host1, gfx::Rect(400, 10, 1, 300)); - EXPECT_EQ("200,409 300x1", rect0.ToString()); - EXPECT_EQ("600,20 1x300", rect1.ToString()); + EXPECT_EQ(gfx::Rect(200, 409, 300, 1), rect0); + EXPECT_EQ(gfx::Rect(600, 20, 1, 300), rect1); } { UpdateDisplay("10+10-500x400/l,600+10-1000x600"); @@ -72,8 +72,8 @@ RootWindowController::ForWindow(root_windows[1])->ash_host(); gfx::Rect rect0 = GetNativeEdgeBounds(host0, gfx::Rect(499, 10, 1, 300)); gfx::Rect rect1 = GetNativeEdgeBounds(host1, gfx::Rect(500, 10, 1, 300)); - EXPECT_EQ("20,10 300x1", rect0.ToString()); - EXPECT_EQ("600,20 1x300", rect1.ToString()); + EXPECT_EQ(gfx::Rect(20, 10, 300, 1), rect0); + EXPECT_EQ(gfx::Rect(600, 20, 1, 300), rect1); } { UpdateDisplay("10+10-500x400/u,600+10-1000x600"); @@ -84,8 +84,8 @@ RootWindowController::ForWindow(root_windows[1])->ash_host(); gfx::Rect rect0 = GetNativeEdgeBounds(host0, gfx::Rect(499, 10, 1, 300)); gfx::Rect rect1 = GetNativeEdgeBounds(host1, gfx::Rect(500, 10, 1, 300)); - EXPECT_EQ("10,100 1x300", rect0.ToString()); - EXPECT_EQ("600,20 1x300", rect1.ToString()); + EXPECT_EQ(gfx::Rect(10, 100, 1, 300), rect0); + EXPECT_EQ(gfx::Rect(600, 20, 1, 300), rect1); } }
diff --git a/ash/display/resolution_notification_controller_unittest.cc b/ash/display/resolution_notification_controller_unittest.cc index f0346ba..e592cc6 100644 --- a/ash/display/resolution_notification_controller_unittest.cc +++ b/ash/display/resolution_notification_controller_unittest.cc
@@ -205,7 +205,7 @@ GetNotificationMessage()); display::ManagedDisplayMode mode; EXPECT_TRUE(display_manager()->GetSelectedModeForDisplayId(id2, &mode)); - EXPECT_EQ("300x200", mode.size().ToString()); + EXPECT_EQ(gfx::Size(300, 200), mode.size()); EXPECT_EQ(59.0, mode.refresh_rate()); // Click the revert button, which reverts to the best resolution. @@ -214,7 +214,7 @@ EXPECT_FALSE(IsNotificationVisible()); EXPECT_EQ(0, accept_count()); EXPECT_TRUE(display_manager()->GetSelectedModeForDisplayId(id2, &mode)); - EXPECT_EQ("300x250", mode.size().ToString()); + EXPECT_EQ(gfx::Size(300, 250), mode.size()); EXPECT_EQ(60.0, mode.refresh_rate()); } @@ -234,7 +234,7 @@ EXPECT_FALSE(IsNotificationVisible()); display::ManagedDisplayMode mode; EXPECT_TRUE(display_manager()->GetSelectedModeForDisplayId(id2, &mode)); - EXPECT_EQ("300x200", mode.size().ToString()); + EXPECT_EQ(gfx::Size(300, 200), mode.size()); EXPECT_EQ(60.0, mode.refresh_rate()); } @@ -252,7 +252,7 @@ EXPECT_TRUE(IsNotificationVisible()); display::ManagedDisplayMode mode; EXPECT_TRUE(display_manager()->GetSelectedModeForDisplayId(id2, &mode)); - EXPECT_EQ("300x200", mode.size().ToString()); + EXPECT_EQ(gfx::Size(300, 200), mode.size()); EXPECT_EQ(60.0, mode.refresh_rate()); ClickOnNotification(); @@ -260,7 +260,7 @@ EXPECT_FALSE(IsNotificationVisible()); EXPECT_EQ(1, accept_count()); EXPECT_TRUE(display_manager()->GetSelectedModeForDisplayId(id2, &mode)); - EXPECT_EQ("300x200", mode.size().ToString()); + EXPECT_EQ(gfx::Size(300, 200), mode.size()); EXPECT_EQ(60.0, mode.refresh_rate()); } @@ -283,7 +283,7 @@ EXPECT_TRUE( display_manager()->GetSelectedModeForDisplayId(display.id(), &mode)); - EXPECT_EQ("300x200", mode.size().ToString()); + EXPECT_EQ(gfx::Size(300, 200), mode.size()); EXPECT_EQ(60.0f, mode.refresh_rate()); // In that case the second button is revert. @@ -301,7 +301,7 @@ EXPECT_TRUE( display_manager()->GetSelectedModeForDisplayId(display.id(), &mode)); - EXPECT_EQ("400x300", mode.size().ToString()); + EXPECT_EQ(gfx::Size(400, 300), mode.size()); EXPECT_EQ(60.0f, mode.refresh_rate()); } @@ -319,7 +319,7 @@ EXPECT_TRUE(IsNotificationVisible()); display::ManagedDisplayMode mode; EXPECT_TRUE(display_manager()->GetSelectedModeForDisplayId(id2, &mode)); - EXPECT_EQ("300x200", mode.size().ToString()); + EXPECT_EQ(gfx::Size(300, 200), mode.size()); EXPECT_EQ(60.0f, mode.refresh_rate()); // Close the notification (imitates clicking [x] button). Also verifies if @@ -349,7 +349,7 @@ display::ManagedDisplayMode mode; EXPECT_TRUE( display_manager()->GetSelectedModeForDisplayId(display.id(), &mode)); - EXPECT_EQ("400x300", mode.size().ToString()); + EXPECT_EQ(gfx::Size(400, 300), mode.size()); EXPECT_EQ(60.0f, mode.refresh_rate()); } @@ -371,7 +371,7 @@ EXPECT_EQ(0, accept_count()); display::ManagedDisplayMode mode; EXPECT_TRUE(display_manager()->GetSelectedModeForDisplayId(id2, &mode)); - EXPECT_EQ("300x200", mode.size().ToString()); + EXPECT_EQ(gfx::Size(300, 200), mode.size()); EXPECT_EQ(60.0f, mode.refresh_rate()); } @@ -389,7 +389,7 @@ EXPECT_TRUE(IsNotificationVisible()); display::ManagedDisplayMode mode; EXPECT_TRUE(display_manager()->GetSelectedModeForDisplayId(id2, &mode)); - EXPECT_EQ("300x200", mode.size().ToString()); + EXPECT_EQ(gfx::Size(300, 200), mode.size()); EXPECT_EQ(59.0f, mode.refresh_rate()); // Invokes SetDisplayResolutionAndNotify during the previous notification is @@ -398,7 +398,7 @@ display_manager_test.GetSecondaryDisplay(), gfx::Size(350, 250), 58, /*old_is_native=*/false, /*new_is_native=*/true); EXPECT_TRUE(display_manager()->GetSelectedModeForDisplayId(id2, &mode)); - EXPECT_EQ("350x250", mode.size().ToString()); + EXPECT_EQ(gfx::Size(350, 250), mode.size()); EXPECT_EQ(58.0f, mode.refresh_rate()); // Then, click the revert button. Although |old_resolution| for the second @@ -409,7 +409,7 @@ EXPECT_FALSE(IsNotificationVisible()); EXPECT_EQ(0, accept_count()); EXPECT_TRUE(display_manager()->GetSelectedModeForDisplayId(id2, &mode)); - EXPECT_EQ("350x250", mode.size().ToString()); + EXPECT_EQ(gfx::Size(350, 250), mode.size()); EXPECT_EQ(58.0f, mode.refresh_rate()); } @@ -432,7 +432,7 @@ GetNotificationMessage()); display::ManagedDisplayMode mode; EXPECT_TRUE(display_manager()->GetSelectedModeForDisplayId(id2, &mode)); - EXPECT_EQ("300x200", mode.size().ToString()); + EXPECT_EQ(gfx::Size(300, 200), mode.size()); EXPECT_EQ(60.0f, mode.refresh_rate()); // Click the revert button, which reverts to the best resolution. @@ -442,7 +442,7 @@ EXPECT_EQ(0, accept_count()); EXPECT_TRUE(display_manager()->GetSelectedModeForDisplayId(id2, &mode)); - EXPECT_EQ("350x250", mode.size().ToString()); + EXPECT_EQ(gfx::Size(350, 250), mode.size()); EXPECT_EQ(60.0f, mode.refresh_rate()); } @@ -491,7 +491,7 @@ EXPECT_FALSE(IsNotificationVisible()); display::ManagedDisplayMode mode; EXPECT_TRUE(display_manager()->GetSelectedModeForDisplayId(id2, &mode)); - EXPECT_EQ("300x200", mode.size().ToString()); + EXPECT_EQ(gfx::Size(300, 200), mode.size()); EXPECT_EQ(60.0f, mode.refresh_rate()); }
diff --git a/ash/display/root_window_transformers_unittest.cc b/ash/display/root_window_transformers_unittest.cc index d9700b83..86da64a 100644 --- a/ash/display/root_window_transformers_unittest.cc +++ b/ash/display/root_window_transformers_unittest.cc
@@ -94,8 +94,8 @@ event->StopPropagation(); } - std::string GetLocationAndReset() { - std::string result = mouse_location_.ToString(); + gfx::Point GetLocationAndReset() { + gfx::Point result = mouse_location_; mouse_location_.SetPoint(0, 0); target_root_ = nullptr; return result; @@ -191,14 +191,14 @@ magnifier->SetEnabled(true); EXPECT_EQ(2.0f, magnifier->GetScale()); - EXPECT_EQ("120x200", root_windows[0]->bounds().size().ToString()); - EXPECT_EQ("150x200", root_windows[1]->bounds().size().ToString()); - EXPECT_EQ("120,0 150x200", - display_manager_test.GetSecondaryDisplay().bounds().ToString()); + EXPECT_EQ(gfx::Size(120, 200), root_windows[0]->bounds().size()); + EXPECT_EQ(gfx::Size(150, 200), root_windows[1]->bounds().size()); + EXPECT_EQ(gfx::Rect(120, 0, 150, 200), + display_manager_test.GetSecondaryDisplay().bounds()); generator1.MoveMouseToInHost(40, 80); - EXPECT_EQ("50,90", event_handler.GetLocationAndReset()); - EXPECT_EQ("50,90", - aura::Env::GetInstance()->last_mouse_location().ToString()); + EXPECT_EQ(gfx::Point(50, 90), event_handler.GetLocationAndReset()); + EXPECT_EQ(gfx::Point(50, 90), + aura::Env::GetInstance()->last_mouse_location()); EXPECT_EQ(display::Display::ROTATE_0, GetActiveDisplayRotation(display1.id())); EXPECT_EQ(display::Display::ROTATE_0, GetActiveDisplayRotation(display2_id)); @@ -212,14 +212,14 @@ magnifier->SetEnabled(true); EXPECT_EQ(2.0f, magnifier->GetScale()); - EXPECT_EQ("200x120", root_windows[0]->bounds().size().ToString()); - EXPECT_EQ("150x200", root_windows[1]->bounds().size().ToString()); - EXPECT_EQ("200,0 150x200", - display_manager_test.GetSecondaryDisplay().bounds().ToString()); + EXPECT_EQ(gfx::Size(200, 120), root_windows[0]->bounds().size()); + EXPECT_EQ(gfx::Size(150, 200), root_windows[1]->bounds().size()); + EXPECT_EQ(gfx::Rect(200, 0, 150, 200), + display_manager_test.GetSecondaryDisplay().bounds()); generator1.MoveMouseToInHost(39, 120); - EXPECT_EQ("110,70", event_handler.GetLocationAndReset()); - EXPECT_EQ("110,70", - aura::Env::GetInstance()->last_mouse_location().ToString()); + EXPECT_EQ(gfx::Point(110, 70), event_handler.GetLocationAndReset()); + EXPECT_EQ(gfx::Point(110, 70), + aura::Env::GetInstance()->last_mouse_location()); EXPECT_EQ(display::Display::ROTATE_90, GetActiveDisplayRotation(display1.id())); EXPECT_EQ(display::Display::ROTATE_0, GetActiveDisplayRotation(display2_id)); @@ -228,8 +228,8 @@ display_manager()->SetLayoutForCurrentDisplays( display::test::CreateDisplayLayout( display_manager(), display::DisplayPlacement::BOTTOM, 50)); - EXPECT_EQ("50,120 150x200", - display_manager_test.GetSecondaryDisplay().bounds().ToString()); + EXPECT_EQ(gfx::Rect(50, 120, 150, 200), + display_manager_test.GetSecondaryDisplay().bounds()); display_manager()->SetDisplayRotation( display2_id, display::Display::ROTATE_270, @@ -238,14 +238,14 @@ generator2.MoveMouseToInHost(151, 199); magnifier->SetEnabled(true); - EXPECT_EQ("200x120", root_windows[0]->bounds().size().ToString()); - EXPECT_EQ("200x150", root_windows[1]->bounds().size().ToString()); - EXPECT_EQ("50,120 200x150", - display_manager_test.GetSecondaryDisplay().bounds().ToString()); + EXPECT_EQ(gfx::Size(200, 120), root_windows[0]->bounds().size()); + EXPECT_EQ(gfx::Size(200, 150), root_windows[1]->bounds().size()); + EXPECT_EQ(gfx::Rect(50, 120, 200, 150), + display_manager_test.GetSecondaryDisplay().bounds()); generator2.MoveMouseToInHost(172, 219); - EXPECT_EQ("95,80", event_handler.GetLocationAndReset()); - EXPECT_EQ("145,200", - aura::Env::GetInstance()->last_mouse_location().ToString()); + EXPECT_EQ(gfx::Point(95, 80), event_handler.GetLocationAndReset()); + EXPECT_EQ(gfx::Point(145, 200), + aura::Env::GetInstance()->last_mouse_location()); EXPECT_EQ(display::Display::ROTATE_90, GetActiveDisplayRotation(display1.id())); EXPECT_EQ(display::Display::ROTATE_270, @@ -259,13 +259,13 @@ generator1.MoveMouseToInHost(59, 99); magnifier->SetEnabled(true); - EXPECT_EQ("120x200", root_windows[0]->bounds().size().ToString()); - EXPECT_EQ("200x150", root_windows[1]->bounds().size().ToString()); + EXPECT_EQ(gfx::Size(120, 200), root_windows[0]->bounds().size()); + EXPECT_EQ(gfx::Size(200, 150), root_windows[1]->bounds().size()); // Display must share at least 100, so the x's offset becomes 20. - EXPECT_EQ("20,200 200x150", - display_manager_test.GetSecondaryDisplay().bounds().ToString()); + EXPECT_EQ(gfx::Rect(20, 200, 200, 150), + display_manager_test.GetSecondaryDisplay().bounds()); generator1.MoveMouseToInHost(39, 59); - EXPECT_EQ("70,120", event_handler.GetLocationAndReset()); + EXPECT_EQ(gfx::Point(70, 120), event_handler.GetLocationAndReset()); EXPECT_EQ(display::Display::ROTATE_180, GetActiveDisplayRotation(display1.id())); EXPECT_EQ(display::Display::ROTATE_270, @@ -293,15 +293,15 @@ magnifier->SetEnabled(true); EXPECT_EQ(2.0f, magnifier->GetScale()); EXPECT_EQ(1.6f, display1.device_scale_factor()); - EXPECT_EQ("0,0 375x250", display1.bounds().ToString()); - EXPECT_EQ("0,0 375x250", root_windows[0]->bounds().ToString()); - EXPECT_EQ("375,0 500x300", display2.bounds().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 375, 250), display1.bounds()); + EXPECT_EQ(gfx::Rect(0, 0, 375, 250), root_windows[0]->bounds()); + EXPECT_EQ(gfx::Rect(375, 0, 500, 300), display2.bounds()); EXPECT_EQ(1.0f, GetStoredZoomScale(display1.id())); EXPECT_EQ(1.0f, GetStoredZoomScale(display2.id())); ui::test::EventGenerator generator(root_windows[0]); generator.MoveMouseToInHost(500, 200); - EXPECT_EQ("249,124", event_handler.GetLocationAndReset()); + EXPECT_EQ(gfx::Point(249, 124), event_handler.GetLocationAndReset()); magnifier->SetEnabled(false); display_manager()->UpdateZoomFactor(display1.id(), 1.f / 1.2f); @@ -309,9 +309,9 @@ display2 = display_manager_test.GetSecondaryDisplay(); magnifier->SetEnabled(true); EXPECT_EQ(2.0f, magnifier->GetScale()); - EXPECT_EQ("0,0 450x300", display1.bounds().ToString()); - EXPECT_EQ("0,0 450x300", root_windows[0]->bounds().ToString()); - EXPECT_EQ("450,0 500x300", display2.bounds().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 450, 300), display1.bounds()); + EXPECT_EQ(gfx::Rect(0, 0, 450, 300), root_windows[0]->bounds()); + EXPECT_EQ(gfx::Rect(450, 0, 500, 300), display2.bounds()); EXPECT_FLOAT_EQ(1.f / 1.2f, GetStoredZoomScale(display1.id())); EXPECT_EQ(1.0f, GetStoredZoomScale(display2.id())); magnifier->SetEnabled(false); @@ -365,24 +365,24 @@ display::Display display1 = display::Screen::GetScreen()->GetPrimaryDisplay(); aura::Window::Windows root_windows = Shell::GetAllRootWindows(); - EXPECT_EQ("0,0 250x375", display1.bounds().ToString()); - EXPECT_EQ("0,0 250x375", root_windows[0]->bounds().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 250, 375), display1.bounds()); + EXPECT_EQ(gfx::Rect(0, 0, 250, 375), root_windows[0]->bounds()); EXPECT_EQ(0.8f, GetStoredZoomScale(display1.id())); ui::test::EventGenerator generator(root_windows[0]); generator.MoveMouseToInHost(300, 200); magnifier->SetEnabled(true); - EXPECT_EQ("125,187", event_handler.GetLocationAndReset()); + EXPECT_EQ(gfx::Point(125, 187), event_handler.GetLocationAndReset()); EXPECT_FLOAT_EQ(2.0f, magnifier->GetScale()); generator.MoveMouseToInHost(300, 200); - EXPECT_EQ("124,186", event_handler.GetLocationAndReset()); + EXPECT_EQ(gfx::Point(124, 186), event_handler.GetLocationAndReset()); generator.MoveMouseToInHost(200, 300); - EXPECT_EQ("155,218", event_handler.GetLocationAndReset()); + EXPECT_EQ(gfx::Point(155, 218), event_handler.GetLocationAndReset()); generator.MoveMouseToInHost(100, 400); - EXPECT_EQ("204,249", event_handler.GetLocationAndReset()); + EXPECT_EQ(gfx::Point(204, 249), event_handler.GetLocationAndReset()); generator.MoveMouseToInHost(0, 0); - EXPECT_EQ("125,298", event_handler.GetLocationAndReset()); + EXPECT_EQ(gfx::Point(125, 298), event_handler.GetLocationAndReset()); magnifier->SetEnabled(false); EXPECT_FLOAT_EQ(1.0f, magnifier->GetScale()); @@ -391,23 +391,23 @@ UpdateDisplay("600x400*2/u@0.8"); display1 = display::Screen::GetScreen()->GetPrimaryDisplay(); root_windows = Shell::GetAllRootWindows(); - EXPECT_EQ("0,0 375x250", display1.bounds().ToString()); - EXPECT_EQ("0,0 375x250", root_windows[0]->bounds().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 375, 250), display1.bounds()); + EXPECT_EQ(gfx::Rect(0, 0, 375, 250), root_windows[0]->bounds()); EXPECT_EQ(0.8f, GetStoredZoomScale(display1.id())); generator.MoveMouseToInHost(300, 200); magnifier->SetEnabled(true); - EXPECT_EQ("187,125", event_handler.GetLocationAndReset()); + EXPECT_EQ(gfx::Point(187, 125), event_handler.GetLocationAndReset()); EXPECT_FLOAT_EQ(2.0f, magnifier->GetScale()); generator.MoveMouseToInHost(300, 200); - EXPECT_EQ("186,124", event_handler.GetLocationAndReset()); + EXPECT_EQ(gfx::Point(186, 124), event_handler.GetLocationAndReset()); generator.MoveMouseToInHost(200, 300); - EXPECT_EQ("218,93", event_handler.GetLocationAndReset()); + EXPECT_EQ(gfx::Point(218, 93), event_handler.GetLocationAndReset()); generator.MoveMouseToInHost(100, 400); - EXPECT_EQ("249,43", event_handler.GetLocationAndReset()); + EXPECT_EQ(gfx::Point(249, 43), event_handler.GetLocationAndReset()); generator.MoveMouseToInHost(0, 0); - EXPECT_EQ("298,125", event_handler.GetLocationAndReset()); + EXPECT_EQ(gfx::Point(298, 125), event_handler.GetLocationAndReset()); magnifier->SetEnabled(false); EXPECT_FLOAT_EQ(1.0f, magnifier->GetScale()); @@ -416,23 +416,23 @@ UpdateDisplay("600x400*2/l@0.8"); display1 = display::Screen::GetScreen()->GetPrimaryDisplay(); root_windows = Shell::GetAllRootWindows(); - EXPECT_EQ("0,0 250x375", display1.bounds().ToString()); - EXPECT_EQ("0,0 250x375", root_windows[0]->bounds().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 250, 375), display1.bounds()); + EXPECT_EQ(gfx::Rect(0, 0, 250, 375), root_windows[0]->bounds()); EXPECT_EQ(0.8f, GetStoredZoomScale(display1.id())); generator.MoveMouseToInHost(300, 200); magnifier->SetEnabled(true); - EXPECT_EQ("125,187", event_handler.GetLocationAndReset()); + EXPECT_EQ(gfx::Point(125, 187), event_handler.GetLocationAndReset()); EXPECT_FLOAT_EQ(2.0f, magnifier->GetScale()); generator.MoveMouseToInHost(300, 200); - EXPECT_EQ("124,186", event_handler.GetLocationAndReset()); + EXPECT_EQ(gfx::Point(124, 186), event_handler.GetLocationAndReset()); generator.MoveMouseToInHost(200, 300); - EXPECT_EQ("93,155", event_handler.GetLocationAndReset()); + EXPECT_EQ(gfx::Point(93, 155), event_handler.GetLocationAndReset()); generator.MoveMouseToInHost(100, 400); - EXPECT_EQ("43,124", event_handler.GetLocationAndReset()); + EXPECT_EQ(gfx::Point(43, 124), event_handler.GetLocationAndReset()); generator.MoveMouseToInHost(0, 0); - EXPECT_EQ("125,74", event_handler.GetLocationAndReset()); + EXPECT_EQ(gfx::Point(125, 74), event_handler.GetLocationAndReset()); magnifier->SetEnabled(false); EXPECT_FLOAT_EQ(1.0f, magnifier->GetScale()); @@ -448,13 +448,13 @@ std::unique_ptr<RootWindowTransformer> transformer( CreateCurrentRootWindowTransformerForMirroring()); // Y margin must be margin is (400 - 500/400 * 200) / 2 = 75 - EXPECT_EQ("0,75,0,75", transformer->GetHostInsets().ToString()); + EXPECT_EQ(gfx::Insets(0, 75, 0, 75), transformer->GetHostInsets()); // Pillar boxed UpdateDisplay("200x400,500x400"); // X margin must be margin is (500 - 200) / 2 = 150 transformer = CreateCurrentRootWindowTransformerForMirroring(); - EXPECT_EQ("150,0,150,0", transformer->GetHostInsets().ToString()); + EXPECT_EQ(gfx::Insets(150, 0, 150, 0), transformer->GetHostInsets()); } TEST_F(RootWindowTransformersTest, MirrorWithRotation) {
diff --git a/ash/display/window_tree_host_manager_unittest.cc b/ash/display/window_tree_host_manager_unittest.cc index 8d62a57..95dcf22d 100644 --- a/ash/display/window_tree_host_manager_unittest.cc +++ b/ash/display/window_tree_host_manager_unittest.cc
@@ -245,7 +245,7 @@ // Make sure that primary display is accessible after shutdown. display::Display primary = display::Screen::GetScreen()->GetPrimaryDisplay(); - EXPECT_EQ("0,0 444x333", primary.bounds().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 444, 333), primary.bounds()); EXPECT_EQ(2, display::Screen::GetScreen()->GetNumDisplays()); } }; @@ -317,8 +317,8 @@ event->StopPropagation(); } - std::string GetLocationAndReset() { - std::string result = mouse_location_.ToString(); + gfx::Point GetLocationAndReset() { + gfx::Point result = mouse_location_; mouse_location_.SetPoint(0, 0); target_root_ = nullptr; return result; @@ -399,9 +399,9 @@ display_manager()->UpdateWorkAreaOfDisplay(secondary_display_id, insets); // Default layout is RIGHT. - EXPECT_EQ("0,0 600x500", GetPrimaryDisplay().bounds().ToString()); - EXPECT_EQ("600,0 500x400", GetSecondaryDisplay().bounds().ToString()); - EXPECT_EQ("605,5 490x390", GetSecondaryDisplay().work_area().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 600, 500), GetPrimaryDisplay().bounds()); + EXPECT_EQ(gfx::Rect(600, 0, 500, 400), GetSecondaryDisplay().bounds()); + EXPECT_EQ(gfx::Rect(605, 5, 490, 390), GetSecondaryDisplay().work_area()); EXPECT_EQ(0, observer.GetFocusChangedCountAndReset()); EXPECT_EQ(0, observer.GetActivationChangedCountAndReset()); @@ -415,9 +415,9 @@ EXPECT_EQ(0, observer.GetFocusChangedCountAndReset()); EXPECT_EQ(0, observer.GetActivationChangedCountAndReset()); EXPECT_EQ(secondary_display_id, observer.GetChangedDisplayIdAndReset()); - EXPECT_EQ("0,0 600x500", GetPrimaryDisplay().bounds().ToString()); - EXPECT_EQ("0,500 500x400", GetSecondaryDisplay().bounds().ToString()); - EXPECT_EQ("5,505 490x390", GetSecondaryDisplay().work_area().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 600, 500), GetPrimaryDisplay().bounds()); + EXPECT_EQ(gfx::Rect(0, 500, 500, 400), GetSecondaryDisplay().bounds()); + EXPECT_EQ(gfx::Rect(5, 505, 490, 390), GetSecondaryDisplay().work_area()); // Layout the secondary display to the left of the primary. SetSecondaryDisplayLayout(display::DisplayPlacement::LEFT); @@ -427,9 +427,9 @@ EXPECT_EQ(0, observer.GetFocusChangedCountAndReset()); EXPECT_EQ(0, observer.GetActivationChangedCountAndReset()); EXPECT_EQ(secondary_display_id, observer.GetChangedDisplayIdAndReset()); - EXPECT_EQ("0,0 600x500", GetPrimaryDisplay().bounds().ToString()); - EXPECT_EQ("-500,0 500x400", GetSecondaryDisplay().bounds().ToString()); - EXPECT_EQ("-495,5 490x390", GetSecondaryDisplay().work_area().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 600, 500), GetPrimaryDisplay().bounds()); + EXPECT_EQ(gfx::Rect(-500, 0, 500, 400), GetSecondaryDisplay().bounds()); + EXPECT_EQ(gfx::Rect(-495, 5, 490, 390), GetSecondaryDisplay().work_area()); // Layout the secondary display to the top of the primary. SetSecondaryDisplayLayout(display::DisplayPlacement::TOP); @@ -439,9 +439,9 @@ EXPECT_EQ(0, observer.GetFocusChangedCountAndReset()); EXPECT_EQ(0, observer.GetActivationChangedCountAndReset()); EXPECT_EQ(secondary_display_id, observer.GetChangedDisplayIdAndReset()); - EXPECT_EQ("0,0 600x500", GetPrimaryDisplay().bounds().ToString()); - EXPECT_EQ("0,-400 500x400", GetSecondaryDisplay().bounds().ToString()); - EXPECT_EQ("5,-395 490x390", GetSecondaryDisplay().work_area().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 600, 500), GetPrimaryDisplay().bounds()); + EXPECT_EQ(gfx::Rect(0, -400, 500, 400), GetSecondaryDisplay().bounds()); + EXPECT_EQ(gfx::Rect(5, -395, 490, 390), GetSecondaryDisplay().work_area()); // Layout to the right with an offset. SetSecondaryDisplayLayoutAndOffset(display::DisplayPlacement::RIGHT, 300); @@ -451,8 +451,8 @@ EXPECT_EQ(0, observer.GetFocusChangedCountAndReset()); EXPECT_EQ(0, observer.GetActivationChangedCountAndReset()); EXPECT_EQ(secondary_display_id, observer.GetChangedDisplayIdAndReset()); - EXPECT_EQ("0,0 600x500", GetPrimaryDisplay().bounds().ToString()); - EXPECT_EQ("600,300 500x400", GetSecondaryDisplay().bounds().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 600, 500), GetPrimaryDisplay().bounds()); + EXPECT_EQ(gfx::Rect(600, 300, 500, 400), GetSecondaryDisplay().bounds()); // Keep the minimum 100. SetSecondaryDisplayLayoutAndOffset(display::DisplayPlacement::RIGHT, 490); @@ -462,8 +462,8 @@ EXPECT_EQ(0, observer.GetFocusChangedCountAndReset()); EXPECT_EQ(0, observer.GetActivationChangedCountAndReset()); EXPECT_EQ(secondary_display_id, observer.GetChangedDisplayIdAndReset()); - EXPECT_EQ("0,0 600x500", GetPrimaryDisplay().bounds().ToString()); - EXPECT_EQ("600,400 500x400", GetSecondaryDisplay().bounds().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 600, 500), GetPrimaryDisplay().bounds()); + EXPECT_EQ(gfx::Rect(600, 400, 500, 400), GetSecondaryDisplay().bounds()); SetSecondaryDisplayLayoutAndOffset(display::DisplayPlacement::RIGHT, -400); EXPECT_EQ(secondary_display_id, observer.GetChangedDisplayIdAndReset()); @@ -472,8 +472,8 @@ EXPECT_EQ(1, observer.CountAndReset()); // resize and add EXPECT_EQ(0, observer.GetFocusChangedCountAndReset()); EXPECT_EQ(0, observer.GetActivationChangedCountAndReset()); - EXPECT_EQ("0,0 600x500", GetPrimaryDisplay().bounds().ToString()); - EXPECT_EQ("600,-300 500x400", GetSecondaryDisplay().bounds().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 600, 500), GetPrimaryDisplay().bounds()); + EXPECT_EQ(gfx::Rect(600, -300, 500, 400), GetSecondaryDisplay().bounds()); // Layout to the bottom with an offset. SetSecondaryDisplayLayoutAndOffset(display::DisplayPlacement::BOTTOM, -200); @@ -483,8 +483,8 @@ EXPECT_EQ(1, observer.CountAndReset()); // resize and add EXPECT_EQ(0, observer.GetFocusChangedCountAndReset()); EXPECT_EQ(0, observer.GetActivationChangedCountAndReset()); - EXPECT_EQ("0,0 600x500", GetPrimaryDisplay().bounds().ToString()); - EXPECT_EQ("-200,500 500x400", GetSecondaryDisplay().bounds().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 600, 500), GetPrimaryDisplay().bounds()); + EXPECT_EQ(gfx::Rect(-200, 500, 500, 400), GetSecondaryDisplay().bounds()); // Keep the minimum 100. SetSecondaryDisplayLayoutAndOffset(display::DisplayPlacement::BOTTOM, 590); @@ -494,8 +494,8 @@ EXPECT_EQ(1, observer.CountAndReset()); // resize and add EXPECT_EQ(0, observer.GetFocusChangedCountAndReset()); EXPECT_EQ(0, observer.GetActivationChangedCountAndReset()); - EXPECT_EQ("0,0 600x500", GetPrimaryDisplay().bounds().ToString()); - EXPECT_EQ("500,500 500x400", GetSecondaryDisplay().bounds().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 600, 500), GetPrimaryDisplay().bounds()); + EXPECT_EQ(gfx::Rect(500, 500, 500, 400), GetSecondaryDisplay().bounds()); SetSecondaryDisplayLayoutAndOffset(display::DisplayPlacement::BOTTOM, -500); EXPECT_EQ(secondary_display_id, observer.GetChangedDisplayIdAndReset()); @@ -504,8 +504,8 @@ EXPECT_EQ(1, observer.CountAndReset()); // resize and add EXPECT_EQ(0, observer.GetFocusChangedCountAndReset()); EXPECT_EQ(0, observer.GetActivationChangedCountAndReset()); - EXPECT_EQ("0,0 600x500", GetPrimaryDisplay().bounds().ToString()); - EXPECT_EQ("-400,500 500x400", GetSecondaryDisplay().bounds().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 600, 500), GetPrimaryDisplay().bounds()); + EXPECT_EQ(gfx::Rect(-400, 500, 500, 400), GetSecondaryDisplay().bounds()); // Setting the same layout shouldn't invoke observers. SetSecondaryDisplayLayoutAndOffset(display::DisplayPlacement::BOTTOM, -500); @@ -515,8 +515,8 @@ EXPECT_EQ(0, observer.CountAndReset()); // resize and add EXPECT_EQ(0, observer.GetFocusChangedCountAndReset()); EXPECT_EQ(0, observer.GetActivationChangedCountAndReset()); - EXPECT_EQ("0,0 600x500", GetPrimaryDisplay().bounds().ToString()); - EXPECT_EQ("-400,500 500x400", GetSecondaryDisplay().bounds().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 600, 500), GetPrimaryDisplay().bounds()); + EXPECT_EQ(gfx::Rect(-400, 500, 500, 400), GetSecondaryDisplay().bounds()); UpdateDisplay("600x500"); EXPECT_LE(1, observer.GetFocusChangedCountAndReset()); @@ -572,7 +572,7 @@ const WMEvent toggle_fullscreen_event(WM_EVENT_TOGGLE_FULLSCREEN); window_state->OnWMEvent(&toggle_fullscreen_event); EXPECT_TRUE(window_state->IsFullscreen()); - EXPECT_EQ("0,0 300x250", w1->bounds().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 300, 250), w1->bounds()); // Dock mode. TestObserver observer; display_info_list.clear(); @@ -590,7 +590,7 @@ EXPECT_EQ(0, observer.GetActivationChangedCountAndReset()); EXPECT_TRUE(window_state->IsFullscreen()); - EXPECT_EQ("0,0 600x500", w1->bounds().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 600, 500), w1->bounds()); } TEST_F(WindowTreeHostManagerTest, BoundsUpdated) { @@ -609,29 +609,29 @@ display_manager()->UpdateWorkAreaOfDisplay(GetSecondaryDisplay().id(), insets); - EXPECT_EQ("0,0 300x200", GetPrimaryDisplay().bounds().ToString()); - EXPECT_EQ("0,200 400x300", GetSecondaryDisplay().bounds().ToString()); - EXPECT_EQ("5,205 390x290", GetSecondaryDisplay().work_area().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 300, 200), GetPrimaryDisplay().bounds()); + EXPECT_EQ(gfx::Rect(0, 200, 400, 300), GetSecondaryDisplay().bounds()); + EXPECT_EQ(gfx::Rect(5, 205, 390, 290), GetSecondaryDisplay().work_area()); UpdateDisplay("500x400,300x200"); EXPECT_EQ(1, observer.CountAndReset()); // two resizes EXPECT_EQ(0, observer.GetFocusChangedCountAndReset()); EXPECT_EQ(0, observer.GetActivationChangedCountAndReset()); - EXPECT_EQ("0,0 500x400", GetPrimaryDisplay().bounds().ToString()); - EXPECT_EQ("0,400 300x200", GetSecondaryDisplay().bounds().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 500, 400), GetPrimaryDisplay().bounds()); + EXPECT_EQ(gfx::Rect(0, 400, 300, 200), GetSecondaryDisplay().bounds()); UpdateDisplay("500x400,400x300"); EXPECT_EQ(1, observer.CountAndReset()); EXPECT_EQ(0, observer.GetFocusChangedCountAndReset()); EXPECT_EQ(0, observer.GetActivationChangedCountAndReset()); - EXPECT_EQ("0,0 500x400", GetPrimaryDisplay().bounds().ToString()); - EXPECT_EQ("0,400 400x300", GetSecondaryDisplay().bounds().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 500, 400), GetPrimaryDisplay().bounds()); + EXPECT_EQ(gfx::Rect(0, 400, 400, 300), GetSecondaryDisplay().bounds()); UpdateDisplay("500x400"); EXPECT_EQ(1, observer.CountAndReset()); EXPECT_LE(1, observer.GetFocusChangedCountAndReset()); EXPECT_LE(1, observer.GetActivationChangedCountAndReset()); - EXPECT_EQ("0,0 500x400", GetPrimaryDisplay().bounds().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 500, 400), GetPrimaryDisplay().bounds()); EXPECT_EQ(1, display::Screen::GetScreen()->GetNumDisplays()); UpdateDisplay("400x500*2,400x300"); @@ -639,8 +639,8 @@ EXPECT_EQ(0, observer.GetFocusChangedCountAndReset()); EXPECT_EQ(0, observer.GetActivationChangedCountAndReset()); ASSERT_EQ(2, display::Screen::GetScreen()->GetNumDisplays()); - EXPECT_EQ("0,0 200x250", GetPrimaryDisplay().bounds().ToString()); - EXPECT_EQ("0,250 400x300", GetSecondaryDisplay().bounds().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 200, 250), GetPrimaryDisplay().bounds()); + EXPECT_EQ(gfx::Rect(0, 250, 400, 300), GetSecondaryDisplay().bounds()); // No change UpdateDisplay("400x500*2,400x300"); @@ -765,12 +765,12 @@ primary_display.id(), display::Screen::GetScreen()->GetDisplayNearestWindow(nullptr).id()); - EXPECT_EQ("0,0 300x200", primary_display.bounds().ToString()); - EXPECT_EQ(gfx::Rect(0, 0, 300, shelf_inset_first).ToString(), - primary_display.work_area().ToString()); - EXPECT_EQ("300,0 400x300", secondary_display.bounds().ToString()); - EXPECT_EQ(gfx::Rect(300, 0, 400, shelf_inset_second).ToString(), - secondary_display.work_area().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 300, 200), primary_display.bounds()); + EXPECT_EQ(gfx::Rect(0, 0, 300, shelf_inset_first), + primary_display.work_area()); + EXPECT_EQ(gfx::Rect(300, 0, 400, 300), secondary_display.bounds()); + EXPECT_EQ(gfx::Rect(300, 0, 400, shelf_inset_second), + secondary_display.work_area()); EXPECT_EQ("id=2200000257, parent=2200000000, right, 50", display_manager() ->GetCurrentDisplayLayout() @@ -803,12 +803,12 @@ display::Screen::GetScreen()->GetPrimaryDisplay(); display::Display swapped_secondary = display_manager_test.GetSecondaryDisplay(); - EXPECT_EQ("0,0 400x300", swapped_primary.bounds().ToString()); - EXPECT_EQ(gfx::Rect(0, 0, 400, shelf_inset_second).ToString(), - swapped_primary.work_area().ToString()); - EXPECT_EQ("-300,-50 300x200", swapped_secondary.bounds().ToString()); - EXPECT_EQ(gfx::Rect(-300, -50, 300, shelf_inset_first).ToString(), - swapped_secondary.work_area().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 400, 300), swapped_primary.bounds()); + EXPECT_EQ(gfx::Rect(0, 0, 400, shelf_inset_second), + swapped_primary.work_area()); + EXPECT_EQ(gfx::Rect(-300, -50, 300, 200), swapped_secondary.bounds()); + EXPECT_EQ(gfx::Rect(-300, -50, 300, shelf_inset_first), + swapped_secondary.work_area()); // Calling the same ID don't do anything. window_tree_host_manager->SetPrimaryDisplayId(secondary_display.id()); @@ -1124,22 +1124,22 @@ window_tree_host_manager->SetOverscanInsets(display1.id(), gfx::Insets(10, 15, 20, 25)); display::test::DisplayManagerTestApi display_manager_test(display_manager()); - EXPECT_EQ("0,0 80x170", root_windows[0]->bounds().ToString()); - EXPECT_EQ("150x200", root_windows[1]->bounds().size().ToString()); - EXPECT_EQ("80,0 150x200", - display_manager_test.GetSecondaryDisplay().bounds().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 80, 170), root_windows[0]->bounds()); + EXPECT_EQ(gfx::Size(150, 200), root_windows[1]->bounds().size()); + EXPECT_EQ(gfx::Rect(80, 0, 150, 200), + display_manager_test.GetSecondaryDisplay().bounds()); ui::test::EventGenerator generator(root_windows[0]); generator.MoveMouseToInHost(20, 25); - EXPECT_EQ("5,15", event_handler.GetLocationAndReset()); + EXPECT_EQ(gfx::Point(5, 15), event_handler.GetLocationAndReset()); window_tree_host_manager->SetOverscanInsets(display1.id(), gfx::Insets()); - EXPECT_EQ("0,0 120x200", root_windows[0]->bounds().ToString()); - EXPECT_EQ("120,0 150x200", - display_manager_test.GetSecondaryDisplay().bounds().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 120, 200), root_windows[0]->bounds()); + EXPECT_EQ(gfx::Rect(120, 0, 150, 200), + display_manager_test.GetSecondaryDisplay().bounds()); generator.MoveMouseToInHost(30, 20); - EXPECT_EQ("30,20", event_handler.GetLocationAndReset()); + EXPECT_EQ(gfx::Point(30, 20), event_handler.GetLocationAndReset()); // Make sure the root window transformer uses correct scale // factor when swapping display. Test crbug.com/253690. @@ -1148,13 +1148,13 @@ gfx::Point point; Shell::GetAllRootWindows()[1]->GetHost()->GetRootTransform().TransformPoint( &point); - EXPECT_EQ("15,10", point.ToString()); + EXPECT_EQ(gfx::Point(15, 10), point); SwapPrimaryDisplay(); point.SetPoint(0, 0); Shell::GetAllRootWindows()[1]->GetHost()->GetRootTransform().TransformPoint( &point); - EXPECT_EQ("15,10", point.ToString()); + EXPECT_EQ(gfx::Point(15, 10), point); Shell::Get()->RemovePreTargetHandler(&event_handler); } @@ -1171,12 +1171,12 @@ ui::test::EventGenerator generator1(root_windows[0]); TestObserver observer; - EXPECT_EQ("120x200", root_windows[0]->bounds().size().ToString()); - EXPECT_EQ("150x200", root_windows[1]->bounds().size().ToString()); - EXPECT_EQ("120,0 150x200", - display_manager_test.GetSecondaryDisplay().bounds().ToString()); + EXPECT_EQ(gfx::Size(120, 200), root_windows[0]->bounds().size()); + EXPECT_EQ(gfx::Size(150, 200), root_windows[1]->bounds().size()); + EXPECT_EQ(gfx::Rect(120, 0, 150, 200), + display_manager_test.GetSecondaryDisplay().bounds()); generator1.MoveMouseToInHost(50, 40); - EXPECT_EQ("50,40", event_handler.GetLocationAndReset()); + EXPECT_EQ(gfx::Point(50, 40), event_handler.GetLocationAndReset()); EXPECT_EQ(display::Display::ROTATE_0, GetActiveDisplayRotation(display1.id())); EXPECT_EQ(display::Display::ROTATE_0, GetActiveDisplayRotation(display2_id)); @@ -1185,12 +1185,12 @@ display_manager()->SetDisplayRotation( display1.id(), display::Display::ROTATE_90, display::Display::RotationSource::ACTIVE); - EXPECT_EQ("200x120", root_windows[0]->bounds().size().ToString()); - EXPECT_EQ("150x200", root_windows[1]->bounds().size().ToString()); - EXPECT_EQ("200,0 150x200", - display_manager_test.GetSecondaryDisplay().bounds().ToString()); + EXPECT_EQ(gfx::Size(200, 120), root_windows[0]->bounds().size()); + EXPECT_EQ(gfx::Size(150, 200), root_windows[1]->bounds().size()); + EXPECT_EQ(gfx::Rect(200, 0, 150, 200), + display_manager_test.GetSecondaryDisplay().bounds()); generator1.MoveMouseToInHost(50, 40); - EXPECT_EQ("40,70", event_handler.GetLocationAndReset()); + EXPECT_EQ(gfx::Point(40, 70), event_handler.GetLocationAndReset()); EXPECT_EQ(display::Display::ROTATE_90, GetActiveDisplayRotation(display1.id())); EXPECT_EQ(display::Display::ROTATE_0, GetActiveDisplayRotation(display2_id)); @@ -1199,16 +1199,16 @@ display_manager()->SetLayoutForCurrentDisplays( display::test::CreateDisplayLayout( display_manager(), display::DisplayPlacement::BOTTOM, 50)); - EXPECT_EQ("50,120 150x200", - display_manager_test.GetSecondaryDisplay().bounds().ToString()); + EXPECT_EQ(gfx::Rect(50, 120, 150, 200), + display_manager_test.GetSecondaryDisplay().bounds()); display_manager()->SetDisplayRotation( display2_id, display::Display::ROTATE_270, display::Display::RotationSource::ACTIVE); - EXPECT_EQ("200x120", root_windows[0]->bounds().size().ToString()); - EXPECT_EQ("200x150", root_windows[1]->bounds().size().ToString()); - EXPECT_EQ("50,120 200x150", - display_manager_test.GetSecondaryDisplay().bounds().ToString()); + EXPECT_EQ(gfx::Size(200, 120), root_windows[0]->bounds().size()); + EXPECT_EQ(gfx::Size(200, 150), root_windows[1]->bounds().size()); + EXPECT_EQ(gfx::Rect(50, 120, 200, 150), + display_manager_test.GetSecondaryDisplay().bounds()); EXPECT_EQ(display::Display::ROTATE_90, GetActiveDisplayRotation(display1.id())); EXPECT_EQ(display::Display::ROTATE_270, @@ -1217,16 +1217,16 @@ ui::test::EventGenerator generator2(root_windows[1]); generator2.MoveMouseToInHost(50, 40); - EXPECT_EQ("180,25", event_handler.GetLocationAndReset()); + EXPECT_EQ(gfx::Point(180, 25), event_handler.GetLocationAndReset()); display_manager()->SetDisplayRotation( display1.id(), display::Display::ROTATE_180, display::Display::RotationSource::ACTIVE); - EXPECT_EQ("120x200", root_windows[0]->bounds().size().ToString()); - EXPECT_EQ("200x150", root_windows[1]->bounds().size().ToString()); + EXPECT_EQ(gfx::Size(120, 200), root_windows[0]->bounds().size()); + EXPECT_EQ(gfx::Size(200, 150), root_windows[1]->bounds().size()); // Display must share at least 100, so the x's offset becomes 20. - EXPECT_EQ("20,200 200x150", - display_manager_test.GetSecondaryDisplay().bounds().ToString()); + EXPECT_EQ(gfx::Rect(20, 200, 200, 150), + display_manager_test.GetSecondaryDisplay().bounds()); EXPECT_EQ(display::Display::ROTATE_180, GetActiveDisplayRotation(display1.id())); EXPECT_EQ(display::Display::ROTATE_270, @@ -1234,7 +1234,7 @@ EXPECT_EQ(1, observer.GetRotationChangedCountAndReset()); generator1.MoveMouseToInHost(50, 40); - EXPECT_EQ("70,160", event_handler.GetLocationAndReset()); + EXPECT_EQ(gfx::Point(70, 160), event_handler.GetLocationAndReset()); Shell::Get()->RemovePreTargetHandler(&event_handler); } @@ -1252,22 +1252,22 @@ display::test::DisplayManagerTestApi display_manager_test(display_manager()); display::Display display2 = display_manager_test.GetSecondaryDisplay(); aura::Window::Windows root_windows = Shell::GetAllRootWindows(); - EXPECT_EQ("0,0 375x250", display1.bounds().ToString()); - EXPECT_EQ("0,0 375x250", root_windows[0]->bounds().ToString()); - EXPECT_EQ("375,0 500x300", display2.bounds().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 375, 250), display1.bounds()); + EXPECT_EQ(gfx::Rect(0, 0, 375, 250), root_windows[0]->bounds()); + EXPECT_EQ(gfx::Rect(375, 0, 500, 300), display2.bounds()); EXPECT_FLOAT_EQ(1.0f, GetStoredZoomScale(display1.id())); EXPECT_FLOAT_EQ(1.0f, GetStoredZoomScale(display2.id())); ui::test::EventGenerator generator(root_windows[0]); generator.MoveMouseToInHost(599, 200); - EXPECT_EQ("374,125", event_handler.GetLocationAndReset()); + EXPECT_EQ(gfx::Point(374, 125), event_handler.GetLocationAndReset()); display_manager()->UpdateZoomFactor(display1.id(), 1.f / 1.2f); display1 = display::Screen::GetScreen()->GetPrimaryDisplay(); display2 = display_manager_test.GetSecondaryDisplay(); - EXPECT_EQ("0,0 450x300", display1.bounds().ToString()); - EXPECT_EQ("0,0 450x300", root_windows[0]->bounds().ToString()); - EXPECT_EQ("450,0 500x300", display2.bounds().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 450, 300), display1.bounds()); + EXPECT_EQ(gfx::Rect(0, 0, 450, 300), root_windows[0]->bounds()); + EXPECT_EQ(gfx::Rect(450, 0, 500, 300), display2.bounds()); EXPECT_FLOAT_EQ(1.f / 1.2f, GetStoredZoomScale(display1.id())); EXPECT_FLOAT_EQ(1.0f, GetStoredZoomScale(display2.id())); @@ -1310,52 +1310,52 @@ display::Display display1 = display::Screen::GetScreen()->GetPrimaryDisplay(); aura::Window::Windows root_windows = Shell::GetAllRootWindows(); - EXPECT_EQ("0,0 250x375", display1.bounds().ToString()); - EXPECT_EQ("0,0 250x375", root_windows[0]->bounds().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 250, 375), display1.bounds()); + EXPECT_EQ(gfx::Rect(0, 0, 250, 375), root_windows[0]->bounds()); EXPECT_EQ(0.8f, GetStoredZoomScale(display1.id())); ui::test::EventGenerator generator(root_windows[0]); generator.MoveMouseToInHost(0, 0); // The mouse location must be inside the root bounds in dp. - EXPECT_EQ("0,374", event_handler.GetLocationAndReset()); + EXPECT_EQ(gfx::Point(0, 374), event_handler.GetLocationAndReset()); generator.MoveMouseToInHost(599, 0); - EXPECT_EQ("0,0", event_handler.GetLocationAndReset()); + EXPECT_EQ(gfx::Point(0, 0), event_handler.GetLocationAndReset()); generator.MoveMouseToInHost(599, 399); - EXPECT_EQ("249,0", event_handler.GetLocationAndReset()); + EXPECT_EQ(gfx::Point(249, 0), event_handler.GetLocationAndReset()); generator.MoveMouseToInHost(0, 399); - EXPECT_EQ("249,374", event_handler.GetLocationAndReset()); + EXPECT_EQ(gfx::Point(249, 374), event_handler.GetLocationAndReset()); UpdateDisplay("600x400*2/u@0.8"); display1 = display::Screen::GetScreen()->GetPrimaryDisplay(); root_windows = Shell::GetAllRootWindows(); - EXPECT_EQ("0,0 375x250", display1.bounds().ToString()); - EXPECT_EQ("0,0 375x250", root_windows[0]->bounds().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 375, 250), display1.bounds()); + EXPECT_EQ(gfx::Rect(0, 0, 375, 250), root_windows[0]->bounds()); EXPECT_EQ(0.8f, GetStoredZoomScale(display1.id())); generator.MoveMouseToInHost(0, 0); - EXPECT_EQ("374,249", event_handler.GetLocationAndReset()); + EXPECT_EQ(gfx::Point(374, 249), event_handler.GetLocationAndReset()); generator.MoveMouseToInHost(599, 0); - EXPECT_EQ("0,249", event_handler.GetLocationAndReset()); + EXPECT_EQ(gfx::Point(0, 249), event_handler.GetLocationAndReset()); generator.MoveMouseToInHost(599, 399); - EXPECT_EQ("0,0", event_handler.GetLocationAndReset()); + EXPECT_EQ(gfx::Point(0, 0), event_handler.GetLocationAndReset()); generator.MoveMouseToInHost(0, 399); - EXPECT_EQ("374,0", event_handler.GetLocationAndReset()); + EXPECT_EQ(gfx::Point(374, 0), event_handler.GetLocationAndReset()); UpdateDisplay("600x400*2/l@0.8"); display1 = display::Screen::GetScreen()->GetPrimaryDisplay(); root_windows = Shell::GetAllRootWindows(); - EXPECT_EQ("0,0 250x375", display1.bounds().ToString()); - EXPECT_EQ("0,0 250x375", root_windows[0]->bounds().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 250, 375), display1.bounds()); + EXPECT_EQ(gfx::Rect(0, 0, 250, 375), root_windows[0]->bounds()); EXPECT_EQ(0.8f, GetStoredZoomScale(display1.id())); generator.MoveMouseToInHost(0, 0); - EXPECT_EQ("249,0", event_handler.GetLocationAndReset()); + EXPECT_EQ(gfx::Point(249, 0), event_handler.GetLocationAndReset()); generator.MoveMouseToInHost(599, 0); - EXPECT_EQ("249,374", event_handler.GetLocationAndReset()); + EXPECT_EQ(gfx::Point(249, 374), event_handler.GetLocationAndReset()); generator.MoveMouseToInHost(599, 399); - EXPECT_EQ("0,374", event_handler.GetLocationAndReset()); + EXPECT_EQ(gfx::Point(0, 374), event_handler.GetLocationAndReset()); generator.MoveMouseToInHost(0, 399); - EXPECT_EQ("0,0", event_handler.GetLocationAndReset()); + EXPECT_EQ(gfx::Point(0, 0), event_handler.GetLocationAndReset()); Shell::Get()->RemovePreTargetHandler(&event_handler); } @@ -1492,7 +1492,7 @@ display_info_list.push_back(new_first_display_info); display_manager()->OnNativeDisplaysChanged(display_info_list); // The shelf is now on the second display. - EXPECT_EQ("400,0 600x500", test_observer.shelf_display_bounds().ToString()); + EXPECT_EQ(gfx::Rect(400, 0, 600, 500), test_observer.shelf_display_bounds()); primary_root->RemoveObserver(&test_observer); } @@ -1506,35 +1506,35 @@ // Set the initial position. generator_on_2nd.MoveMouseToInHost(150, 150); - EXPECT_EQ("450,150", env->last_mouse_location().ToString()); + EXPECT_EQ(gfx::Point(450, 150), env->last_mouse_location()); // A mouse pointer will stay in the 2nd display. UpdateDisplay("400x300,300x200"); - EXPECT_EQ("550,50", env->last_mouse_location().ToString()); + EXPECT_EQ(gfx::Point(550, 50), env->last_mouse_location()); // A mouse pointer will be outside of displays and move to the // center of 2nd display. UpdateDisplay("400x300,110x100"); - EXPECT_EQ("455,50", env->last_mouse_location().ToString()); + EXPECT_EQ(gfx::Point(455, 50), env->last_mouse_location()); // 2nd display was disconnected, and the cursor is // now in the 1st display. UpdateDisplay("500x400"); - EXPECT_EQ("55,350", env->last_mouse_location().ToString()); + EXPECT_EQ(gfx::Point(55, 350), env->last_mouse_location()); // 1st display's resolution has changed, and the mouse pointer is // now outside. Move the mouse pointer to the center of 1st display. UpdateDisplay("400x300"); - EXPECT_EQ("200,150", env->last_mouse_location().ToString()); + EXPECT_EQ(gfx::Point(200, 150), env->last_mouse_location()); // Move the mouse pointer to the bottom of 1st display. ui::test::EventGenerator generator_on_1st(root_windows[0]); generator_on_1st.MoveMouseToInHost(150, 290); - EXPECT_EQ("150,290", env->last_mouse_location().ToString()); + EXPECT_EQ(gfx::Point(150, 290), env->last_mouse_location()); // The mouse pointer is now on 2nd display. UpdateDisplay("300x280,300x200"); - EXPECT_EQ("450,10", env->last_mouse_location().ToString()); + EXPECT_EQ(gfx::Point(450, 10), env->last_mouse_location()); } TEST_F(WindowTreeHostManagerTest, @@ -1548,20 +1548,20 @@ // Logical cursor location is updated to keep the same physical location. generator.MoveMouseToInHost(350, 150); - EXPECT_EQ("350,150", env->last_mouse_location().ToString()); + EXPECT_EQ(gfx::Point(350, 150), env->last_mouse_location()); UpdateDisplay("300x500/r"); - EXPECT_EQ("250,150", env->last_mouse_location().ToString()); + EXPECT_EQ(gfx::Point(250, 150), env->last_mouse_location()); // Logical cursor location change shouldn't change when the cursor isn't // visible. UpdateDisplay("500x300"); generator.MoveMouseToInHost(350, 150); - EXPECT_EQ("350,150", env->last_mouse_location().ToString()); + EXPECT_EQ(gfx::Point(350, 150), env->last_mouse_location()); Shell::Get()->cursor_manager()->HideCursor(); UpdateDisplay("300x500/r"); - EXPECT_EQ("350,150", env->last_mouse_location().ToString()); + EXPECT_EQ(gfx::Point(350, 150), env->last_mouse_location()); } TEST_F(WindowTreeHostManagerTest, @@ -1574,31 +1574,30 @@ UpdateDisplay("300x200,400x300"); aura::Window::Windows root_windows = Shell::GetAllRootWindows(); - EXPECT_EQ("-400,0 400x300", + EXPECT_EQ(gfx::Rect(-400, 0, 400, 300), display::test::DisplayManagerTestApi(display_manager()) .GetSecondaryDisplay() - .bounds() - .ToString()); + .bounds()); aura::Env* env = aura::Env::GetInstance(); // Set the initial position. root_windows[0]->MoveCursorTo(gfx::Point(-150, 250)); - EXPECT_EQ("-150,250", env->last_mouse_location().ToString()); + EXPECT_EQ(gfx::Point(-150, 250), env->last_mouse_location()); // A mouse pointer will stay in 2nd display. UpdateDisplay("400x300,200x300"); - EXPECT_EQ("-100,150", env->last_mouse_location().ToString()); + EXPECT_EQ(gfx::Point(-100, 150), env->last_mouse_location()); // A mouse pointer will be outside of displays and move to the // center of 2nd display. UpdateDisplay("400x300,200x100"); - EXPECT_EQ("-100,50", env->last_mouse_location().ToString()); + EXPECT_EQ(gfx::Point(-100, 50), env->last_mouse_location()); // 2nd display was disconnected. Mouse pointer should move to // 1st display. UpdateDisplay("400x300"); - EXPECT_EQ("200,150", env->last_mouse_location().ToString()); + EXPECT_EQ(gfx::Point(200, 150), env->last_mouse_location()); } // Test that the cursor swaps displays and that its scale factor and rotation @@ -1617,13 +1616,13 @@ window_tree_host_manager->GetPrimaryRootWindow()->MoveCursorTo( gfx::Point(20, 50)); - EXPECT_EQ("20,50", env->last_mouse_location().ToString()); + EXPECT_EQ(gfx::Point(20, 50), env->last_mouse_location()); EXPECT_EQ(1.0f, cursor_manager->GetCursor().image_scale_factor()); EXPECT_EQ(display::Display::ROTATE_0, test_api.GetCurrentCursorRotation()); SwapPrimaryDisplay(); - EXPECT_EQ("20,50", env->last_mouse_location().ToString()); + EXPECT_EQ(gfx::Point(20, 50), env->last_mouse_location()); EXPECT_EQ(2.0f, cursor_manager->GetCursor().image_scale_factor()); EXPECT_EQ(display::Display::ROTATE_90, test_api.GetCurrentCursorRotation()); } @@ -1648,7 +1647,7 @@ window_tree_host_manager->GetPrimaryRootWindow()->MoveCursorTo( gfx::Point(20, 50)); - EXPECT_EQ("20,50", env->last_mouse_location().ToString()); + EXPECT_EQ(gfx::Point(20, 50), env->last_mouse_location()); EXPECT_EQ(1.0f, cursor_manager->GetCursor().image_scale_factor()); EXPECT_EQ(display::Display::ROTATE_0, test_api.GetCurrentCursorRotation()); @@ -1657,7 +1656,7 @@ window_tree_host_manager->GetPrimaryDisplayId()); // Cursor should be centered on the remaining display. - EXPECT_EQ("75,100", env->last_mouse_location().ToString()); + EXPECT_EQ(gfx::Point(75, 100), env->last_mouse_location()); EXPECT_EQ(2.0f, cursor_manager->GetCursor().image_scale_factor()); EXPECT_EQ(display::Display::ROTATE_90, test_api.GetCurrentCursorRotation());
diff --git a/ash/login/ui/fingerprint_auth_factor_model.cc b/ash/login/ui/fingerprint_auth_factor_model.cc index 43add99..4ab2080 100644 --- a/ash/login/ui/fingerprint_auth_factor_model.cc +++ b/ash/login/ui/fingerprint_auth_factor_model.cc
@@ -66,7 +66,7 @@ case FingerprintState::AVAILABLE_WITH_TOUCH_SENSOR_WARNING: return AuthFactorState::kErrorTemporary; case FingerprintState::DISABLED_FROM_ATTEMPTS: - FALLTHROUGH; + [[fallthrough]]; case FingerprintState::DISABLED_FROM_TIMEOUT: return AuthFactorState::kErrorPermanent; } @@ -87,7 +87,7 @@ switch (state_) { case FingerprintState::UNAVAILABLE: - FALLTHROUGH; + [[fallthrough]]; case FingerprintState::AVAILABLE_DEFAULT: return IDS_ASH_LOGIN_FINGERPRINT_UNLOCK_AVAILABLE; case FingerprintState::AVAILABLE_WITH_TOUCH_SENSOR_WARNING: @@ -124,12 +124,12 @@ switch (state_) { case FingerprintState::AVAILABLE_DEFAULT: - FALLTHROUGH; + [[fallthrough]]; case FingerprintState::AVAILABLE_WITH_TOUCH_SENSOR_WARNING: icon->SetIcon(kLockScreenFingerprintIcon); break; case FingerprintState::UNAVAILABLE: - FALLTHROUGH; + [[fallthrough]]; case FingerprintState::DISABLED_FROM_TIMEOUT: icon->SetIcon(kLockScreenFingerprintDisabledIcon, AuthIconView::Color::kDisabled);
diff --git a/ash/login/ui/smart_lock_auth_factor_model.cc b/ash/login/ui/smart_lock_auth_factor_model.cc index eb29a25..e922026 100644 --- a/ash/login/ui/smart_lock_auth_factor_model.cc +++ b/ash/login/ui/smart_lock_auth_factor_model.cc
@@ -30,7 +30,7 @@ EasyUnlockIconState state) { switch (state) { case EasyUnlockIconState::NONE: - FALLTHROUGH; + [[fallthrough]]; case EasyUnlockIconState::HARDLOCKED: SetSmartLockState(SmartLockState::kDisabled); break; @@ -79,15 +79,15 @@ switch (state_) { case SmartLockState::kDisabled: - FALLTHROUGH; + [[fallthrough]]; case SmartLockState::kInactive: return AuthFactorState::kUnavailable; case SmartLockState::kPhoneNotFound: - FALLTHROUGH; + [[fallthrough]]; case SmartLockState::kConnectingToPhone: - FALLTHROUGH; + [[fallthrough]]; case SmartLockState::kPhoneFoundLockedAndDistant: - FALLTHROUGH; + [[fallthrough]]; case SmartLockState::kPhoneFoundUnlockedAndDistant: return AuthFactorState::kAvailable; case SmartLockState::kPhoneAuthenticated: @@ -95,13 +95,13 @@ case SmartLockState::kPhoneFoundLockedAndProximate: return AuthFactorState::kReady; case SmartLockState::kPasswordReentryRequired: - FALLTHROUGH; + [[fallthrough]]; case SmartLockState::kPrimaryUserAbsent: - FALLTHROUGH; + [[fallthrough]]; case SmartLockState::kPhoneNotAuthenticated: - FALLTHROUGH; + [[fallthrough]]; case SmartLockState::kBluetoothDisabled: - FALLTHROUGH; + [[fallthrough]]; case SmartLockState::kPhoneNotLockable: return AuthFactorState::kErrorPermanent; } @@ -119,13 +119,13 @@ switch (state_) { case SmartLockState::kDisabled: - FALLTHROUGH; + [[fallthrough]]; case SmartLockState::kInactive: - FALLTHROUGH; + [[fallthrough]]; case SmartLockState::kPasswordReentryRequired: - FALLTHROUGH; + [[fallthrough]]; case SmartLockState::kPrimaryUserAbsent: - FALLTHROUGH; + [[fallthrough]]; case SmartLockState::kPhoneNotAuthenticated: return can_use_pin_ ? IDS_AUTH_FACTOR_LABEL_PASSWORD_OR_PIN_REQUIRED : IDS_AUTH_FACTOR_LABEL_PASSWORD_REQUIRED; @@ -136,7 +136,7 @@ case SmartLockState::kConnectingToPhone: return IDS_SMART_LOCK_LABEL_LOOKING_FOR_PHONE; case SmartLockState::kPhoneFoundLockedAndDistant: - FALLTHROUGH; + [[fallthrough]]; case SmartLockState::kPhoneFoundUnlockedAndDistant: return IDS_SMART_LOCK_LABEL_PHONE_TOO_FAR; case SmartLockState::kPhoneNotFound: @@ -181,7 +181,7 @@ icon->StopProgressAnimation(); return; case SmartLockState::kPhoneFoundLockedAndDistant: - FALLTHROUGH; + [[fallthrough]]; case SmartLockState::kPhoneFoundUnlockedAndDistant: icon->SetIcon(kLockScreenSmartLockBluetoothIcon, AuthIconView::Color::kPrimary); @@ -198,13 +198,13 @@ icon->StopProgressAnimation(); return; case SmartLockState::kPrimaryUserAbsent: - FALLTHROUGH; + [[fallthrough]]; case SmartLockState::kPhoneNotAuthenticated: - FALLTHROUGH; + [[fallthrough]]; case SmartLockState::kPasswordReentryRequired: - FALLTHROUGH; + [[fallthrough]]; case SmartLockState::kPhoneNotLockable: - FALLTHROUGH; + [[fallthrough]]; case SmartLockState::kBluetoothDisabled: icon->SetIcon(kLockScreenSmartLockDisabledIcon, AuthIconView::Color::kDisabled); @@ -212,9 +212,9 @@ return; case SmartLockState::kPhoneAuthenticated: // Click to enter -- icon handled by parent view. - FALLTHROUGH; + [[fallthrough]]; case SmartLockState::kDisabled: - FALLTHROUGH; + [[fallthrough]]; case SmartLockState::kInactive: // Intentionally blank. return;
diff --git a/ash/webui/camera_app_ui/resources/js/js.gni b/ash/webui/camera_app_ui/resources/js/js.gni index 123e9e0..9df8304 100644 --- a/ash/webui/camera_app_ui/resources/js/js.gni +++ b/ash/webui/camera_app_ui/resources/js/js.gni
@@ -52,7 +52,7 @@ "mojo/type.ts", "mojo/util.ts", "nav.ts", - "new_feature_toast.js", + "new_feature_toast.ts", "perf.ts", "snackbar.ts", "sound.ts",
diff --git a/ash/webui/camera_app_ui/resources/js/new_feature_toast.js b/ash/webui/camera_app_ui/resources/js/new_feature_toast.js deleted file mode 100644 index dc89649..0000000 --- a/ash/webui/camera_app_ui/resources/js/new_feature_toast.js +++ /dev/null
@@ -1,270 +0,0 @@ -// Copyright 2021 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 animation from './animation.js'; -import * as dom from './dom.js'; -import {I18nString} from './i18n_string.js'; -import * as loadTimeData from './models/load_time_data.js'; -import * as util from './util.js'; - -/** - * Interval of emerge time between two consecutive ripples in milliseconds. - */ -const RIPPLE_INTERVAL_MS = 5000; - -/** - * Controller for showing ripple effect. - */ -class RippleEffect { - /** - * @param {!HTMLElement} el Element to show ripple effect on. - */ - constructor(el) { - /** - * @const {!HTMLElement} - * @private - */ - this.el_ = el; - - const style = this.el_.computedStyleMap(); - - /** - * Initial width of ripple in px. - * @const {!number} - * @private - */ - this.width_ = util.getStyleValueInPx(style, '--ripple-start-width'); - - /** - * Initial height of ripple in px. - * @const {!number} - * @private - */ - this.height_ = util.getStyleValueInPx(style, '--ripple-start-height'); - - /** - * @const {number} - * @private - */ - this.cancelHandle_ = setInterval(() => { - this.addRipple_(); - }, RIPPLE_INTERVAL_MS); - - this.addRipple_(); - } - - /** - * @return {!Promise} - * @private - */ - async addRipple_() { - const rect = this.el_.getBoundingClientRect(); - if (rect.width === 0) { - return; - } - const tpl = util.instantiateTemplate('#ripple-template'); - const ripple = dom.getFrom(tpl, '.ripple', HTMLDivElement); - const style = ripple.attributeStyleMap; - style.set('left', CSS.px(rect.left - (this.width_ - rect.width) / 2)); - style.set('top', CSS.px(rect.top - (this.height_ - rect.height) / 2)); - style.set('width', CSS.px(this.width_)); - style.set('height', CSS.px(this.height_)); - document.body.appendChild(tpl); - await animation.play(ripple); - document.body.removeChild(ripple); - } - - /** - * Stops ripple effect. - * @public - */ - stop() { - clearInterval(this.cancelHandle_); - } -} - -/** - * Interval for toast updaing position. - */ -const TOAST_POSITION_UPDATE_MS = 500; - -/** - * @enum {string} - */ -const PositionProperty = { - BOTTOM: 'bottom', - LEFT: 'left', - RIGHT: 'right', - TOP: 'top', -}; - -/** - * Controller for showing new feature toast. - */ -class Toast { - /** - * @param {!HTMLElement} el - */ - constructor(el) { - /** - * @const {!HTMLElement} - * @private - */ - this.el_ = el; - - /** - * Offset between the position property of toast and the target |el| to - * determine their relative position. - * @const { - * !Array<{ - * elProperty: !PositionProperty, - * toastProperty: !PositionProperty, - * offset: number, - * }>} - * @private - */ - this.offsetProperties_ = (() => { - const properties = []; - const style = this.el_.computedStyleMap(); - for (const dir of ['x', 'y']) { - const toastProperty = style.get(`--toast-ref-${dir}`).toString(); - const elProperty = style.get(`--toast-element-ref-${dir}`).toString(); - const offset = util.getStyleValueInPx(style, `--toast-offset-${dir}`); - properties.push({elProperty, toastProperty, offset}); - } - return properties; - })(); - - const tpl = util.instantiateTemplate('#new-feature-toast-template'); - - /** - * @const {!HTMLDivElement} - * @private - */ - this.toast_ = dom.getFrom(tpl, '#new-feature-toast', HTMLDivElement); - - /** - * @const {number} - * @private - */ - this.cancelHandle_ = setInterval(() => { - this.updatePosition_(); - }, TOAST_POSITION_UPDATE_MS); - - // Set up i18n texts. - const i18nId = - /** @type {!I18nString} */ (el.getAttribute('i18n-new-feature')); - const textEl = dom.getFrom(tpl, '.new-feature-toast-text', HTMLSpanElement); - const text = loadTimeData.getI18nMessage(i18nId); - textEl.textContent = text; - const ariaLabel = - loadTimeData.getI18nMessage(I18nString.NEW_CONTROL_NAVIGATION, text); - this.toast_.setAttribute('aria-label', ariaLabel); - - document.body.appendChild(tpl); - this.updatePosition_(); - } - - /** - * @private - */ - updatePosition_() { - const rect = this.el_.getBoundingClientRect(); - const style = this.toast_.attributeStyleMap; - if (rect.width === 0) { - style.set('display', 'none'); - return; - } - style.clear(); - for (const {elProperty, toastProperty, offset} of this.offsetProperties_) { - let value = rect[elProperty] + offset; - if (toastProperty === PositionProperty.RIGHT) { - value = window.innerWidth - value; - } else if (toastProperty === PositionProperty.BOTTOM) { - value = window.innerHeight - value; - } - style.set(toastProperty, CSS.px(value)); - } - } - - /** - * @public - */ - focus() { - this.el_.setAttribute('aria-owns', 'new-feature-toast'); - this.toast_.focus(); - } - - /** - * @public - */ - hide() { - this.el_.removeAttribute('aria-owns'); - clearInterval(this.cancelHandle_); - document.body.removeChild(this.toast_); - } -} - -/** - * @type {?{ - * ripple: !RippleEffect, - * toast: !Toast, - * timeout: number, - * }} - */ -let showing = null; - -/** - * @public - */ -export function hide() { - if (showing === null) { - return; - } - const {ripple, toast, timeout} = showing; - showing = null; - ripple.stop(); - toast.hide(); - clearTimeout(timeout); -} - -/** - * Timeout for showing new feature toast. - */ -const SHOWING_TIMEOUT_MS = 10000; - -/** - * @param {!HTMLElement} el - * @return {!Promise} - */ -export async function show(el) { - if (showing !== null) { - hide(); - } - - await new Promise((r) => { - const ripple = new RippleEffect(el); - const toast = new Toast(el); - const timeout = setTimeout(r, SHOWING_TIMEOUT_MS); - showing = {ripple, toast, timeout}; - }); - hide(); -} - -/** - * @return {boolean} If new feature toast is showing. - */ -export function isShowing() { - return showing !== null; -} - -/** - * Focuses to new feature toast. - */ -export function focus() { - if (showing === null) { - return; - } - showing.toast.focus(); -}
diff --git a/ash/webui/camera_app_ui/resources/js/new_feature_toast.ts b/ash/webui/camera_app_ui/resources/js/new_feature_toast.ts new file mode 100644 index 0000000..9c979cc --- /dev/null +++ b/ash/webui/camera_app_ui/resources/js/new_feature_toast.ts
@@ -0,0 +1,218 @@ +// Copyright 2021 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 animation from './animation.js'; +import * as dom from './dom.js'; +import {I18nString} from './i18n_string.js'; +import * as loadTimeData from './models/load_time_data.js'; +import * as util from './util.js'; + +/** + * Interval of emerge time between two consecutive ripples in milliseconds. + */ +const RIPPLE_INTERVAL_MS = 5000; + +/** + * Controller for showing ripple effect. + */ +class RippleEffect { + /** + * Initial width of ripple in px. + */ + private readonly width: number; + + /** + * Initial height of ripple in px. + */ + private readonly height: number; + + private readonly cancelHandle: number; + + /** + * @param el Element to show ripple effect on. + */ + constructor(private readonly el: HTMLElement) { + const style = this.el.computedStyleMap(); + + this.width = util.getStyleValueInPx(style, '--ripple-start-width'); + this.height = util.getStyleValueInPx(style, '--ripple-start-height'); + this.cancelHandle = setInterval(() => { + this.addRipple(); + }, RIPPLE_INTERVAL_MS); + + this.addRipple(); + } + + private async addRipple(): Promise<void> { + const rect = this.el.getBoundingClientRect(); + if (rect.width === 0) { + return; + } + const tpl = util.instantiateTemplate('#ripple-template'); + const ripple = dom.getFrom(tpl, '.ripple', HTMLDivElement); + const style = ripple.attributeStyleMap; + style.set('left', CSS.px(rect.left - (this.width - rect.width) / 2)); + style.set('top', CSS.px(rect.top - (this.height - rect.height) / 2)); + style.set('width', CSS.px(this.width)); + style.set('height', CSS.px(this.height)); + document.body.appendChild(tpl); + await animation.play(ripple); + document.body.removeChild(ripple); + } + + /** + * Stops ripple effect. + */ + stop(): void { + clearInterval(this.cancelHandle); + } +} + +/** + * Interval for toast updaing position. + */ +const TOAST_POSITION_UPDATE_MS = 500; + +enum PositionProperty { + BOTTOM = 'bottom', + LEFT = 'left', + RIGHT = 'right', + TOP = 'top', +} + +/** + * Controller for showing new feature toast. + */ +class Toast { + private readonly offsetProperties: Array<{ + elProperty: PositionProperty, + toastProperty: PositionProperty, + offset: number, + }>; + + private readonly toast: HTMLDivElement; + + private readonly cancelHandle: number; + + constructor(private readonly el: HTMLElement) { + /** + * Offset between the position property of toast and the target |el| to + * determine their relative position. + */ + this.offsetProperties = (() => { + const properties = []; + const style = this.el.computedStyleMap(); + for (const dir of ['x', 'y']) { + const toastProperty = style.get(`--toast-ref-${dir}`).toString(); + const elProperty = style.get(`--toast-element-ref-${dir}`).toString(); + const offset = util.getStyleValueInPx(style, `--toast-offset-${dir}`); + properties.push({elProperty, toastProperty, offset}); + } + return properties; + })(); + + const tpl = util.instantiateTemplate('#new-feature-toast-template'); + this.toast = dom.getFrom(tpl, '#new-feature-toast', HTMLDivElement); + + this.cancelHandle = setInterval(() => { + this.updatePosition(); + }, TOAST_POSITION_UPDATE_MS); + + // Set up i18n texts. + const i18nId = + util.assertEnumVariant(I18nString, el.getAttribute('i18n-new-feature')); + const textEl = dom.getFrom(tpl, '.new-feature-toast-text', HTMLSpanElement); + const text = loadTimeData.getI18nMessage(i18nId); + textEl.textContent = text; + const ariaLabel = + loadTimeData.getI18nMessage(I18nString.NEW_CONTROL_NAVIGATION, text); + this.toast.setAttribute('aria-label', ariaLabel); + + document.body.appendChild(tpl); + this.updatePosition(); + } + + private updatePosition() { + const rect = this.el.getBoundingClientRect(); + const style = this.toast.attributeStyleMap; + if (rect.width === 0) { + style.set('display', 'none'); + return; + } + style.clear(); + for (const {elProperty, toastProperty, offset} of this.offsetProperties) { + let value = rect[elProperty] + offset; + if (toastProperty === PositionProperty.RIGHT) { + value = window.innerWidth - value; + } else if (toastProperty === PositionProperty.BOTTOM) { + value = window.innerHeight - value; + } + style.set(toastProperty, CSS.px(value)); + } + } + + focus(): void { + this.el.setAttribute('aria-owns', 'new-feature-toast'); + this.toast.focus(); + } + + hide(): void { + this.el.removeAttribute('aria-owns'); + clearInterval(this.cancelHandle); + document.body.removeChild(this.toast); + } +} + +let showing: { + ripple: RippleEffect, + toast: Toast, + timeout: number, +}|null = null; + +export function hide(): void { + if (showing === null) { + return; + } + const {ripple, toast, timeout} = showing; + showing = null; + ripple.stop(); + toast.hide(); + clearTimeout(timeout); +} + +/** + * Timeout for showing new feature toast. + */ +const SHOWING_TIMEOUT_MS = 10000; + +export async function show(el: HTMLElement): Promise<void> { + if (showing !== null) { + hide(); + } + + await new Promise((r) => { + const ripple = new RippleEffect(el); + const toast = new Toast(el); + const timeout = setTimeout(r, SHOWING_TIMEOUT_MS); + showing = {ripple, toast, timeout}; + }); + hide(); +} + +/** + * @return If new feature toast is showing. + */ +export function isShowing(): boolean { + return showing !== null; +} + +/** + * Focuses to new feature toast. + */ +export function focus(): void { + if (showing === null) { + return; + } + showing.toast.focus(); +}
diff --git a/ash/webui/camera_app_ui/resources/js/views/camera.js b/ash/webui/camera_app_ui/resources/js/views/camera.js index f51c04ed..b2654f4 100644 --- a/ash/webui/camera_app_ui/resources/js/views/camera.js +++ b/ash/webui/camera_app_ui/resources/js/views/camera.js
@@ -166,15 +166,6 @@ this.layout_ = new Layout(); /** - * @type {!ScanOptions} - * @private - */ - this.scanOptions_ = new ScanOptions({ - doReconfigure: () => this.start(), - infoUpdater: this.infoUpdater_, - }); - - /** * Video preview for the camera. * @type {!Preview} * @private @@ -182,6 +173,13 @@ this.preview_ = new Preview(() => this.start()); /** + * @type {!ScanOptions} + * @private + */ + this.scanOptions_ = + new ScanOptions((point) => this.preview_.setPointOfInterest(point)); + + /** * Options for the camera. * @type {!Options} * @private
diff --git a/ash/webui/camera_app_ui/resources/js/views/camera/document_corner_overlay.js b/ash/webui/camera_app_ui/resources/js/views/camera/document_corner_overlay.js index 15f12316..1477cd3 100644 --- a/ash/webui/camera_app_ui/resources/js/views/camera/document_corner_overlay.js +++ b/ash/webui/camera_app_ui/resources/js/views/camera/document_corner_overlay.js
@@ -7,11 +7,15 @@ import { Point, PolarVector, + Vector, vectorFromPoints, } from '../../geometry.js'; import {I18nString} from '../../i18n_string.js'; import {DeviceOperator} from '../../mojo/device_operator.js'; import { + PointF, // eslint-disable-line no-unused-vars +} from '../../mojo/type.js'; +import { closeEndpoint, MojoEndpoint, // eslint-disable-line no-unused-vars } from '../../mojo/util.js'; @@ -24,6 +28,11 @@ const BASE_LENGTH = 100; /** + * Threshold of the document area scale difference. + */ +const THRESHOLD_SCALE_DIFF = 0.3; + +/** * @typedef {{ * position?: !Point, * angle?: number, @@ -33,6 +42,18 @@ let PlaceParams; // eslint-disable-line no-unused-vars /** + * Information to roughly represents the area of the document displaying on the + * stream. + * The |center| is the center point of the detected document area and the + * |scale| is calculated by the longest length among the document edges. + * @typedef {{ + * center: !Point, + * scale: number, + * }} + */ +let DocumentArea; // eslint-disable-line no-unused-vars + +/** * Controller for placing line-like element. */ class Line { @@ -163,9 +184,11 @@ */ export class DocumentCornerOverlay { /** + * @param {!function(!Point): !Promise<void>} updatePointOfInterest function + * to update point of interest on the stream. * @public */ - constructor() { + constructor(updatePointOfInterest) { /** * @const {!HTMLDivElement} * @private @@ -187,6 +210,11 @@ dom.getFrom(this.overlay_, '.corner-container', HTMLDivElement); /** + * @const {!function(!Point): !Promise<void>} + */ + this.updatePointOfInterest_ = updatePointOfInterest; + + /** * @type {?string} * @private */ @@ -231,6 +259,13 @@ */ this.noDocumentTimerId_ = null; + /** + * Previous document area which are used to calculate the point of interest. + * @type {!DocumentArea} + * @private + */ + this.prevDocArea_ = null; + this.hide_(); } @@ -270,6 +305,7 @@ this.onNoCornerDetected_(); return; } + this.maybeUpdatePointOfInterest_(corners); const rect = this.cornerContainer_.getBoundingClientRect(); const toOverlaySpace = (pt) => new Point(rect.width * pt.x, rect.height * pt.y); @@ -314,6 +350,57 @@ } /** + * @param {!Array<!PointF>} corners + * @return {!Promise<void>} + */ + async maybeUpdatePointOfInterest_(corners) { + assert(corners.length === 4); + + const newDocArea = (() => { + let centerX = 0; + let centerY = 0; + let maxEdgeLength = 0; + const shouldUpdatePOI = (() => { + let isPreviousPOIOutsideNewDoc = this.prevDocArea_ === null; + const {x: xp, y: yp} = this.prevDocArea_?.center || {x: 0, y: 0}; + for (let i = 0; i < corners.length; ++i) { + const {x: x1, y: y1} = corners[i]; + const {x: x2, y: y2} = corners[(i + 1) % 4]; + + centerX += x1 / 4; + centerY += y1 / 4; + + const edgeLength = (new Vector(x2 - x1, y2 - y1)).length(); + maxEdgeLength = Math.max(maxEdgeLength, edgeLength); + + const d = (x2 - x1) * (yp - y1) - (xp - x1) * (y2 - y1); + if (d >= 0) { + isPreviousPOIOutsideNewDoc = true; + } + } + const isDocScaleChanges = this.prevDocArea_ === null || + Math.abs(maxEdgeLength - this.prevDocArea_.scale) / + this.prevDocArea_.scale > + THRESHOLD_SCALE_DIFF; + return isPreviousPOIOutsideNewDoc || isDocScaleChanges; + })(); + if (!shouldUpdatePOI) { + return null; + } + return {center: new Point(centerX, centerY), scale: maxEdgeLength}; + })(); + + if (newDocArea !== null) { + try { + await this.updatePointOfInterest_(newDocArea.center); + } catch { + // POI might not be supported on device so it is acceptable to fail. + } + this.prevDocArea_ = newDocArea; + } + } + + /** * @param {!Array<!Point>} corners */ onCornerDetected_(corners) {
diff --git a/ash/webui/camera_app_ui/resources/js/views/camera/preview.js b/ash/webui/camera_app_ui/resources/js/views/camera/preview.js index a20f480..7293b211 100644 --- a/ash/webui/camera_app_ui/resources/js/views/camera/preview.js +++ b/ash/webui/camera_app_ui/resources/js/views/camera/preview.js
@@ -10,6 +10,7 @@ import * as dom from '../../dom.js'; import {reportError} from '../../error.js'; import {FaceOverlay} from '../../face.js'; +import {Point} from '../../geometry.js'; import {DeviceOperator, parseMetadata} from '../../mojo/device_operator.js'; import { AndroidControlAeAntibandingMode, @@ -762,21 +763,32 @@ } /** + * Apply point of interest to the stream. + * @param {!Point} point The point in normalize coordidate system, which means + * both |x| and |y| are in range [0, 1). + * @return {!Promise<void>} + */ + setPointOfInterest(point) { + const constraints = { + advanced: [{pointsOfInterest: [{x: point.x, y: point.y}]}], + }; + const track = this.getVideoTrack_(); + return track.applyConstraints(constraints); + } + + /** * Handles clicking for focus. * @param {!MouseEvent} event Click event. * @private */ onFocusClicked_(event) { this.cancelFocus_(); - - // Normalize to square space coordinates by W3C spec. - const x = event.offsetX / this.video_.offsetWidth; - const y = event.offsetY / this.video_.offsetHeight; - const constraints = {advanced: [{pointsOfInterest: [{x, y}]}]}; - const track = this.getVideoTrack_(); const focus = (async () => { try { - await track.applyConstraints(constraints); + // Normalize to square space coordinates by W3C spec. + const x = event.offsetX / this.video_.offsetWidth; + const y = event.offsetY / this.video_.offsetHeight; + await this.setPointOfInterest(new Point(x, y)); } catch { // The device might not support setting pointsOfInterest. Ignore the // error and return.
diff --git a/ash/webui/camera_app_ui/resources/js/views/camera/scan_options.js b/ash/webui/camera_app_ui/resources/js/views/camera/scan_options.js index 1b087ab..8b319ec8 100644 --- a/ash/webui/camera_app_ui/resources/js/views/camera/scan_options.js +++ b/ash/webui/camera_app_ui/resources/js/views/camera/scan_options.js
@@ -7,6 +7,8 @@ // eslint-disable-next-line no-unused-vars import {DeviceInfoUpdater} from '../../device/device_info_updater.js'; import * as dom from '../../dom.js'; +// eslint-disable-next-line no-unused-vars +import {Point} from '../../geometry.js'; import {sendBarcodeEnabledEvent} from '../../metrics.js'; import {BarcodeScanner} from '../../models/barcode.js'; import * as state from '../../state.js'; @@ -49,18 +51,11 @@ */ export class ScanOptions { /** - * @param {{ - * doReconfigure: function(): !Promise, - * infoUpdater: !DeviceInfoUpdater, - * }} params + * @param {!function(!Point): !Promise<void>} updatePointOfInterest function + * to update point of interest on the stream. + * @public */ - constructor({doReconfigure, infoUpdater}) { - /** - * @type {function(): !Promise} - * @private - */ - this.doReconfigure_ = doReconfigure; - + constructor(updatePointOfInterest) { /** * Togglable barcode option in photo mode. * @type {!HTMLInputElement} @@ -95,7 +90,8 @@ * @const {!DocumentCornerOverlay} * @private */ - this.documentCornerOverylay_ = new DocumentCornerOverlay(); + this.documentCornerOverylay_ = + new DocumentCornerOverlay(updatePointOfInterest); /** * Called when scan option changed.
diff --git a/ash/webui/eche_app_ui/resources/browser_proxy.js b/ash/webui/eche_app_ui/resources/browser_proxy.js index 001afad..d8bd8e4 100644 --- a/ash/webui/eche_app_ui/resources/browser_proxy.js +++ b/ash/webui/eche_app_ui/resources/browser_proxy.js
@@ -77,8 +77,15 @@ // window.close() doesn't work from the iframe. guestMessagePipe.registerHandler(Message.CLOSE_WINDOW, async () => { - console.log('echeapi browser_proxy.js window.close'); - window.close(); + const info = /** @type {!SystemInfo} */ (await systemInfo.getSystemInfo()); + const systemInfoJson = JSON.parse(JSON.stringify(info)); + const debugMode = JSON.parse(systemInfoJson.systemInfo)['debug_mode']; + if (debugMode) { + console.log('echeapi debug on, browser_proxy.js window.close block'); + } else { + console.log('echeapi browser_proxy.js window.close'); + window.close(); + } }); // Register GET_SYSTEM_INFO pipes for wrapping getSystemInfo async api call.
diff --git a/ash/webui/eche_app_ui/resources/message_types.js b/ash/webui/eche_app_ui/resources/message_types.js index 9a5cc3cf..ef67b8b 100644 --- a/ash/webui/eche_app_ui/resources/message_types.js +++ b/ash/webui/eche_app_ui/resources/message_types.js
@@ -24,6 +24,7 @@ * deviceName: string, * tabletMode: boolean, * wifiConnectionState: string, + * debugMode: boolean, * }} */ /* #export */ let SystemInfo;
diff --git a/ash/webui/eche_app_ui/system_info_provider.cc b/ash/webui/eche_app_ui/system_info_provider.cc index 113f3d2..d978427 100644 --- a/ash/webui/eche_app_ui/system_info_provider.cc +++ b/ash/webui/eche_app_ui/system_info_provider.cc
@@ -4,6 +4,7 @@ #include "ash/webui/eche_app_ui/system_info_provider.h" +#include "ash/constants/ash_features.h" #include "ash/public/cpp/tablet_mode.h" #include "ash/public/cpp/tablet_mode_observer.h" #include "ash/webui/eche_app_ui/mojom/types_mojom_traits.h" @@ -21,6 +22,7 @@ const char kJsonBoardNameKey[] = "board_name"; const char kJsonTabletModeKey[] = "tablet_mode"; const char kJsonWifiConnectionStateKey[] = "wifi_connection_state"; +const char kJsonDebugModeKey[] = "debug_mode"; using chromeos::network_config::mojom::ConnectionStateType; // TODO(https://crbug.com/1164001): remove when it moved to ash. @@ -70,6 +72,9 @@ found_type == CONNECTION_STATE_TYPE.end() ? "" : found_type->second; json_dictionary.SetString(kJsonWifiConnectionStateKey, connecton_state_string); + json_dictionary.SetBoolean( + kJsonDebugModeKey, + base::FeatureList::IsEnabled(features::kEcheSWADebugMode)); std::string json_message; base::JSONWriter::Write(json_dictionary, &json_message);
diff --git a/ash/webui/eche_app_ui/system_info_provider.h b/ash/webui/eche_app_ui/system_info_provider.h index 5db2942..50eadf2 100644 --- a/ash/webui/eche_app_ui/system_info_provider.h +++ b/ash/webui/eche_app_ui/system_info_provider.h
@@ -20,6 +20,7 @@ extern const char kJsonBoardNameKey[]; extern const char kJsonTabletModeKey[]; extern const char kJsonWifiConnectionStateKey[]; +extern const char kJsonDebugModeKey[]; class SystemInfo;
diff --git a/ash/webui/eche_app_ui/system_info_provider_unittest.cc b/ash/webui/eche_app_ui/system_info_provider_unittest.cc index f6bf3af..c4e631c 100644 --- a/ash/webui/eche_app_ui/system_info_provider_unittest.cc +++ b/ash/webui/eche_app_ui/system_info_provider_unittest.cc
@@ -25,12 +25,14 @@ const bool kFakeTabletMode = true; const ConnectionStateType kFakeWifiConnectionState = ConnectionStateType::kConnected; +const bool kFakeDebugMode = false; void ParseJson(const std::string& json, std::string& device_name, std::string& board_name, bool& tablet_mode, - std::string& wifi_connection_state) { + std::string& wifi_connection_state, + bool& debug_mode) { std::unique_ptr<base::Value> message_value = base::JSONReader::ReadDeprecated(json); base::DictionaryValue* message_dictionary; @@ -43,6 +45,10 @@ tablet_mode = tablet_mode_opt.value(); message_dictionary->GetString(kJsonWifiConnectionStateKey, &wifi_connection_state); + absl::optional<bool> debug_mode_opt = + message_dictionary->FindBoolKey(kJsonDebugModeKey); + if (debug_mode_opt.has_value()) + debug_mode = debug_mode_opt.value(); } class FakeTabletMode : public ash::TabletMode { @@ -158,15 +164,18 @@ std::string board_name = ""; bool tablet_mode = false; std::string wifi_connection_state = ""; + bool debug_mode = true; GetSystemInfo(); std::string json = Callback::GetSystemInfo(); - ParseJson(json, device_name, board_name, tablet_mode, wifi_connection_state); + ParseJson(json, device_name, board_name, tablet_mode, wifi_connection_state, + debug_mode); EXPECT_EQ(device_name, kFakeDeviceName); EXPECT_EQ(board_name, kFakeBoardName); EXPECT_EQ(tablet_mode, kFakeTabletMode); EXPECT_EQ(wifi_connection_state, "connected"); + EXPECT_EQ(debug_mode, kFakeDebugMode); } } // namespace eche_app
diff --git a/base/task/sequence_manager/sequence_manager_impl.cc b/base/task/sequence_manager/sequence_manager_impl.cc index 1264aa9..68d721d 100644 --- a/base/task/sequence_manager/sequence_manager_impl.cc +++ b/base/task/sequence_manager/sequence_manager_impl.cc
@@ -14,7 +14,6 @@ #include "base/compiler_specific.h" #include "base/debug/crash_logging.h" #include "base/debug/stack_trace.h" -#include "base/feature_list.h" #include "base/json/json_writer.h" #include "base/logging.h" #include "base/memory/ptr_util.h" @@ -68,10 +67,6 @@ base::Value value_; }; -// Controls whether canceled tasks are removed from the front of the queue when -// deciding when the next wake up should happen. -std::atomic_bool g_no_wake_ups_for_canceled_tasks{false}; - } // namespace std::unique_ptr<SequenceManager> CreateSequenceManagerOnCurrentThread( @@ -151,6 +146,12 @@ } #endif // !defined(OS_NACL) +// Controls whether canceled tasks are removed from the front of the queue when +// deciding when the next wake up should happen. +// Note: An atomic is used here because some tests can initialize two different +// sequence managers on different threads (e.g. by using base::Thread). +std::atomic_bool g_no_wake_ups_for_canceled_tasks{false}; + } // namespace class SequenceManagerImpl::NativeWorkHandleImpl final @@ -318,14 +319,30 @@ } // static -void SequenceManagerImpl::MaybeSetNoWakeUpsForCanceledTasks() { - if (FeatureList::IsEnabled(kNoWakeUpsForCanceledTasks)) - g_no_wake_ups_for_canceled_tasks.store(true, std::memory_order_relaxed); +void SequenceManagerImpl::InitializeFeatures() { + ApplyNoWakeUpsForCanceledTasks(); + TaskQueueImpl::ApplyRemoveCanceledTasksInTaskQueue(); +} + +// static +void SequenceManagerImpl::ApplyNoWakeUpsForCanceledTasks() { + // Since kNoWakeUpsForCanceledTasks is not constexpr (forbidden for Features), + // it cannot be used to initialize |g_no_wake_ups_for_canceled_tasks| at + // compile time. At least DCHECK that its initial value matches the default + // value of the feature here. + DCHECK_EQ( + g_no_wake_ups_for_canceled_tasks.load(std::memory_order_relaxed), + kNoWakeUpsForCanceledTasks.default_state == FEATURE_ENABLED_BY_DEFAULT); + g_no_wake_ups_for_canceled_tasks.store( + FeatureList::IsEnabled(kNoWakeUpsForCanceledTasks), + std::memory_order_relaxed); } // static void SequenceManagerImpl::ResetNoWakeUpsForCanceledTasksForTesting() { - g_no_wake_ups_for_canceled_tasks.store(false, std::memory_order_relaxed); + g_no_wake_ups_for_canceled_tasks.store( + kNoWakeUpsForCanceledTasks.default_state == FEATURE_ENABLED_BY_DEFAULT, + std::memory_order_relaxed); } void SequenceManagerImpl::BindToMessagePump(std::unique_ptr<MessagePump> pump) {
diff --git a/base/task/sequence_manager/sequence_manager_impl.h b/base/task/sequence_manager/sequence_manager_impl.h index 3cd479c..6ba6882 100644 --- a/base/task/sequence_manager/sequence_manager_impl.h +++ b/base/task/sequence_manager/sequence_manager_impl.h
@@ -18,6 +18,7 @@ #include "base/cancelable_callback.h" #include "base/containers/circular_deque.h" #include "base/debug/crash_logging.h" +#include "base/feature_list.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" @@ -104,12 +105,17 @@ static std::unique_ptr<SequenceManagerImpl> CreateUnbound( SequenceManager::Settings settings); - // Sets state to eliminate wake ups for canceled tasks, if the - // kNoWakeUpsForCanceledTasks feature is enabled. Must be invoked after - // FeatureList initialization. - static void MaybeSetNoWakeUpsForCanceledTasks(); + // Initializes the state of all the sequence manager features. Must be invoked + // after FeatureList initialization. + static void InitializeFeatures(); - // Resets state that eliminates wake ups for canceled tasks. + // Sets the global cached state of the NoWakeUpsForCanceledTasks feature + // according to its enabled state. Must be invoked after FeatureList + // initialization. + static void ApplyNoWakeUpsForCanceledTasks(); + + // Resets the global cached state of the NoWakeUpsForCanceledTasks feature + // according to its default state. static void ResetNoWakeUpsForCanceledTasksForTesting(); // SequenceManager implementation:
diff --git a/base/task/sequence_manager/sequence_manager_impl_unittest.cc b/base/task/sequence_manager/sequence_manager_impl_unittest.cc index b21d92b..d34b5ec7 100644 --- a/base/task/sequence_manager/sequence_manager_impl_unittest.cc +++ b/base/task/sequence_manager/sequence_manager_impl_unittest.cc
@@ -451,7 +451,7 @@ public: ScopedNoWakeUpsForCanceledTasks() : scoped_feature_list_(SequenceManagerImpl::kNoWakeUpsForCanceledTasks) { - SequenceManagerImpl::MaybeSetNoWakeUpsForCanceledTasks(); + SequenceManagerImpl::ApplyNoWakeUpsForCanceledTasks(); } ~ScopedNoWakeUpsForCanceledTasks() {
diff --git a/base/task/sequence_manager/task_queue_impl.cc b/base/task/sequence_manager/task_queue_impl.cc index 788bad1..df9d6d8 100644 --- a/base/task/sequence_manager/task_queue_impl.cc +++ b/base/task/sequence_manager/task_queue_impl.cc
@@ -59,6 +59,15 @@ namespace internal { +namespace { + +// Cache of the state of the kRemoveCanceledTasksInTaskQueue feature. This +// avoids the need to constantly query its enabled state through +// FeatureList::IsEnabled(). +bool g_is_remove_canceled_tasks_in_task_queue_enabled = false; + +} // namespace + TaskQueueImpl::GuardedTaskPoster::GuardedTaskPoster(TaskQueueImpl* outer) : outer_(outer) {} @@ -131,7 +140,7 @@ OnceClosure callback, TimeTicks delayed_run_time, base::subtle::DelayPolicy delay_policy) { - if (!IsRemoveCanceledTasksInTaskQueueFeatureEnabled()) { + if (!g_is_remove_canceled_tasks_in_task_queue_enabled) { // This will revert to PostDelayedTaskAt() with default DelayedTaskHandle. return SequencedTaskRunner::PostCancelableDelayedTaskAt( pass_key, location, std::move(callback), delayed_run_time, @@ -146,7 +155,7 @@ const Location& location, OnceClosure callback, TimeDelta delay) { - if (!IsRemoveCanceledTasksInTaskQueueFeatureEnabled()) { + if (!g_is_remove_canceled_tasks_in_task_queue_enabled) { return SequencedTaskRunner::PostCancelableDelayedTask( location, std::move(callback), delay); } @@ -169,13 +178,19 @@ return associated_thread_->IsBoundToCurrentThread(); } -bool TaskQueueImpl::TaskRunner:: - IsRemoveCanceledTasksInTaskQueueFeatureEnabled() { - if (!remove_canceled_tasks_in_task_queue_.has_value()) { - remove_canceled_tasks_in_task_queue_ = - FeatureList::IsEnabled(kRemoveCanceledTasksInTaskQueue); - } - return remove_canceled_tasks_in_task_queue_.value(); +// static +void TaskQueueImpl::ApplyRemoveCanceledTasksInTaskQueue() { + DCHECK_EQ(kRemoveCanceledTasksInTaskQueue.default_state, + FEATURE_DISABLED_BY_DEFAULT); + g_is_remove_canceled_tasks_in_task_queue_enabled = + FeatureList::IsEnabled(kRemoveCanceledTasksInTaskQueue); +} + +// static +void TaskQueueImpl::ResetRemoveCanceledTasksInTaskQueueForTesting() { + g_is_remove_canceled_tasks_in_task_queue_enabled = + kRemoveCanceledTasksInTaskQueue.default_state == + FEATURE_ENABLED_BY_DEFAULT; } TaskQueueImpl::TaskQueueImpl(SequenceManagerImpl* sequence_manager,
diff --git a/base/task/sequence_manager/task_queue_impl.h b/base/task/sequence_manager/task_queue_impl.h index c6d1e24..a4ebda9 100644 --- a/base/task/sequence_manager/task_queue_impl.h +++ b/base/task/sequence_manager/task_queue_impl.h
@@ -75,6 +75,15 @@ // tasks (normally the most common type) don't starve out immediate work. class BASE_EXPORT TaskQueueImpl { public: + // Sets the global cached state of the RemoveCanceledTasksInTaskQueue feature + // according to its enabled state. Must be invoked after FeatureList + // initialization. + static void ApplyRemoveCanceledTasksInTaskQueue(); + + // Resets the global cached state of the RemoveCanceledTasksInTaskQueue + // feature according to its default state. + static void ResetRemoveCanceledTasksInTaskQueueForTesting(); + TaskQueueImpl(SequenceManagerImpl* sequence_manager, WakeUpQueue* wake_up_queue, const TaskQueue::Spec& spec); @@ -344,17 +353,9 @@ private: ~TaskRunner() final; - bool IsRemoveCanceledTasksInTaskQueueFeatureEnabled(); - const scoped_refptr<GuardedTaskPoster> task_poster_; const scoped_refptr<AssociatedThreadId> associated_thread_; const TaskType task_type_; - // Caches whether kRemoveCanceledTasksInTaskQueue is enabled. FeatureList - // access is too expensive to be done for each task, costing >1% of total - // CPU on the main renderer thread, from field data. - // Using an optional since *this can be constructed before the feature - // system is initialized. - absl::optional<bool> remove_canceled_tasks_in_task_queue_; }; // A queue for holding delayed tasks before their delay has expired.
diff --git a/base/task/sequence_manager/task_queue_unittest.cc b/base/task/sequence_manager/task_queue_unittest.cc index e16d2ca..8e90d659 100644 --- a/base/task/sequence_manager/task_queue_unittest.cc +++ b/base/task/sequence_manager/task_queue_unittest.cc
@@ -99,11 +99,26 @@ voter.reset(); } +class ScopedNoWakeUpsForCanceledTasks { + public: + explicit ScopedNoWakeUpsForCanceledTasks(bool feature_enabled) { + scoped_feature_list_.InitWithFeatureState(kRemoveCanceledTasksInTaskQueue, + feature_enabled); + TaskQueueImpl::ApplyRemoveCanceledTasksInTaskQueue(); + } + + ~ScopedNoWakeUpsForCanceledTasks() { + TaskQueueImpl::ResetRemoveCanceledTasksInTaskQueueForTesting(); + } + + private: + test::ScopedFeatureList scoped_feature_list_; +}; + TEST(TaskQueueTest, CanceledTaskRemovedIfFeatureEnabled) { for (bool feature_enabled : {false, true}) { - test::ScopedFeatureList scoped_feature_list; - scoped_feature_list.InitWithFeatureState(kRemoveCanceledTasksInTaskQueue, - feature_enabled); + ScopedNoWakeUpsForCanceledTasks scoped_no_wake_ups_for_canceled_tasks( + feature_enabled); auto sequence_manager = CreateSequenceManagerOnCurrentThreadWithPump( MessagePump::Create(MessagePumpType::DEFAULT));
diff --git a/base/values.cc b/base/values.cc index 45f7ebf..f5fdad8 100644 --- a/base/values.cc +++ b/base/values.cc
@@ -872,10 +872,6 @@ return is_dict(); } -Value* Value::DeepCopy() const { - return new Value(Clone()); -} - std::unique_ptr<Value> Value::CreateDeepCopy() const { return std::make_unique<Value>(Clone()); }
diff --git a/base/values.h b/base/values.h index 11dc332a..198e81e 100644 --- a/base/values.h +++ b/base/values.h
@@ -550,9 +550,6 @@ // this works because C++ supports covariant return types. // DEPRECATED, use `Value::Clone()` instead. // TODO(crbug.com/646113): Delete this and migrate callsites. - Value* DeepCopy() const; - // DEPRECATED, use `Value::Clone()` instead. - // TODO(crbug.com/646113): Delete this and migrate callsites. std::unique_ptr<Value> CreateDeepCopy() const; // Comparison operators so that Values can easily be used with standard
diff --git a/build/config/linux/gtk/BUILD.gn b/build/config/linux/gtk/BUILD.gn index c7173176..349043f 100644 --- a/build/config/linux/gtk/BUILD.gn +++ b/build/config/linux/gtk/BUILD.gn
@@ -7,12 +7,6 @@ assert(is_linux, "This file should only be referenced on Linux") -declare_args() { - # The (major) version of GTK to build against. A different version may be - # loaded at runtime. - gtk_version = 3 -} - # GN doesn't check visibility for configs so we give this an obviously internal # name to discourage random targets from accidentally depending on this and # bypassing the GTK target's visibility. @@ -33,11 +27,8 @@ group("gtk") { visibility = [ - # This is the only target that can depend on GTK. Do not add more targets - # to this list. - "//ui/gtk:gtk_stubs", - - # These are allow-listed for WebRTC builds. + # These are allow-listed for WebRTC builds. Nothing in else should depend + # on GTK. "//examples:peerconnection_client", "//remoting/host:common", "//remoting/host:remoting_me2me_host_static", @@ -52,18 +43,3 @@ public_configs = [ ":gtk_internal_config" ] } - -# Depend on "gtkprint" to get this. -pkg_config("gtkprint_internal_config") { - if (gtk_version == 3) { - packages = [ "gtk+-unix-print-3.0" ] - } else { - assert(gtk_version == 4) - packages = [ "gtk4-unix-print" ] - } -} - -group("gtkprint") { - visibility = [ "//ui/gtk:*" ] - public_configs = [ ":gtkprint_internal_config" ] -}
diff --git a/build/config/linux/gtk/gtk.gni b/build/config/linux/gtk/gtk.gni index 1e45248e..64e62f2 100644 --- a/build/config/linux/gtk/gtk.gni +++ b/build/config/linux/gtk/gtk.gni
@@ -7,4 +7,8 @@ declare_args() { # Whether or not we should use libgtk. use_gtk = is_linux && !is_chromecast + + # The (major) version of GTK to build against. A different version may be + # loaded at runtime. + gtk_version = 3 }
diff --git a/build/fuchsia/linux.sdk.sha1 b/build/fuchsia/linux.sdk.sha1 index 2d9e5602..17432d4 100644 --- a/build/fuchsia/linux.sdk.sha1 +++ b/build/fuchsia/linux.sdk.sha1
@@ -1 +1 @@ -7.20220104.1.1 +7.20220104.3.1
diff --git a/build/fuchsia/linux_internal.sdk.sha1 b/build/fuchsia/linux_internal.sdk.sha1 index a49ff61..782d076 100644 --- a/build/fuchsia/linux_internal.sdk.sha1 +++ b/build/fuchsia/linux_internal.sdk.sha1
@@ -1 +1 @@ -7.20220104.2.3 +7.20220105.0.1
diff --git a/build/fuchsia/mac.sdk.sha1 b/build/fuchsia/mac.sdk.sha1 index 2d9e5602..17432d4 100644 --- a/build/fuchsia/mac.sdk.sha1 +++ b/build/fuchsia/mac.sdk.sha1
@@ -1 +1 @@ -7.20220104.1.1 +7.20220104.3.1
diff --git a/build/rust/tests/BUILD.gn b/build/rust/tests/BUILD.gn index eebda9ca..87d92f4 100644 --- a/build/rust/tests/BUILD.gn +++ b/build/rust/tests/BUILD.gn
@@ -12,7 +12,7 @@ deps = [ ":deps" ] if (build_rust_unit_tests) { - deps += [ ":native_rust_unittests__from__build_rust_tests" ] + deps += [ ":build_rust_tests" ] } } @@ -59,7 +59,8 @@ } if (build_rust_unit_tests) { - rust_unit_tests_group("native_rust_unittests__from__build_rust_tests") { + # A group covering all native Rust unit tests under //build/rust directory. + rust_unit_tests_group("build_rust_tests") { deps = [ ":deps" ] } }
diff --git a/chrome/VERSION b/chrome/VERSION index d050e1ec..7ca1b4c0 100644 --- a/chrome/VERSION +++ b/chrome/VERSION
@@ -1,4 +1,4 @@ MAJOR=99 MINOR=0 -BUILD=4808 +BUILD=4809 PATCH=0
diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni index 220effc..1824e362 100644 --- a/chrome/android/chrome_java_resources.gni +++ b/chrome/android/chrome_java_resources.gni
@@ -531,6 +531,7 @@ "java/res/drawable/material_tooltip_background.xml", "java/res/drawable/mir_card.xml", "java/res/drawable/outline_chevron_right_24dp.xml", + "java/res/drawable/pill_background.xml", "java/res/drawable/price_tracking_disabled.xml", "java/res/drawable/price_tracking_enabled_filled.xml", "java/res/drawable/price_tracking_enabled_outline.xml", @@ -650,6 +651,7 @@ "java/res/layout/fre_data_reduction_proxy_lite_mode.xml", "java/res/layout/fre_tos_privacy_disclaimer.xml", "java/res/layout/fre_tosanduma.xml", + "java/res/layout/fullscreen_notification.xml", "java/res/layout/history_clear_browsing_data_header.xml", "java/res/layout/history_item_view.xml", "java/res/layout/history_main.xml",
diff --git a/chrome/android/features/cablev2_authenticator/java/src/org/chromium/chrome/browser/webauth/authenticator/CableAuthenticatorUI.java b/chrome/android/features/cablev2_authenticator/java/src/org/chromium/chrome/browser/webauth/authenticator/CableAuthenticatorUI.java index fced563..f6aecac5 100644 --- a/chrome/android/features/cablev2_authenticator/java/src/org/chromium/chrome/browser/webauth/authenticator/CableAuthenticatorUI.java +++ b/chrome/android/features/cablev2_authenticator/java/src/org/chromium/chrome/browser/webauth/authenticator/CableAuthenticatorUI.java
@@ -212,12 +212,6 @@ mState = State.QR_CONFIRM; break; } - - // Reference these strings to avoid an error about them being unused. - // They're checked in for translation ahead of the code that uses them. - // TODO(agl): remove this. - getResources().getString(R.string.cablev2_paask_body); - getResources().getString(R.string.cablev2_paask_title); } // This class should not be reachable on Android versions < N (API level 24).
diff --git a/chrome/android/java/res/drawable/pill_background.xml b/chrome/android/java/res/drawable/pill_background.xml new file mode 100644 index 0000000..b9ed6ad --- /dev/null +++ b/chrome/android/java/res/drawable/pill_background.xml
@@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright 2021 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. --> + +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:dither="true" + android:shape="rectangle"> + <corners android:radius="40dp" /> + <solid android:color="@color/default_bg_color_dark"/> + <size + android:width="60dp" + android:height="20dp" /> +</shape>
diff --git a/chrome/android/java/res/layout/fullscreen_notification.xml b/chrome/android/java/res/layout/fullscreen_notification.xml new file mode 100644 index 0000000..5687b66a --- /dev/null +++ b/chrome/android/java/res/layout/fullscreen_notification.xml
@@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright 2021 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" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:paddingTop="24dp"> + <TextView + android:id="@+id/text" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:maxWidth="@dimen/fullscreen_notification_max_width" + android:layout_gravity="center" + android:background="@drawable/pill_background" + android:textAppearance="@style/TextAppearance.Toast" + android:paddingStart="20dp" + android:paddingEnd="20dp" + android:paddingTop="8dp" + android:paddingBottom="8dp" + android:textAlignment="center" + android:text="@string/immersive_fullscreen_api_notification"/> +</LinearLayout>
diff --git a/chrome/android/java/res/values/dimens.xml b/chrome/android/java/res/values/dimens.xml index 6cbd92c..b2547931 100644 --- a/chrome/android/java/res/values/dimens.xml +++ b/chrome/android/java/res/values/dimens.xml
@@ -157,6 +157,7 @@ <!-- Should match toolbar_height_no_shadow --> <dimen name="control_container_height">56dp</dimen> <dimen name="custom_tabs_control_container_height">56dp</dimen> + <dimen name="fullscreen_notification_max_width">320dp</dimen> <!-- The combined height of the tab strip and toolbar. --> <dimen name="tab_strip_and_toolbar_height">56dp</dimen>
diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml index f438f91..31c384b2 100644 --- a/chrome/android/java/res/xml/privacy_preferences.xml +++ b/chrome/android/java/res/xml/privacy_preferences.xml
@@ -54,6 +54,11 @@ android:key="privacy_sandbox" android:title="@string/prefs_privacy_sandbox" android:fragment="org.chromium.chrome.browser.privacy_sandbox.PrivacySandboxSettingsFragment"/> + <Preference + android:key="phone_as_a_security_key" + android:title="@string/cablev2_paask_title" + android:summary="@string/cablev2_paask_body" + android:fragment="org.chromium.chrome.browser.webauthn.PrivacySettingsFragment"/> <org.chromium.components.browser_ui.settings.TextMessagePreference android:key="sync_and_services_link" android:summary="@string/privacy_sync_and_services_link_legacy"
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java index 7a42e48..52a50597 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
@@ -128,6 +128,7 @@ import org.chromium.chrome.browser.profiles.OTRProfileID; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.profiles.ProfileManager; +import org.chromium.chrome.browser.read_later.ReadingListUtils; import org.chromium.chrome.browser.reengagement.ReengagementNotificationController; import org.chromium.chrome.browser.search_engines.SearchEngineChoiceNotification; import org.chromium.chrome.browser.settings.SettingsLauncherImpl; @@ -2155,6 +2156,7 @@ // get back to the previous state. The reason for startsWith check is that the // actual redirected URL is a different system language based help url. final @TabLaunchType int type = currentTab.getLaunchType(); + final boolean helpUrl = currentTab.getUrl().getSpec().startsWith(HELP_URL_PREFIX); if (type == TabLaunchType.FROM_CHROME_UI && helpUrl) { getCurrentTabModel().closeTab(currentTab); @@ -2194,6 +2196,11 @@ return true; } + if (type == TabLaunchType.FROM_READING_LIST) { + assert !isTablet() : "Not expecting to see FROM_READING_LIST on tablets"; + ReadingListUtils.showReadingList(currentTab.isIncognito()); + } + final boolean shouldCloseTab = backShouldCloseTab(currentTab); // Minimize the app if either: @@ -2236,6 +2243,7 @@ int type = tab.getLaunchType(); return type == TabLaunchType.FROM_LINK || type == TabLaunchType.FROM_EXTERNAL_APP + || type == TabLaunchType.FROM_READING_LIST || type == TabLaunchType.FROM_LONGPRESS_FOREGROUND || type == TabLaunchType.FROM_LONGPRESS_BACKGROUND || (type == TabLaunchType.FROM_RESTORE
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java index 20dd77f0..ffbf73d4 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java
@@ -49,6 +49,7 @@ import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.subscriptions.CommerceSubscriptionsServiceFactory; import org.chromium.chrome.browser.tab.Tab; +import org.chromium.chrome.browser.tab.TabLaunchType; import org.chromium.chrome.browser.ui.messages.snackbar.Snackbar; import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager; import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager.SnackbarController; @@ -367,7 +368,8 @@ // Tablet. if (DeviceFormFactor.isNonMultiDisplayContextOnTablet(context)) { - openUrl(context, url, activity == null ? null : activity.getComponentName()); + openUrl(context, url, activity == null ? null : activity.getComponentName(), + /*launchType=*/null); return; } @@ -500,7 +502,8 @@ isIncognito); model.setReadStatusForReadingList(bookmarkItem.getUrl(), true); } else { - openUrl(context, bookmarkItem.getUrl().getSpec(), openBookmarkComponentName); + openUrl(context, bookmarkItem.getUrl().getSpec(), openBookmarkComponentName, + /*launchType=*/null); } return true; } @@ -552,12 +555,26 @@ return null; } - private static void openUrl(Context context, String url, ComponentName componentName) { + /** + * Opens a url. + * + * @param url Url to open. + * @param componentName Name of the component opening the URL. If null, {@link + * ChromeTabbedActivity} is used. + * @param launchType If not null, url is opened in a new tab with the specified {@link + * TabLaunchType}. + */ + private static void openUrl(Context context, String url, ComponentName componentName, + @Nullable @TabLaunchType Integer launchType) { Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url)); intent.putExtra( Browser.EXTRA_APPLICATION_ID, context.getApplicationContext().getPackageName()); intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); intent.putExtra(IntentHandler.EXTRA_PAGE_TRANSITION_TYPE, PageTransition.AUTO_BOOKMARK); + if (launchType != null) { + IntentHandler.setTabLaunchType(intent, launchType); + intent.putExtra(Browser.EXTRA_CREATE_NEW_TAB, true); + } if (componentName != null) { ChromeTabbedActivity.setNonAliasedComponent(intent, componentName); @@ -576,7 +593,10 @@ if (ReadingListFeatures.shouldUseCustomTab()) { openReadingListInCustomTab(context, url, isOffTheRecord); } else { - openUrl(context, url, componentName); + openUrl(context, url, componentName, + DeviceFormFactor.isNonMultiDisplayContextOnTablet(context) + ? null + : TabLaunchType.FROM_READING_LIST); } }
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenHtmlApiHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenHtmlApiHandler.java index a31dfe9..1af3b73 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenHtmlApiHandler.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenHtmlApiHandler.java
@@ -11,9 +11,10 @@ import android.app.Activity; import android.os.Handler; import android.os.Message; -import android.view.Gravity; +import android.view.LayoutInflater; import android.view.View; import android.view.View.OnLayoutChangeListener; +import android.view.ViewGroup; import android.view.Window; import android.view.WindowManager; @@ -46,7 +47,6 @@ import org.chromium.content_public.browser.NavigationHandle; import org.chromium.content_public.browser.SelectionPopupController; import org.chromium.content_public.browser.WebContents; -import org.chromium.ui.widget.Toast; import java.lang.ref.WeakReference; @@ -66,6 +66,8 @@ // Delay to allow a frame to render between getting the fullscreen layout update and clearing // the SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN flag. private static final long CLEAR_LAYOUT_FULLSCREEN_DELAY_MS = 20; + // Fade in/out animation duration for fullscreen notification toast. + private static final int TOAST_FADE_MS = 500; private final Activity mActivity; private final Handler mHandler; @@ -86,7 +88,7 @@ // Toast at the top of the screen that is shown when user enters fullscreen for the // first time. - private Toast mNotificationToast; + private View mNotificationToast; private OnLayoutChangeListener mFullscreenOnLayoutChangeListener; @@ -355,13 +357,10 @@ * @param controlsHidden {@code true} if the controls are now hidden. */ private void maybeEnterFullscreenFromPendingState(boolean controlsHidden) { - if (!controlsHidden || mTab == null) return; - if (mPendingFullscreenOptions != null) { + if (!controlsHidden) return; + if (mTab != null && mPendingFullscreenOptions != null) { enterFullscreen(mTab, mPendingFullscreenOptions); mPendingFullscreenOptions = null; - } else { - // Restore browser controls if the fullscreen process got canceled. - TabBrowserControlsConstraintsHelper.update(mTab, BrowserControlsState.SHOWN, true); } } @@ -512,23 +511,29 @@ * Create and show the fullscreen notification toast. */ private void showNotificationToast() { - if (mNotificationToast != null) { - mNotificationToast.cancel(); - } - int resId = R.string.immersive_fullscreen_api_notification; - mNotificationToast = Toast.makeText(mActivity, resId, Toast.LENGTH_LONG); - mNotificationToast.setGravity(Gravity.TOP | Gravity.CENTER, 0, 0); - mNotificationToast.show(); + assert mTab != null && mTab.getContentView() != null; + ViewGroup parent = mTab.getContentView(); + if (mNotificationToast != null) parent.removeView(mNotificationToast); + mNotificationToast = + LayoutInflater.from(mActivity).inflate(R.layout.fullscreen_notification, null); + mNotificationToast.setAlpha(0); + parent.addView(mNotificationToast); + mNotificationToast.animate().alpha(1).setDuration(TOAST_FADE_MS).start(); + mHandler.postDelayed(this::hideNotificationToast, 5000); } /** * Hides the notification toast. */ private void hideNotificationToast() { - if (mNotificationToast != null) { - mNotificationToast.cancel(); + if (mNotificationToast == null) return; + mNotificationToast.animate().alpha(0).setDuration(TOAST_FADE_MS).withEndAction(() -> { + // The Tab might have been destroyed while the toast is on. + if (mTab != null && mTab.getContentView() != null) { + mTab.getContentView().removeView(mNotificationToast); + } mNotificationToast = null; - } + }); } // ActivityStateListener
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java index 0009313..e876287 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
@@ -61,6 +61,7 @@ private static final String PREF_PRIVACY_SANDBOX = "privacy_sandbox"; private static final String PREF_PRIVACY_REVIEW = "privacy_review"; private static final String PREF_INCOGNITO_LOCK = "incognito_lock"; + private static final String PREF_PHONE_AS_A_SECURITY_KEY = "phone_as_a_security_key"; private ManagedPreferenceDelegate mManagedPreferenceDelegate; private IncognitoLockSettings mIncognitoLockSettings; @@ -136,6 +137,10 @@ Preference syncAndServicesLink = findPreference(PREF_SYNC_AND_SERVICES_LINK); syncAndServicesLink.setSummary(buildSyncAndServicesLink()); + Preference phoneAsASecurityKey = findPreference(PREF_PHONE_AS_A_SECURITY_KEY); + phoneAsASecurityKey.setVisible( + ChromeFeatureList.isEnabled(ChromeFeatureList.WEB_AUTH_PHONE_SUPPORT)); + updatePreferences(); }
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/read_later/ReadingListBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/read_later/ReadingListBridge.java index c30998f6..f5f5d80d 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/read_later/ReadingListBridge.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/read_later/ReadingListBridge.java
@@ -8,10 +8,6 @@ import org.chromium.base.annotations.CalledByNative; import org.chromium.base.annotations.NativeMethods; import org.chromium.chrome.R; -import org.chromium.chrome.browser.bookmarks.BookmarkUtils; -import org.chromium.chrome.browser.flags.ChromeFeatureList; -import org.chromium.components.bookmarks.BookmarkId; -import org.chromium.components.bookmarks.BookmarkType; /** * Contains JNI methods to needed by read later feature. @@ -40,9 +36,7 @@ @CalledByNative private static void openReadingListPage() { - if (!ChromeFeatureList.isEnabled(ChromeFeatureList.READ_LATER)) return; - BookmarkUtils.showBookmarkManager( - null, new BookmarkId(0, BookmarkType.READING_LIST), /*isIncognito=*/false); + ReadingListUtils.showReadingList(/*isIncognito=*/false); } @NativeMethods
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/read_later/ReadingListUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/read_later/ReadingListUtils.java index 63e15ab..980d907 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/read_later/ReadingListUtils.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/read_later/ReadingListUtils.java
@@ -140,4 +140,15 @@ public static void setReadingListSupportedForTesting(Boolean supported) { sReadingListSupportedForTesting = supported; } + + /** + * Opens the Reading list folder in the bookmark manager. + * + * @param isIncognito Whether the bookmark manager should open in incognito mode. + */ + public static void showReadingList(boolean isIncognito) { + if (!ReadingListFeatures.isReadingListEnabled()) return; + BookmarkUtils.showBookmarkManager( + null, new BookmarkId(0, BookmarkType.READING_LIST), /*isIncognito=*/isIncognito); + } }
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java index 5f782070..0a5d277 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java
@@ -464,6 +464,7 @@ case TabLaunchType.FROM_LAUNCHER_SHORTCUT: case TabLaunchType.FROM_LAUNCH_NEW_INCOGNITO_TAB: case TabLaunchType.FROM_APP_WIDGET: + case TabLaunchType.FROM_READING_LIST: transition = PageTransition.AUTO_TOPLEVEL; break; case TabLaunchType.FROM_LONGPRESS_FOREGROUND:
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkTest.java index fd45e505..ab4ecf199 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkTest.java
@@ -79,6 +79,7 @@ import org.chromium.chrome.browser.preferences.ChromePreferenceKeys; import org.chromium.chrome.browser.preferences.SharedPreferencesManager; import org.chromium.chrome.browser.profiles.Profile; +import org.chromium.chrome.browser.read_later.ReadingListUtils; import org.chromium.chrome.browser.sync.SyncService; import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.ui.messages.snackbar.Snackbar; @@ -1255,7 +1256,8 @@ Assert.assertFalse(customTabIntent.hasExtra(IntentHandler.EXTRA_OPEN_NEW_INCOGNITO_TAB)); TestThreadUtils.runOnUiThreadBlocking( () -> { Assert.assertTrue(activity.getActivityTab().getUrl().equals(mTestUrlA)); }); - activity.finish(); + pressBack(); + onView(withText("Reading list")).check(matches(isDisplayed())); } @Test @@ -1287,7 +1289,46 @@ Criteria.checkThat(activityTab, Matchers.notNullValue()); Criteria.checkThat(activityTab.getUrl(), Matchers.notNullValue()); Criteria.checkThat(activityTab.getUrl(), Matchers.is(mTestUrlA)); + Criteria.checkThat(activityTab.isIncognito(), Matchers.is(false)); }); + pressBack(); + onView(withText("Reading list")).check(matches(isDisplayed())); + } + + @Test + @SmallTest + @Features.EnableFeatures( + {ChromeFeatureList.BOOKMARK_BOTTOM_SHEET, ChromeFeatureList.READ_LATER + "<Study"}) + @CommandLineFlags. + Add({"force-fieldtrials=Study/Group", "force-fieldtrial-params=Study.Group:use_cct/false"}) + public void + testReadingListOpenInIncognitoTab() throws Exception { + addReadingListBookmark(TEST_PAGE_TITLE_GOOGLE, mTestUrlA); + BookmarkPromoHeader.forcePromoStateForTests(SyncPromoState.NO_PROMO); + mActivityTestRule.loadUrlInNewTab("about:blank", /*incognito=*/true); + openBookmarkManager(); + CriteriaHelper.pollUiThread(() -> mBookmarkModel.getReadingListItem(mTestUrlA) != null); + + // Open the "Reading list" folder. + TestThreadUtils.runOnUiThreadBlocking( + () -> mManager.openFolder(mBookmarkModel.getRootFolderId())); + onView(withText("Reading list")).perform(click()); + RecyclerViewTestUtils.waitForStableRecyclerView(mItemsContainer); + View readingListRow = mItemsContainer.findViewHolderForAdapterPosition(1).itemView; + Assert.assertEquals("The 2nd view should be reading list.", BookmarkType.READING_LIST, + getIdByPosition(1).getType()); + TestThreadUtils.runOnUiThreadBlocking(() -> TouchCommon.singleClickView(readingListRow)); + + ChromeTabbedActivity activity = waitForTabbedActivity(); + CriteriaHelper.pollUiThread(() -> { + Tab activityTab = activity.getActivityTab(); + Criteria.checkThat(activityTab, Matchers.notNullValue()); + Criteria.checkThat(activityTab.getUrl(), Matchers.notNullValue()); + Criteria.checkThat(activityTab.getUrl(), Matchers.is(mTestUrlA)); + Criteria.checkThat(activityTab.isIncognito(), Matchers.is(true)); + }); + pressBack(); + onView(withText("Reading list")).check(matches(isDisplayed())); } @Test @@ -1906,17 +1947,12 @@ BookmarkTestUtil.waitForBookmarkModelLoaded(); if (mActivityTestRule.getActivity().isTablet()) { - TestThreadUtils.runOnUiThreadBlocking(() -> { - BookmarkUtils.showBookmarkManager( - null, new BookmarkId(0, BookmarkType.READING_LIST), /*isIncognito=*/false); - }); + TestThreadUtils.runOnUiThreadBlocking( + () -> ReadingListUtils.showReadingList(/*isIncognito=*/false)); } else { mBookmarkActivity = ApplicationTestUtils.waitForActivityWithClass( - BookmarkActivity.class, Stage.CREATED, () -> { - BookmarkUtils.showBookmarkManager(null, - new BookmarkId(0, BookmarkType.READING_LIST), - /*isIncognito=*/false); - }); + BookmarkActivity.class, Stage.CREATED, + () -> ReadingListUtils.showReadingList(/*isIncognito=*/false)); } onView(withText("Reading list")).check(matches(isDisplayed()));
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc index 73ed668..9fd13c88 100644 --- a/chrome/app/chrome_main_delegate.cc +++ b/chrome/app/chrome_main_delegate.cc
@@ -728,8 +728,7 @@ base::HangWatcher::InitializeOnMainThread(); base::internal::TimerBase::InitializeFeatures(); - base::sequence_manager::internal::SequenceManagerImpl:: - MaybeSetNoWakeUpsForCanceledTasks(); + base::sequence_manager::internal::SequenceManagerImpl::InitializeFeatures(); } #if defined(OS_WIN)
diff --git a/chrome/app/os_settings_search_tag_strings_grdp/IDS_OS_SETTINGS_TAG_LANGUAGES_PREDICTIVE_WRITING.png.sha1 b/chrome/app/os_settings_search_tag_strings_grdp/IDS_OS_SETTINGS_TAG_LANGUAGES_PREDICTIVE_WRITING.png.sha1 deleted file mode 100644 index 56e4dc7..0000000 --- a/chrome/app/os_settings_search_tag_strings_grdp/IDS_OS_SETTINGS_TAG_LANGUAGES_PREDICTIVE_WRITING.png.sha1 +++ /dev/null
@@ -1 +0,0 @@ -2a3bbf72ef81f200ac512f3e620fb8f377a28997 \ No newline at end of file
diff --git a/chrome/app/os_settings_search_tag_strings_grdp/IDS_OS_SETTINGS_TAG_LANGUAGES_PREDICTIVE_WRITING_ALT1.png.sha1 b/chrome/app/os_settings_search_tag_strings_grdp/IDS_OS_SETTINGS_TAG_LANGUAGES_PREDICTIVE_WRITING_ALT1.png.sha1 deleted file mode 100644 index 51b54aef..0000000 --- a/chrome/app/os_settings_search_tag_strings_grdp/IDS_OS_SETTINGS_TAG_LANGUAGES_PREDICTIVE_WRITING_ALT1.png.sha1 +++ /dev/null
@@ -1 +0,0 @@ -6096c161313e4218004791671ddea8f026dcc721 \ No newline at end of file
diff --git a/chrome/app/os_settings_search_tag_strings_grdp/IDS_OS_SETTINGS_TAG_LANGUAGES_PREDICTIVE_WRITING_ALT2.png.sha1 b/chrome/app/os_settings_search_tag_strings_grdp/IDS_OS_SETTINGS_TAG_LANGUAGES_PREDICTIVE_WRITING_ALT2.png.sha1 deleted file mode 100644 index 3cae7fd..0000000 --- a/chrome/app/os_settings_search_tag_strings_grdp/IDS_OS_SETTINGS_TAG_LANGUAGES_PREDICTIVE_WRITING_ALT2.png.sha1 +++ /dev/null
@@ -1 +0,0 @@ -e52931073886d6a17a93ba62f7098099e39ed7bc \ No newline at end of file
diff --git a/chrome/app/os_settings_strings.grdp b/chrome/app/os_settings_strings.grdp index 39b72218..ddb60e1 100644 --- a/chrome/app/os_settings_strings.grdp +++ b/chrome/app/os_settings_strings.grdp
@@ -515,12 +515,6 @@ <message name="IDS_SETTINGS_SUGGESTIONS_EMOJI_SUGGESTION_DESCRIPTION" desc="The description for emoji suggestion (when an user types a word, some emojis might be suggested for the user to insert after) section."> Get emoji suggestions based on what you're typing </message> - <message name="IDS_SETTINGS_SUGGESTIONS_PREDICTIVE_WRITING_TITLE" desc="The label for predictive writing suggestions (when a user types a word, some text might be suggested for the user to insert after) section."> - Predictive writing - </message> - <message name="IDS_SETTINGS_SUGGESTIONS_PREDICTIVE_WRITING_DESCRIPTION" desc="The description for predictive writing suggestions (when a user types a word, some text might be suggested for the user to insert after) section."> - Show inline writing suggestions that appear as you type - </message> <!-- Input Method Options Section --> <message name="IDS_SETTINGS_INPUT_METHOD_OPTIONS_BASIC" desc="The label for the section in input method options page containing basic options.">
diff --git a/chrome/app/os_settings_strings_grdp/IDS_SETTINGS_SUGGESTIONS_PREDICTIVE_WRITING_DESCRIPTION.png.sha1 b/chrome/app/os_settings_strings_grdp/IDS_SETTINGS_SUGGESTIONS_PREDICTIVE_WRITING_DESCRIPTION.png.sha1 deleted file mode 100644 index d4d0c08f..0000000 --- a/chrome/app/os_settings_strings_grdp/IDS_SETTINGS_SUGGESTIONS_PREDICTIVE_WRITING_DESCRIPTION.png.sha1 +++ /dev/null
@@ -1 +0,0 @@ -62315a5fa9dfadd48fee696118829038da3479a6 \ No newline at end of file
diff --git a/chrome/app/os_settings_strings_grdp/IDS_SETTINGS_SUGGESTIONS_PREDICTIVE_WRITING_TITLE.png.sha1 b/chrome/app/os_settings_strings_grdp/IDS_SETTINGS_SUGGESTIONS_PREDICTIVE_WRITING_TITLE.png.sha1 deleted file mode 100644 index f55da612..0000000 --- a/chrome/app/os_settings_strings_grdp/IDS_SETTINGS_SUGGESTIONS_PREDICTIVE_WRITING_TITLE.png.sha1 +++ /dev/null
@@ -1 +0,0 @@ -c14b1787683aa3d575a95a010b1b569daab353a8 \ No newline at end of file
diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp index fa944b9..bc7b1ad0 100644 --- a/chrome/app/settings_strings.grdp +++ b/chrome/app/settings_strings.grdp
@@ -610,6 +610,9 @@ <message name="IDS_SETTINGS_PASSWORD_DELETED_PASSWORD_FROM_ACCOUNT_AND_DEVICE" desc="Label for an undo tooltip following deletion of a password from the account and the device."> Password deleted from this device and your Google Account </message> + <message name="IDS_SETTINGS_PASSWORD_COPIED_TO_CLIPBOARD" desc="Label for a tooltip following copying a password to the clipboard."> + Password copied to clipboard + </message> <message name="IDS_SETTINGS_PASSWORD_MOVE_PASSWORDS_TO_ACCOUNT" desc="Message displayed in the moving multiple passwords to the user Google Account banner."> To easily use them on all your devices, you can move them to your Google Account </message>
diff --git a/chrome/app/settings_strings_grdp/IDS_SETTINGS_PASSWORD_COPIED_TO_CLIPBOARD.png.sha1 b/chrome/app/settings_strings_grdp/IDS_SETTINGS_PASSWORD_COPIED_TO_CLIPBOARD.png.sha1 new file mode 100644 index 0000000..5dc666f7 --- /dev/null +++ b/chrome/app/settings_strings_grdp/IDS_SETTINGS_PASSWORD_COPIED_TO_CLIPBOARD.png.sha1
@@ -0,0 +1 @@ +5d5b61a5e9c225ab781b0bde742bf44b2def669a \ No newline at end of file
diff --git a/chrome/app/shared_settings_strings.grdp b/chrome/app/shared_settings_strings.grdp index c59a125..5e32cdf 100644 --- a/chrome/app/shared_settings_strings.grdp +++ b/chrome/app/shared_settings_strings.grdp
@@ -117,6 +117,9 @@ <message name="IDS_SETTINGS_NEARBY_SHARE_FAST_INITIATION_NOTIFICATION_TOGGLE_DESCRIPTION" desc="Description for the toggle that allows a user to turn fast initiation notifications on or off. Fast initiation notifications alert the user when devices nearby are trying to share."> When devices are sharing nearby </message> + <message name="IDS_SETTINGS_NEARBY_SHARE_FAST_INITIATION_NOTIFICATION_TOGGLE_ARIA_LABEL" desc="Title for screen readers for the toggle that allows a user to turn fast initiation notifications on or off. Fast initiation notifications alert the user when devices nearby are trying to share." is_accessibility_with_no_ui="true"> + Show notification when devices are sharing nearby + </message> <message name="IDS_SETTINGS_NEARBY_SHARE_DEVICE_NAME_ARIA_DESCRIPTION" desc="Description for screen readers, not displayed in UI, specifying the current device name which is shown to other devices for the Nearby Share feature." is_accessibility_with_no_ui="true"> Current device name is <ph name="DEVICE_NAME">$1<ex>Michael's Chromebook</ex></ph> </message>
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index a2f79d2..817e55d 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc
@@ -282,7 +282,7 @@ #include "base/win/windows_version.h" #include "chrome/browser/win/titlebar_config.h" #include "ui/color/color_switches.h" // nogncheck -#endif // OS_WIN +#endif // OS_WIN #if defined(TOOLKIT_VIEWS) #include "ui/views/views_features.h" @@ -7749,6 +7749,13 @@ "UseMultipleOverlays")}, #endif +#if BUILDFLAG(IS_CHROMEOS_ASH) + {"usb-notification-controller", + flag_descriptions::kUsbNotificationControllerName, + flag_descriptions::kUsbNotificationControllerDescription, kOsCrOS, + FEATURE_VALUE_TYPE(ash::features::kUsbNotificationController)}, +#endif + #if defined(OS_CHROMEOS) {"link-capturing-ui-update", flag_descriptions::kLinkCapturingUiUpdateName, flag_descriptions::kLinkCapturingUiUpdateDescription, kOsCrOS, @@ -7761,6 +7768,13 @@ FEATURE_VALUE_TYPE(chrome::android::kDragAndDropAndroid)}, #endif // defined(OS_ANDROID) +#if defined(OS_ANDROID) + {"use-ulp-languages-in-chrome", + flag_descriptions::kUseULPLanguagesInChromeName, + flag_descriptions::kUseULPLanguagesInChromeDescription, kOsAndroid, + FEATURE_VALUE_TYPE(language::kUseULPLanguagesInChrome)} +#endif + // NOTE: Adding a new flag requires adding a corresponding entry to enum // "LoginCustomFlags" in tools/metrics/histograms/enums.xml. See "Flag // Histograms" in tools/metrics/histograms/README.md (run the
diff --git a/chrome/browser/apps/app_service/file_utils.cc b/chrome/browser/apps/app_service/file_utils.cc index a2b5c63..29471df9 100644 --- a/chrome/browser/apps/app_service/file_utils.cc +++ b/chrome/browser/apps/app_service/file_utils.cc
@@ -5,10 +5,8 @@ #include "chrome/browser/apps/app_service/file_utils.h" #include "base/files/file_path.h" -#include "base/files/file_util.h" #include "chrome/browser/ash/file_manager/app_id.h" #include "chrome/browser/ash/file_manager/fileapi_util.h" -#include "net/base/filename_util.h" #include "storage/browser/file_system/file_system_context.h" #include "storage/browser/file_system/file_system_url.h" #include "url/gurl.h" @@ -65,14 +63,4 @@ return GURL(); } -std::vector<GURL> GetFileUrls(const std::vector<base::FilePath>& file_paths) { - std::vector<GURL> file_urls; - for (auto& file_path : file_paths) { - GURL file_url = - net::FilePathToFileURL(base::MakeAbsoluteFilePath(file_path)); - file_urls.push_back(file_url); - } - return file_urls; -} - } // namespace apps
diff --git a/chrome/browser/apps/app_service/file_utils.h b/chrome/browser/apps/app_service/file_utils.h index 3ca62a82..2061278 100644 --- a/chrome/browser/apps/app_service/file_utils.h +++ b/chrome/browser/apps/app_service/file_utils.h
@@ -38,8 +38,6 @@ // GURL if cannot get the filesystem: scheme url. GURL GetFileSystemUrl(Profile* profile, const base::FilePath& file_path); -// Convert absolute file path to file: scheme url. -std::vector<GURL> GetFileUrls(const std::vector<base::FilePath>& file_paths); } // namespace apps #endif // CHROME_BROWSER_APPS_APP_SERVICE_FILE_UTILS_H_
diff --git a/chrome/browser/apps/app_service/file_utils_unittest.cc b/chrome/browser/apps/app_service/file_utils_unittest.cc index fd25c32b..280e61c 100644 --- a/chrome/browser/apps/app_service/file_utils_unittest.cc +++ b/chrome/browser/apps/app_service/file_utils_unittest.cc
@@ -12,8 +12,6 @@ #include "testing/gtest/include/gtest/gtest.h" #include "base/files/file_path.h" -#include "base/files/file_util.h" -#include "base/files/scoped_temp_dir.h" #include "base/strings/strcat.h" #include "chrome/browser/ash/file_manager/fileapi_util.h" #include "chrome/test/base/testing_browser_process.h" @@ -21,7 +19,6 @@ #include "chrome/test/base/testing_profile_manager.h" #include "content/public/test/browser_task_environment.h" #include "extensions/common/extension.h" -#include "net/base/filename_util.h" #include "storage/browser/file_system/external_mount_points.h" #include "storage/browser/file_system/file_system_url.h" #include "storage/common/file_system/file_system_util.h" @@ -142,27 +139,6 @@ base::FilePath(storage::kExternalDir).Append(mount_name_), path))); } -TEST_F(FileUtilsTest, GetFileUrls) { - constexpr char kTestData[] = "testing1234"; - base::FilePath test_file = GetTempDir().AppendASCII("test.txt"); - ASSERT_EQ(static_cast<int>(base::size(kTestData)), - base::WriteFile(test_file, kTestData, base::size(kTestData))); - - std::vector<GURL> url_list; - std::vector<base::FilePath> fp_list; - - // fp_list is empty. - url_list = GetFileUrls(fp_list); - EXPECT_THAT(url_list, IsEmpty()); - - // fp_list containing test profile path should work with file: url. - fp_list.push_back(test_file); - url_list = GetFileUrls(fp_list); - base::FilePath url_path; - net::FileURLToFilePath(url_list.at(0), &url_path); - EXPECT_EQ(url_path, test_file); -} - TEST_F(FileUtilsTest, GetSingleFileSystemURL) { GURL url; storage::FileSystemURL fsurl;
diff --git a/chrome/browser/apps/app_service/intent_util.cc b/chrome/browser/apps/app_service/intent_util.cc index 2ebf2553..5b303f1f 100644 --- a/chrome/browser/apps/app_service/intent_util.cc +++ b/chrome/browser/apps/app_service/intent_util.cc
@@ -397,28 +397,23 @@ } #if BUILDFLAG(IS_CHROMEOS_ASH) -// TODO(crbug.com/853604): Make this not link to file manager extension if -// possible. Added support to not link with file manager extension but still -// need to refactor all users of the util functions to switch to it (alanding). +// TODO(crbug.com/1253219): Use FilePaths in intents to avoid dependency on +// File Manager. apps::mojom::IntentPtr CreateShareIntentFromFiles( - absl::optional<Profile*> profile, + Profile* profile, const std::vector<base::FilePath>& file_paths, const std::vector<std::string>& mime_types) { - auto file_urls = profile.has_value() - ? apps::GetFileSystemUrls(profile.value(), file_paths) - : apps::GetFileUrls(file_paths); + auto file_urls = apps::GetFileSystemUrls(profile, file_paths); return CreateShareIntentFromFiles(file_urls, mime_types); } apps::mojom::IntentPtr CreateShareIntentFromFiles( - absl::optional<Profile*> profile, + Profile* profile, const std::vector<base::FilePath>& file_paths, const std::vector<std::string>& mime_types, const std::string& share_text, const std::string& share_title) { - auto file_urls = profile.has_value() - ? apps::GetFileSystemUrls(profile.value(), file_paths) - : apps::GetFileUrls(file_paths); + auto file_urls = apps::GetFileSystemUrls(profile, file_paths); return CreateShareIntentFromFiles(file_urls, mime_types, share_text, share_title); }
diff --git a/chrome/browser/apps/app_service/intent_util.h b/chrome/browser/apps/app_service/intent_util.h index d45e513..5d7996f 100644 --- a/chrome/browser/apps/app_service/intent_util.h +++ b/chrome/browser/apps/app_service/intent_util.h
@@ -61,25 +61,20 @@ const extensions::Extension* extension); #if BUILDFLAG(IS_CHROMEOS_ASH) -// Create an intent struct with filesystem:// or file:// type URLs from the -// file paths and mime types of a list of files. -// This util has to live under chrome/ because it uses fileapis -// and cannot be included in components/. -// |profile| is required for generating filesystem:// type URLs, otherwise -// default to generating file:// type URLs. +// Create an intent struct with filesystem:// type URLs from the file paths and +// mime types of a list of files. This util has to live under chrome/ because it +// uses fileapis and cannot be included in components/. apps::mojom::IntentPtr CreateShareIntentFromFiles( - absl::optional<Profile*> profile, + Profile* profile, const std::vector<base::FilePath>& file_paths, const std::vector<std::string>& mime_types); -// Create an intent struct with filesystem:// or file:// type URLs from the -// file paths, mime types of a list of files, and the share text and title. -// This util has to live under chrome/ because it uses fileapis -// and cannot be included in components/. -// |profile| is required for generating filesystem:// type URLs, otherwise -// default to generating file:// type URLs. +// Create an intent struct with filesystem:// type URLs from the file paths and +// mime types of a list of files, and the share text and title. This util has to +// live under chrome/ because it uses fileapis and cannot be included in +// components/. apps::mojom::IntentPtr CreateShareIntentFromFiles( - absl::optional<Profile*> profile, + Profile* profile, const std::vector<base::FilePath>& file_paths, const std::vector<std::string>& mime_types, const std::string& share_text,
diff --git a/chrome/browser/apps/app_service/intent_util_unittest.cc b/chrome/browser/apps/app_service/intent_util_unittest.cc index c2b4837..14e0679f 100644 --- a/chrome/browser/apps/app_service/intent_util_unittest.cc +++ b/chrome/browser/apps/app_service/intent_util_unittest.cc
@@ -12,9 +12,6 @@ #include "ash/components/arc/mojom/intent_helper.mojom.h" #include "base/check.h" #include "base/containers/flat_map.h" -#include "base/files/file_path.h" -#include "base/files/file_util.h" -#include "base/files/scoped_temp_dir.h" #include "base/values.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/apps/app_service/intent_util.h" @@ -328,43 +325,6 @@ apps_util::CreateCreateNoteIntent(), filters[1])); } -TEST_F(IntentUtilsTest, CreateShareIntentFromFiles_GetFileUrls) { - base::ScopedTempDir scoped_temp_dir; - ASSERT_TRUE(scoped_temp_dir.CreateUniqueTempDir()); - constexpr char kTestData[] = "testing1234"; - constexpr char kTestText[] = "text1234"; - constexpr char kShareTitle[] = "title1234"; - std::vector<base::FilePath> file_paths; - std::vector<std::string> mime_types; - - base::FilePath test_file_path = - scoped_temp_dir.GetPath().AppendASCII("test.txt"); - ASSERT_EQ(static_cast<int>(base::size(kTestData)), - base::WriteFile(test_file_path, kTestData, base::size(kTestData))); - file_paths.push_back(test_file_path); - mime_types.push_back(".txt"); - - apps::mojom::IntentPtr intent = apps_util::CreateShareIntentFromFiles( - absl::nullopt, file_paths, mime_types, kTestText, kShareTitle); - const std::string intent_str = - "#Intent;action=android.intent.action.SEND;launchFlags=0x10200000;" - "component=com.android.vending/;type=*/*;" - "S.android.intent.extra.TEXT=text1234;" - "S.android.intent.extra.SUBJECT=title1234;end"; - EXPECT_EQ(intent_str, - apps_util::CreateLaunchIntent("com.android.vending", intent)); - - apps::mojom::IntentPtr intent_with_text_and_title = - apps_util::CreateShareIntentFromFiles(absl::nullopt, file_paths, - mime_types); - const std::string intent_with_text_and_title_str = - "#Intent;action=android.intent.action.SEND;launchFlags=0x10200000;" - "component=com.android.vending/;type=*/*;end"; - EXPECT_EQ(intent_with_text_and_title_str, - apps_util::CreateLaunchIntent("com.android.vending", - intent_with_text_and_title)); -} - TEST_F(IntentUtilsTest, CreateChromeAppIntentFilters_FileHandlers) { // Foo app provides file handler for text/plain and all file types. extensions::ExtensionBuilder foo_app;
diff --git a/chrome/browser/apps/app_service/metrics/app_platform_input_metrics.cc b/chrome/browser/apps/app_service/metrics/app_platform_input_metrics.cc index 165b348..16ad0d3 100644 --- a/chrome/browser/apps/app_service/metrics/app_platform_input_metrics.cc +++ b/chrome/browser/apps/app_service/metrics/app_platform_input_metrics.cc
@@ -41,22 +41,6 @@ } } -// Returns the app id for the active tab in the browser window `window`. If -// there is no app for the active tab, returns the Chrome browser app id. -std::string GetActiveAppIdForBrowserWindow(aura::Window* window) { - auto* browser = chrome::FindBrowserWithWindow(window); - if (!browser || !browser->tab_strip_model()) { - return extension_misc::kChromeAppId; - } - - auto* web_contents = browser->tab_strip_model()->GetActiveWebContents(); - if (!web_contents) { - return extension_misc::kChromeAppId; - } - auto app_id = GetAppIdForWebContents(web_contents); - return app_id.empty() ? extension_misc::kChromeAppId : app_id; -} - } // namespace AppPlatformInputMetrics::AppPlatformInputMetrics( @@ -116,30 +100,29 @@ return; } - if (update.State() & InstanceState::kDestroyed) { - window_to_app_info_.erase(update.Window()); - return; - } - aura::Window* window = update.Window(); - auto app_id = update.AppId(); - AppTypeName app_type_name = GetAppTypeNameForWindow( - profile_, GetAppType(profile_, app_id), app_id, window); - if (app_type_name == AppTypeName::kUnknown) { + if (update.State() & InstanceState::kDestroyed) { + window_to_app_info_.erase(window); + browser_to_tab_list_.RemoveActivatedTab(update.InstanceId()); return; } - if (IsAppOpenedInTab(app_type_name, app_id)) { - window = window->GetToplevelWindow(); - app_id = extension_misc::kChromeAppId; + auto app_id = update.AppId(); + auto app_type = GetAppType(profile_, app_id); + + // For apps, not opened with browser windows, the app id and app type should + // not change. So if we have the app info for the window, we don't need to + // update it. + if (base::Contains(window_to_app_info_, window) && + !IsAppOpenedWithBrowserWindow(profile_, app_type, app_id)) { + return; } - if (app_id == extension_misc::kChromeAppId) { - app_id = GetActiveAppIdForBrowserWindow(window); + if (update.State() & apps::InstanceState::kActive) { + SetAppInfoForActivatedWindow(app_type, app_id, window, update.InstanceId()); + } else { + SetAppInfoForInactivatedWindow(update.InstanceId()); } - - window_to_app_info_[window].app_id = app_id; - window_to_app_info_[window].app_type_name = app_type_name; } void AppPlatformInputMetrics::OnInstanceRegistryWillBeDestroyed( @@ -170,6 +153,68 @@ app_id_to_source_id_.erase(it); } +void AppPlatformInputMetrics::SetAppInfoForActivatedWindow( + mojom::AppType app_type, + const std::string& app_id, + aura::Window* window, + const base::UnguessableToken& instance_id) { + // For the browser window, if a tab of the browser is activated, we don't + // need to update, because we can reuse the active tab's app id. + if (app_id == extension_misc::kChromeAppId && + browser_to_tab_list_.HasActivatedTab(window)) { + return; + } + + AppTypeName app_type_name = + GetAppTypeNameForWindow(profile_, app_type, app_id, window); + if (app_type_name == AppTypeName::kUnknown) { + return; + } + + // For apps opened in browser windows, get the top level window, and modify + // `browser_to_tab_list_` to save the activated tab app id. + if (IsAppOpenedWithBrowserWindow(profile_, app_type, app_id)) { + window = window->GetToplevelWindow(); + if (IsAppOpenedInTab(app_type_name, app_id)) { + // When the tab is pulled to a separate browser window, the instance id is + // not changed, but the parent browser window is changed. So remove the + // tab window instance from previous browser window, and add it to the new + // browser window. + browser_to_tab_list_.RemoveActivatedTab(instance_id); + browser_to_tab_list_.AddActivatedTab(window, instance_id, app_id); + } + } + + window_to_app_info_[window].app_id = app_id; + window_to_app_info_[window].app_type_name = app_type_name; +} + +void AppPlatformInputMetrics::SetAppInfoForInactivatedWindow( + const base::UnguessableToken& instance_id) { + // When the window is inactived, only modify the app info for browser windows, + // because the activated tab changing might affect the app id for browser + // windows. + // + // For apps, not opened with browser windows, the app id and app type should + // not be changed for non-browser windows, and they can be modified when the + // window is activated. + auto* browser_window = browser_to_tab_list_.GetBrowserWindow(instance_id); + if (!browser_window) { + return; + } + + browser_to_tab_list_.RemoveActivatedTab(instance_id); + + auto app_id = browser_to_tab_list_.GetActivatedTabAppId(browser_window); + if (app_id.empty()) { + app_id = extension_misc::kChromeAppId; + } + + window_to_app_info_[browser_window].app_id = app_id; + window_to_app_info_[browser_window].app_type_name = + apps::AppTypeName::kChromeBrowser; +} + void AppPlatformInputMetrics::RecordEventCount(InputEventSource event_source, ui::EventTarget* event_target) { views::Widget* target = views::Widget::GetTopLevelWidgetForNativeView(
diff --git a/chrome/browser/apps/app_service/metrics/app_platform_input_metrics.h b/chrome/browser/apps/app_service/metrics/app_platform_input_metrics.h index c17b3d0..b8b5b4c 100644 --- a/chrome/browser/apps/app_service/metrics/app_platform_input_metrics.h +++ b/chrome/browser/apps/app_service/metrics/app_platform_input_metrics.h
@@ -9,6 +9,7 @@ #include "base/containers/flat_map.h" #include "chrome/browser/apps/app_service/metrics/app_platform_metrics_utils.h" +#include "chrome/browser/apps/app_service/metrics/browser_to_tab_list.h" #include "chrome/browser/profiles/profile.h" #include "components/services/app_service/public/cpp/app_registry_cache.h" #include "components/services/app_service/public/cpp/instance_registry.h" @@ -74,6 +75,14 @@ void OnAppRegistryCacheWillBeDestroyed(AppRegistryCache* cache) override; void OnAppUpdate(const AppUpdate& update) override; + void SetAppInfoForActivatedWindow(mojom::AppType app_type, + const std::string& app_id, + aura::Window* window, + const base::UnguessableToken& instance_id); + + void SetAppInfoForInactivatedWindow( + const base::UnguessableToken& instance_id); + void RecordEventCount(InputEventSource event_source, ui::EventTarget* event_target); @@ -84,6 +93,8 @@ Profile* profile_; + BrowserToTabList browser_to_tab_list_; + // The map from the window to the app info. base::flat_map<aura::Window*, AppInfo> window_to_app_info_;
diff --git a/chrome/browser/apps/app_service/metrics/app_platform_metrics.cc b/chrome/browser/apps/app_service/metrics/app_platform_metrics.cc index 5c2539e..1dbce63 100644 --- a/chrome/browser/apps/app_service/metrics/app_platform_metrics.cc +++ b/chrome/browser/apps/app_service/metrics/app_platform_metrics.cc
@@ -703,9 +703,13 @@ // For web apps open in tabs, set the top browser window as inactive to stop // calculating the browser window running time. if (IsAppOpenedInTab(app_type_name, app_id)) { + // When the tab is pulled to a separate browser window, the instance id is + // not changed, but the parent browser window is changed. So remove the + // tab window instance from previous browser window, and add it to the new + // browser window. browser_to_tab_list_.RemoveActivatedTab(update.InstanceId()); browser_to_tab_list_.AddActivatedTab(update.Window()->GetToplevelWindow(), - update.InstanceId()); + update.InstanceId(), update.AppId()); InstanceState state; base::UnguessableToken browser_id; GetBrowserIdAndState(update, browser_id, state);
diff --git a/chrome/browser/apps/app_service/metrics/app_platform_metrics_service_unittest.cc b/chrome/browser/apps/app_service/metrics/app_platform_metrics_service_unittest.cc index 78c2c77..b5104d3 100644 --- a/chrome/browser/apps/app_service/metrics/app_platform_metrics_service_unittest.cc +++ b/chrome/browser/apps/app_service/metrics/app_platform_metrics_service_unittest.cc
@@ -1638,6 +1638,16 @@ } } + std::unique_ptr<Browser> CreateBrowser() { + Browser::CreateParams params(profile(), true); + params.type = Browser::TYPE_NORMAL; + browser_window_ = std::make_unique<TestBrowserWindow>(); + params.window = browser_window_.get(); + browser_window_->SetNativeWindow(window()); + params.window = browser_window_.get(); + return std::unique_ptr<Browser>(Browser::Create(params)); + } + void VerifyUkm(const std::string& app_info, AppTypeName app_type_name, int event_count, @@ -1655,17 +1665,36 @@ (int)event_source); } + void VerifyUkm(int count, + const std::string& app_info, + AppTypeName app_type_name, + int event_count, + InputEventSource event_source) { + const auto entries = + test_ukm_recorder()->GetEntriesByName("ChromeOSApp.InputEvent"); + ASSERT_EQ(count, (int)entries.size()); + const auto* entry = entries[count - 1]; + test_ukm_recorder()->ExpectEntrySourceHasUrl(entry, GURL(app_info)); + test_ukm_recorder()->ExpectEntryMetric(entry, "AppType", + (int)app_type_name); + test_ukm_recorder()->ExpectEntryMetric(entry, "AppInputEventCount", + event_count); + test_ukm_recorder()->ExpectEntryMetric(entry, "AppInputEventSource", + (int)event_source); + } + private: std::unique_ptr<ash::AshTestHelper> ash_test_helper_; // Where down events are dispatched to. std::unique_ptr<views::Widget> widget_; + + std::unique_ptr<TestBrowserWindow> browser_window_; }; -// Verify the input event is recorded when the window is inactivated, and no -// more input event is recorded when the window is destroyed. -TEST_F(AppPlatformInputMetricsTest, WindowStateChanged) { - ModifyInstance(/*app_id=*/"a", window(), kInactiveInstanceState); +// Verify no more input event is recorded when the window is destroyed. +TEST_F(AppPlatformInputMetricsTest, WindowIsDestroyed) { + ModifyInstance(/*app_id=*/"a", window(), kActive); CreateInputEvent(InputEventSource::kMouse); app_platform_input_metrics()->OnFiveMinutes(); VerifyUkm("app://com.google.A", AppTypeName::kArc, /*event_count=*/1, @@ -1773,4 +1802,68 @@ EXPECT_EQ(1, stylus_event_count); } +TEST_F(AppPlatformInputMetricsTest, BrowserWindow) { + InstallOneApp(extension_misc::kChromeAppId, apps::mojom::AppType::kChromeApp, + "Chrome", apps::mojom::Readiness::kReady, + apps::mojom::InstallSource::kSystem); + auto browser = CreateBrowser(); + + // Set the browser window as activated. + ModifyInstance(extension_misc::kChromeAppId, window(), kActiveInstanceState); + CreateInputEvent(InputEventSource::kMouse); + app_platform_input_metrics()->OnFiveMinutes(); + VerifyUkm(std::string("app://") + extension_misc::kChromeAppId, + AppTypeName::kChromeBrowser, /*event_count=*/1, + InputEventSource::kMouse); + + // Create a web app tab1. + const std::string web_app_id1 = "w"; + const GURL url1 = GURL("https://foo.com"); + auto web_app_window1 = + CreateWebAppWindow(browser->window()->GetNativeWindow()); + + // Set the web app tab1 as activated. + ModifyInstance(web_app_id1, web_app_window1.get(), kActiveInstanceState); + CreateInputEvent(InputEventSource::kMouse); + app_platform_input_metrics()->OnFiveMinutes(); + // Verify 2 input metrics events are recorded. + VerifyUkm(2, url1.spec(), AppTypeName::kChromeBrowser, + /*event_count=*/1, InputEventSource::kMouse); + + // Create a web app tab2. + const std::string web_app_id2 = "w2"; + const GURL url2 = GURL("https://foo2.com"); + auto web_app_window2 = + CreateWebAppWindow(browser->window()->GetNativeWindow()); + + // Set the web app tab2 as activated. + ModifyInstance(web_app_id2, web_app_window2.get(), kActiveInstanceState); + ModifyInstance(web_app_id1, web_app_window1.get(), kInactiveInstanceState); + CreateInputEvent(InputEventSource::kStylus); + CreateInputEvent(InputEventSource::kStylus); + app_platform_input_metrics()->OnFiveMinutes(); + // Verify 3 input metrics events are recorded. + VerifyUkm(3, url2.spec(), AppTypeName::kChromeBrowser, + /*event_count=*/2, InputEventSource::kStylus); + + // Set the web app tab2 as destroyed, and web app tab1 as activated. + ModifyInstance(web_app_id2, web_app_window2.get(), + apps::InstanceState::kDestroyed); + ModifyInstance(web_app_id1, web_app_window1.get(), kActiveInstanceState); + CreateInputEvent(InputEventSource::kKeyboard); + app_platform_input_metrics()->OnFiveMinutes(); + // Verify 4 input metrics events are recorded. + VerifyUkm(4, url1.spec(), AppTypeName::kChromeBrowser, + /*event_count=*/1, InputEventSource::kKeyboard); + + // Set the web app tab1 as inactivated. + ModifyInstance(web_app_id1, web_app_window1.get(), kInactiveInstanceState); + CreateInputEvent(InputEventSource::kStylus); + app_platform_input_metrics()->OnFiveMinutes(); + // Verify 5 input metrics events are recorded. + VerifyUkm(5, std::string("app://") + extension_misc::kChromeAppId, + AppTypeName::kChromeBrowser, + /*event_count=*/1, InputEventSource::kStylus); +} + } // namespace apps
diff --git a/chrome/browser/apps/app_service/metrics/app_platform_metrics_utils.cc b/chrome/browser/apps/app_service/metrics/app_platform_metrics_utils.cc index 8fd84d9..67c0038 100644 --- a/chrome/browser/apps/app_service/metrics/app_platform_metrics_utils.cc +++ b/chrome/browser/apps/app_service/metrics/app_platform_metrics_utils.cc
@@ -142,6 +142,29 @@ app_id != extension_misc::kChromeAppId; } +bool IsAppOpenedWithBrowserWindow(Profile* profile, + apps::mojom::AppType app_type, + const std::string& app_id) { + if (app_type == mojom::AppType::kWeb || + app_type == mojom::AppType::kSystemWeb || + app_type == mojom::AppType::kExtension) { + return true; + } + + if (app_type != mojom::AppType::kChromeApp) { + return false; + } + + DCHECK(profile); + extensions::ExtensionRegistry* registry = + extensions::ExtensionRegistry::Get(profile); + DCHECK(registry); + const extensions::Extension* extension = + registry->GetInstalledExtension(app_id); + + return extension && !extension->is_platform_app(); +} + AppTypeName GetAppTypeNameForWebAppWindow(Profile* profile, const std::string& app_id, aura::Window* window) {
diff --git a/chrome/browser/apps/app_service/metrics/app_platform_metrics_utils.h b/chrome/browser/apps/app_service/metrics/app_platform_metrics_utils.h index bc9cc0bbf..9d6a771 100644 --- a/chrome/browser/apps/app_service/metrics/app_platform_metrics_utils.h +++ b/chrome/browser/apps/app_service/metrics/app_platform_metrics_utils.h
@@ -85,13 +85,19 @@ apps::mojom::LaunchContainer container); // Returns false if |window| is a Chrome app window or a standalone web app -// window. Otherwise, return true; +// window. Otherwise, return true. bool IsBrowser(aura::Window* window); // Returns true if the app with |app_id| is opened as a tab in a browser window. -// Otherwise, return false; +// Otherwise, return false. bool IsAppOpenedInTab(AppTypeName app_type_name, const std::string& app_id); +// Returns true if the app with |app_type| is opened with a browser window. +// Otherwise, return false. +bool IsAppOpenedWithBrowserWindow(Profile* profile, + apps::mojom::AppType app_type, + const std::string& app_id); + // Determines what app type a web app should be logged as based on |window|. In // particular, web apps in tabs are logged as part of Chrome browser. AppTypeName GetAppTypeNameForWebAppWindow(Profile* profile,
diff --git a/chrome/browser/apps/app_service/metrics/browser_to_tab_list.cc b/chrome/browser/apps/app_service/metrics/browser_to_tab_list.cc index 3522bdf..3640626 100644 --- a/chrome/browser/apps/app_service/metrics/browser_to_tab_list.cc +++ b/chrome/browser/apps/app_service/metrics/browser_to_tab_list.cc
@@ -13,9 +13,10 @@ BrowserToTabList::~BrowserToTabList() = default; BrowserToTabList::BrowserToTab::BrowserToTab( - const aura::Window* browser_window, - const base::UnguessableToken& tab_id) - : browser_window(browser_window), tab_id(tab_id) {} + aura::Window* browser_window, + const base::UnguessableToken& tab_id, + const std::string& app_id) + : browser_window(browser_window), tab_id(tab_id), app_id(app_id) {} bool BrowserToTabList::HasActivatedTab(const aura::Window* browser_window) { for (const auto& it : active_browsers_to_tabs_) { @@ -26,7 +27,17 @@ return false; } -const aura::Window* BrowserToTabList::GetBrowserWindow( +std::string BrowserToTabList::GetActivatedTabAppId( + const aura::Window* browser_window) { + for (const auto& it : active_browsers_to_tabs_) { + if (it.browser_window == browser_window) { + return it.app_id; + } + } + return std::string(); +} + +aura::Window* BrowserToTabList::GetBrowserWindow( const base::UnguessableToken& tab_id) const { for (const auto& it : active_browsers_to_tabs_) { if (it.tab_id == tab_id) { @@ -36,8 +47,9 @@ return nullptr; } -void BrowserToTabList::AddActivatedTab(const aura::Window* browser_window, - const base::UnguessableToken& tab_id) { +void BrowserToTabList::AddActivatedTab(aura::Window* browser_window, + const base::UnguessableToken& tab_id, + const std::string& app_id) { bool found = false; for (const auto& it : active_browsers_to_tabs_) { if (it.browser_window == browser_window && it.tab_id == tab_id) { @@ -47,7 +59,8 @@ } if (!found) { - active_browsers_to_tabs_.push_back(BrowserToTab(browser_window, tab_id)); + active_browsers_to_tabs_.push_back( + BrowserToTab(browser_window, tab_id, app_id)); } }
diff --git a/chrome/browser/apps/app_service/metrics/browser_to_tab_list.h b/chrome/browser/apps/app_service/metrics/browser_to_tab_list.h index 3b16f3c..5e973dc 100644 --- a/chrome/browser/apps/app_service/metrics/browser_to_tab_list.h +++ b/chrome/browser/apps/app_service/metrics/browser_to_tab_list.h
@@ -29,23 +29,29 @@ // Otherwise, returns false. bool HasActivatedTab(const aura::Window* browser_window); - // Returns the browser window for `tab_id`. - const aura::Window* GetBrowserWindow( - const base::UnguessableToken& tab_id) const; + // Returns the active tab's app id if the browser with `browser_window` has + // activated tab for an app. Otherwise, returns an empty string. + std::string GetActivatedTabAppId(const aura::Window* browser_window); - // Adds `browser_window` and `tab_id` to`active_browser_to_tabs_`. - void AddActivatedTab(const aura::Window* browser_window, - const base::UnguessableToken& tab_id); + // Returns the browser window for `tab_id`. + aura::Window* GetBrowserWindow(const base::UnguessableToken& tab_id) const; + + // Adds `browser_window`, `tab_id`, `tab_add_id` to`active_browser_to_tabs_`. + void AddActivatedTab(aura::Window* browser_window, + const base::UnguessableToken& tab_id, + const std::string& app_id); // Removes `tab_id` from `active_browser_to_tabs_`. void RemoveActivatedTab(const base::UnguessableToken& tab_id); private: struct BrowserToTab { - BrowserToTab(const aura::Window* browser_window, - const base::UnguessableToken& tab_id); - const aura::Window* browser_window; + BrowserToTab(aura::Window* browser_window, + const base::UnguessableToken& tab_id, + const std::string& app_id); + aura::Window* browser_window; base::UnguessableToken tab_id; + std::string app_id; }; // Stores the list of browser-tab instance id pairs.
diff --git a/chrome/browser/apps/app_service/publishers/extension_apps_chromeos.cc b/chrome/browser/apps/app_service/publishers/extension_apps_chromeos.cc index f42d68d..b8c6889 100644 --- a/chrome/browser/apps/app_service/publishers/extension_apps_chromeos.cc +++ b/chrome/browser/apps/app_service/publishers/extension_apps_chromeos.cc
@@ -32,7 +32,6 @@ #include "chrome/browser/apps/app_service/metrics/app_service_metrics.h" #include "chrome/browser/apps/app_service/publishers/extension_apps_util.h" #include "chrome/browser/ash/arc/arc_util.h" -#include "chrome/browser/ash/arc/arc_web_contents_data.h" #include "chrome/browser/ash/child_accounts/time_limits/app_time_limit_interface.h" #include "chrome/browser/ash/crosapi/browser_util.h" #include "chrome/browser/ash/crostini/crostini_util.h" @@ -40,6 +39,7 @@ #include "chrome/browser/ash/file_manager/file_browser_handlers.h" #include "chrome/browser/ash/file_manager/fileapi_util.h" #include "chrome/browser/browser_process.h" +#include "chrome/browser/chromeos/arc/arc_web_contents_data.h" #include "chrome/browser/chromeos/extensions/gfx_utils.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_uninstall_dialog.h"
diff --git a/chrome/browser/ash/arc/arc_util.cc b/chrome/browser/ash/arc/arc_util.cc index 03d87f82..86d300c 100644 --- a/chrome/browser/ash/arc/arc_util.cc +++ b/chrome/browser/ash/arc/arc_util.cc
@@ -27,7 +27,6 @@ #include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h" -#include "chrome/browser/ash/arc/arc_web_contents_data.h" #include "chrome/browser/ash/arc/policy/arc_policy_util.h" #include "chrome/browser/ash/arc/session/arc_session_manager.h" #include "chrome/browser/ash/file_manager/path_util.h" @@ -41,6 +40,7 @@ #include "chrome/browser/ash/profiles/profile_helper.h" #include "chrome/browser/ash/settings/cros_settings.h" #include "chrome/browser/browser_process.h" +#include "chrome/browser/chromeos/arc/arc_web_contents_data.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/profiles/profiles_state.h"
diff --git a/chrome/browser/ash/arc/intent_helper/arc_external_protocol_dialog.cc b/chrome/browser/ash/arc/intent_helper/arc_external_protocol_dialog.cc index 2bac76c8..5e662b8 100644 --- a/chrome/browser/ash/arc/intent_helper/arc_external_protocol_dialog.cc +++ b/chrome/browser/ash/arc/intent_helper/arc_external_protocol_dialog.cc
@@ -14,8 +14,8 @@ #include "chrome/app/vector_icons/vector_icons.h" #include "chrome/browser/apps/intent_helper/metrics/intent_handling_metrics.h" #include "chrome/browser/apps/intent_helper/page_transition_util.h" -#include "chrome/browser/ash/arc/arc_web_contents_data.h" #include "chrome/browser/ash/external_protocol_dialog.h" +#include "chrome/browser/chromeos/arc/arc_web_contents_data.h" #include "chrome/browser/sharing/click_to_call/click_to_call_metrics.h" #include "chrome/browser/sharing/click_to_call/click_to_call_ui_controller.h" #include "chrome/browser/sharing/click_to_call/click_to_call_utils.h"
diff --git a/chrome/browser/ash/arc/intent_helper/arc_external_protocol_dialog_unittest.cc b/chrome/browser/ash/arc/intent_helper/arc_external_protocol_dialog_unittest.cc index 8d705f3..26a2a2d 100644 --- a/chrome/browser/ash/arc/intent_helper/arc_external_protocol_dialog_unittest.cc +++ b/chrome/browser/ash/arc/intent_helper/arc_external_protocol_dialog_unittest.cc
@@ -9,7 +9,7 @@ #include "ash/components/arc/session/arc_service_manager.h" #include "ash/components/arc/test/connection_holder_util.h" #include "base/time/time.h" -#include "chrome/browser/ash/arc/arc_web_contents_data.h" +#include "chrome/browser/chromeos/arc/arc_web_contents_data.h" #include "chrome/browser/sharing/click_to_call/click_to_call_ui_controller.h" #include "chrome/browser/sharing/fake_device_info.h" #include "chrome/browser/sharing/mock_sharing_service.h"
diff --git a/chrome/browser/ash/arc/nearby_share/nearby_share_session_impl.cc b/chrome/browser/ash/arc/nearby_share/nearby_share_session_impl.cc index e6b7c5e..642a6e1 100644 --- a/chrome/browser/ash/arc/nearby_share/nearby_share_session_impl.cc +++ b/chrome/browser/ash/arc/nearby_share/nearby_share_session_impl.cc
@@ -237,7 +237,7 @@ return nullptr; } return apps_util::CreateShareIntentFromFiles( - absl::nullopt, share_file_paths, share_file_mime_types, std::string(), + profile_, share_file_paths, share_file_mime_types, std::string(), share_info_->title); } @@ -361,21 +361,8 @@ return; } - backend_task_runner_->PostTaskAndReplyWithResult( - FROM_HERE, - base::BindOnce(&NearbyShareSessionImpl::ConvertShareIntentInfoToIntent, - base::Unretained(this)), - base::BindOnce( - &NearbyShareSessionImpl::OnConvertedShareIntentInfoToIntent, - weak_ptr_factory_.GetWeakPtr())); -} + auto intent = ConvertShareIntentInfoToIntent(); -void NearbyShareSessionImpl::OnConvertedShareIntentInfoToIntent( - apps::mojom::IntentPtr intent) { - DCHECK_CURRENTLY_ON(content::BrowserThread::UI); - DCHECK(arc_window_); - - DVLOG(1) << __func__; if (!intent) { LOG(ERROR) << "No share info found."; ShowErrorDialog();
diff --git a/chrome/browser/ash/arc/nearby_share/nearby_share_session_impl.h b/chrome/browser/ash/arc/nearby_share/nearby_share_session_impl.h index 7728441..0ee0514 100644 --- a/chrome/browser/ash/arc/nearby_share/nearby_share_session_impl.h +++ b/chrome/browser/ash/arc/nearby_share/nearby_share_session_impl.h
@@ -75,9 +75,6 @@ // point we show the progress bar UI to the user. void OnFileStreamingStarted(); - // Called when Share Intent Info object is converted to Intent mojom object. - void OnConvertedShareIntentInfoToIntent(apps::mojom::IntentPtr intent); - // Calls |SharesheetService.ShowNearbyShareBubble()| to start the Chrome // Nearby Share user flow and display bubble in ARC window. void ShowNearbyShareBubbleInArcWindow(
diff --git a/chrome/browser/ash/crosapi/browser_util_unittest.cc b/chrome/browser/ash/crosapi/browser_util_unittest.cc index 2e671129..a981edd 100644 --- a/chrome/browser/ash/crosapi/browser_util_unittest.cc +++ b/chrome/browser/ash/crosapi/browser_util_unittest.cc
@@ -492,11 +492,11 @@ base::Version version{"1.1.1.1"}; browser_util::RecordDataVer(&pref_service_, user_id_hash, version); - base::DictionaryValue expected; - expected.SetString(user_id_hash, version.GetString()); - const base::DictionaryValue* dict = &base::Value::AsDictionaryValue( - *pref_service_.GetDictionary(browser_util::kDataVerPref)); - EXPECT_TRUE(dict->Equals(&expected)); + base::Value expected{base::Value::Type::DICTIONARY}; + expected.SetStringKey(user_id_hash, version.GetString()); + const base::Value* dict = + pref_service_.GetDictionary(browser_util::kDataVerPref); + EXPECT_EQ(*dict, expected); } TEST_F(BrowserUtilTest, RecordDataVerOverrides) { @@ -507,12 +507,12 @@ browser_util::RecordDataVer(&pref_service_, user_id_hash, version1); browser_util::RecordDataVer(&pref_service_, user_id_hash, version2); - base::DictionaryValue expected; - expected.SetString(user_id_hash, version2.GetString()); + base::Value expected{base::Value::Type::DICTIONARY}; + expected.SetStringKey(user_id_hash, version2.GetString()); - const base::DictionaryValue* dict = &base::Value::AsDictionaryValue( - *pref_service_.GetDictionary(browser_util::kDataVerPref)); - EXPECT_TRUE(dict->Equals(&expected)); + const base::Value* dict = + pref_service_.GetDictionary(browser_util::kDataVerPref); + EXPECT_EQ(*dict, expected); } TEST_F(BrowserUtilTest, RecordDataVerWithMultipleUsers) { @@ -529,13 +529,13 @@ base::Version version3{"3.3.3.3"}; browser_util::RecordDataVer(&pref_service_, user_id_hash_1, version3); - base::DictionaryValue expected; - expected.SetString(user_id_hash_1, version3.GetString()); - expected.SetString(user_id_hash_2, version2.GetString()); + base::Value expected{base::Value::Type::DICTIONARY}; + expected.SetStringKey(user_id_hash_1, version3.GetString()); + expected.SetStringKey(user_id_hash_2, version2.GetString()); - const base::DictionaryValue* dict = &base::Value::AsDictionaryValue( - *pref_service_.GetDictionary(browser_util::kDataVerPref)); - EXPECT_TRUE(dict->Equals(&expected)); + const base::Value* dict = + pref_service_.GetDictionary(browser_util::kDataVerPref); + EXPECT_EQ(*dict, expected); } TEST_F(BrowserUtilTest, IsDataWipeRequiredInvalid) {
diff --git a/chrome/browser/ash/crostini/crostini_manager.cc b/chrome/browser/ash/crostini/crostini_manager.cc index 9676e2c..8dae741e 100644 --- a/chrome/browser/ash/crostini/crostini_manager.cc +++ b/chrome/browser/ash/crostini/crostini_manager.cc
@@ -2842,7 +2842,7 @@ CrostiniUISurface::kAppList); // signal. // Then perform the same steps as for starting. - FALLTHROUGH; + [[fallthrough]]; case vm_tools::cicerone::StartLxdContainerResponse::STARTING: { VLOG(1) << "Awaiting LxdContainerStartingSignal for " << owner_id_ << ", " << container_id;
diff --git a/chrome/browser/ash/crostini/crostini_package_notification.cc b/chrome/browser/ash/crostini/crostini_package_notification.cc index d615979..aa7a12d 100644 --- a/chrome/browser/ash/crostini/crostini_package_notification.cc +++ b/chrome/browser/ash/crostini/crostini_package_notification.cc
@@ -228,7 +228,7 @@ // it becomes in infinite progress bar. Do that here because we have no // way to know how long this will take or how close we are to completion. progress_percent = -1; - FALLTHROUGH; + [[fallthrough]]; case PackageOperationStatus::RUNNING: never_timeout = true; notification_type = message_center::NOTIFICATION_TYPE_PROGRESS;
diff --git a/chrome/browser/ash/input_method/assistive_suggester.cc b/chrome/browser/ash/input_method/assistive_suggester.cc index 95a71a9..eac91f6b 100644 --- a/chrome/browser/ash/input_method/assistive_suggester.cc +++ b/chrome/browser/ash/input_method/assistive_suggester.cc
@@ -183,7 +183,7 @@ : profile_(profile), personal_info_suggester_(engine, profile), emoji_suggester_(engine, profile), - multi_word_suggester_(engine), + multi_word_suggester_(engine, profile), suggester_switch_(std::move(suggester_switch)) { RecordAssistiveUserPrefForPersonalInfo( profile_->GetPrefs()->GetBoolean(prefs::kAssistPersonalInfoEnabled));
diff --git a/chrome/browser/ash/input_method/fake_suggestion_handler.cc b/chrome/browser/ash/input_method/fake_suggestion_handler.cc index 20eb296..6082bcb 100644 --- a/chrome/browser/ash/input_method/fake_suggestion_handler.cc +++ b/chrome/browser/ash/input_method/fake_suggestion_handler.cc
@@ -28,6 +28,7 @@ context_id_ = context_id; suggestion_text_ = details.text; confirmed_length_ = details.confirmed_length; + last_suggestion_details_ = details; return true; }
diff --git a/chrome/browser/ash/input_method/fake_suggestion_handler.h b/chrome/browser/ash/input_method/fake_suggestion_handler.h index 4202c4f..b1faa2f 100644 --- a/chrome/browser/ash/input_method/fake_suggestion_handler.h +++ b/chrome/browser/ash/input_method/fake_suggestion_handler.h
@@ -56,6 +56,9 @@ bool GetDismissedSuggestion() { return dismissed_suggestion_; } std::vector<std::u16string> GetAnnouncements() { return announcements_; } bool GetHighlightedSuggestion() { return highlighted_suggestion_; } + ui::ime::SuggestionDetails GetLastSuggestionDetails() { + return last_suggestion_details_; + } private: int context_id_ = 0; @@ -66,6 +69,7 @@ bool dismissed_suggestion_ = false; bool highlighted_suggestion_ = false; std::vector<std::u16string> announcements_; + ui::ime::SuggestionDetails last_suggestion_details_; }; } // namespace input_method
diff --git a/chrome/browser/ash/input_method/input_method_engine.cc b/chrome/browser/ash/input_method/input_method_engine.cc index f8afc76..056d88f 100644 --- a/chrome/browser/ash/input_method/input_method_engine.cc +++ b/chrome/browser/ash/input_method/input_method_engine.cc
@@ -1116,23 +1116,19 @@ property->is_selection_item_checked = item.checked; } if (item.modified & MENU_ITEM_MODIFIED_STYLE) { - if (!item.children.empty()) { - // TODO(nona): Implement it. - } else { - switch (item.style) { - case InputMethodManager::MENU_ITEM_STYLE_NONE: + switch (item.style) { + case InputMethodManager::MENU_ITEM_STYLE_NONE: NOTREACHED(); break; - case InputMethodManager::MENU_ITEM_STYLE_CHECK: + case InputMethodManager::MENU_ITEM_STYLE_CHECK: // TODO(nona): Implement it. break; - case InputMethodManager::MENU_ITEM_STYLE_RADIO: + case InputMethodManager::MENU_ITEM_STYLE_RADIO: property->is_selection_item = true; break; - case InputMethodManager::MENU_ITEM_STYLE_SEPARATOR: + case InputMethodManager::MENU_ITEM_STYLE_SEPARATOR: // TODO(nona): Implement it. break; - } } }
diff --git a/chrome/browser/ash/input_method/multi_word_suggester.cc b/chrome/browser/ash/input_method/multi_word_suggester.cc index 3e1e407..a9ebf6f 100644 --- a/chrome/browser/ash/input_method/multi_word_suggester.cc +++ b/chrome/browser/ash/input_method/multi_word_suggester.cc
@@ -6,11 +6,14 @@ #include <cmath> +#include "ash/constants/ash_pref_names.h" #include "ash/services/ime/public/cpp/suggestions.h" #include "base/metrics/histogram_functions.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" +#include "base/time/time.h" #include "chrome/browser/ash/input_method/ui/suggestion_details.h" +#include "components/prefs/scoped_user_pref_update.h" #include "ui/events/keycodes/dom/dom_code.h" namespace ash { @@ -21,6 +24,7 @@ using ::chromeos::ime::TextSuggestionMode; using ::chromeos::ime::TextSuggestionType; +constexpr char kMultiWordFirstAcceptTimeDays[] = "multi_word_first_accept"; constexpr char16_t kSuggestionShownMessage[] = u"predictive writing candidate shown, press tab to accept"; constexpr char16_t kSuggestionAcceptedMessage[] = @@ -64,13 +68,42 @@ delta); } +std::optional<int> GetTimeFirstAcceptedSuggestion(Profile* profile) { + DictionaryPrefUpdate update(profile->GetPrefs(), + prefs::kAssistiveInputFeatureSettings); + auto value = update->FindIntKey(kMultiWordFirstAcceptTimeDays); + if (value.has_value()) + return value.value(); + return std::nullopt; +} + +void SetTimeFirstAcceptedSuggestion(Profile* profile) { + DictionaryPrefUpdate update(profile->GetPrefs(), + prefs::kAssistiveInputFeatureSettings); + auto time_since_epoch = base::Time::Now() - base::Time::UnixEpoch(); + update->SetIntKey(kMultiWordFirstAcceptTimeDays, + time_since_epoch.InDaysFloored()); +} + +bool ShouldShowTabGuide(Profile* profile) { + auto time_first_accepted = GetTimeFirstAcceptedSuggestion(profile); + if (!time_first_accepted) + return true; + + base::TimeDelta first_accepted = base::Days(*time_first_accepted); + base::TimeDelta time_since_epoch = + base::Time::Now() - base::Time::UnixEpoch(); + return (time_since_epoch - first_accepted) <= base::Days(7); +} + // TODO(crbug/1146266): Add DismissedAccuracy metric back in. } // namespace MultiWordSuggester::MultiWordSuggester( - SuggestionHandlerInterface* suggestion_handler) - : suggestion_handler_(suggestion_handler), state_(this) { + SuggestionHandlerInterface* suggestion_handler, + Profile* profile) + : suggestion_handler_(suggestion_handler), state_(this), profile_(profile) { suggestion_button_.id = ui::ime::ButtonId::kSuggestion; suggestion_button_.window_type = ui::ime::AssistiveWindowType::kMultiWordSuggestion; @@ -171,6 +204,9 @@ RecordTimeToAccept(base::TimeTicks::Now() - suggestion->time_first_shown); } + if (!GetTimeFirstAcceptedSuggestion(profile_)) + SetTimeFirstAcceptedSuggestion(profile_); + state_.UpdateState(SuggestionState::State::kSuggestionAccepted); state_.ResetSuggestion(); return true; @@ -216,7 +252,7 @@ ui::ime::SuggestionDetails details; details.text = suggestion.text; details.show_accept_annotation = false; - details.show_quick_accept_annotation = true; + details.show_quick_accept_annotation = ShouldShowTabGuide(profile_); details.confirmed_length = suggestion.confirmed_length; details.show_setting_link = false;
diff --git a/chrome/browser/ash/input_method/multi_word_suggester.h b/chrome/browser/ash/input_method/multi_word_suggester.h index 123c42ea6..6701b0f 100644 --- a/chrome/browser/ash/input_method/multi_word_suggester.h +++ b/chrome/browser/ash/input_method/multi_word_suggester.h
@@ -20,9 +20,10 @@ // suggestions generated by the system. class MultiWordSuggester : public Suggester { public: - // `suggestion_handler` needs to exist longer than the lifetime of this - // object. - explicit MultiWordSuggester(SuggestionHandlerInterface* suggestion_handler); + // `suggestion_handler` and `profile` need to exist longer than the lifetime + // of this object. + MultiWordSuggester(SuggestionHandlerInterface* suggestion_handler, + Profile* profile); ~MultiWordSuggester() override; // Suggester overrides: @@ -153,6 +154,9 @@ SuggestionState state_; ui::ime::AssistiveWindowButton suggestion_button_; + + // The current user's Chrome user profile. + Profile* const profile_; }; } // namespace input_method
diff --git a/chrome/browser/ash/input_method/multi_word_suggester_unittest.cc b/chrome/browser/ash/input_method/multi_word_suggester_unittest.cc index 23796d5..d7278ae 100644 --- a/chrome/browser/ash/input_method/multi_word_suggester_unittest.cc +++ b/chrome/browser/ash/input_method/multi_word_suggester_unittest.cc
@@ -4,11 +4,17 @@ #include "chrome/browser/ash/input_method/multi_word_suggester.h" +#include <memory> #include <vector> +#include "ash/constants/ash_pref_names.h" #include "ash/services/ime/public/cpp/suggestions.h" #include "base/test/metrics/histogram_tester.h" +#include "base/time/time.h" #include "chrome/browser/ash/input_method/fake_suggestion_handler.h" +#include "chrome/test/base/testing_profile.h" +#include "components/prefs/scoped_user_pref_update.h" +#include "content/public/test/browser_task_environment.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/events/base_event_utils.h" #include "ui/events/keycodes/dom/dom_code.h" @@ -29,666 +35,682 @@ ui::EventTimeForNow())); } +void SetFirstAcceptTimeTo(Profile* profile, int days_ago) { + DictionaryPrefUpdate update(profile->GetPrefs(), + prefs::kAssistiveInputFeatureSettings); + base::TimeDelta since_epoch = base::Time::Now() - base::Time::UnixEpoch(); + update->SetIntKey("multi_word_first_accept", + since_epoch.InDaysFloored() - days_ago); +} + +std::optional<int> GetFirstAcceptTime(Profile* profile) { + DictionaryPrefUpdate update(profile->GetPrefs(), + prefs::kAssistiveInputFeatureSettings); + auto value = update->FindIntKey("multi_word_first_accept"); + if (value.has_value()) + return value.value(); + return std::nullopt; +} + } // namespace -TEST(MultiWordSuggesterTest, IgnoresIrrelevantExternalSuggestions) { - FakeSuggestionHandler suggestion_handler; - MultiWordSuggester suggester(&suggestion_handler); +class MultiWordSuggesterTest : public testing::Test { + public: + void SetUp() override { + profile_ = std::make_unique<TestingProfile>(); + suggester_ = std::make_unique<MultiWordSuggester>(&suggestion_handler_, + profile_.get()); + } + protected: + content::BrowserTaskEnvironment task_environment_; + + FakeSuggestionHandler suggestion_handler_; + std::unique_ptr<TestingProfile> profile_; + std::unique_ptr<MultiWordSuggester> suggester_; +}; + +TEST_F(MultiWordSuggesterTest, IgnoresIrrelevantExternalSuggestions) { std::vector<TextSuggestion> suggestions = { TextSuggestion{.mode = TextSuggestionMode::kPrediction, .type = TextSuggestionType::kAssistivePersonalInfo, .text = "my name is John Wayne"}}; - suggester.OnFocus(kFocusedContextId); - suggester.OnSurroundingTextChanged(u"", 0, 0); - suggester.OnExternalSuggestionsUpdated(suggestions); + suggester_->OnFocus(kFocusedContextId); + suggester_->OnSurroundingTextChanged(u"", 0, 0); + suggester_->OnExternalSuggestionsUpdated(suggestions); - EXPECT_FALSE(suggestion_handler.GetShowingSuggestion()); - EXPECT_NE(suggestion_handler.GetContextId(), kFocusedContextId); - EXPECT_EQ(suggestion_handler.GetSuggestionText(), u""); + EXPECT_FALSE(suggestion_handler_.GetShowingSuggestion()); + EXPECT_NE(suggestion_handler_.GetContextId(), kFocusedContextId); + EXPECT_EQ(suggestion_handler_.GetSuggestionText(), u""); } -TEST(MultiWordSuggesterTest, IgnoresEmpyExternalSuggestions) { - FakeSuggestionHandler suggestion_handler; - MultiWordSuggester suggester(&suggestion_handler); +TEST_F(MultiWordSuggesterTest, IgnoresEmpyExternalSuggestions) { + suggester_->OnFocus(kFocusedContextId); + suggester_->OnSurroundingTextChanged(u"", 0, 0); + suggester_->OnExternalSuggestionsUpdated({}); - suggester.OnFocus(kFocusedContextId); - suggester.OnSurroundingTextChanged(u"", 0, 0); - suggester.OnExternalSuggestionsUpdated({}); - - EXPECT_FALSE(suggestion_handler.GetShowingSuggestion()); - EXPECT_NE(suggestion_handler.GetContextId(), kFocusedContextId); - EXPECT_EQ(suggestion_handler.GetSuggestionText(), u""); + EXPECT_FALSE(suggestion_handler_.GetShowingSuggestion()); + EXPECT_NE(suggestion_handler_.GetContextId(), kFocusedContextId); + EXPECT_EQ(suggestion_handler_.GetSuggestionText(), u""); } -TEST(MultiWordSuggesterTest, DisplaysRelevantExternalSuggestions) { - FakeSuggestionHandler suggestion_handler; - MultiWordSuggester suggester(&suggestion_handler); - +TEST_F(MultiWordSuggesterTest, DisplaysRelevantExternalSuggestions) { std::vector<TextSuggestion> suggestions = { TextSuggestion{.mode = TextSuggestionMode::kPrediction, .type = TextSuggestionType::kMultiWord, .text = "hello there!"}}; - suggester.OnFocus(kFocusedContextId); - suggester.OnSurroundingTextChanged(u"", 0, 0); - suggester.OnExternalSuggestionsUpdated(suggestions); + suggester_->OnFocus(kFocusedContextId); + suggester_->OnSurroundingTextChanged(u"", 0, 0); + suggester_->OnExternalSuggestionsUpdated(suggestions); - EXPECT_TRUE(suggestion_handler.GetShowingSuggestion()); - EXPECT_EQ(suggestion_handler.GetContextId(), kFocusedContextId); - EXPECT_EQ(suggestion_handler.GetSuggestionText(), u"hello there!"); + EXPECT_TRUE(suggestion_handler_.GetShowingSuggestion()); + EXPECT_EQ(suggestion_handler_.GetContextId(), kFocusedContextId); + EXPECT_EQ(suggestion_handler_.GetSuggestionText(), u"hello there!"); } -TEST(MultiWordSuggesterTest, AcceptsSuggestionOnTabPress) { - FakeSuggestionHandler suggestion_handler; - MultiWordSuggester suggester(&suggestion_handler); - +TEST_F(MultiWordSuggesterTest, AcceptsSuggestionOnTabPress) { std::vector<TextSuggestion> suggestions = { TextSuggestion{.mode = TextSuggestionMode::kPrediction, .type = TextSuggestionType::kMultiWord, .text = "hi there!"}, }; - suggester.OnFocus(kFocusedContextId); - suggester.OnSurroundingTextChanged(u"", 0, 0); - suggester.OnExternalSuggestionsUpdated(suggestions); - SendKeyEvent(&suggester, ui::DomCode::TAB); + suggester_->OnFocus(kFocusedContextId); + suggester_->OnSurroundingTextChanged(u"", 0, 0); + suggester_->OnExternalSuggestionsUpdated(suggestions); + SendKeyEvent(suggester_.get(), ui::DomCode::TAB); - EXPECT_FALSE(suggestion_handler.GetShowingSuggestion()); - EXPECT_FALSE(suggestion_handler.GetDismissedSuggestion()); - EXPECT_TRUE(suggestion_handler.GetAcceptedSuggestion()); - EXPECT_EQ(suggestion_handler.GetSuggestionText(), u""); + EXPECT_FALSE(suggestion_handler_.GetShowingSuggestion()); + EXPECT_FALSE(suggestion_handler_.GetDismissedSuggestion()); + EXPECT_TRUE(suggestion_handler_.GetAcceptedSuggestion()); + EXPECT_EQ(suggestion_handler_.GetSuggestionText(), u""); } -TEST(MultiWordSuggesterTest, DoesNotAcceptSuggestionOnNonTabKeypress) { - FakeSuggestionHandler suggestion_handler; - MultiWordSuggester suggester(&suggestion_handler); - +TEST_F(MultiWordSuggesterTest, DoesNotAcceptSuggestionOnNonTabKeypress) { std::vector<TextSuggestion> suggestions = { TextSuggestion{.mode = TextSuggestionMode::kPrediction, .type = TextSuggestionType::kMultiWord, .text = "hi there!"}, }; - suggester.OnFocus(kFocusedContextId); - suggester.OnSurroundingTextChanged(u"", 0, 0); - suggester.OnExternalSuggestionsUpdated(suggestions); - SendKeyEvent(&suggester, ui::DomCode::ARROW_UP); + suggester_->OnFocus(kFocusedContextId); + suggester_->OnSurroundingTextChanged(u"", 0, 0); + suggester_->OnExternalSuggestionsUpdated(suggestions); + SendKeyEvent(suggester_.get(), ui::DomCode::ARROW_UP); - EXPECT_TRUE(suggestion_handler.GetShowingSuggestion()); - EXPECT_FALSE(suggestion_handler.GetAcceptedSuggestion()); - EXPECT_EQ(suggestion_handler.GetSuggestionText(), u"hi there!"); + EXPECT_TRUE(suggestion_handler_.GetShowingSuggestion()); + EXPECT_FALSE(suggestion_handler_.GetAcceptedSuggestion()); + EXPECT_EQ(suggestion_handler_.GetSuggestionText(), u"hi there!"); } -TEST(MultiWordSuggesterTest, DoesNotAcceptSuggestionOnArrowDownKeypress) { - FakeSuggestionHandler suggestion_handler; - MultiWordSuggester suggester(&suggestion_handler); - +TEST_F(MultiWordSuggesterTest, DoesNotAcceptSuggestionOnArrowDownKeypress) { std::vector<TextSuggestion> suggestions = { TextSuggestion{.mode = TextSuggestionMode::kPrediction, .type = TextSuggestionType::kMultiWord, .text = "hi there!"}, }; - suggester.OnFocus(kFocusedContextId); - suggester.OnSurroundingTextChanged(u"", 0, 0); - suggester.OnExternalSuggestionsUpdated(suggestions); - SendKeyEvent(&suggester, ui::DomCode::ARROW_DOWN); + suggester_->OnFocus(kFocusedContextId); + suggester_->OnSurroundingTextChanged(u"", 0, 0); + suggester_->OnExternalSuggestionsUpdated(suggestions); + SendKeyEvent(suggester_.get(), ui::DomCode::ARROW_DOWN); - EXPECT_TRUE(suggestion_handler.GetShowingSuggestion()); - EXPECT_FALSE(suggestion_handler.GetAcceptedSuggestion()); - EXPECT_EQ(suggestion_handler.GetSuggestionText(), u"hi there!"); + EXPECT_TRUE(suggestion_handler_.GetShowingSuggestion()); + EXPECT_FALSE(suggestion_handler_.GetAcceptedSuggestion()); + EXPECT_EQ(suggestion_handler_.GetSuggestionText(), u"hi there!"); } -TEST(MultiWordSuggesterTest, DoesNotAcceptSuggestionOnEnterKeypress) { - FakeSuggestionHandler suggestion_handler; - MultiWordSuggester suggester(&suggestion_handler); - +TEST_F(MultiWordSuggesterTest, DoesNotAcceptSuggestionOnEnterKeypress) { std::vector<TextSuggestion> suggestions = { TextSuggestion{.mode = TextSuggestionMode::kPrediction, .type = TextSuggestionType::kMultiWord, .text = "hi there!"}, }; - suggester.OnFocus(kFocusedContextId); - suggester.OnSurroundingTextChanged(u"", 0, 0); - suggester.OnExternalSuggestionsUpdated(suggestions); - SendKeyEvent(&suggester, ui::DomCode::ENTER); + suggester_->OnFocus(kFocusedContextId); + suggester_->OnSurroundingTextChanged(u"", 0, 0); + suggester_->OnExternalSuggestionsUpdated(suggestions); + SendKeyEvent(suggester_.get(), ui::DomCode::ENTER); - EXPECT_TRUE(suggestion_handler.GetShowingSuggestion()); - EXPECT_FALSE(suggestion_handler.GetAcceptedSuggestion()); - EXPECT_EQ(suggestion_handler.GetSuggestionText(), u"hi there!"); + EXPECT_TRUE(suggestion_handler_.GetShowingSuggestion()); + EXPECT_FALSE(suggestion_handler_.GetAcceptedSuggestion()); + EXPECT_EQ(suggestion_handler_.GetSuggestionText(), u"hi there!"); } -TEST(MultiWordSuggesterTest, AcceptsSuggestionOnDownPlusEnterPress) { - FakeSuggestionHandler suggestion_handler; - MultiWordSuggester suggester(&suggestion_handler); - +TEST_F(MultiWordSuggesterTest, AcceptsSuggestionOnDownPlusEnterPress) { std::vector<TextSuggestion> suggestions = { TextSuggestion{.mode = TextSuggestionMode::kPrediction, .type = TextSuggestionType::kMultiWord, .text = "hi there!"}, }; - suggester.OnFocus(kFocusedContextId); - suggester.OnSurroundingTextChanged(u"", 0, 0); - suggester.OnExternalSuggestionsUpdated(suggestions); - SendKeyEvent(&suggester, ui::DomCode::ARROW_DOWN); - SendKeyEvent(&suggester, ui::DomCode::ENTER); + suggester_->OnFocus(kFocusedContextId); + suggester_->OnSurroundingTextChanged(u"", 0, 0); + suggester_->OnExternalSuggestionsUpdated(suggestions); + SendKeyEvent(suggester_.get(), ui::DomCode::ARROW_DOWN); + SendKeyEvent(suggester_.get(), ui::DomCode::ENTER); - EXPECT_FALSE(suggestion_handler.GetShowingSuggestion()); - EXPECT_FALSE(suggestion_handler.GetDismissedSuggestion()); - EXPECT_TRUE(suggestion_handler.GetAcceptedSuggestion()); - EXPECT_EQ(suggestion_handler.GetSuggestionText(), u""); + EXPECT_FALSE(suggestion_handler_.GetShowingSuggestion()); + EXPECT_FALSE(suggestion_handler_.GetDismissedSuggestion()); + EXPECT_TRUE(suggestion_handler_.GetAcceptedSuggestion()); + EXPECT_EQ(suggestion_handler_.GetSuggestionText(), u""); } -TEST(MultiWordSuggesterTest, HighlightsSuggestionOnDownArrow) { - FakeSuggestionHandler suggestion_handler; - MultiWordSuggester suggester(&suggestion_handler); - +TEST_F(MultiWordSuggesterTest, HighlightsSuggestionOnDownArrow) { std::vector<TextSuggestion> suggestions = { TextSuggestion{.mode = TextSuggestionMode::kPrediction, .type = TextSuggestionType::kMultiWord, .text = "hi there!"}, }; - suggester.OnFocus(kFocusedContextId); - suggester.OnSurroundingTextChanged(u"", 0, 0); - suggester.OnExternalSuggestionsUpdated(suggestions); - SendKeyEvent(&suggester, ui::DomCode::ARROW_DOWN); + suggester_->OnFocus(kFocusedContextId); + suggester_->OnSurroundingTextChanged(u"", 0, 0); + suggester_->OnExternalSuggestionsUpdated(suggestions); + SendKeyEvent(suggester_.get(), ui::DomCode::ARROW_DOWN); - EXPECT_TRUE(suggestion_handler.GetHighlightedSuggestion()); + EXPECT_TRUE(suggestion_handler_.GetHighlightedSuggestion()); } -TEST(MultiWordSuggesterTest, MaintainsHighlightOnMultipleDownArrow) { - FakeSuggestionHandler suggestion_handler; - MultiWordSuggester suggester(&suggestion_handler); - +TEST_F(MultiWordSuggesterTest, MaintainsHighlightOnMultipleDownArrow) { std::vector<TextSuggestion> suggestions = { TextSuggestion{.mode = TextSuggestionMode::kPrediction, .type = TextSuggestionType::kMultiWord, .text = "hi there!"}, }; - suggester.OnFocus(kFocusedContextId); - suggester.OnSurroundingTextChanged(u"", 0, 0); - suggester.OnExternalSuggestionsUpdated(suggestions); - SendKeyEvent(&suggester, ui::DomCode::ARROW_DOWN); - SendKeyEvent(&suggester, ui::DomCode::ARROW_DOWN); - SendKeyEvent(&suggester, ui::DomCode::ARROW_DOWN); + suggester_->OnFocus(kFocusedContextId); + suggester_->OnSurroundingTextChanged(u"", 0, 0); + suggester_->OnExternalSuggestionsUpdated(suggestions); + SendKeyEvent(suggester_.get(), ui::DomCode::ARROW_DOWN); + SendKeyEvent(suggester_.get(), ui::DomCode::ARROW_DOWN); + SendKeyEvent(suggester_.get(), ui::DomCode::ARROW_DOWN); - EXPECT_TRUE(suggestion_handler.GetHighlightedSuggestion()); + EXPECT_TRUE(suggestion_handler_.GetHighlightedSuggestion()); } -TEST(MultiWordSuggesterTest, RemovesHighlightOnDownThenUpArrow) { - FakeSuggestionHandler suggestion_handler; - MultiWordSuggester suggester(&suggestion_handler); - +TEST_F(MultiWordSuggesterTest, RemovesHighlightOnDownThenUpArrow) { std::vector<TextSuggestion> suggestions = { TextSuggestion{.mode = TextSuggestionMode::kPrediction, .type = TextSuggestionType::kMultiWord, .text = "hi there!"}, }; - suggester.OnFocus(kFocusedContextId); - suggester.OnSurroundingTextChanged(u"", 0, 0); - suggester.OnExternalSuggestionsUpdated(suggestions); - SendKeyEvent(&suggester, ui::DomCode::ARROW_DOWN); - SendKeyEvent(&suggester, ui::DomCode::ARROW_UP); + suggester_->OnFocus(kFocusedContextId); + suggester_->OnSurroundingTextChanged(u"", 0, 0); + suggester_->OnExternalSuggestionsUpdated(suggestions); + SendKeyEvent(suggester_.get(), ui::DomCode::ARROW_DOWN); + SendKeyEvent(suggester_.get(), ui::DomCode::ARROW_UP); - EXPECT_FALSE(suggestion_handler.GetHighlightedSuggestion()); + EXPECT_FALSE(suggestion_handler_.GetHighlightedSuggestion()); } -TEST(MultiWordSuggesterTest, HighlightIsNotShownWithUpArrow) { - FakeSuggestionHandler suggestion_handler; - MultiWordSuggester suggester(&suggestion_handler); - +TEST_F(MultiWordSuggesterTest, HighlightIsNotShownWithUpArrow) { std::vector<TextSuggestion> suggestions = { TextSuggestion{.mode = TextSuggestionMode::kPrediction, .type = TextSuggestionType::kMultiWord, .text = "hi there!"}, }; - suggester.OnFocus(kFocusedContextId); - suggester.OnSurroundingTextChanged(u"", 0, 0); - suggester.OnExternalSuggestionsUpdated(suggestions); - SendKeyEvent(&suggester, ui::DomCode::ARROW_UP); + suggester_->OnFocus(kFocusedContextId); + suggester_->OnSurroundingTextChanged(u"", 0, 0); + suggester_->OnExternalSuggestionsUpdated(suggestions); + SendKeyEvent(suggester_.get(), ui::DomCode::ARROW_UP); - EXPECT_FALSE(suggestion_handler.GetHighlightedSuggestion()); + EXPECT_FALSE(suggestion_handler_.GetHighlightedSuggestion()); } -TEST(MultiWordSuggesterTest, HighlightIsNotShownWithMultipleUpArrow) { - FakeSuggestionHandler suggestion_handler; - MultiWordSuggester suggester(&suggestion_handler); - +TEST_F(MultiWordSuggesterTest, HighlightIsNotShownWithMultipleUpArrow) { std::vector<TextSuggestion> suggestions = { TextSuggestion{.mode = TextSuggestionMode::kPrediction, .type = TextSuggestionType::kMultiWord, .text = "hi there!"}, }; - suggester.OnFocus(kFocusedContextId); - suggester.OnSurroundingTextChanged(u"", 0, 0); - suggester.OnExternalSuggestionsUpdated(suggestions); - SendKeyEvent(&suggester, ui::DomCode::ARROW_UP); - SendKeyEvent(&suggester, ui::DomCode::ARROW_UP); + suggester_->OnFocus(kFocusedContextId); + suggester_->OnSurroundingTextChanged(u"", 0, 0); + suggester_->OnExternalSuggestionsUpdated(suggestions); + SendKeyEvent(suggester_.get(), ui::DomCode::ARROW_UP); + SendKeyEvent(suggester_.get(), ui::DomCode::ARROW_UP); - EXPECT_FALSE(suggestion_handler.GetHighlightedSuggestion()); + EXPECT_FALSE(suggestion_handler_.GetHighlightedSuggestion()); } -TEST(MultiWordSuggesterTest, CalculatesConfirmedLengthForOneWord) { - FakeSuggestionHandler suggestion_handler; - MultiWordSuggester suggester(&suggestion_handler); +TEST_F(MultiWordSuggesterTest, DisplaysTabGuideline) { + std::vector<TextSuggestion> suggestions = { + TextSuggestion{.mode = TextSuggestionMode::kPrediction, + .type = TextSuggestionType::kMultiWord, + .text = "hi there!"}, + }; + suggester_->OnFocus(kFocusedContextId); + suggester_->OnSurroundingTextChanged(u"", 0, 0); + suggester_->OnExternalSuggestionsUpdated(suggestions); + + auto suggestion_details = suggestion_handler_.GetLastSuggestionDetails(); + EXPECT_TRUE(suggestion_details.show_quick_accept_annotation); +} + +TEST_F(MultiWordSuggesterTest, + DisplaysTabGuidelineWithinSevenDaysOfFirstAccept) { + std::vector<TextSuggestion> suggestions = { + TextSuggestion{.mode = TextSuggestionMode::kPrediction, + .type = TextSuggestionType::kMultiWord, + .text = "hi there!"}, + }; + + SetFirstAcceptTimeTo(profile_.get(), /*days_ago=*/6); + + suggester_->OnFocus(kFocusedContextId); + suggester_->OnSurroundingTextChanged(u"", 0, 0); + suggester_->OnExternalSuggestionsUpdated(suggestions); + + auto suggestion_details = suggestion_handler_.GetLastSuggestionDetails(); + EXPECT_TRUE(suggestion_details.show_quick_accept_annotation); +} + +TEST_F(MultiWordSuggesterTest, + DoesNotDisplayTabGuidelineSevenDaysAfterFirstAccept) { + std::vector<TextSuggestion> suggestions = { + TextSuggestion{.mode = TextSuggestionMode::kPrediction, + .type = TextSuggestionType::kMultiWord, + .text = "hi there!"}, + }; + + SetFirstAcceptTimeTo(profile_.get(), /*days_ago=*/7); + + suggester_->OnFocus(kFocusedContextId); + suggester_->OnSurroundingTextChanged(u"", 0, 0); + suggester_->OnExternalSuggestionsUpdated(suggestions); + + auto suggestion_details = suggestion_handler_.GetLastSuggestionDetails(); + EXPECT_FALSE(suggestion_details.show_quick_accept_annotation); +} + +TEST_F(MultiWordSuggesterTest, SetsAcceptTimeOnFirstSuggestionAcceptedOnly) { + std::vector<TextSuggestion> suggestions = { + TextSuggestion{.mode = TextSuggestionMode::kPrediction, + .type = TextSuggestionType::kMultiWord, + .text = "hi there!"}, + }; + + auto pref_before_accept = GetFirstAcceptTime(profile_.get()); + suggester_->OnFocus(kFocusedContextId); + suggester_->OnSurroundingTextChanged(u"", 0, 0); + suggester_->OnExternalSuggestionsUpdated(suggestions); + SendKeyEvent(suggester_.get(), ui::DomCode::TAB); + auto pref_after_first_accept = GetFirstAcceptTime(profile_.get()); + + suggester_->OnSurroundingTextChanged(u"", 0, 0); + suggester_->OnExternalSuggestionsUpdated(suggestions); + SendKeyEvent(suggester_.get(), ui::DomCode::TAB); + auto pref_after_second_accept = GetFirstAcceptTime(profile_.get()); + + EXPECT_EQ(pref_before_accept, std::nullopt); + ASSERT_TRUE(pref_after_first_accept.has_value()); + ASSERT_TRUE(pref_after_second_accept.has_value()); + EXPECT_EQ(*pref_after_first_accept, *pref_after_second_accept); +} + +TEST_F(MultiWordSuggesterTest, CalculatesConfirmedLengthForOneWord) { std::vector<TextSuggestion> suggestions = { TextSuggestion{.mode = TextSuggestionMode::kCompletion, .type = TextSuggestionType::kMultiWord, .text = "how are you going"}, }; - suggester.OnFocus(kFocusedContextId); - suggester.OnSurroundingTextChanged(u"ho", /*cursor_pos=*/2, /*anchor_pos=*/2); - suggester.OnExternalSuggestionsUpdated(suggestions); + suggester_->OnFocus(kFocusedContextId); + suggester_->OnSurroundingTextChanged(u"ho", /*cursor_pos=*/2, + /*anchor_pos=*/2); + suggester_->OnExternalSuggestionsUpdated(suggestions); - EXPECT_TRUE(suggestion_handler.GetShowingSuggestion()); - EXPECT_EQ(suggestion_handler.GetSuggestionText(), u"how are you going"); - EXPECT_EQ(suggestion_handler.GetConfirmedLength(), 2); // ho + EXPECT_TRUE(suggestion_handler_.GetShowingSuggestion()); + EXPECT_EQ(suggestion_handler_.GetSuggestionText(), u"how are you going"); + EXPECT_EQ(suggestion_handler_.GetConfirmedLength(), 2); // ho } -TEST(MultiWordSuggesterTest, CalculatesConfirmedLengthForManyWords) { - FakeSuggestionHandler suggestion_handler; - MultiWordSuggester suggester(&suggestion_handler); - +TEST_F(MultiWordSuggesterTest, CalculatesConfirmedLengthForManyWords) { std::vector<TextSuggestion> suggestions = { TextSuggestion{.mode = TextSuggestionMode::kCompletion, .type = TextSuggestionType::kMultiWord, .text = "where are you going"}, }; - suggester.OnFocus(kFocusedContextId); - suggester.OnSurroundingTextChanged(u"hey there sam whe", - /*cursor_pos=*/17, /*anchor_pos=*/17); - suggester.OnExternalSuggestionsUpdated(suggestions); + suggester_->OnFocus(kFocusedContextId); + suggester_->OnSurroundingTextChanged(u"hey there sam whe", + /*cursor_pos=*/17, /*anchor_pos=*/17); + suggester_->OnExternalSuggestionsUpdated(suggestions); - EXPECT_TRUE(suggestion_handler.GetShowingSuggestion()); - EXPECT_EQ(suggestion_handler.GetSuggestionText(), u"where are you going"); - EXPECT_EQ(suggestion_handler.GetConfirmedLength(), 3); // whe + EXPECT_TRUE(suggestion_handler_.GetShowingSuggestion()); + EXPECT_EQ(suggestion_handler_.GetSuggestionText(), u"where are you going"); + EXPECT_EQ(suggestion_handler_.GetConfirmedLength(), 3); // whe } -TEST(MultiWordSuggesterTest, CalculatesConfirmedLengthGreedily) { - FakeSuggestionHandler suggestion_handler; - MultiWordSuggester suggester(&suggestion_handler); - +TEST_F(MultiWordSuggesterTest, CalculatesConfirmedLengthGreedily) { std::vector<TextSuggestion> suggestions = { TextSuggestion{.mode = TextSuggestionMode::kCompletion, .type = TextSuggestionType::kMultiWord, .text = "hohohohoho"}, }; - suggester.OnFocus(kFocusedContextId); - suggester.OnSurroundingTextChanged(u"merry christmas hohoho", - /*cursor_pos=*/22, - /*anchor_pos=*/22); - suggester.OnExternalSuggestionsUpdated(suggestions); + suggester_->OnFocus(kFocusedContextId); + suggester_->OnSurroundingTextChanged(u"merry christmas hohoho", + /*cursor_pos=*/22, + /*anchor_pos=*/22); + suggester_->OnExternalSuggestionsUpdated(suggestions); - EXPECT_TRUE(suggestion_handler.GetShowingSuggestion()); - EXPECT_EQ(suggestion_handler.GetSuggestionText(), u"hohohohoho"); - EXPECT_EQ(suggestion_handler.GetConfirmedLength(), 6); // hohoho + EXPECT_TRUE(suggestion_handler_.GetShowingSuggestion()); + EXPECT_EQ(suggestion_handler_.GetSuggestionText(), u"hohohohoho"); + EXPECT_EQ(suggestion_handler_.GetConfirmedLength(), 6); // hohoho } -TEST(MultiWordSuggesterTest, CalculatesConfirmedLengthForPredictions) { - FakeSuggestionHandler suggestion_handler; - MultiWordSuggester suggester(&suggestion_handler); - +TEST_F(MultiWordSuggesterTest, CalculatesConfirmedLengthForPredictions) { std::vector<TextSuggestion> suggestions = { TextSuggestion{.mode = TextSuggestionMode::kPrediction, .type = TextSuggestionType::kMultiWord, .text = "is the next task"}, }; - suggester.OnFocus(kFocusedContextId); - suggester.OnSurroundingTextChanged(u"this ", - /*cursor_pos=*/5, /*anchor_pos=*/5); - suggester.OnExternalSuggestionsUpdated(suggestions); + suggester_->OnFocus(kFocusedContextId); + suggester_->OnSurroundingTextChanged(u"this ", + /*cursor_pos=*/5, /*anchor_pos=*/5); + suggester_->OnExternalSuggestionsUpdated(suggestions); - EXPECT_TRUE(suggestion_handler.GetShowingSuggestion()); - EXPECT_EQ(suggestion_handler.GetSuggestionText(), u"is the next task"); - EXPECT_EQ(suggestion_handler.GetConfirmedLength(), 0); + EXPECT_TRUE(suggestion_handler_.GetShowingSuggestion()); + EXPECT_EQ(suggestion_handler_.GetSuggestionText(), u"is the next task"); + EXPECT_EQ(suggestion_handler_.GetConfirmedLength(), 0); } -TEST(MultiWordSuggesterTest, HandlesNewlinesWhenCalculatingConfirmedLength) { - FakeSuggestionHandler suggestion_handler; - MultiWordSuggester suggester(&suggestion_handler); - +TEST_F(MultiWordSuggesterTest, HandlesNewlinesWhenCalculatingConfirmedLength) { std::vector<TextSuggestion> suggestions = { TextSuggestion{.mode = TextSuggestionMode::kCompletion, .type = TextSuggestionType::kMultiWord, .text = "how are you"}, }; - suggester.OnFocus(kFocusedContextId); - suggester.OnSurroundingTextChanged(u"\nh", - /*cursor_pos=*/2, /*anchor_pos=*/2); - suggester.OnExternalSuggestionsUpdated(suggestions); + suggester_->OnFocus(kFocusedContextId); + suggester_->OnSurroundingTextChanged(u"\nh", + /*cursor_pos=*/2, /*anchor_pos=*/2); + suggester_->OnExternalSuggestionsUpdated(suggestions); - EXPECT_TRUE(suggestion_handler.GetShowingSuggestion()); - EXPECT_EQ(suggestion_handler.GetSuggestionText(), u"how are you"); - EXPECT_EQ(suggestion_handler.GetConfirmedLength(), 1); // h + EXPECT_TRUE(suggestion_handler_.GetShowingSuggestion()); + EXPECT_EQ(suggestion_handler_.GetSuggestionText(), u"how are you"); + EXPECT_EQ(suggestion_handler_.GetConfirmedLength(), 1); // h } -TEST(MultiWordSuggesterTest, HandlesMultipleRepeatingCharsWhenTracking) { - FakeSuggestionHandler suggestion_handler; - MultiWordSuggester suggester(&suggestion_handler); - +TEST_F(MultiWordSuggesterTest, HandlesMultipleRepeatingCharsWhenTracking) { std::vector<TextSuggestion> suggestions = { TextSuggestion{.mode = TextSuggestionMode::kCompletion, .type = TextSuggestionType::kMultiWord, .text = "how are you"}, }; - suggester.OnFocus(kFocusedContextId); - suggester.OnSurroundingTextChanged(u"h", /*cursor_pos=*/1, /*anchor_pos=*/1); - suggester.Suggest(u"h", /*cursor_pos=*/1, /*anchor_pos=*/1); - suggester.OnExternalSuggestionsUpdated(suggestions); - suggester.OnSurroundingTextChanged(u"hh", /*cursor_pos=*/2, /*anchor_pos=*/2); + suggester_->OnFocus(kFocusedContextId); + suggester_->OnSurroundingTextChanged(u"h", /*cursor_pos=*/1, + /*anchor_pos=*/1); + suggester_->Suggest(u"h", /*cursor_pos=*/1, /*anchor_pos=*/1); + suggester_->OnExternalSuggestionsUpdated(suggestions); + suggester_->OnSurroundingTextChanged(u"hh", /*cursor_pos=*/2, + /*anchor_pos=*/2); - EXPECT_FALSE(suggester.Suggest(u"hh", /*cursor_pos=*/2, /*anchor_pos=*/2)); + EXPECT_FALSE(suggester_->Suggest(u"hh", /*cursor_pos=*/2, /*anchor_pos=*/2)); } -TEST(MultiWordSuggesterTest, DoesNotDismissOnMultipleCursorMoveToEndOfText) { - FakeSuggestionHandler suggestion_handler; - MultiWordSuggester suggester(&suggestion_handler); - +TEST_F(MultiWordSuggesterTest, DoesNotDismissOnMultipleCursorMoveToEndOfText) { std::vector<TextSuggestion> suggestions = { TextSuggestion{.mode = TextSuggestionMode::kCompletion, .type = TextSuggestionType::kMultiWord, .text = "how are you"}, }; - suggester.OnFocus(kFocusedContextId); - suggester.OnSurroundingTextChanged(u"hello h", /*cursor_pos=*/7, - /*anchor_pos=*/7); - suggester.Suggest(u"hello h", /*cursor_pos=*/7, /*anchor_pos=*/7); - suggester.OnExternalSuggestionsUpdated(suggestions); - suggester.OnSurroundingTextChanged(u"hello h", /*cursor_pos=*/7, - /*anchor_pos=*/7); - suggester.Suggest(u"hello h", /*cursor_pos=*/7, /*anchor_pos=*/7); - suggester.OnSurroundingTextChanged(u"hello h", /*cursor_pos=*/7, - /*anchor_pos=*/7); + suggester_->OnFocus(kFocusedContextId); + suggester_->OnSurroundingTextChanged(u"hello h", /*cursor_pos=*/7, + /*anchor_pos=*/7); + suggester_->Suggest(u"hello h", /*cursor_pos=*/7, /*anchor_pos=*/7); + suggester_->OnExternalSuggestionsUpdated(suggestions); + suggester_->OnSurroundingTextChanged(u"hello h", /*cursor_pos=*/7, + /*anchor_pos=*/7); + suggester_->Suggest(u"hello h", /*cursor_pos=*/7, /*anchor_pos=*/7); + suggester_->OnSurroundingTextChanged(u"hello h", /*cursor_pos=*/7, + /*anchor_pos=*/7); - EXPECT_TRUE(suggester.Suggest(u"hello h", /*cursor_pos=*/7, - /*anchor_pos=*/7)); + EXPECT_TRUE(suggester_->Suggest(u"hello h", /*cursor_pos=*/7, + /*anchor_pos=*/7)); } -TEST(MultiWordSuggesterTest, TracksLastSuggestionOnSurroundingTextChange) { - FakeSuggestionHandler suggestion_handler; - MultiWordSuggester suggester(&suggestion_handler); - +TEST_F(MultiWordSuggesterTest, TracksLastSuggestionOnSurroundingTextChange) { std::vector<TextSuggestion> suggestions = { TextSuggestion{.mode = TextSuggestionMode::kCompletion, .type = TextSuggestionType::kMultiWord, .text = "where are you going"}, }; - suggester.OnFocus(kFocusedContextId); - suggester.OnSurroundingTextChanged(u"hey there sam whe", 17, 17); - suggester.OnExternalSuggestionsUpdated(suggestions); - suggester.OnSurroundingTextChanged(u"hey there sam wher", 18, 18); - suggester.Suggest(u"hey there sam wher", 18, 18); - suggester.OnSurroundingTextChanged(u"hey there sam where", 19, 19); - suggester.Suggest(u"hey there sam where", 19, 19); - suggester.OnSurroundingTextChanged(u"hey there sam where ", 20, 20); - suggester.Suggest(u"hey there sam where ", 20, 20); - suggester.OnSurroundingTextChanged(u"hey there sam where a", 21, 21); - suggester.Suggest(u"hey there sam where a", 21, 21); - suggester.OnSurroundingTextChanged(u"hey there sam where ar", 22, 22); - suggester.Suggest(u"hey there sam where ar", 22, 22); - suggester.OnSurroundingTextChanged(u"hey there sam where are", 23, 23); - suggester.Suggest(u"hey there sam where are", 23, 23); + suggester_->OnFocus(kFocusedContextId); + suggester_->OnSurroundingTextChanged(u"hey there sam whe", 17, 17); + suggester_->OnExternalSuggestionsUpdated(suggestions); + suggester_->OnSurroundingTextChanged(u"hey there sam wher", 18, 18); + suggester_->Suggest(u"hey there sam wher", 18, 18); + suggester_->OnSurroundingTextChanged(u"hey there sam where", 19, 19); + suggester_->Suggest(u"hey there sam where", 19, 19); + suggester_->OnSurroundingTextChanged(u"hey there sam where ", 20, 20); + suggester_->Suggest(u"hey there sam where ", 20, 20); + suggester_->OnSurroundingTextChanged(u"hey there sam where a", 21, 21); + suggester_->Suggest(u"hey there sam where a", 21, 21); + suggester_->OnSurroundingTextChanged(u"hey there sam where ar", 22, 22); + suggester_->Suggest(u"hey there sam where ar", 22, 22); + suggester_->OnSurroundingTextChanged(u"hey there sam where are", 23, 23); + suggester_->Suggest(u"hey there sam where are", 23, 23); - EXPECT_TRUE(suggestion_handler.GetShowingSuggestion()); - EXPECT_EQ(suggestion_handler.GetSuggestionText(), u"where are you going"); - EXPECT_EQ(suggestion_handler.GetConfirmedLength(), 9); // where are + EXPECT_TRUE(suggestion_handler_.GetShowingSuggestion()); + EXPECT_EQ(suggestion_handler_.GetSuggestionText(), u"where are you going"); + EXPECT_EQ(suggestion_handler_.GetConfirmedLength(), 9); // where are } -TEST(MultiWordSuggesterTest, - TracksLastSuggestionOnSurroundingTextChangeAtBeginningText) { - FakeSuggestionHandler suggestion_handler; - MultiWordSuggester suggester(&suggestion_handler); - +TEST_F(MultiWordSuggesterTest, + TracksLastSuggestionOnSurroundingTextChangeAtBeginningText) { std::vector<TextSuggestion> suggestions = { TextSuggestion{.mode = TextSuggestionMode::kCompletion, .type = TextSuggestionType::kMultiWord, .text = "how are you"}, }; - suggester.OnFocus(kFocusedContextId); - suggester.OnSurroundingTextChanged(u"h", 1, 1); - suggester.OnExternalSuggestionsUpdated(suggestions); - suggester.OnSurroundingTextChanged(u"ho", 2, 2); - suggester.Suggest(u"ho", 2, 2); - suggester.OnSurroundingTextChanged(u"how", 3, 3); - suggester.Suggest(u"how", 3, 3); + suggester_->OnFocus(kFocusedContextId); + suggester_->OnSurroundingTextChanged(u"h", 1, 1); + suggester_->OnExternalSuggestionsUpdated(suggestions); + suggester_->OnSurroundingTextChanged(u"ho", 2, 2); + suggester_->Suggest(u"ho", 2, 2); + suggester_->OnSurroundingTextChanged(u"how", 3, 3); + suggester_->Suggest(u"how", 3, 3); - EXPECT_TRUE(suggestion_handler.GetShowingSuggestion()); - EXPECT_EQ(suggestion_handler.GetSuggestionText(), u"how are you"); - EXPECT_EQ(suggestion_handler.GetConfirmedLength(), 3); // how + EXPECT_TRUE(suggestion_handler_.GetShowingSuggestion()); + EXPECT_EQ(suggestion_handler_.GetSuggestionText(), u"how are you"); + EXPECT_EQ(suggestion_handler_.GetConfirmedLength(), 3); // how } -TEST(MultiWordSuggesterTest, TracksLastSuggestionOnLargeSurroundingTextChange) { - FakeSuggestionHandler suggestion_handler; - MultiWordSuggester suggester(&suggestion_handler); - +TEST_F(MultiWordSuggesterTest, + TracksLastSuggestionOnLargeSurroundingTextChange) { std::vector<TextSuggestion> suggestions = { TextSuggestion{.mode = TextSuggestionMode::kCompletion, .type = TextSuggestionType::kMultiWord, .text = "how are you"}, }; - suggester.OnFocus(kFocusedContextId); - suggester.OnSurroundingTextChanged(u"h", 1, 1); - suggester.OnExternalSuggestionsUpdated(suggestions); - suggester.OnSurroundingTextChanged(u"how ar", 6, 6); - suggester.Suggest(u"how ar", 6, 6); - suggester.OnSurroundingTextChanged(u"how are yo", 10, 10); - suggester.Suggest(u"how are yo", 10, 10); + suggester_->OnFocus(kFocusedContextId); + suggester_->OnSurroundingTextChanged(u"h", 1, 1); + suggester_->OnExternalSuggestionsUpdated(suggestions); + suggester_->OnSurroundingTextChanged(u"how ar", 6, 6); + suggester_->Suggest(u"how ar", 6, 6); + suggester_->OnSurroundingTextChanged(u"how are yo", 10, 10); + suggester_->Suggest(u"how are yo", 10, 10); - EXPECT_TRUE(suggestion_handler.GetShowingSuggestion()); - EXPECT_EQ(suggestion_handler.GetSuggestionText(), u"how are you"); - EXPECT_EQ(suggestion_handler.GetConfirmedLength(), 10); // how are yo + EXPECT_TRUE(suggestion_handler_.GetShowingSuggestion()); + EXPECT_EQ(suggestion_handler_.GetSuggestionText(), u"how are you"); + EXPECT_EQ(suggestion_handler_.GetConfirmedLength(), 10); // how are yo } -TEST(MultiWordSuggesterTest, - DoesNotTrackLastSuggestionIfSurroundingTextChange) { - FakeSuggestionHandler suggestion_handler; - MultiWordSuggester suggester(&suggestion_handler); - +TEST_F(MultiWordSuggesterTest, + DoesNotTrackLastSuggestionIfSurroundingTextChange) { std::vector<TextSuggestion> suggestions = { TextSuggestion{.mode = TextSuggestionMode::kCompletion, .type = TextSuggestionType::kMultiWord, .text = "how are you"}, }; - suggester.OnFocus(kFocusedContextId); - suggester.OnSurroundingTextChanged(u"h", 1, 1); - suggester.OnExternalSuggestionsUpdated(suggestions); - suggester.OnSurroundingTextChanged(u"how ar", 6, 6); - suggester.Suggest(u"how ar", 6, 6); - suggester.OnSurroundingTextChanged(u"how yo", 6, 6); + suggester_->OnFocus(kFocusedContextId); + suggester_->OnSurroundingTextChanged(u"h", 1, 1); + suggester_->OnExternalSuggestionsUpdated(suggestions); + suggester_->OnSurroundingTextChanged(u"how ar", 6, 6); + suggester_->Suggest(u"how ar", 6, 6); + suggester_->OnSurroundingTextChanged(u"how yo", 6, 6); // The consumer will handle dismissing the suggestion - EXPECT_FALSE(suggester.Suggest(u"how yo", 6, 6)); + EXPECT_FALSE(suggester_->Suggest(u"how yo", 6, 6)); } -TEST(MultiWordSuggesterTest, - DoesNotTrackLastSuggestionIfCursorBeforeSuggestionStartPos) { - FakeSuggestionHandler suggestion_handler; - MultiWordSuggester suggester(&suggestion_handler); - +TEST_F(MultiWordSuggesterTest, + DoesNotTrackLastSuggestionIfCursorBeforeSuggestionStartPos) { std::vector<TextSuggestion> suggestions = { TextSuggestion{.mode = TextSuggestionMode::kPrediction, .type = TextSuggestionType::kMultiWord, .text = " for the example"}, }; - suggester.OnFocus(kFocusedContextId); - suggester.OnSurroundingTextChanged(u"this is some text", 17, 17); - suggester.OnExternalSuggestionsUpdated(suggestions); - suggester.OnSurroundingTextChanged(u"this is some text ", 18, 18); - suggester.Suggest(u"this is some text ", 18, 18); - suggester.OnSurroundingTextChanged(u"this is some text f", 19, 19); - suggester.Suggest(u"this is some text f", 19, 19); - suggester.OnSurroundingTextChanged(u"this is some text fo", 20, 20); - suggester.Suggest(u"this is some text fo", 20, 20); - suggester.OnSurroundingTextChanged(u"this is some text f", 19, 19); - suggester.Suggest(u"this is some text f", 19, 19); - suggester.OnSurroundingTextChanged(u"this is some text ", 18, 18); - suggester.Suggest(u"this is some text ", 18, 18); - suggester.OnSurroundingTextChanged(u"this is some text", 17, 17); + suggester_->OnFocus(kFocusedContextId); + suggester_->OnSurroundingTextChanged(u"this is some text", 17, 17); + suggester_->OnExternalSuggestionsUpdated(suggestions); + suggester_->OnSurroundingTextChanged(u"this is some text ", 18, 18); + suggester_->Suggest(u"this is some text ", 18, 18); + suggester_->OnSurroundingTextChanged(u"this is some text f", 19, 19); + suggester_->Suggest(u"this is some text f", 19, 19); + suggester_->OnSurroundingTextChanged(u"this is some text fo", 20, 20); + suggester_->Suggest(u"this is some text fo", 20, 20); + suggester_->OnSurroundingTextChanged(u"this is some text f", 19, 19); + suggester_->Suggest(u"this is some text f", 19, 19); + suggester_->OnSurroundingTextChanged(u"this is some text ", 18, 18); + suggester_->Suggest(u"this is some text ", 18, 18); + suggester_->OnSurroundingTextChanged(u"this is some text", 17, 17); - EXPECT_FALSE(suggester.Suggest(u"this is some text", 17, 17)); + EXPECT_FALSE(suggester_->Suggest(u"this is some text", 17, 17)); } -TEST(MultiWordSuggesterTest, DoesNotTrackSuggestionPastSuggestionPoint) { - FakeSuggestionHandler suggestion_handler; - MultiWordSuggester suggester(&suggestion_handler); - +TEST_F(MultiWordSuggesterTest, DoesNotTrackSuggestionPastSuggestionPoint) { std::vector<TextSuggestion> suggestions = { TextSuggestion{.mode = TextSuggestionMode::kCompletion, .type = TextSuggestionType::kMultiWord, .text = " for the example"}, }; - suggester.OnFocus(kFocusedContextId); - suggester.OnSurroundingTextChanged(u"this is some text fo", 20, 20); - suggester.OnExternalSuggestionsUpdated(suggestions); - suggester.OnSurroundingTextChanged(u"this is some text for", 21, 21); - suggester.Suggest(u"this is some text for", 21, 21); - suggester.OnSurroundingTextChanged(u"this is some text fo", 20, 20); - bool at_suggestion_point = suggester.Suggest(u"this is some text fo", 20, 20); - suggester.OnSurroundingTextChanged(u"this is some text f", 19, 19); + suggester_->OnFocus(kFocusedContextId); + suggester_->OnSurroundingTextChanged(u"this is some text fo", 20, 20); + suggester_->OnExternalSuggestionsUpdated(suggestions); + suggester_->OnSurroundingTextChanged(u"this is some text for", 21, 21); + suggester_->Suggest(u"this is some text for", 21, 21); + suggester_->OnSurroundingTextChanged(u"this is some text fo", 20, 20); + bool at_suggestion_point = + suggester_->Suggest(u"this is some text fo", 20, 20); + suggester_->OnSurroundingTextChanged(u"this is some text f", 19, 19); bool before_suggestion_point = - suggester.Suggest(u"this is some text f", 19, 19); + suggester_->Suggest(u"this is some text f", 19, 19); EXPECT_TRUE(at_suggestion_point); EXPECT_FALSE(before_suggestion_point); } -TEST(MultiWordSuggesterTest, DismissesSuggestionAfterCursorMoveFromEndOfText) { - FakeSuggestionHandler suggestion_handler; - MultiWordSuggester suggester(&suggestion_handler); - +TEST_F(MultiWordSuggesterTest, + DismissesSuggestionAfterCursorMoveFromEndOfText) { std::vector<TextSuggestion> suggestions = { TextSuggestion{.mode = TextSuggestionMode::kCompletion, .type = TextSuggestionType::kMultiWord, .text = " for the example"}, }; - suggester.OnFocus(kFocusedContextId); - suggester.OnSurroundingTextChanged(u"this is some text fo", 20, 20); - suggester.OnExternalSuggestionsUpdated(suggestions); - suggester.OnSurroundingTextChanged(u"this is some text for", 21, 21); - suggester.Suggest(u"this is some text for", 21, 21); - suggester.OnSurroundingTextChanged(u"this is some text for", 15, 15); + suggester_->OnFocus(kFocusedContextId); + suggester_->OnSurroundingTextChanged(u"this is some text fo", 20, 20); + suggester_->OnExternalSuggestionsUpdated(suggestions); + suggester_->OnSurroundingTextChanged(u"this is some text for", 21, 21); + suggester_->Suggest(u"this is some text for", 21, 21); + suggester_->OnSurroundingTextChanged(u"this is some text for", 15, 15); - EXPECT_FALSE(suggester.Suggest(u"this is some text for", 15, 15)); + EXPECT_FALSE(suggester_->Suggest(u"this is some text for", 15, 15)); } -TEST(MultiWordSuggesterTest, ReturnsGenericActionIfNoSuggestionHasBeenShown) { - FakeSuggestionHandler suggestion_handler; - MultiWordSuggester suggester(&suggestion_handler); +TEST_F(MultiWordSuggesterTest, ReturnsGenericActionIfNoSuggestionHasBeenShown) { + suggester_->OnFocus(kFocusedContextId); + suggester_->OnSurroundingTextChanged(u"hey there sam whe", 17, 17); - suggester.OnFocus(kFocusedContextId); - suggester.OnSurroundingTextChanged(u"hey there sam whe", 17, 17); - - EXPECT_EQ(suggester.GetProposeActionType(), AssistiveType::kGenericAction); + EXPECT_EQ(suggester_->GetProposeActionType(), AssistiveType::kGenericAction); } -TEST(MultiWordSuggesterTest, - ReturnsCompletionActionIfCompletionSuggestionShown) { - FakeSuggestionHandler suggestion_handler; - MultiWordSuggester suggester(&suggestion_handler); - +TEST_F(MultiWordSuggesterTest, + ReturnsCompletionActionIfCompletionSuggestionShown) { std::vector<TextSuggestion> suggestions = { TextSuggestion{.mode = TextSuggestionMode::kCompletion, .type = TextSuggestionType::kMultiWord, .text = "how are you"}, }; - suggester.OnFocus(kFocusedContextId); - suggester.OnSurroundingTextChanged(u"how ar", 6, 6); - suggester.OnExternalSuggestionsUpdated(suggestions); + suggester_->OnFocus(kFocusedContextId); + suggester_->OnSurroundingTextChanged(u"how ar", 6, 6); + suggester_->OnExternalSuggestionsUpdated(suggestions); - EXPECT_EQ(suggester.GetProposeActionType(), + EXPECT_EQ(suggester_->GetProposeActionType(), AssistiveType::kMultiWordCompletion); } -TEST(MultiWordSuggesterTest, - ReturnsPredictionActionIfPredictionSuggestionShown) { - FakeSuggestionHandler suggestion_handler; - MultiWordSuggester suggester(&suggestion_handler); - +TEST_F(MultiWordSuggesterTest, + ReturnsPredictionActionIfPredictionSuggestionShown) { std::vector<TextSuggestion> suggestions = { TextSuggestion{.mode = TextSuggestionMode::kPrediction, .type = TextSuggestionType::kMultiWord, .text = "how are you"}, }; - suggester.OnFocus(kFocusedContextId); - suggester.OnSurroundingTextChanged(u"how", 3, 3); - suggester.OnExternalSuggestionsUpdated(suggestions); + suggester_->OnFocus(kFocusedContextId); + suggester_->OnSurroundingTextChanged(u"how", 3, 3); + suggester_->OnExternalSuggestionsUpdated(suggestions); - EXPECT_EQ(suggester.GetProposeActionType(), + EXPECT_EQ(suggester_->GetProposeActionType(), AssistiveType::kMultiWordPrediction); } -TEST(MultiWordSuggesterTest, - ReturnsCompletionActionAfterAcceptingCompletionSuggestion) { - FakeSuggestionHandler suggestion_handler; - MultiWordSuggester suggester(&suggestion_handler); - +TEST_F(MultiWordSuggesterTest, + ReturnsCompletionActionAfterAcceptingCompletionSuggestion) { std::vector<TextSuggestion> suggestions = { TextSuggestion{.mode = TextSuggestionMode::kCompletion, .type = TextSuggestionType::kMultiWord, .text = "aren\'t you"}, }; - suggester.OnFocus(kFocusedContextId); - suggester.OnSurroundingTextChanged(u"why ar", 6, 6); - suggester.Suggest(u"why", 6, 6); - suggester.OnExternalSuggestionsUpdated(suggestions); - SendKeyEvent(&suggester, ui::DomCode::TAB); + suggester_->OnFocus(kFocusedContextId); + suggester_->OnSurroundingTextChanged(u"why ar", 6, 6); + suggester_->Suggest(u"why", 6, 6); + suggester_->OnExternalSuggestionsUpdated(suggestions); + SendKeyEvent(suggester_.get(), ui::DomCode::TAB); - ASSERT_EQ(suggester.GetProposeActionType(), + ASSERT_EQ(suggester_->GetProposeActionType(), AssistiveType::kMultiWordCompletion); } -TEST(MultiWordSuggesterTest, - ReturnsPredictionActionAfterAcceptingPredictionSuggestion) { - FakeSuggestionHandler suggestion_handler; - MultiWordSuggester suggester(&suggestion_handler); - +TEST_F(MultiWordSuggesterTest, + ReturnsPredictionActionAfterAcceptingPredictionSuggestion) { std::vector<TextSuggestion> suggestions = { TextSuggestion{.mode = TextSuggestionMode::kPrediction, .type = TextSuggestionType::kMultiWord, .text = "aren\'t you"}, }; - suggester.OnFocus(kFocusedContextId); - suggester.OnSurroundingTextChanged(u"why", 3, 3); - suggester.Suggest(u"why", 3, 3); - suggester.OnExternalSuggestionsUpdated(suggestions); - SendKeyEvent(&suggester, ui::DomCode::TAB); + suggester_->OnFocus(kFocusedContextId); + suggester_->OnSurroundingTextChanged(u"why", 3, 3); + suggester_->Suggest(u"why", 3, 3); + suggester_->OnExternalSuggestionsUpdated(suggestions); + SendKeyEvent(suggester_.get(), ui::DomCode::TAB); - ASSERT_EQ(suggester.GetProposeActionType(), + ASSERT_EQ(suggester_->GetProposeActionType(), AssistiveType::kMultiWordPrediction); } -TEST(MultiWordSuggesterTest, RecordsTimeToAcceptMetric) { - FakeSuggestionHandler suggestion_handler; - MultiWordSuggester suggester(&suggestion_handler); - +TEST_F(MultiWordSuggesterTest, RecordsTimeToAcceptMetric) { std::vector<TextSuggestion> suggestions = { TextSuggestion{.mode = TextSuggestionMode::kPrediction, .type = TextSuggestionType::kMultiWord, @@ -699,20 +721,17 @@ histogram_tester.ExpectTotalCount( "InputMethod.Assistive.TimeToAccept.MultiWord", 0); - suggester.OnFocus(kFocusedContextId); - suggester.OnSurroundingTextChanged(u"how", 3, 3); - suggester.OnExternalSuggestionsUpdated(suggestions); - SendKeyEvent(&suggester, ui::DomCode::TAB); + suggester_->OnFocus(kFocusedContextId); + suggester_->OnSurroundingTextChanged(u"how", 3, 3); + suggester_->OnExternalSuggestionsUpdated(suggestions); + SendKeyEvent(suggester_.get(), ui::DomCode::TAB); - EXPECT_TRUE(suggestion_handler.GetAcceptedSuggestion()); + EXPECT_TRUE(suggestion_handler_.GetAcceptedSuggestion()); histogram_tester.ExpectTotalCount( "InputMethod.Assistive.TimeToAccept.MultiWord", 1); } -TEST(MultiWordSuggesterTest, RecordsTimeToDismissMetric) { - FakeSuggestionHandler suggestion_handler; - MultiWordSuggester suggester(&suggestion_handler); - +TEST_F(MultiWordSuggesterTest, RecordsTimeToDismissMetric) { std::vector<TextSuggestion> suggestions = { TextSuggestion{.mode = TextSuggestionMode::kPrediction, .type = TextSuggestionType::kMultiWord, @@ -723,162 +742,143 @@ histogram_tester.ExpectTotalCount( "InputMethod.Assistive.TimeToDismiss.MultiWord", 0); - suggester.OnFocus(kFocusedContextId); - suggester.OnSurroundingTextChanged(u"how", 3, 3); - suggester.OnExternalSuggestionsUpdated(suggestions); - suggester.DismissSuggestion(); + suggester_->OnFocus(kFocusedContextId); + suggester_->OnSurroundingTextChanged(u"how", 3, 3); + suggester_->OnExternalSuggestionsUpdated(suggestions); + suggester_->DismissSuggestion(); histogram_tester.ExpectTotalCount( "InputMethod.Assistive.TimeToDismiss.MultiWord", 1); } -TEST(MultiWordSuggesterTest, SurroundingTextChangesDoNotTriggerAnnouncements) { - FakeSuggestionHandler suggestion_handler; - MultiWordSuggester suggester(&suggestion_handler); +TEST_F(MultiWordSuggesterTest, + SurroundingTextChangesDoNotTriggerAnnouncements) { + suggester_->OnFocus(kFocusedContextId); + suggester_->OnSurroundingTextChanged(u"why are", 7, 7); + suggester_->Suggest(u"why are", 7, 7); + suggester_->OnSurroundingTextChanged(u"why aren", 8, 8); + suggester_->Suggest(u"why aren", 8, 8); + suggester_->OnSurroundingTextChanged(u"why aren'", 9, 9); + suggester_->Suggest(u"why aren'", 9, 9); + suggester_->OnSurroundingTextChanged(u"why aren't", 10, 10); + suggester_->Suggest(u"why aren't", 10, 10); - suggester.OnFocus(kFocusedContextId); - suggester.OnSurroundingTextChanged(u"why are", 7, 7); - suggester.Suggest(u"why are", 7, 7); - suggester.OnSurroundingTextChanged(u"why aren", 8, 8); - suggester.Suggest(u"why aren", 8, 8); - suggester.OnSurroundingTextChanged(u"why aren'", 9, 9); - suggester.Suggest(u"why aren'", 9, 9); - suggester.OnSurroundingTextChanged(u"why aren't", 10, 10); - suggester.Suggest(u"why aren't", 10, 10); - - ASSERT_EQ(suggestion_handler.GetAnnouncements().size(), 0); + ASSERT_EQ(suggestion_handler_.GetAnnouncements().size(), 0); } -TEST(MultiWordSuggesterTest, ShowingSuggestionsTriggersAnnouncement) { - FakeSuggestionHandler suggestion_handler; - MultiWordSuggester suggester(&suggestion_handler); - +TEST_F(MultiWordSuggesterTest, ShowingSuggestionsTriggersAnnouncement) { std::vector<TextSuggestion> suggestions = { TextSuggestion{.mode = TextSuggestionMode::kCompletion, .type = TextSuggestionType::kMultiWord, .text = "aren\'t you"}, }; - suggester.OnFocus(kFocusedContextId); - suggester.OnSurroundingTextChanged(u"why are", 7, 7); - suggester.Suggest(u"why are", 7, 7); - suggester.OnExternalSuggestionsUpdated(suggestions); + suggester_->OnFocus(kFocusedContextId); + suggester_->OnSurroundingTextChanged(u"why are", 7, 7); + suggester_->Suggest(u"why are", 7, 7); + suggester_->OnExternalSuggestionsUpdated(suggestions); - ASSERT_EQ(suggestion_handler.GetAnnouncements().size(), 1); - EXPECT_EQ(suggestion_handler.GetAnnouncements().back(), + ASSERT_EQ(suggestion_handler_.GetAnnouncements().size(), 1); + EXPECT_EQ(suggestion_handler_.GetAnnouncements().back(), u"predictive writing candidate shown, press tab to accept"); } -TEST(MultiWordSuggesterTest, TrackingSuggestionsTriggersAnnouncementOnlyOnce) { - FakeSuggestionHandler suggestion_handler; - MultiWordSuggester suggester(&suggestion_handler); - +TEST_F(MultiWordSuggesterTest, + TrackingSuggestionsTriggersAnnouncementOnlyOnce) { std::vector<TextSuggestion> suggestions = { TextSuggestion{.mode = TextSuggestionMode::kCompletion, .type = TextSuggestionType::kMultiWord, .text = "aren\'t you"}, }; - suggester.OnFocus(kFocusedContextId); - suggester.OnSurroundingTextChanged(u"why are", 7, 7); - suggester.Suggest(u"why are", 7, 7); - suggester.OnExternalSuggestionsUpdated(suggestions); - suggester.OnSurroundingTextChanged(u"why aren", 8, 8); - suggester.Suggest(u"why aren", 8, 8); - suggester.OnSurroundingTextChanged(u"why aren'", 9, 9); - suggester.Suggest(u"why aren'", 9, 9); - suggester.OnSurroundingTextChanged(u"why aren't", 10, 10); - suggester.Suggest(u"why aren't", 10, 10); + suggester_->OnFocus(kFocusedContextId); + suggester_->OnSurroundingTextChanged(u"why are", 7, 7); + suggester_->Suggest(u"why are", 7, 7); + suggester_->OnExternalSuggestionsUpdated(suggestions); + suggester_->OnSurroundingTextChanged(u"why aren", 8, 8); + suggester_->Suggest(u"why aren", 8, 8); + suggester_->OnSurroundingTextChanged(u"why aren'", 9, 9); + suggester_->Suggest(u"why aren'", 9, 9); + suggester_->OnSurroundingTextChanged(u"why aren't", 10, 10); + suggester_->Suggest(u"why aren't", 10, 10); - ASSERT_EQ(suggestion_handler.GetAnnouncements().size(), 1); - EXPECT_EQ(suggestion_handler.GetAnnouncements().back(), + ASSERT_EQ(suggestion_handler_.GetAnnouncements().size(), 1); + EXPECT_EQ(suggestion_handler_.GetAnnouncements().back(), u"predictive writing candidate shown, press tab to accept"); } -TEST(MultiWordSuggesterTest, AcceptingSuggestionTriggersAnnouncement) { - FakeSuggestionHandler suggestion_handler; - MultiWordSuggester suggester(&suggestion_handler); - +TEST_F(MultiWordSuggesterTest, AcceptingSuggestionTriggersAnnouncement) { std::vector<TextSuggestion> suggestions = { TextSuggestion{.mode = TextSuggestionMode::kCompletion, .type = TextSuggestionType::kMultiWord, .text = "aren\'t you"}, }; - suggester.OnFocus(kFocusedContextId); - suggester.OnSurroundingTextChanged(u"why are", 7, 7); - suggester.Suggest(u"why are", 7, 7); - suggester.OnExternalSuggestionsUpdated(suggestions); - SendKeyEvent(&suggester, ui::DomCode::TAB); + suggester_->OnFocus(kFocusedContextId); + suggester_->OnSurroundingTextChanged(u"why are", 7, 7); + suggester_->Suggest(u"why are", 7, 7); + suggester_->OnExternalSuggestionsUpdated(suggestions); + SendKeyEvent(suggester_.get(), ui::DomCode::TAB); - ASSERT_EQ(suggestion_handler.GetAnnouncements().size(), 2); - EXPECT_EQ(suggestion_handler.GetAnnouncements().back(), + ASSERT_EQ(suggestion_handler_.GetAnnouncements().size(), 2); + EXPECT_EQ(suggestion_handler_.GetAnnouncements().back(), u"predictive writing candidate inserted"); } -TEST(MultiWordSuggesterTest, - TransitionsFromAcceptSuggestionToNoSuggestionDoesNotTriggerAnnounce) { - FakeSuggestionHandler suggestion_handler; - MultiWordSuggester suggester(&suggestion_handler); - +TEST_F(MultiWordSuggesterTest, + TransitionsFromAcceptSuggestionToNoSuggestionDoesNotTriggerAnnounce) { std::vector<TextSuggestion> suggestions = { TextSuggestion{.mode = TextSuggestionMode::kCompletion, .type = TextSuggestionType::kMultiWord, .text = "aren\'t you"}, }; - suggester.OnFocus(kFocusedContextId); - suggester.OnSurroundingTextChanged(u"why are", 7, 7); - suggester.Suggest(u"why are", 7, 7); - suggester.OnExternalSuggestionsUpdated(suggestions); - SendKeyEvent(&suggester, ui::DomCode::TAB); - suggester.OnSurroundingTextChanged(u"why aren", 8, 8); - suggester.Suggest(u"why aren", 8, 8); + suggester_->OnFocus(kFocusedContextId); + suggester_->OnSurroundingTextChanged(u"why are", 7, 7); + suggester_->Suggest(u"why are", 7, 7); + suggester_->OnExternalSuggestionsUpdated(suggestions); + SendKeyEvent(suggester_.get(), ui::DomCode::TAB); + suggester_->OnSurroundingTextChanged(u"why aren", 8, 8); + suggester_->Suggest(u"why aren", 8, 8); - ASSERT_EQ(suggestion_handler.GetAnnouncements().size(), 2); + ASSERT_EQ(suggestion_handler_.GetAnnouncements().size(), 2); } -TEST(MultiWordSuggesterTest, DismissingSuggestionTriggersAnnouncement) { - FakeSuggestionHandler suggestion_handler; - MultiWordSuggester suggester(&suggestion_handler); - +TEST_F(MultiWordSuggesterTest, DismissingSuggestionTriggersAnnouncement) { std::vector<TextSuggestion> suggestions = { TextSuggestion{.mode = TextSuggestionMode::kCompletion, .type = TextSuggestionType::kMultiWord, .text = "aren\'t you"}, }; - suggester.OnFocus(kFocusedContextId); - suggester.OnSurroundingTextChanged(u"why are", 7, 7); - suggester.Suggest(u"why are", 7, 7); - suggester.OnExternalSuggestionsUpdated(suggestions); - suggester.DismissSuggestion(); + suggester_->OnFocus(kFocusedContextId); + suggester_->OnSurroundingTextChanged(u"why are", 7, 7); + suggester_->Suggest(u"why are", 7, 7); + suggester_->OnExternalSuggestionsUpdated(suggestions); + suggester_->DismissSuggestion(); - ASSERT_EQ(suggestion_handler.GetAnnouncements().size(), 2); - EXPECT_EQ(suggestion_handler.GetAnnouncements().back(), + ASSERT_EQ(suggestion_handler_.GetAnnouncements().size(), 2); + EXPECT_EQ(suggestion_handler_.GetAnnouncements().back(), u"predictive writing candidate dismissed"); } -TEST(MultiWordSuggesterTest, - TransitionsFromDismissSuggestionToNoSuggestionDoesNotTriggerAnnounce) { - FakeSuggestionHandler suggestion_handler; - MultiWordSuggester suggester(&suggestion_handler); - +TEST_F(MultiWordSuggesterTest, + TransitionsFromDismissSuggestionToNoSuggestionDoesNotTriggerAnnounce) { std::vector<TextSuggestion> suggestions = { TextSuggestion{.mode = TextSuggestionMode::kCompletion, .type = TextSuggestionType::kMultiWord, .text = "aren\'t you"}, }; - suggester.OnFocus(kFocusedContextId); - suggester.OnSurroundingTextChanged(u"why are", 7, 7); - suggester.Suggest(u"why are", 7, 7); - suggester.OnExternalSuggestionsUpdated(suggestions); - suggester.DismissSuggestion(); - suggester.OnSurroundingTextChanged(u"why aren", 8, 8); - suggester.Suggest(u"why aren", 8, 8); + suggester_->OnFocus(kFocusedContextId); + suggester_->OnSurroundingTextChanged(u"why are", 7, 7); + suggester_->Suggest(u"why are", 7, 7); + suggester_->OnExternalSuggestionsUpdated(suggestions); + suggester_->DismissSuggestion(); + suggester_->OnSurroundingTextChanged(u"why aren", 8, 8); + suggester_->Suggest(u"why aren", 8, 8); - ASSERT_EQ(suggestion_handler.GetAnnouncements().size(), 2); + ASSERT_EQ(suggestion_handler_.GetAnnouncements().size(), 2); } } // namespace input_method
diff --git a/chrome/browser/ash/mobile/mobile_activator.cc b/chrome/browser/ash/mobile/mobile_activator.cc index 10d574a..42fbea5 100644 --- a/chrome/browser/ash/mobile/mobile_activator.cc +++ b/chrome/browser/ash/mobile/mobile_activator.cc
@@ -810,9 +810,8 @@ case PlanActivationState::kInitiatingActivation: case PlanActivationState::kTryingOTASP: case PlanActivationState::kOTASP: - // This used to call Shill.Service.ActivateCellularModem, however that - // method is no longer implemented. Instead this just starts the timer - // waiting for activation state changes. https://crbug.com/1021688. + // Starts the timer waiting for activation state changes. + // https://crbug.com/1021688. StartOTASPTimer(); break; case PlanActivationState::kPageLoading:
diff --git a/chrome/browser/ash/net/network_throttling_observer.cc b/chrome/browser/ash/net/network_throttling_observer.cc index 5d5ad8d..1267052e 100644 --- a/chrome/browser/ash/net/network_throttling_observer.cc +++ b/chrome/browser/ash/net/network_throttling_observer.cc
@@ -39,9 +39,8 @@ const std::string& pref_name) { DCHECK(pref_name == prefs::kNetworkThrottlingEnabled); - const base::DictionaryValue* throttling_policy = - &base::Value::AsDictionaryValue( - *local_state_->GetDictionary(prefs::kNetworkThrottlingEnabled)); + const base::Value* throttling_policy = + local_state_->GetDictionary(prefs::kNetworkThrottlingEnabled); // Default is to disable throttling if the policy is not found. bool enabled = false;
diff --git a/chrome/browser/ash/phonehub/camera_roll_download_manager_impl.cc b/chrome/browser/ash/phonehub/camera_roll_download_manager_impl.cc index c262945..ed7545f 100644 --- a/chrome/browser/ash/phonehub/camera_roll_download_manager_impl.cc +++ b/chrome/browser/ash/phonehub/camera_roll_download_manager_impl.cc
@@ -19,10 +19,14 @@ #include "base/location.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" +#include "base/metrics/histogram_functions.h" +#include "base/numerics/clamped_math.h" +#include "base/numerics/safe_conversions.h" #include "base/system/sys_info.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" +#include "base/time/time.h" #include "chrome/browser/ui/ash/holding_space/holding_space_keyed_service.h" #include "chromeos/components/multidevice/logging/logging.h" #include "chromeos/services/secure_channel/public/mojom/secure_channel_types.mojom.h" @@ -33,6 +37,8 @@ namespace { +const size_t kBytesPerKilobyte = 1024; + scoped_refptr<base::SequencedTaskRunner> CreateTaskRunner() { return base::ThreadPool::CreateSequencedTaskRunner( {base::MayBlock(), base::TaskPriority::USER_VISIBLE}); @@ -61,18 +67,13 @@ CameraRollDownloadManagerImpl::DownloadItem::DownloadItem( int64_t payload_id, const base::FilePath& file_path, + int64_t file_size_bytes, const std::string& holding_space_item_id) : payload_id(payload_id), file_path(file_path), + file_size_bytes(file_size_bytes), holding_space_item_id(holding_space_item_id) {} -CameraRollDownloadManagerImpl::DownloadItem::DownloadItem( - const CameraRollDownloadManagerImpl::DownloadItem&) = default; - -CameraRollDownloadManagerImpl::DownloadItem& -CameraRollDownloadManagerImpl::DownloadItem::operator=( - const CameraRollDownloadManagerImpl::DownloadItem&) = default; - CameraRollDownloadManagerImpl::DownloadItem::~DownloadItem() = default; CameraRollDownloadManagerImpl::CameraRollDownloadManagerImpl( @@ -158,7 +159,8 @@ ash::HoldingSpaceProgress(/*current_bytes=*/0, /*total_bytes=*/file_size_bytes)); pending_downloads_.emplace( - payload_id, DownloadItem(payload_id, file_path, holding_space_item_id)); + payload_id, DownloadItem(payload_id, file_path, file_size_bytes, + holding_space_item_id)); std::move(payload_files_callback) .Run(CreatePayloadFilesResult::kSuccess, std::move(payload_files)); @@ -173,7 +175,8 @@ return; } - holding_space_keyed_service_->UpdateItem(it->second.holding_space_item_id) + const DownloadItem& download_item = it->second; + holding_space_keyed_service_->UpdateItem(download_item.holding_space_item_id) ->SetProgress(ash::HoldingSpaceProgress(update->bytes_transferred, update->total_bytes)) .SetInvalidateImage( @@ -188,25 +191,41 @@ // Delete files created for failed and canceled items, in addition to // removing the DownloadItem objects. DeleteFile(update->payload_id); - ABSL_FALLTHROUGH_INTENDED; + return; case chromeos::secure_channel::mojom::FileTransferStatus::kSuccess: + base::UmaHistogramCounts100000( + "PhoneHub.CameraRoll.DownloadItem.TransferRate", + CalculateItemTransferRate(download_item)); pending_downloads_.erase(it); } } +int CameraRollDownloadManagerImpl::CalculateItemTransferRate( + const DownloadItem& download_item) const { + base::TimeDelta total_download_time = + base::TimeTicks::Now() - download_item.start_timestamp; + base::ClampedNumeric bytes_per_second = base::ClampDiv( + download_item.file_size_bytes, total_download_time.InSecondsF()); + return base::saturated_cast<int>( + base::ClampDiv(bytes_per_second, kBytesPerKilobyte)); +} + void CameraRollDownloadManagerImpl::DeleteFile(int64_t payload_id) { - if (pending_downloads_.contains(payload_id)) { - task_runner_->PostTask( - FROM_HERE, base::BindOnce( - [](const DownloadItem& download_item) { - if (!base::DeleteFile(download_item.file_path)) { - PA_LOG(WARNING) - << "Failed to delete file for payload " - << download_item.payload_id; - } - }, - pending_downloads_.at(payload_id))); + auto it = pending_downloads_.find(payload_id); + if (it == pending_downloads_.end()) { + return; } + + task_runner_->PostTask( + FROM_HERE, base::BindOnce( + [](const base::FilePath& file_path, int64_t payload_id) { + if (!base::DeleteFile(file_path)) { + PA_LOG(WARNING) << "Failed to delete file for payload " + << payload_id; + } + }, + it->second.file_path, payload_id)); + pending_downloads_.erase(it); } } // namespace phonehub
diff --git a/chrome/browser/ash/phonehub/camera_roll_download_manager_impl.h b/chrome/browser/ash/phonehub/camera_roll_download_manager_impl.h index 50b0dc26..519a871 100644 --- a/chrome/browser/ash/phonehub/camera_roll_download_manager_impl.h +++ b/chrome/browser/ash/phonehub/camera_roll_download_manager_impl.h
@@ -15,6 +15,7 @@ #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/task/sequenced_task_runner.h" +#include "base/time/time.h" #include "chrome/browser/ui/ash/holding_space/holding_space_keyed_service.h" #include "chromeos/services/secure_channel/public/mojom/secure_channel_types.mojom.h" @@ -44,14 +45,17 @@ struct DownloadItem { DownloadItem(int64_t payload_id, const base::FilePath& file_path, + int64_t file_size_bytes, const std::string& holding_space_item_id); - DownloadItem(const DownloadItem&); - DownloadItem& operator=(const DownloadItem&); + DownloadItem(DownloadItem&&) = default; + DownloadItem& operator=(DownloadItem&&) = default; ~DownloadItem(); int64_t payload_id; base::FilePath file_path; + int64_t file_size_bytes; std::string holding_space_item_id; + base::TimeTicks start_timestamp = base::TimeTicks::Now(); }; void OnDiskSpaceCheckComplete( @@ -70,6 +74,7 @@ int64_t file_size_bytes, CreatePayloadFilesCallback payload_files_callback, chromeos::secure_channel::mojom::PayloadFilesPtr payload_files); + int CalculateItemTransferRate(const DownloadItem& download_item) const; const base::FilePath download_path_; ash::HoldingSpaceKeyedService* holding_space_keyed_service_;
diff --git a/chrome/browser/ash/phonehub/camera_roll_download_manager_impl_unittest.cc b/chrome/browser/ash/phonehub/camera_roll_download_manager_impl_unittest.cc index ff50a55..b32f78c 100644 --- a/chrome/browser/ash/phonehub/camera_roll_download_manager_impl_unittest.cc +++ b/chrome/browser/ash/phonehub/camera_roll_download_manager_impl_unittest.cc
@@ -20,7 +20,9 @@ #include "base/run_loop.h" #include "base/system/sys_info.h" #include "base/test/bind.h" +#include "base/test/metrics/histogram_tester.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "chrome/browser/ash/login/users/fake_chrome_user_manager.h" #include "chrome/browser/ui/ash/holding_space/holding_space_keyed_service.h" #include "chrome/browser/ui/ash/holding_space/holding_space_keyed_service_factory.h" @@ -132,9 +134,11 @@ return camera_roll_download_manager_.get(); } - private: content::BrowserTaskEnvironment task_environment_{ base::test::TaskEnvironment::TimeSource::MOCK_TIME}; + base::HistogramTester histogram_tester_; + + private: std::unique_ptr<TestingProfileManager> profile_manager_; TestingProfile* const profile_; ash::FakeChromeUserManager* const user_manager_; @@ -236,15 +240,17 @@ TEST_F(CameraRollDownloadManagerImplTest, UpdateDownloadProgress) { proto::CameraRollItemMetadata item_metadata; item_metadata.set_file_name("IMG_0001.jpeg"); - item_metadata.set_file_size_bytes(1000); + int64_t file_size_bytes = 1024 * 30; // 30 KB; + item_metadata.set_file_size_bytes(file_size_bytes); CreatePayloadFiles(/*payload_id=*/1234, item_metadata); + task_environment_.FastForwardBy(base::Seconds(10)); camera_roll_download_manager()->UpdateDownloadProgress( chromeos::secure_channel::mojom::FileTransferUpdate::New( /*payload_id=*/1234, chromeos::secure_channel::mojom::FileTransferStatus::kInProgress, - /*total_bytes=*/1000, - /*bytes_transferred=*/500)); + /*total_bytes=*/file_size_bytes, + /*bytes_transferred=*/file_size_bytes / 2)); const base::FilePath expected_path = GetDownloadPath().Append("IMG_0001.jpeg"); @@ -254,14 +260,19 @@ EXPECT_FALSE(holding_space_item->progress().IsComplete()); EXPECT_EQ(0.5f, holding_space_item->progress().GetValue()); + task_environment_.FastForwardBy(base::Seconds(5)); camera_roll_download_manager()->UpdateDownloadProgress( chromeos::secure_channel::mojom::FileTransferUpdate::New( /*payload_id=*/1234, chromeos::secure_channel::mojom::FileTransferStatus::kSuccess, - /*total_bytes=*/1000, - /*bytes_transferred=*/1000)); + /*total_bytes=*/file_size_bytes, + /*bytes_transferred=*/file_size_bytes)); EXPECT_TRUE(holding_space_item->progress().IsComplete()); EXPECT_EQ(1, holding_space_item->progress().GetValue()); + // Expected transfer rate is 30 KB / (10 + 5) s = 2 Kb/s + histogram_tester_.ExpectUniqueSample( + "PhoneHub.CameraRoll.DownloadItem.TransferRate", 2, + /*expected_bucket_count=*/1); } TEST_F(CameraRollDownloadManagerImplTest,
diff --git a/chrome/browser/ash/plugin_vm/plugin_vm_installer.cc b/chrome/browser/ash/plugin_vm/plugin_vm_installer.cc index 618790c7..5119113 100644 --- a/chrome/browser/ash/plugin_vm/plugin_vm_installer.cc +++ b/chrome/browser/ash/plugin_vm/plugin_vm_installer.cc
@@ -85,7 +85,7 @@ switch (installing_state) { case PluginVmInstaller::InstallingState::kInactive: NOTREACHED(); - FALLTHROUGH; + [[fallthrough]]; case PluginVmInstaller::InstallingState::kCheckingLicense: return PluginVmSetupResult::kUserCancelledValidatingLicense; case PluginVmInstaller::InstallingState::kCheckingDiskSpace:
diff --git a/chrome/browser/ash/plugin_vm/plugin_vm_manager_impl.cc b/chrome/browser/ash/plugin_vm/plugin_vm_manager_impl.cc index 71dd34e..1c92fe8c 100644 --- a/chrome/browser/ash/plugin_vm/plugin_vm_manager_impl.cc +++ b/chrome/browser/ash/plugin_vm/plugin_vm_manager_impl.cc
@@ -84,7 +84,7 @@ switch (result) { default: NOTREACHED(); - FALLTHROUGH; + [[fallthrough]]; case PluginVmLaunchResult::kError: title = l10n_util::GetStringFUTF16(IDS_PLUGIN_VM_START_VM_ERROR_TITLE, app_name);
diff --git a/chrome/browser/ash/web_applications/projector_system_web_app_info.cc b/chrome/browser/ash/web_applications/projector_system_web_app_info.cc index b836e056..5286135 100644 --- a/chrome/browser/ash/web_applications/projector_system_web_app_info.cc +++ b/chrome/browser/ash/web_applications/projector_system_web_app_info.cc
@@ -5,13 +5,27 @@ #include "chrome/browser/ash/web_applications/projector_system_web_app_info.h" #include "ash/constants/ash_features.h" +#include "ash/constants/ash_pref_names.h" #include "ash/grit/ash_projector_app_trusted_resources.h" #include "ash/webui/projector_app/public/cpp/projector_app_constants.h" #include "chrome/browser/ash/web_applications/system_web_app_install_utils.h" #include "chrome/browser/policy/profile_policy_connector.h" #include "chrome/grit/generated_resources.h" +#include "components/prefs/pref_service.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/chromeos/styles/cros_styles.h" + +namespace { + +SkColor GetBgColor(bool use_dark_mode) { + return cros_styles::ResolveColor( + cros_styles::ColorName::kBgColor, use_dark_mode, + base::FeatureList::IsEnabled( + ash::features::kSemanticColorsDebugOverride)); +} + +} // namespace ProjectorSystemWebAppDelegate::ProjectorSystemWebAppDelegate(Profile* profile) : web_app::SystemWebAppDelegate(web_app::SystemAppType::PROJECTOR, @@ -32,8 +46,8 @@ // TODO(b/195127670): Add 48, 128, and 192 size icons through // CreateIconInfoForSystemWebApp(). - // TODO(b/195127670): Figure out the theme color. - info->theme_color = SK_ColorBLACK; + info->theme_color = GetBgColor(/*use_dark_mode=*/false); + info->dark_mode_theme_color = GetBgColor(/*use_dark_mode=*/true); info->display_mode = blink::mojom::DisplayMode::kStandalone; info->user_display_mode = blink::mojom::DisplayMode::kStandalone; @@ -55,7 +69,7 @@ return ash::features::IsProjectorAllUserEnabled(); } - // TODO(b/209675088): Check Projector admin policy. - return ash::features::IsProjectorEnabled() || - ash::features::IsProjectorManagedUserEnabled(); + // Check feature availability and admin policy for managed users. + return ash::features::IsProjectorEnabled() && + profile_->GetPrefs()->GetBoolean(ash::prefs::kProjectorAllowByPolicy); }
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc index 042a9c1..e194037 100644 --- a/chrome/browser/chrome_browser_main.cc +++ b/chrome/browser/chrome_browser_main.cc
@@ -1429,12 +1429,6 @@ if (profile_info.mode == StartupProfileMode::kError) return content::RESULT_CODE_NORMAL_EXIT; - if (base::FeatureList::IsEnabled( - features::kSpareRendererOnPrimaryProfileCreation)) { - content::RenderProcessHost::WarmupSpareRenderProcessHost( - profile_info.profile); - } - #if defined(OS_WIN) && BUILDFLAG(USE_BROWSER_SPELLCHECKER) // Create the spellcheck service. This will asynchronously retrieve the // Windows platform spellcheck dictionary language tags used to populate the
diff --git a/chrome/browser/chromeos/BUILD.gn b/chrome/browser/chromeos/BUILD.gn index 0e3423c..d65f3975 100644 --- a/chrome/browser/chromeos/BUILD.gn +++ b/chrome/browser/chromeos/BUILD.gn
@@ -743,8 +743,6 @@ "../ash/arc/arc_ui_availability_reporter.h", "../ash/arc/arc_util.cc", "../ash/arc/arc_util.h", - "../ash/arc/arc_web_contents_data.cc", - "../ash/arc/arc_web_contents_data.h", "../ash/arc/auth/arc_active_directory_enrollment_token_fetcher.cc", "../ash/arc/auth/arc_active_directory_enrollment_token_fetcher.h", "../ash/arc/auth/arc_auth_code_fetcher.h", @@ -3242,6 +3240,8 @@ "app_mode/kiosk_session_plugin_handler_delegate.h", "app_mode/kiosk_settings_navigation_throttle.cc", "app_mode/kiosk_settings_navigation_throttle.h", + "arc/arc_web_contents_data.cc", + "arc/arc_web_contents_data.h", "arc/icon_decode_request.cc", "arc/icon_decode_request.h", "extensions/active_tab_permission_granter_delegate_chromeos.cc", @@ -4934,6 +4934,11 @@ deps = [ ":session_affiliated_user" ] } +proto_library("crd_event_proto") { + sources = [ "../policy/messaging_layer/proto/synced/crd_event.proto" ] + deps = [ ":session_affiliated_user" ] +} + proto_library("session_affiliated_user") { sources = [ "../policy/messaging_layer/proto/synced/session_affiliated_user.proto" ]
diff --git a/chrome/browser/ash/arc/arc_web_contents_data.cc b/chrome/browser/chromeos/arc/arc_web_contents_data.cc similarity index 88% rename from chrome/browser/ash/arc/arc_web_contents_data.cc rename to chrome/browser/chromeos/arc/arc_web_contents_data.cc index 7bc33fd..69cd711 100644 --- a/chrome/browser/ash/arc/arc_web_contents_data.cc +++ b/chrome/browser/chromeos/arc/arc_web_contents_data.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ash/arc/arc_web_contents_data.h" +#include "chrome/browser/chromeos/arc/arc_web_contents_data.h" namespace arc {
diff --git a/chrome/browser/ash/arc/arc_web_contents_data.h b/chrome/browser/chromeos/arc/arc_web_contents_data.h similarity index 82% rename from chrome/browser/ash/arc/arc_web_contents_data.h rename to chrome/browser/chromeos/arc/arc_web_contents_data.h index 20b43dde..e6acbc8 100644 --- a/chrome/browser/ash/arc/arc_web_contents_data.h +++ b/chrome/browser/chromeos/arc/arc_web_contents_data.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_ASH_ARC_ARC_WEB_CONTENTS_DATA_H_ -#define CHROME_BROWSER_ASH_ARC_ARC_WEB_CONTENTS_DATA_H_ +#ifndef CHROME_BROWSER_CHROMEOS_ARC_ARC_WEB_CONTENTS_DATA_H_ +#define CHROME_BROWSER_CHROMEOS_ARC_ARC_WEB_CONTENTS_DATA_H_ #include "content/public/browser/web_contents_user_data.h" @@ -30,4 +30,4 @@ } // namespace arc -#endif // CHROME_BROWSER_ASH_ARC_ARC_WEB_CONTENTS_DATA_H_ +#endif // CHROME_BROWSER_CHROMEOS_ARC_ARC_WEB_CONTENTS_DATA_H_
diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn index 166cb3d..e4c1e03 100644 --- a/chrome/browser/extensions/BUILD.gn +++ b/chrome/browser/extensions/BUILD.gn
@@ -158,8 +158,6 @@ "api/gcm/gcm_api.h", "api/history/history_api.cc", "api/history/history_api.h", - "api/i18n/i18n_api.cc", - "api/i18n/i18n_api.h", "api/identity/extension_token_key.cc", "api/identity/extension_token_key.h", "api/identity/gaia_remote_consent_flow.cc",
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 56dafd7..33eb06db 100644 --- a/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc +++ b/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc
@@ -399,7 +399,7 @@ case InstallableCheckResult::kInstallable: content::WebContents* containing_contents = web_contents.get(); chrome::ScopedTabbedBrowserDisplayer displayer(profile); - const GURL& url = web_contents->GetURL(); + const GURL& url = web_contents->GetLastCommittedURL(); chrome::AddWebContents( displayer.browser(), nullptr, std::move(web_contents), url, WindowOpenDisposition::NEW_FOREGROUND_TAB, gfx::Rect());
diff --git a/chrome/browser/extensions/api/virtual_keyboard_private/chrome_virtual_keyboard_delegate.cc b/chrome/browser/extensions/api/virtual_keyboard_private/chrome_virtual_keyboard_delegate.cc index c5ec93b3..1e8ad26 100644 --- a/chrome/browser/extensions/api/virtual_keyboard_private/chrome_virtual_keyboard_delegate.cc +++ b/chrome/browser/extensions/api/virtual_keyboard_private/chrome_virtual_keyboard_delegate.cc
@@ -656,10 +656,11 @@ if (config != current_config) { ChromeKeyboardControllerClient::Get()->SetKeyboardConfig(config); - // This reloads virtual keyboard even if it exists. This ensures virtual - // keyboard gets the correct state through - // chrome.virtualKeyboardPrivate.getKeyboardConfig. - // TODO(oka): Extension should reload on it's own by receiving event + // This reloads the virtual keyboard (VK) even if it exists, so it can get + // new restrictFeatures via chrome.virtualKeyboardPrivate.getKeyboardConfig. + // However, this reload is unnecessary as the API specs do NOT require + // restrictFeatures to take effect immediately midway through a VK session. + // Keeping this unnecessary reload for now, just to avoid behaviour changes. ChromeKeyboardControllerClient::Get()->RebuildKeyboardIfEnabled(); } return update;
diff --git a/chrome/browser/feed/android/web_feed_bridge.cc b/chrome/browser/feed/android/web_feed_bridge.cc index 81cda3b..4f2c1bc 100644 --- a/chrome/browser/feed/android/web_feed_bridge.cc +++ b/chrome/browser/feed/android/web_feed_bridge.cc
@@ -136,8 +136,9 @@ } void OnCanonicalUrlFetched(const absl::optional<::GURL>& url) { - if (url) - page_info_.SetUrl(*url); + if (url) { + page_info_.SetCanonicalUrl(*url); + } url_fetched_ = true; CallCallbackIfReady();
diff --git a/chrome/browser/feedback/feedback_dialog_utils.cc b/chrome/browser/feedback/feedback_dialog_utils.cc index 9156ea29..6077cf55 100644 --- a/chrome/browser/feedback/feedback_dialog_utils.cc +++ b/chrome/browser/feedback/feedback_dialog_utils.cc
@@ -42,7 +42,7 @@ } } if (target_tab) - return target_tab->GetURL(); + return target_tab->GetLastCommittedURL(); } }
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json index 709623f..2f4631ac 100644 --- a/chrome/browser/flag-metadata.json +++ b/chrome/browser/flag-metadata.json
@@ -5538,6 +5538,11 @@ "expiry_milestone": 101 }, { + "name": "usb-notification-controller", + "owners": [ "jthies", "bleung" ], + "expiry_milestone": 102 + }, + { "name": "use-angle", "owners": [ "angle-team@google.com" ], // This flag is used by certain customers to set ANGLE to use its OpenGL @@ -5625,6 +5630,11 @@ "expiry_milestone": -1 }, { + "name": "use-ulp-languages-in-chrome", + "owners": [ "chrome-language@google.com" ], + "expiry_milestone": 105 + }, + { "name": "use-wallpaper-staging-url", "owners": [ "cros-customization@google.com", "hsuregan", "khorimoto" ], // This flag is required for QA and dogfood testing.
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc index 7177a5a..a4e7868 100644 --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc
@@ -3559,6 +3559,10 @@ const char kUserMediaScreenCapturingDescription[] = "Allows sites to request a video stream of your screen."; +const char kUseULPLanguagesInChromeName[] = "Use ULP languages in Chrome"; +const char kUseULPLanguagesInChromeDescription[] = + "Enables use of ULP language data in Chrome"; + const char kVideoTutorialsName[] = "Enable video tutorials"; const char kVideoTutorialsDescription[] = "Show video tutorials in Chrome"; const char kVideoTutorialsInstantFetchName[] = @@ -5190,6 +5194,11 @@ const char kUiSlowAnimationsName[] = "Slow UI animations"; const char kUiSlowAnimationsDescription[] = "Makes all UI animations slow."; +const char kUsbNotificationControllerName[] = + "Enable USB Notification Controller"; +const char kUsbNotificationControllerDescription[] = + "Enables USB related notifications from the Chrome OS type-c daemon."; + const char kVaapiJpegImageDecodeAccelerationName[] = "VA-API JPEG decode acceleration for images"; const char kVaapiJpegImageDecodeAccelerationDescription[] =
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h index 34cf8cb..cf3bb4e8 100644 --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h
@@ -2045,6 +2045,9 @@ extern const char kUserMediaScreenCapturingName[]; extern const char kUserMediaScreenCapturingDescription[]; +extern const char kUseULPLanguagesInChromeName[]; +extern const char kUseULPLanguagesInChromeDescription[]; + extern const char kVideoTutorialsName[]; extern const char kVideoTutorialsDescription[]; extern const char kVideoTutorialsInstantFetchName[]; @@ -2990,6 +2993,9 @@ extern const char kUiSlowAnimationsName[]; extern const char kUiSlowAnimationsDescription[]; +extern const char kUsbNotificationControllerName[]; +extern const char kUsbNotificationControllerDescription[]; + extern const char kUseFakeDeviceForMediaStreamName[]; extern const char kUseFakeDeviceForMediaStreamDescription[];
diff --git a/chrome/browser/language/android/BUILD.gn b/chrome/browser/language/android/BUILD.gn index 6811ae5..6b5a619 100644 --- a/chrome/browser/language/android/BUILD.gn +++ b/chrome/browser/language/android/BUILD.gn
@@ -25,6 +25,7 @@ sources = [ "java/src/org/chromium/chrome/browser/language/AppLanguagePromoDialog.java", "java/src/org/chromium/chrome/browser/language/LanguageAskPrompt.java", + "java/src/org/chromium/chrome/browser/language/LanguageBridge.java", "java/src/org/chromium/chrome/browser/language/settings/AlwaysTranslateListFragment.java", "java/src/org/chromium/chrome/browser/language/settings/AppLanguagePreferenceDelegate.java", "java/src/org/chromium/chrome/browser/language/settings/ContentLanguagesPreference.java", @@ -56,6 +57,7 @@ "//components/browser_ui/styles/android:java", "//components/browser_ui/widget/android:java", "//components/language/android:java", + "//components/language/android:ulp_delegate_java", "//components/prefs/android:java", "//components/user_prefs/android:java", "//content/public/android:content_java", @@ -74,8 +76,10 @@ } generate_jni("jni_headers") { - sources = - [ "java/src/org/chromium/chrome/browser/translate/TranslateBridge.java" ] + sources = [ + "java/src/org/chromium/chrome/browser/language/LanguageBridge.java", + "java/src/org/chromium/chrome/browser/translate/TranslateBridge.java", + ] } android_resources("java_resources") {
diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/LanguageBridge.java b/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/LanguageBridge.java new file mode 100644 index 0000000..b73a8c7 --- /dev/null +++ b/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/LanguageBridge.java
@@ -0,0 +1,31 @@ +// Copyright 2021 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.language; + +import android.text.TextUtils; + +import org.chromium.base.annotations.CalledByNative; +import org.chromium.components.language.LanguageProfileController; +import org.chromium.components.language.LanguageProfileDelegateImpl; + +import java.util.List; + +/** + * Bridge class for native code to access ULP data for a profile. + * @param accountName Account name for current profile for querying ULP. + */ +public class LanguageBridge { + @CalledByNative + public static String[] getULPLanguages(String accountName) { + LanguageProfileDelegateImpl delegate = new LanguageProfileDelegateImpl(); + LanguageProfileController controller = new LanguageProfileController(delegate); + + if (TextUtils.isEmpty(accountName)) accountName = null; + List<String> languages_list = controller.getLanguagePreferences(accountName); + String[] languages_array = new String[languages_list.size()]; + languages_array = languages_list.toArray(languages_array); + return languages_array; + } +}
diff --git a/chrome/browser/language/language_model_manager_factory.cc b/chrome/browser/language/language_model_manager_factory.cc index d3a1fbe..2bcfd769 100644 --- a/chrome/browser/language/language_model_manager_factory.cc +++ b/chrome/browser/language/language_model_manager_factory.cc
@@ -7,23 +7,115 @@ #include <memory> #include "base/feature_list.h" +#include "base/task/post_task.h" +#include "base/task/thread_pool.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/incognito_helpers.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/profiles/profile_manager.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" #include "components/keyed_service/core/keyed_service.h" #include "components/language/content/browser/geo_language_model.h" #include "components/language/content/browser/geo_language_provider.h" #include "components/language/core/browser/language_model_manager.h" +#include "components/language/core/browser/language_prefs.h" +#include "components/language/core/browser/locale_util.h" #include "components/language/core/browser/pref_names.h" +#include "components/language/core/browser/ulp_metrics_logger.h" #include "components/language/core/common/language_experiments.h" #include "components/language/core/language_model/baseline_language_model.h" #include "components/language/core/language_model/fluent_language_model.h" +#include "components/language/core/language_model/ulp_language_model.h" #include "components/pref_registry/pref_registry_syncable.h" #include "components/prefs/pref_service.h" +#include "components/translate/core/browser/translate_prefs.h" + +#if defined(OS_ANDROID) +#include "base/android/jni_string.h" +#include "base/android/scoped_java_ref.h" +#include "chrome/browser/language/android/jni_headers/LanguageBridge_jni.h" +#endif namespace { +#if defined(OS_ANDROID) +// Records per-initialization ULP-related metrics. +void RecordULPInitMetrics(Profile* profile, + const std::vector<std::string>& ulp_languages) { + language::ULPMetricsLogger logger; + + logger.RecordInitiationLanguageCount(ulp_languages.size()); + + PrefService* pref_service = profile->GetPrefs(); + const std::string app_locale = g_browser_process->GetApplicationLocale(); + logger.RecordInitiationUILanguageInULP( + logger.DetermineLanguageStatus(app_locale, ulp_languages)); + + const std::string translate_target_language = + translate::TranslatePrefs(pref_service).GetRecentTargetLanguage(); + logger.RecordInitiationTranslateTargetInULP( + logger.DetermineLanguageStatus(translate_target_language, ulp_languages)); + + std::vector<std::string> accept_languages; + language::LanguagePrefs(pref_service) + .GetAcceptLanguagesList(&accept_languages); + + language::ULPLanguageStatus accept_language_status = + language::ULPLanguageStatus::kLanguageNotInULP; + if (accept_languages.size() > 0) { + accept_language_status = + logger.DetermineLanguageStatus(accept_languages[0], ulp_languages); + } + logger.RecordInitiationTopAcceptLanguageInULP(accept_language_status); + + logger.RecordInitiationAcceptLanguagesULPOverlap( + logger.ULPLanguagesInAcceptLanguagesRatio(accept_languages, + ulp_languages)); +} + +std::vector<std::string> JavaLanguageBridgeGetULPLanguagesWrapper( + std::string account_name) { + JNIEnv* env = base::android::AttachCurrentThread(); + base::android::ScopedJavaLocalRef<jstring> account_name_java = + base::android::ConvertUTF8ToJavaString(env, account_name); + base::android::ScopedJavaLocalRef<jobjectArray> languages_java = + Java_LanguageBridge_getULPLanguages(env, account_name_java); + + const int num_langs = (*env).GetArrayLength(languages_java.obj()); + std::vector<std::string> languages; + for (int i = 0; i < num_langs; i++) { + jstring language_name_java = + (jstring)(*env).GetObjectArrayElement(languages_java.obj(), i); + languages.emplace_back( + base::android::ConvertJavaStringToUTF8(env, language_name_java)); + } + + return languages; +} + +void CreateAndAddULPLanguageModel(Profile* profile, + std::vector<std::string> languages) { + RecordULPInitMetrics(profile, languages); + + std::unique_ptr<language::ULPLanguageModel> ulp_model = + std::make_unique<language::ULPLanguageModel>(); + + int score_divisor = 1; + for (std::string lang : languages) { + // List of languages is already ordered by preference, generate scores + // accordingly. + ulp_model->AddULPLanguage(lang, 1.0f / score_divisor); + score_divisor++; + } + + language::LanguageModelManager* manager = + LanguageModelManagerFactory::GetForBrowserContext(profile); + manager->AddModel(language::LanguageModelManager::ModelType::ULP, + std::move(ulp_model)); +} +#endif + void PrepareLanguageModels(Profile* const profile, language::LanguageModelManager* const manager) { // Create and set the primary Language Model to use based on the state of @@ -53,6 +145,18 @@ language::LanguageModelManager::ModelType::BASELINE); break; } + + // On Android, additionally create a ULPLanguageModel and populate it with + // ULP data. +#if defined(OS_ANDROID) + if (base::FeatureList::IsEnabled(language::kUseULPLanguagesInChrome)) { + base::ThreadPool::PostTaskAndReplyWithResult( + FROM_HERE, {base::MayBlock()}, + base::BindOnce(&JavaLanguageBridgeGetULPLanguagesWrapper, + profile->GetProfileUserName()), + base::BindOnce(&CreateAndAddULPLanguageModel, profile)); + } +#endif } } // namespace
diff --git a/chrome/browser/language/language_model_manager_factory_unittest.cc b/chrome/browser/language/language_model_manager_factory_unittest.cc index 86d6bbe..5f4c0f56 100644 --- a/chrome/browser/language/language_model_manager_factory_unittest.cc +++ b/chrome/browser/language/language_model_manager_factory_unittest.cc
@@ -26,4 +26,7 @@ ASSERT_THAT(incognito, Not(IsNull())); EXPECT_THAT(LanguageModelManagerFactory::GetForBrowserContext(incognito), Eq(manager)); + + // Must wait for task posted in PrepareLanguageModels to complete. + task_environment.RunUntilIdle(); }
diff --git a/chrome/browser/media_galleries/media_galleries_preferences.cc b/chrome/browser/media_galleries/media_galleries_preferences.cc index 2307989..b0d9921 100644 --- a/chrome/browser/media_galleries/media_galleries_preferences.cc +++ b/chrome/browser/media_galleries/media_galleries_preferences.cc
@@ -107,39 +107,37 @@ return count; } -bool GetPrefId(const base::DictionaryValue& dict, MediaGalleryPrefId* value) { - std::string string_id; - if (!dict.GetString(kMediaGalleriesPrefIdKey, &string_id) || - !base::StringToUint64(string_id, value)) { +bool GetPrefId(const base::Value& dict, MediaGalleryPrefId* value) { + const std::string* string_id = dict.FindStringKey(kMediaGalleriesPrefIdKey); + if (!string_id || !base::StringToUint64(*string_id, value)) { return false; } return true; } -bool GetType(const base::DictionaryValue& dict, - MediaGalleryPrefInfo::Type* type) { - std::string string_type; - if (!dict.GetString(kMediaGalleriesTypeKey, &string_type)) +bool GetType(const base::Value& dict, MediaGalleryPrefInfo::Type* type) { + const std::string* string_type = dict.FindStringKey(kMediaGalleriesTypeKey); + if (!string_type) return false; - if (string_type == kMediaGalleriesTypeUserAddedValue) { + if (*string_type == kMediaGalleriesTypeUserAddedValue) { *type = MediaGalleryPrefInfo::kUserAdded; return true; } - if (string_type == kMediaGalleriesTypeAutoDetectedValue) { + if (*string_type == kMediaGalleriesTypeAutoDetectedValue) { *type = MediaGalleryPrefInfo::kAutoDetected; return true; } - if (string_type == kMediaGalleriesTypeBlockListedValue) { + if (*string_type == kMediaGalleriesTypeBlockListedValue) { *type = MediaGalleryPrefInfo::kBlockListed; return true; } - if (string_type == kMediaGalleriesTypeScanResultValue) { + if (*string_type == kMediaGalleriesTypeScanResultValue) { *type = MediaGalleryPrefInfo::kScanResult; return true; } - if (string_type == kMediaGalleriesTypeRemovedScanValue) { + if (*string_type == kMediaGalleriesTypeRemovedScanValue) { *type = MediaGalleryPrefInfo::kRemovedScan; return true; } @@ -173,21 +171,21 @@ } MediaGalleryPrefInfo::DefaultGalleryType GetDefaultGalleryType( - const base::DictionaryValue& dict) { - std::string default_gallery_type_string; - if (!dict.GetString( - kMediaGalleriesDefaultGalleryTypeKey, &default_gallery_type_string)) + const base::Value& dict) { + const std::string* default_gallery_type_string = + dict.FindStringKey(kMediaGalleriesDefaultGalleryTypeKey); + if (!default_gallery_type_string) return MediaGalleryPrefInfo::kNotDefault; - if (default_gallery_type_string == + if (*default_gallery_type_string == kMediaGalleriesDefaultGalleryTypeMusicDefaultValue) { return MediaGalleryPrefInfo::kMusicDefault; } - if (default_gallery_type_string == + if (*default_gallery_type_string == kMediaGalleriesDefaultGalleryTypePicturesDefaultValue) { return MediaGalleryPrefInfo::kPicturesDefault; } - if (default_gallery_type_string == + if (*default_gallery_type_string == kMediaGalleriesDefaultGalleryTypeVideosDefaultValue) { return MediaGalleryPrefInfo::kVideosDefault; } @@ -218,7 +216,8 @@ } bool PopulateGalleryPrefInfoFromDictionary( - const base::DictionaryValue& dict, MediaGalleryPrefInfo* out_gallery_info) { + const base::Value& dict_value, + MediaGalleryPrefInfo* out_gallery_info) { MediaGalleryPrefId pref_id; std::u16string display_name; std::string device_id; @@ -231,6 +230,10 @@ absl::optional<double> last_attach_time; bool volume_metadata_valid = false; + // TODO(crbug.com/1187061): Refactor this to remove DictionaryValue. + const base::DictionaryValue& dict = + base::Value::AsDictionaryValue(dict_value); + if (!GetPrefId(dict, &pref_id) || !dict.GetString(kMediaGalleriesDeviceIdKey, &device_id) || !dict.GetString(kMediaGalleriesPathKey, &path) || @@ -342,9 +345,9 @@ bool GetMediaGalleryPermissionFromDictionary( const base::DictionaryValue* dict, MediaGalleryPermission* out_permission) { - const std::string* string_id = dict->FindStringPath(kMediaGalleryIdKey); + const std::string* string_id = dict->FindStringKey(kMediaGalleryIdKey); absl::optional<bool> has_permission = - dict->FindBoolPath(kMediaGalleryHasPermissionKey); + dict->FindBoolKey(kMediaGalleryHasPermissionKey); if (string_id && base::StringToUint64(*string_id, &out_permission->pref_id) && has_permission) { out_permission->has_permission = *has_permission; @@ -583,8 +586,7 @@ continue; MediaGalleryPrefInfo gallery_info; - if (!PopulateGalleryPrefInfoFromDictionary( - base::Value::AsDictionaryValue(gallery_value), &gallery_info)) + if (!PopulateGalleryPrefInfoFromDictionary(gallery_value, &gallery_info)) continue; known_galleries_[gallery_info.pref_id] = gallery_info; @@ -802,8 +804,7 @@ for (auto& gallery_value : list->GetList()) { MediaGalleryPrefId iter_id; - if (gallery_value.is_dict() && - GetPrefId(base::Value::AsDictionaryValue(gallery_value), &iter_id) && + if (gallery_value.is_dict() && GetPrefId(gallery_value, &iter_id) && *pref_id_it == iter_id) { if (update_gallery_type) gallery_value.SetStringKey(kMediaGalleriesTypeKey, @@ -902,8 +903,7 @@ for (auto& gallery_value : list->GetList()) { MediaGalleryPrefId pref_id; - if (!(gallery_value.is_dict() && - GetPrefId(base::Value::AsDictionaryValue(gallery_value), &pref_id))) + if (!(gallery_value.is_dict() && GetPrefId(gallery_value, &pref_id))) continue; std::string* default_gallery_type_string = @@ -998,12 +998,10 @@ for (auto iter = list->GetList().begin(); iter != list->GetList().end(); ++iter) { MediaGalleryPrefId iter_id; - if (iter->is_dict() && - GetPrefId(base::Value::AsDictionaryValue(*iter), &iter_id) && - id == iter_id) { + if (iter->is_dict() && GetPrefId(*iter, &iter_id) && id == iter_id) { RemoveGalleryPermissionsFromPrefs(id); MediaGalleryPrefInfo::Type type; - if (!erase && GetType(base::Value::AsDictionaryValue(*iter), &type) && + if (!erase && GetType(*iter, &type) && (type == MediaGalleryPrefInfo::kAutoDetected || type == MediaGalleryPrefInfo::kScanResult)) { if (type == MediaGalleryPrefInfo::kAutoDetected) {
diff --git a/chrome/browser/nearby_sharing/sharesheet/nearby_share_action.cc b/chrome/browser/nearby_sharing/sharesheet/nearby_share_action.cc index c5ace09..94206eb 100644 --- a/chrome/browser/nearby_sharing/sharesheet/nearby_share_action.cc +++ b/chrome/browser/nearby_sharing/sharesheet/nearby_share_action.cc
@@ -26,7 +26,6 @@ #include "chrome/common/webui_url_constants.h" #include "chrome/grit/generated_resources.h" #include "components/services/app_service/public/cpp/intent_util.h" -#include "net/base/filename_util.h" #include "storage/browser/file_system/file_system_context.h" #include "storage/browser/file_system/file_system_url.h" #include "third_party/skia/include/core/SkColor.h" @@ -38,42 +37,21 @@ namespace { -base::FilePath GetFilePathFromGurl( - const GURL& gurl, - const storage::FileSystemContext* fs_context) { - // For filesystem:// type URL. Path managed by file_manager (e.g. MyFiles). - if (gurl.SchemeIs(url::kFileSystemScheme)) { - if (!fs_context) { - return base::FilePath(); - } - - const storage::FileSystemURL fs_url = - fs_context->CrackURLInFirstPartyContext(gurl); - if (fs_url.is_valid()) { - return fs_url.path(); - } - } - - // For file:// type URL. Path is not managed by file_manager (used by ARC). - if (gurl.SchemeIs(url::kFileScheme)) { - base::FilePath file_path; - if (net::FileURLToFilePath(gurl, &file_path)) { - return file_path; - } - } - return base::FilePath(); -} - std::vector<base::FilePath> ResolveFileUrls( Profile* profile, const std::vector<apps::mojom::IntentFilePtr>& files) { std::vector<base::FilePath> file_paths; storage::FileSystemContext* fs_context = file_manager::util::GetFileManagerFileSystemContext(profile); + DCHECK(fs_context); for (const auto& file : files) { - const base::FilePath file_path = GetFilePathFromGurl(file->url, fs_context); - if (!file_path.empty()) { - file_paths.push_back(file_path); + // Only supports filesystem: type URLs, for paths managed by file_manager + // (e.g. MyFiles). + DCHECK(file->url.SchemeIsFileSystem()); + const storage::FileSystemURL fs_url = + fs_context->CrackURLInFirstPartyContext(file->url); + if (fs_url.is_valid()) { + file_paths.push_back(fs_url.path()); } } return file_paths;
diff --git a/chrome/browser/nearby_sharing/sharesheet/nearby_share_action_unittest.cc b/chrome/browser/nearby_sharing/sharesheet/nearby_share_action_unittest.cc index 3f78d30..9fa1c97 100644 --- a/chrome/browser/nearby_sharing/sharesheet/nearby_share_action_unittest.cc +++ b/chrome/browser/nearby_sharing/sharesheet/nearby_share_action_unittest.cc
@@ -9,11 +9,17 @@ #include <vector> #include "base/bind.h" +#include "base/files/file_path.h" +#include "chrome/browser/ash/file_manager/fileapi_util.h" +#include "chrome/browser/ash/file_manager/path_util.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" #include "chrome/test/base/testing_profile_manager.h" #include "components/services/app_service/public/cpp/intent_util.h" #include "content/public/test/browser_task_environment.h" +#include "storage/browser/file_system/external_mount_points.h" +#include "storage/browser/file_system/file_system_url.h" +#include "storage/common/file_system/file_system_types.h" #include "testing/gtest/include/gtest/gtest.h" namespace { @@ -23,9 +29,9 @@ const char kTitle[] = "Title"; const char kMimeTypeText[] = "text/plain"; const char kMimeTypeJPG[] = "image/jpg"; -const char kTextFile1[] = "file:///path/to/file1.txt"; -const char kTextFile2[] = "file:///path/to/file2.txt"; -const char kImageFile[] = "file:///path/to/file3.jpg"; +const char kTextFile1[] = "file1.txt"; +const char kTextFile2[] = "file2.txt"; +const char kImageFile[] = "file3.jpg"; const char kUrl[] = "https://google.com"; const char kDriveShareUrl[] = "https://docs.google.com"; @@ -63,6 +69,27 @@ ASSERT_DEATH(ActionCleanupCallbackStub(), ""); nearby_share_action_->SetActionCleanupCallbackForArc( base::BindOnce(&ActionCleanupCallbackStub)); + + storage::ExternalMountPoints* mount_points = + storage::ExternalMountPoints::GetSystemInstance(); + mount_points->RegisterFileSystem( + file_manager::util::GetDownloadsMountPointName(profile_), + storage::kFileSystemTypeLocal, storage::FileSystemMountOption(), + file_manager::util::GetDownloadsFolderForProfile(profile_)); + } + + GURL GetFileSystemUrl(const std::string& file_name) { + url::Origin origin = + url::Origin::Create(file_manager::util::GetFileManagerURL()); + std::string mount_point_name = + file_manager::util::GetDownloadsMountPointName(profile_); + storage::ExternalMountPoints* mount_points = + storage::ExternalMountPoints::GetSystemInstance(); + return mount_points + ->CreateExternalFileSystemURL(blink::StorageKey(origin), + mount_point_name, + base::FilePath(file_name)) + .ToGURL(); } std::vector<IntentTestCase> GetIntentTestCases() { @@ -84,43 +111,47 @@ TextAttachment::Type::kUrl, /*file_count=*/0}); // Drive share, one file test_cases.push_back( - {apps_util::CreateShareIntentFromDriveFile( - GURL(kTextFile1), kMimeTypeText, GURL(kDriveShareUrl), false), + {apps_util::CreateShareIntentFromDriveFile(GetFileSystemUrl(kTextFile1), + kMimeTypeText, + GURL(kDriveShareUrl), false), /*contains_hosted_document=*/true, /*should_show_action=*/true, TextAttachment::Type::kUrl, /*file_count=*/0}); // File share, one file test_cases.push_back({apps_util::CreateShareIntentFromFiles( - {GURL(kImageFile)}, {kMimeTypeJPG}), + {GetFileSystemUrl(kImageFile)}, {kMimeTypeJPG}), /*contains_hosted_document=*/false, /*should_show_action=*/true, absl::nullopt, /*file_count=*/1}); // File share, two text files - test_cases.push_back({apps_util::CreateShareIntentFromFiles( - {GURL(kTextFile1), GURL(kTextFile2)}, - {kMimeTypeText, kMimeTypeText}), - /*contains_hosted_document=*/false, - /*should_show_action=*/true, absl::nullopt, - /*file_count=*/2}); + test_cases.push_back( + {apps_util::CreateShareIntentFromFiles( + {GetFileSystemUrl(kTextFile1), GetFileSystemUrl(kTextFile2)}, + {kMimeTypeText, kMimeTypeText}), + /*contains_hosted_document=*/false, + /*should_show_action=*/true, absl::nullopt, + /*file_count=*/2}); // File share, two mixed files - test_cases.push_back({apps_util::CreateShareIntentFromFiles( - {GURL(kTextFile1), GURL(kImageFile)}, - {kMimeTypeText, kMimeTypeJPG}), - /*contains_hosted_document=*/false, - /*should_show_action=*/true, absl::nullopt, - /*file_count=*/2}); + test_cases.push_back( + {apps_util::CreateShareIntentFromFiles( + {GetFileSystemUrl(kTextFile1), GetFileSystemUrl(kImageFile)}, + {kMimeTypeText, kMimeTypeJPG}), + /*contains_hosted_document=*/false, + /*should_show_action=*/true, absl::nullopt, + /*file_count=*/2}); // File share, one file with title test_cases.push_back( - {apps_util::CreateShareIntentFromFiles({GURL(kImageFile)}, + {apps_util::CreateShareIntentFromFiles({GetFileSystemUrl(kImageFile)}, {kMimeTypeJPG}, kEmpty, kTitle), /*contains_hosted_document=*/false, /*should_show_action=*/true, absl::nullopt, /*file_count=*/1}); // Invalid: File share with text body - test_cases.push_back({apps_util::CreateShareIntentFromFiles( - {GURL(kTextFile1), GURL(kTextFile2)}, - {kMimeTypeText, kMimeTypeText}, kMessage, kTitle), - /*contains_hosted_document=*/false, - /*should_show_action=*/false, - TextAttachment::Type::kText, /*file_count=*/2}); + test_cases.push_back( + {apps_util::CreateShareIntentFromFiles( + {GetFileSystemUrl(kTextFile1), GetFileSystemUrl(kTextFile2)}, + {kMimeTypeText, kMimeTypeText}, kMessage, kTitle), + /*contains_hosted_document=*/false, + /*should_show_action=*/false, TextAttachment::Type::kText, + /*file_count=*/2}); return test_cases; }
diff --git a/chrome/browser/plugins/plugin_finder.cc b/chrome/browser/plugins/plugin_finder.cc index 02330ce7..1b793bf6 100644 --- a/chrome/browser/plugins/plugin_finder.cc +++ b/chrome/browser/plugins/plugin_finder.cc
@@ -177,9 +177,10 @@ void PluginFinder::ReinitializePlugins( const base::DictionaryValue* plugin_list) { base::AutoLock lock(mutex_); - int version = 0; // If no version is defined, we default to 0. const char kVersionKey[] = "x-version"; - plugin_list->GetInteger(kVersionKey, &version); + + // If no version is defined, we default to 0. + int version = plugin_list->FindIntKey(kVersionKey).value_or(0); if (version <= version_) return;
diff --git a/chrome/browser/policy/messaging_layer/proto/synced/crd_event.proto b/chrome/browser/policy/messaging_layer/proto/synced/crd_event.proto new file mode 100644 index 0000000..a44ed5d --- /dev/null +++ b/chrome/browser/policy/messaging_layer/proto/synced/crd_event.proto
@@ -0,0 +1,50 @@ +// Events related to adding and removing users from Chrome. + +syntax = "proto2"; + +option optimize_for = LITE_RUNTIME; + +import "session_affiliated_user.proto"; + +package ash.reporting; + +enum ConnectionType { + CRD_CONNECTION_UNKNOWN = 0; + CRD_CONNECTION_DIRECT = 1; + CRD_CONNECTION_RELAY = 2; +} + +// To be reported when host is started. +message CRDHostStarted {} + +// To be reported when client is connected or reconnected. +message CRDClientConnected { + optional string host_ip = 1; + optional string client_ip = 2; + optional string session_id = 3; + optional ConnectionType connection_type = 4; +} + +// To be reported when client is disconnected. +message CRDClientDisconnected { + optional string host_ip = 1; + optional string client_ip = 2; + optional string session_id = 3; +} + +// To be reported when host is ended. +message CRDHostEnded {} + +message CRDRecord { + optional int64 event_timestamp_sec = 1; // Seconds since epoch. + + optional .reporting.SessionAffiliatedUser host_user = + 2; // Omitted if not affiliated. + + oneof event { + CRDHostStarted started = 3; + CRDClientConnected connected = 4; + CRDClientDisconnected disconnected = 5; + CRDHostEnded ended = 6; + } +}
diff --git a/chrome/browser/resources/bookmarks/BUILD.gn b/chrome/browser/resources/bookmarks/BUILD.gn index aa4eb82..7c380a9 100644 --- a/chrome/browser/resources/bookmarks/BUILD.gn +++ b/chrome/browser/resources/bookmarks/BUILD.gn
@@ -9,6 +9,7 @@ import("//tools/typescript/ts_library.gni") import("//ui/webui/resources/tools/generate_grd.gni") import("../tools/optimize_webui.gni") +import("bookmarks.gni") preprocess_folder = "preprocessed" tsc_folder = "tsc" @@ -51,57 +52,20 @@ } preprocess_if_expr("preprocess") { - in_folder = "./" + in_folder = "." out_folder = "$target_gen_dir/$preprocess_folder" - in_files = [ - "actions.ts", - "api_listener.ts", - "bookmarks.ts", - "browser_proxy.ts", - "constants.ts", - "debouncer.ts", - "dialog_focus_manager.ts", - "dnd_manager.ts", - "mouse_focus_behavior.ts", - "reducers.ts", - "store_client_mixin.ts", - "store.ts", - "types.ts", - "util.ts", - ] + in_files = non_web_component_files } preprocess_if_expr("preprocess_generated") { deps = [ ":web_components" ] in_folder = target_gen_dir out_folder = "$target_gen_dir/$preprocess_folder" - in_files = [ - "app.ts", - "command_manager.ts", - "edit_dialog.ts", - "folder_node.ts", - "item.ts", - "list.ts", - "router.ts", - "shared_style.ts", - "shared_vars.ts", - "toolbar.ts", - ] + in_files = web_component_files } html_to_js("web_components") { - js_files = [ - "app.ts", - "command_manager.ts", - "edit_dialog.ts", - "folder_node.ts", - "item.ts", - "list.ts", - "router.ts", - "shared_style.ts", - "shared_vars.ts", - "toolbar.ts", - ] + js_files = web_component_files } grit("resources") { @@ -126,32 +90,7 @@ out_dir = "$target_gen_dir/$tsc_folder" composite = true tsconfig_base = "tsconfig_base.json" - in_files = [ - "actions.ts", - "api_listener.ts", - "app.ts", - "bookmarks.ts", - "browser_proxy.ts", - "command_manager.ts", - "constants.ts", - "debouncer.ts", - "dialog_focus_manager.ts", - "dnd_manager.ts", - "edit_dialog.ts", - "folder_node.ts", - "item.ts", - "list.ts", - "mouse_focus_behavior.ts", - "reducers.ts", - "router.ts", - "shared_vars.ts", - "shared_style.ts", - "store.ts", - "store_client_mixin.ts", - "toolbar.ts", - "types.ts", - "util.ts", - ] + in_files = web_component_files + non_web_component_files definitions = [ "//tools/typescript/definitions/bookmarks.d.ts", "//tools/typescript/definitions/bookmark_manager_private.d.ts",
diff --git a/chrome/browser/resources/bookmarks/bookmarks.gni b/chrome/browser/resources/bookmarks/bookmarks.gni new file mode 100644 index 0000000..65fa3bc --- /dev/null +++ b/chrome/browser/resources/bookmarks/bookmarks.gni
@@ -0,0 +1,35 @@ +# Copyright 2021 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. + +# List of files that don't need to be passed to html_to_js(). +non_web_component_files = [ + "actions.ts", + "api_listener.ts", + "bookmarks.ts", + "browser_proxy.ts", + "constants.ts", + "debouncer.ts", + "dialog_focus_manager.ts", + "dnd_manager.ts", + "mouse_focus_behavior.ts", + "reducers.ts", + "store_client_mixin.ts", + "store.ts", + "types.ts", + "util.ts", +] + +# List of files that should be passed to html_to_js(). +web_component_files = [ + "app.ts", + "command_manager.ts", + "edit_dialog.ts", + "folder_node.ts", + "item.ts", + "list.ts", + "router.ts", + "shared_style.ts", + "shared_vars.ts", + "toolbar.ts", +]
diff --git a/chrome/browser/resources/chromeos/emoji_picker/emoji_picker.html b/chrome/browser/resources/chromeos/emoji_picker/emoji_picker.html index 53ffc45a..2e6979f 100644 --- a/chrome/browser/resources/chromeos/emoji_picker/emoji_picker.html +++ b/chrome/browser/resources/chromeos/emoji_picker/emoji_picker.html
@@ -60,12 +60,13 @@ } /* Mark the first and 10th group as scroll targets to get the correct scroll - * snapping behavior. */ - #tabs :nth-child(2) { + * snapping behavior. Only apply scroll snapping when using emoji-based + subcategory bar. */ + :host(:not([text-subcategory-bar-enabled])) #tabs :nth-child(2) { scroll-snap-align: center; scroll-snap-stop: always; } - #tabs :nth-child(14) { + :host(:not([text-subcategory-bar-enabled])) #tabs :nth-child(14) { scroll-snap-align: center; scroll-snap-stop: always; } @@ -165,19 +166,11 @@ grid-gap: unset; } - /* TODO(b/212459278, b/212459260): Reset bar, left and right chevron - visibility again after finishing the subcategory bar layout implementation.*/ + /* TODO(b/212459278): Reset bar visibility again after finishing + the subcategory bar layout implementation.*/ :host([text-subcategory-bar-enabled]) #bar { visibility: hidden; } - - :host([text-subcategory-bar-enabled]) #left-chevron { - visibility: hidden; - } - - :host([text-subcategory-bar-enabled]) #right-chevron { - visibility: hidden; - } </style> <div class="sr-only" aria-live="polite">
diff --git a/chrome/browser/resources/chromeos/emoji_picker/emoji_picker.js b/chrome/browser/resources/chromeos/emoji_picker/emoji_picker.js index 1dc664d..7581a62 100644 --- a/chrome/browser/resources/chromeos/emoji_picker/emoji_picker.js +++ b/chrome/browser/resources/chromeos/emoji_picker/emoji_picker.js
@@ -190,6 +190,9 @@ /** @private {boolean} */ this.v2Enabled = false; + /** @private {number} */ + this.pagination = 1; + this.addEventListener( GROUP_BUTTON_CLICK, ev => this.selectGroup(ev.detail.group)); this.addEventListener( @@ -354,20 +357,42 @@ } onRightChevronClick() { - this.$.tabs.scrollLeft = ((EMOJI_PICKER_TOTAL_EMOJI_WIDTH) * 8); - this.scrollToGroup(GROUP_TABS[GROUP_PER_ROW - 1].groupId); - this.groupTabsMoving = true; - this.$.bar.style.left = EMOJI_PICKER_TOTAL_EMOJI_WIDTH_PX; + if (!this.textSubcategoryBarEnabled) { + const numTabsInFirstPage = 8; + this.$.tabs.scrollLeft = + ((EMOJI_PICKER_TOTAL_EMOJI_WIDTH) * numTabsInFirstPage); + this.scrollToGroup(GROUP_TABS[GROUP_PER_ROW - 1].groupId); + this.groupTabsMoving = true; + this.$.bar.style.left = EMOJI_PICKER_TOTAL_EMOJI_WIDTH_PX; + } else { + // TODO(b/211057511): fix offset after new layout is applied + const offsetByLeftChevron = GROUP_ICON_SIZE; + const maxPagination = this.getPaginationArray(this.emojiGroupTabs).pop(); + this.pagination = Math.min(this.pagination + 1, maxPagination); + this.$.tabs.scrollLeft = + (this.pagination - 1) * EMOJI_PICKER_WIDTH - offsetByLeftChevron; + this.groupTabsMoving = true; + } } onLeftChevronClick() { - this.$.tabs.scrollLeft = 0; - this.scrollToGroup(GROUP_TABS[0].groupId); - this.groupTabsMoving = true; - if (this.history.emoji.length > 0) { - this.$.bar.style.left = '0'; + if (!this.textSubcategoryBarEnabled) { + this.$.tabs.scrollLeft = 0; + this.scrollToGroup(GROUP_TABS[0].groupId); + this.groupTabsMoving = true; + if (this.history.emoji.length > 0) { + this.$.bar.style.left = '0'; + } else { + this.$.bar.style.left = EMOJI_PICKER_TOTAL_EMOJI_WIDTH_PX; + } } else { - this.$.bar.style.left = EMOJI_PICKER_TOTAL_EMOJI_WIDTH_PX; + // TODO(b/211057511): fix offset after new layout is applied + const offsetByLeftChevron = GROUP_ICON_SIZE; + this.pagination = Math.max(this.pagination - 1, 1); + this.$.tabs.scrollLeft = this.pagination === 1 ? + 0 : + (this.pagination - 1) * EMOJI_PICKER_WIDTH - offsetByLeftChevron; + this.groupTabsMoving = true; } } @@ -407,17 +432,26 @@ * @private */ updateChevrons() { - if (this.$.tabs.scrollLeft > GROUP_ICON_SIZE) { - this.$['left-chevron'].style.display = 'flex'; + if (!this.textSubcategoryBarEnabled) { + if (this.$.tabs.scrollLeft > GROUP_ICON_SIZE) { + this.$['left-chevron'].style.display = 'flex'; + } else { + this.$['left-chevron'].style.display = 'none'; + } + // 1 less because we need to allow room for the chevrons + if (this.$.tabs.scrollLeft + GROUP_ICON_SIZE * GROUP_PER_ROW < + GROUP_ICON_SIZE * (GROUP_TABS.length + 1)) { + this.$['right-chevron'].style.display = 'flex'; + } else { + this.$['right-chevron'].style.display = 'none'; + } } else { - this.$['left-chevron'].style.display = 'none'; - } - // 1 less because we need to allow room for the chevrons - if (this.$.tabs.scrollLeft + GROUP_ICON_SIZE * GROUP_PER_ROW < - GROUP_ICON_SIZE * (GROUP_TABS.length + 1)) { - this.$['right-chevron'].style.display = 'flex'; - } else { - this.$['right-chevron'].style.display = 'none'; + this.$['left-chevron'].style.display = + this.pagination >= 2 ? 'flex' : 'none'; + this.$['right-chevron'].style.display = + this.pagination < this.getPaginationArray(this.emojiGroupTabs).pop() ? + 'flex' : + 'none'; } } @@ -594,10 +628,12 @@ */ onCategoryChanged(newCategoryName) { if (this.v2Enabled) { - const historyTab = this.emojiGroupTabs[0]; + const historyTab = Object.assign(this.emojiGroupTabs[0], {pagination: 1}); const categoryTabs = V2_SUBCATEGORY_TABS.filter(tab => tab.category === newCategoryName); this.set('emojiGroupTabs', [historyTab, ...categoryTabs]); + this.set('pagination', 1); + this.updateChevrons(); } }
diff --git a/chrome/browser/resources/chromeos/wallpaper_manager/images/ui/2x/button_close.png b/chrome/browser/resources/chromeos/wallpaper_manager/images/ui/2x/button_close.png new file mode 100644 index 0000000..7a28084 --- /dev/null +++ b/chrome/browser/resources/chromeos/wallpaper_manager/images/ui/2x/button_close.png Binary files differ
diff --git a/chrome/browser/resources/chromeos/wallpaper_manager/images/ui/2x/check.png b/chrome/browser/resources/chromeos/wallpaper_manager/images/ui/2x/check.png new file mode 100644 index 0000000..f11047e --- /dev/null +++ b/chrome/browser/resources/chromeos/wallpaper_manager/images/ui/2x/check.png Binary files differ
diff --git a/chrome/browser/resources/chromeos/wallpaper_manager/images/ui/2x/close-overlay-hover.png b/chrome/browser/resources/chromeos/wallpaper_manager/images/ui/2x/close-overlay-hover.png new file mode 100644 index 0000000..c49f563 --- /dev/null +++ b/chrome/browser/resources/chromeos/wallpaper_manager/images/ui/2x/close-overlay-hover.png Binary files differ
diff --git a/chrome/browser/resources/chromeos/wallpaper_manager/images/ui/2x/close-overlay.png b/chrome/browser/resources/chromeos/wallpaper_manager/images/ui/2x/close-overlay.png new file mode 100644 index 0000000..efb23e7 --- /dev/null +++ b/chrome/browser/resources/chromeos/wallpaper_manager/images/ui/2x/close-overlay.png Binary files differ
diff --git a/chrome/browser/resources/chromeos/wallpaper_manager/images/ui/2x/no_images_illustration.png b/chrome/browser/resources/chromeos/wallpaper_manager/images/ui/2x/no_images_illustration.png new file mode 100644 index 0000000..037cd8e --- /dev/null +++ b/chrome/browser/resources/chromeos/wallpaper_manager/images/ui/2x/no_images_illustration.png Binary files differ
diff --git a/chrome/browser/resources/downloads/BUILD.gn b/chrome/browser/resources/downloads/BUILD.gn index 2a1c5e8cd..e991634 100644 --- a/chrome/browser/resources/downloads/BUILD.gn +++ b/chrome/browser/resources/downloads/BUILD.gn
@@ -9,6 +9,7 @@ import("//tools/typescript/ts_library.gni") import("//ui/webui/resources/tools/generate_grd.gni") import("../tools/optimize_webui.gni") +import("downloads.gni") preprocess_folder = "preprocessed" @@ -53,28 +54,16 @@ } preprocess_if_expr("preprocess") { - in_folder = "./" + in_folder = "." out_folder = "$target_gen_dir/$preprocess_folder" - in_files = [ - "browser_proxy.ts", - "constants.ts", - "data.ts", - "downloads.ts", - "icon_loader.ts", - "search_service.ts", - ] + in_files = non_web_component_files } preprocess_if_expr("preprocess_web_components") { deps = [ ":web_components" ] in_folder = target_gen_dir out_folder = "$target_gen_dir/$preprocess_folder" - in_files = [ - "icons.ts", - "item.ts", - "manager.ts", - "toolbar.ts", - ] + in_files = web_component_files } copy("copy_mojo") { @@ -101,12 +90,7 @@ } html_to_js("web_components") { - js_files = [ - "icons.ts", - "item.ts", - "manager.ts", - "toolbar.ts", - ] + js_files = web_component_files } ts_library("build_ts") { @@ -114,19 +98,8 @@ out_dir = "$target_gen_dir/tsc" composite = true tsconfig_base = "tsconfig_base.json" - in_files = [ - "browser_proxy.ts", - "constants.ts", - "data.ts", - "downloads.mojom-webui.js", - "downloads.ts", - "icon_loader.ts", - "icons.ts", - "item.ts", - "manager.ts", - "search_service.ts", - "toolbar.ts", - ] + in_files = web_component_files + non_web_component_files + + [ "downloads.mojom-webui.js" ] deps = [ "//third_party/polymer/v3_0:library", "//ui/webui/resources:library",
diff --git a/chrome/browser/resources/downloads/downloads.gni b/chrome/browser/resources/downloads/downloads.gni new file mode 100644 index 0000000..e48b3784 --- /dev/null +++ b/chrome/browser/resources/downloads/downloads.gni
@@ -0,0 +1,21 @@ +# Copyright 2021 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. + +# List of files that don't need to be passed to html_to_js(). +non_web_component_files = [ + "browser_proxy.ts", + "constants.ts", + "data.ts", + "downloads.ts", + "icon_loader.ts", + "search_service.ts", +] + +# List of files that should be passed to html_to_js(). +web_component_files = [ + "icons.ts", + "item.ts", + "manager.ts", + "toolbar.ts", +]
diff --git a/chrome/browser/resources/extensions/BUILD.gn b/chrome/browser/resources/extensions/BUILD.gn index 81705a7..6e80a69 100644 --- a/chrome/browser/resources/extensions/BUILD.gn +++ b/chrome/browser/resources/extensions/BUILD.gn
@@ -11,6 +11,7 @@ import("//tools/typescript/ts_library.gni") import("//ui/webui/resources/tools/generate_grd.gni") import("../tools/optimize_webui.gni") +import("extensions.gni") assert(enable_extensions, "enable extensions check failed") @@ -51,101 +52,20 @@ } preprocess_if_expr("preprocess") { - in_folder = "./" + in_folder = "." out_folder = "$target_gen_dir/$preprocess_folder" - in_files = [ - "drag_and_drop_handler.ts", - "extensions.ts", - "item_mixin.ts", - "item_util.ts", - "keyboard_shortcut_delegate.ts", - "navigation_helper.ts", - "service.ts", - "shortcut_util.ts", - ] - - if (is_chromeos_ash) { - in_files += [ "kiosk_browser_proxy.ts" ] - } + in_files = non_web_component_files } preprocess_if_expr("preprocess_generated") { public_deps = [ ":web_components" ] in_folder = target_gen_dir out_folder = "$target_gen_dir/$preprocess_folder" - in_files = [ - "code_section.ts", - "activity_log/activity_log_history_item.ts", - "activity_log/activity_log_history.ts", - "activity_log/activity_log.ts", - "activity_log/activity_log_stream_item.ts", - "activity_log/activity_log_stream.ts", - "detail_view.ts", - "drop_overlay.ts", - "error_page.ts", - "host_permissions_toggle_list.ts", - "icons.ts", - "install_warnings_dialog.ts", - "item.ts", - "item_list.ts", - "keyboard_shortcuts.ts", - "load_error.ts", - "manager.ts", - "options_dialog.ts", - "pack_dialog_alert.ts", - "pack_dialog.ts", - "runtime_host_permissions.ts", - "runtime_hosts_dialog.ts", - "shared_style.ts", - "shared_vars.ts", - "shortcut_input.ts", - "sidebar.ts", - "toggle_row.ts", - "toolbar.ts", - ] - - if (is_chromeos_ash) { - in_files += [ "kiosk_dialog.ts" ] - } + in_files = web_component_files } -group("web_components") { - public_deps = [ - ":web_components_local", - "activity_log:web_components", - ] -} - -html_to_js("web_components_local") { - js_files = [ - "code_section.ts", - "detail_view.ts", - "drop_overlay.ts", - "error_page.ts", - "host_permissions_toggle_list.ts", - "icons.ts", - "install_warnings_dialog.ts", - "item.ts", - "item_list.ts", - "keyboard_shortcuts.ts", - "load_error.ts", - "manager.ts", - "options_dialog.ts", - "pack_dialog.ts", - "pack_dialog_alert.ts", - "runtime_host_permissions.ts", - "runtime_hosts_dialog.ts", - "shared_style.ts", - "shared_vars.ts", - "shortcut_input.ts", - "sidebar.ts", - "toggle_row.ts", - "toolbar.ts", - ] - - if (is_chromeos_ash) { - js_files += [ "kiosk_dialog.ts" ] - } +html_to_js("web_components") { + js_files = web_component_files } grit("resources") { @@ -169,44 +89,7 @@ root_dir = "$target_gen_dir/$preprocess_folder" out_dir = "$target_gen_dir/tsc" tsconfig_base = "tsconfig_base.json" - in_files = [ - "activity_log/activity_log_history_item.ts", - "activity_log/activity_log_history.ts", - "activity_log/activity_log.ts", - "activity_log/activity_log_stream_item.ts", - "activity_log/activity_log_stream.ts", - "code_section.ts", - "detail_view.ts", - "drag_and_drop_handler.ts", - "drop_overlay.ts", - "error_page.ts", - "extensions.ts", - "host_permissions_toggle_list.ts", - "icons.ts", - "install_warnings_dialog.ts", - "item_mixin.ts", - "item.ts", - "item_list.ts", - "item_util.ts", - "keyboard_shortcut_delegate.ts", - "keyboard_shortcuts.ts", - "load_error.ts", - "manager.ts", - "navigation_helper.ts", - "options_dialog.ts", - "pack_dialog_alert.ts", - "pack_dialog.ts", - "runtime_host_permissions.ts", - "runtime_hosts_dialog.ts", - "service.ts", - "shared_style.ts", - "shared_vars.ts", - "shortcut_input.ts", - "shortcut_util.ts", - "sidebar.ts", - "toggle_row.ts", - "toolbar.ts", - ] + in_files = web_component_files + non_web_component_files definitions = [ "//tools/typescript/definitions/activity_log_private.d.ts", "//tools/typescript/definitions/chrome_event.d.ts", @@ -217,10 +100,6 @@ ] if (is_chromeos_ash) { - in_files += [ - "kiosk_browser_proxy.ts", - "kiosk_dialog.ts", - ] definitions += [ "//tools/typescript/definitions/chrome_send.d.ts" ] }
diff --git a/chrome/browser/resources/extensions/activity_log/BUILD.gn b/chrome/browser/resources/extensions/activity_log/BUILD.gn deleted file mode 100644 index 7745d6b7..0000000 --- a/chrome/browser/resources/extensions/activity_log/BUILD.gn +++ /dev/null
@@ -1,15 +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("//tools/polymer/html_to_js.gni") - -html_to_js("web_components") { - js_files = [ - "activity_log.ts", - "activity_log_history.ts", - "activity_log_history_item.ts", - "activity_log_stream.ts", - "activity_log_stream_item.ts", - ] -}
diff --git a/chrome/browser/resources/extensions/extensions.gni b/chrome/browser/resources/extensions/extensions.gni new file mode 100644 index 0000000..07319d1 --- /dev/null +++ b/chrome/browser/resources/extensions/extensions.gni
@@ -0,0 +1,57 @@ +# Copyright 2021 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("//build/config/chromeos/ui_mode.gni") + +# List of files that don't need to be passed to html_to_js(). +non_web_component_files = [ + "drag_and_drop_handler.ts", + "extensions.ts", + "item_mixin.ts", + "item_util.ts", + "keyboard_shortcut_delegate.ts", + "navigation_helper.ts", + "service.ts", + "shortcut_util.ts", +] + +if (is_chromeos_ash) { + non_web_component_files += [ "kiosk_browser_proxy.ts" ] +} + +# List of files that should be passed to html_to_js(). +web_component_files = [ + "activity_log/activity_log.ts", + "activity_log/activity_log_history.ts", + "activity_log/activity_log_history_item.ts", + "activity_log/activity_log_stream.ts", + "activity_log/activity_log_stream_item.ts", + "code_section.ts", + "detail_view.ts", + "drop_overlay.ts", + "error_page.ts", + "host_permissions_toggle_list.ts", + "icons.ts", + "install_warnings_dialog.ts", + "item.ts", + "item_list.ts", + "keyboard_shortcuts.ts", + "load_error.ts", + "manager.ts", + "options_dialog.ts", + "pack_dialog.ts", + "pack_dialog_alert.ts", + "runtime_host_permissions.ts", + "runtime_hosts_dialog.ts", + "shared_style.ts", + "shared_vars.ts", + "shortcut_input.ts", + "sidebar.ts", + "toggle_row.ts", + "toolbar.ts", +] + +if (is_chromeos_ash) { + web_component_files += [ "kiosk_dialog.ts" ] +}
diff --git a/chrome/browser/resources/history/BUILD.gn b/chrome/browser/resources/history/BUILD.gn index 1957cd2..699d9025 100644 --- a/chrome/browser/resources/history/BUILD.gn +++ b/chrome/browser/resources/history/BUILD.gn
@@ -9,6 +9,7 @@ import("//tools/typescript/ts_library.gni") import("//ui/webui/resources/tools/generate_grd.gni") import("../tools/optimize_webui.gni") +import("history.gni") preprocess_folder = "preprocessed" @@ -66,47 +67,16 @@ } preprocess_if_expr("preprocess") { - in_folder = "./" + in_folder = "." out_folder = "$target_gen_dir/$preprocess_folder" - in_files = [ - "browser_service.ts", - "constants.ts", - "externs.ts", - "history_clusters/browser_proxy.ts", - "history_clusters/metrics_proxy.ts", - "history_clusters/open_window_proxy.ts", - "history.ts", - "lazy_load.ts", - "query_manager.ts", - "searched_label.ts", - ] + in_files = non_web_component_files } preprocess_if_expr("preprocess_generated") { deps = [ ":web_components" ] in_folder = target_gen_dir out_folder = "$target_gen_dir/$preprocess_folder" - in_files = [ - "app.ts", - "history_clusters/cluster.ts", - "history_clusters/clusters.ts", - "history_clusters/page_favicon.ts", - "history_clusters/search_query.ts", - "history_clusters/shared_style.ts", - "history_clusters/shared_vars.ts", - "history_clusters/top_visit.ts", - "history_clusters/url_visit.ts", - "history_item.ts", - "history_list.ts", - "history_toolbar.ts", - "router.ts", - "shared_icons.ts", - "shared_style.ts", - "shared_vars.ts", - "side_bar.ts", - "synced_device_card.ts", - "synced_device_manager.ts", - ] + in_files = web_component_files } grit("resources") { @@ -126,65 +96,16 @@ output_dir = "$root_gen_dir/chrome" } -html_to_js("web_components_local") { - js_files = [ - "app.ts", - "history_item.ts", - "history_list.ts", - "history_toolbar.ts", - "router.ts", - "shared_icons.ts", - "shared_style.ts", - "shared_vars.ts", - "side_bar.ts", - "synced_device_card.ts", - "synced_device_manager.ts", - ] -} - -group("web_components") { - public_deps = [ - ":web_components_local", - "history_clusters:web_components", - ] +html_to_js("web_components") { + js_files = web_component_files } ts_library("build_ts") { root_dir = "$target_gen_dir/$preprocess_folder" out_dir = "$target_gen_dir/tsc" tsconfig_base = "tsconfig_base.json" - in_files = [ - "app.ts", - "browser_service.ts", - "constants.ts", - "externs.ts", - "history_clusters/browser_proxy.ts", - "history_clusters/cluster.ts", - "history_clusters/clusters.ts", - "history_clusters/history_clusters.mojom-webui.js", - "history_clusters/metrics_proxy.ts", - "history_clusters/open_window_proxy.ts", - "history_clusters/page_favicon.ts", - "history_clusters/search_query.ts", - "history_clusters/shared_style.ts", - "history_clusters/shared_vars.ts", - "history_clusters/top_visit.ts", - "history_clusters/url_visit.ts", - "history_item.ts", - "history_list.ts", - "history_toolbar.ts", - "history.ts", - "lazy_load.ts", - "query_manager.ts", - "router.ts", - "searched_label.ts", - "shared_icons.ts", - "shared_style.ts", - "shared_vars.ts", - "side_bar.ts", - "synced_device_card.ts", - "synced_device_manager.ts", - ] + in_files = web_component_files + non_web_component_files + + [ "history_clusters/history_clusters.mojom-webui.js" ] deps = [ "//third_party/polymer/v3_0:library", "//ui/webui/resources:library",
diff --git a/chrome/browser/resources/history/history.gni b/chrome/browser/resources/history/history.gni new file mode 100644 index 0000000..96c38f5 --- /dev/null +++ b/chrome/browser/resources/history/history.gni
@@ -0,0 +1,40 @@ +# Copyright 2021 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. + +# List of files that don't need to be passed to html_to_js(). +non_web_component_files = [ + "browser_service.ts", + "constants.ts", + "externs.ts", + "history_clusters/browser_proxy.ts", + "history_clusters/metrics_proxy.ts", + "history_clusters/open_window_proxy.ts", + "history.ts", + "lazy_load.ts", + "query_manager.ts", + "searched_label.ts", +] + +# List of files that should be passed to html_to_js(). +web_component_files = [ + "app.ts", + "history_clusters/cluster.ts", + "history_clusters/clusters.ts", + "history_clusters/page_favicon.ts", + "history_clusters/search_query.ts", + "history_clusters/shared_style.ts", + "history_clusters/shared_vars.ts", + "history_clusters/top_visit.ts", + "history_clusters/url_visit.ts", + "history_item.ts", + "history_list.ts", + "history_toolbar.ts", + "router.ts", + "shared_icons.ts", + "shared_style.ts", + "shared_vars.ts", + "side_bar.ts", + "synced_device_card.ts", + "synced_device_manager.ts", +]
diff --git a/chrome/browser/resources/history/history_clusters/BUILD.gn b/chrome/browser/resources/history/history_clusters/BUILD.gn deleted file mode 100644 index 47a7bc9b..0000000 --- a/chrome/browser/resources/history/history_clusters/BUILD.gn +++ /dev/null
@@ -1,18 +0,0 @@ -# Copyright 2021 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("//tools/polymer/html_to_js.gni") - -html_to_js("web_components") { - js_files = [ - "cluster.ts", - "clusters.ts", - "page_favicon.ts", - "search_query.ts", - "shared_style.ts", - "shared_vars.ts", - "top_visit.ts", - "url_visit.ts", - ] -}
diff --git a/chrome/browser/resources/settings/autofill_page/passwords_list_handler.html b/chrome/browser/resources/settings/autofill_page/passwords_list_handler.html index 5f027f0..2bde091 100644 --- a/chrome/browser/resources/settings/autofill_page/passwords_list_handler.html +++ b/chrome/browser/resources/settings/autofill_page/passwords_list_handler.html
@@ -6,7 +6,6 @@ text-overflow: ellipsis; white-space: nowrap; } - </style> <slot name="body"></slot> @@ -51,8 +50,12 @@ </password-remove-dialog> </template> - <cr-toast id="toast" duration="5000"> + <cr-toast id="removalToast" duration="5000"> <div id="removalNotification">[[removalNotification_]]</div> <cr-button aria-label="$i18n{undoDescription}" on-click="onUndoButtonClick_">$i18n{undoRemovePassword}</cr-button> </cr-toast> + + <cr-toast id="copyToast" duration="5000"> + <div id="copyNotification">$i18n{passwordCopiedToClipboard}</div> + </cr-toast>
diff --git a/chrome/browser/resources/settings/autofill_page/passwords_list_handler.ts b/chrome/browser/resources/settings/autofill_page/passwords_list_handler.ts index 819fae3..1b5e07d 100644 --- a/chrome/browser/resources/settings/autofill_page/passwords_list_handler.ts +++ b/chrome/browser/resources/settings/autofill_page/passwords_list_handler.ts
@@ -48,7 +48,8 @@ export interface PasswordsListHandlerElement { $: { menu: CrActionMenuElement, - toast: CrToastElement, + removalToast: CrToastElement, + copyToast: CrToastElement, }; } @@ -191,16 +192,14 @@ disconnectedCallback() { super.disconnectedCallback(); - if (this.$.toast.open) { - this.$.toast.hide(); - } + this.hideToasts_(); } /** * Closes the toast manager. */ onSavedPasswordOrExceptionRemoved() { - this.$.toast.hide(); + this.$.removalToast.hide(); } /** @@ -292,6 +291,7 @@ this.requestActivePlaintextPassword_( chrome.passwordsPrivate.PlaintextReason.COPY, _ => { this.activePassword_ = null; + this.displayCopyNotification_(); }); this.$.menu.close(); @@ -321,6 +321,15 @@ this.activePassword_ = null; } + private hideToasts_() { + if (this.$.removalToast.open) { + this.$.removalToast.hide(); + } + if (this.$.copyToast.open) { + this.$.copyToast.hide(); + } + } + /** * At least one of |removedFromAccount| or |removedFromDevice| must be true. */ @@ -338,7 +347,9 @@ this.removalNotification_ = this.i18n('passwordDeletedFromDevice'); } } - this.$.toast.show(); + + this.hideToasts_(); + this.$.removalToast.show(); } private onUndoButtonClick_() { @@ -346,6 +357,11 @@ this.onSavedPasswordOrExceptionRemoved(); } + private displayCopyNotification_() { + this.hideToasts_(); + this.$.copyToast.show(); + } + /** * Should only be called when |activePassword_| has a device copy. */
diff --git a/chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_share_subpage.html b/chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_share_subpage.html index 1cecc90b..d4a8413 100644 --- a/chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_share_subpage.html +++ b/chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_share_subpage.html
@@ -224,8 +224,7 @@ </div> <cr-toggle id="fastInitiationNotificationToggle" - aria-labelledby="fastInitiationNotificationRowTitle" - aria-describedby="fastInitiationNotificationRowDescription" + aria-label="$i18n{fastInitiationNotificationToggleAriaLabel}" checked="[[isFastInitiationNotificationEnabled_( settings.fastInitiationNotificationState)]]" on-change="onFastInitiationNotificationToggledByUser_"
diff --git a/chrome/browser/resources/settings/chromeos/os_languages_page/os_languages_section.js b/chrome/browser/resources/settings/chromeos/os_languages_page/os_languages_section.js index 14b3e0e..ffe0df7 100644 --- a/chrome/browser/resources/settings/chromeos/os_languages_page/os_languages_section.js +++ b/chrome/browser/resources/settings/chromeos/os_languages_page/os_languages_section.js
@@ -83,8 +83,7 @@ type: Boolean, value() { return loadTimeData.getBoolean('allowAssistivePersonalInfo') || - loadTimeData.getBoolean('allowEmojiSuggestion') || - loadTimeData.getBoolean('allowPredictiveWriting'); + loadTimeData.getBoolean('allowEmojiSuggestion'); }, } },
diff --git a/chrome/browser/resources/settings/chromeos/os_languages_page/smart_inputs_page.html b/chrome/browser/resources/settings/chromeos/os_languages_page/smart_inputs_page.html index 9f6e617e..2f025c3d 100644 --- a/chrome/browser/resources/settings/chromeos/os_languages_page/smart_inputs_page.html +++ b/chrome/browser/resources/settings/chromeos/os_languages_page/smart_inputs_page.html
@@ -59,13 +59,4 @@ deep-link-focus-id$="[[Setting.kShowEmojiSuggestions]]"> </settings-toggle-button> </template> - <template is="dom-if" if="[[allowPredictiveWriting_]]"> - <settings-toggle-button id="predictiveWriting" class="hr" - pref="{{prefs.assistive_input.predictive_writing_enabled}}" - label="$i18n{predictiveWritingTitle}" - sub-label="$i18n{predictiveWritingDescription}" - aria-label="$i18n{predictiveWritingTitle}" - deep-link-focus-id$="[[Setting.kShowPredictiveWriting]]"> - </settings-toggle-button> - </template> </div>
diff --git a/chrome/browser/resources/settings/chromeos/os_languages_page/smart_inputs_page.js b/chrome/browser/resources/settings/chromeos/os_languages_page/smart_inputs_page.js index 47c68352..24789b7 100644 --- a/chrome/browser/resources/settings/chromeos/os_languages_page/smart_inputs_page.js +++ b/chrome/browser/resources/settings/chromeos/os_languages_page/smart_inputs_page.js
@@ -55,14 +55,6 @@ }, }, - /** @private */ - allowPredictiveWriting_: { - type: Boolean, - value() { - return loadTimeData.getBoolean('allowPredictiveWriting'); - }, - }, - /** * Used by DeepLinkingBehavior to focus this page's deep links. * @type {!Set<!chromeos.settings.mojom.Setting>} @@ -72,7 +64,6 @@ value: () => new Set([ chromeos.settings.mojom.Setting.kShowPersonalInformationSuggestions, chromeos.settings.mojom.Setting.kShowEmojiSuggestions, - chromeos.settings.mojom.Setting.kShowPredictiveWriting, ]), }, },
diff --git a/chrome/browser/resources/signin/profile_picker/BUILD.gn b/chrome/browser/resources/signin/profile_picker/BUILD.gn index 70a6bff8..2d607f9 100644 --- a/chrome/browser/resources/signin/profile_picker/BUILD.gn +++ b/chrome/browser/resources/signin/profile_picker/BUILD.gn
@@ -10,6 +10,7 @@ import("//tools/typescript/ts_library.gni") import("//ui/webui/resources/tools/generate_grd.gni") import("../../tools/optimize_webui.gni") +import("profile_picker.gni") assert(!is_chromeos_ash) @@ -69,37 +70,20 @@ } preprocess_if_expr("preprocess") { - in_folder = "./" + in_folder = "." out_folder = "$target_gen_dir/$preprocess_folder" - in_files = [ - "ensure_lazy_loaded.ts", - "icons.ts", - "lazy_load.ts", - "manage_profiles_browser_proxy.ts", - "navigation_mixin.ts", - "policy_helper.ts", - "profile_picker.ts", - ] + in_files = non_web_component_files +} + +html_to_js("web_components") { + js_files = web_component_files } preprocess_if_expr("preprocess_generated") { deps = [ ":web_components" ] in_folder = target_gen_dir out_folder = "$target_gen_dir/$preprocess_folder" - in_files = [ - "profile_picker_app.ts", - "profile_picker_main_view.ts", - "profile_card.ts", - "profile_card_menu.ts", - "profile_creation_flow/local_profile_customization.ts", - "profile_creation_flow/profile_type_choice.ts", - "profile_picker_shared_css.ts", - "profile_creation_flow/shared_css.ts", - "profile_switch.ts", - ] - if (is_chromeos_lacros) { - in_files += [ "profile_creation_flow/account_selection_lacros.ts" ] - } + in_files = web_component_files } grit("resources") { @@ -124,27 +108,7 @@ out_dir = "$target_gen_dir/tsc" composite = true tsconfig_base = "tsconfig_base.json" - in_files = [ - "ensure_lazy_loaded.ts", - "icons.ts", - "lazy_load.ts", - "manage_profiles_browser_proxy.ts", - "navigation_mixin.ts", - "policy_helper.ts", - "profile_card.ts", - "profile_card_menu.ts", - "profile_creation_flow/local_profile_customization.ts", - "profile_creation_flow/profile_type_choice.ts", - "profile_creation_flow/shared_css.ts", - "profile_picker_app.ts", - "profile_picker.ts", - "profile_picker_main_view.ts", - "profile_picker_shared_css.ts", - "profile_switch.ts", - ] - if (is_chromeos_lacros) { - in_files += [ "profile_creation_flow/account_selection_lacros.ts" ] - } + in_files = web_component_files + non_web_component_files definitions = [ "//tools/typescript/definitions/chrome_send.d.ts", "//tools/typescript/definitions/metrics_private.d.ts", @@ -160,21 +124,3 @@ ":preprocess_generated", ] } - -group("web_components") { - public_deps = [ - ":web_components_local", - "profile_creation_flow:web_components", - ] -} - -html_to_js("web_components_local") { - js_files = [ - "profile_card.ts", - "profile_card_menu.ts", - "profile_picker_app.ts", - "profile_picker_main_view.ts", - "profile_picker_shared_css.ts", - "profile_switch.ts", - ] -}
diff --git a/chrome/browser/resources/signin/profile_picker/profile_creation_flow/BUILD.gn b/chrome/browser/resources/signin/profile_picker/profile_creation_flow/BUILD.gn deleted file mode 100644 index e1550d1..0000000 --- a/chrome/browser/resources/signin/profile_picker/profile_creation_flow/BUILD.gn +++ /dev/null
@@ -1,17 +0,0 @@ -# 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("//build/config/chromeos/ui_mode.gni") -import("//tools/polymer/html_to_js.gni") - -html_to_js("web_components") { - js_files = [ - "profile_type_choice.ts", - "local_profile_customization.ts", - "shared_css.ts", - ] - if (is_chromeos_lacros) { - js_files += [ "account_selection_lacros.ts" ] - } -}
diff --git a/chrome/browser/resources/signin/profile_picker/profile_picker.gni b/chrome/browser/resources/signin/profile_picker/profile_picker.gni new file mode 100644 index 0000000..6b8ce7e --- /dev/null +++ b/chrome/browser/resources/signin/profile_picker/profile_picker.gni
@@ -0,0 +1,33 @@ +# Copyright 2021 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("//build/config/chromeos/ui_mode.gni") + +# List of files that don't need to be passed to html_to_js(). +non_web_component_files = [ + "ensure_lazy_loaded.ts", + "icons.ts", + "lazy_load.ts", + "manage_profiles_browser_proxy.ts", + "navigation_mixin.ts", + "policy_helper.ts", + "profile_picker.ts", +] + +# List of files that should be passed to html_to_js(). +web_component_files = [ + "profile_card_menu.ts", + "profile_card.ts", + "profile_creation_flow/local_profile_customization.ts", + "profile_creation_flow/profile_type_choice.ts", + "profile_creation_flow/shared_css.ts", + "profile_picker_app.ts", + "profile_picker_main_view.ts", + "profile_picker_shared_css.ts", + "profile_switch.ts", +] + +if (is_chromeos_lacros) { + web_component_files += [ "profile_creation_flow/account_selection_lacros.ts" ] +}
diff --git a/chrome/browser/ssl/security_state_tab_helper_browsertest.cc b/chrome/browser/ssl/security_state_tab_helper_browsertest.cc index ff757220..912ac61 100644 --- a/chrome/browser/ssl/security_state_tab_helper_browsertest.cc +++ b/chrome/browser/ssl/security_state_tab_helper_browsertest.cc
@@ -75,6 +75,7 @@ #include "content/public/common/referrer.h" #include "content/public/test/browser_test.h" #include "content/public/test/browser_test_utils.h" +#include "content/public/test/fenced_frame_test_util.h" #include "content/public/test/navigation_handle_observer.h" #include "content/public/test/prerender_test_util.h" #include "content/public/test/signed_exchange_browser_test_helper.h" @@ -1796,4 +1797,105 @@ ASSERT_TRUE(test_server->ShutdownAndWaitUntilComplete()); } +// For tests which use fenced frame. +class SecurityStateTabHelperFencedFrameTest + : public SecurityStateTabHelperTest, + public testing::WithParamInterface<bool> { + public: + SecurityStateTabHelperFencedFrameTest() { + // Enable or disable MixedContentAutoupgrade feature based on the test + // parameter. + scoped_feature_list_.InitWithFeatureState( + blink::features::kMixedContentAutoupgrade, GetParam()); + } + ~SecurityStateTabHelperFencedFrameTest() override = default; + SecurityStateTabHelperFencedFrameTest( + const SecurityStateTabHelperFencedFrameTest&) = delete; + + SecurityStateTabHelperFencedFrameTest& operator=( + const SecurityStateTabHelperFencedFrameTest&) = delete; + + content::test::FencedFrameTestHelper& fenced_frame_test_helper() { + return fenced_frame_helper_; + } + + content::WebContents* web_contents() { + return browser()->tab_strip_model()->GetActiveWebContents(); + } + + bool IsAutoupgradeEnabled() { return GetParam(); } + + private: + content::test::FencedFrameTestHelper fenced_frame_helper_; + base::test::ScopedFeatureList scoped_feature_list_; +}; + +INSTANTIATE_TEST_SUITE_P(All, + SecurityStateTabHelperFencedFrameTest, + testing::Bool()); + +IN_PROC_BROWSER_TEST_P(SecurityStateTabHelperFencedFrameTest, + ChangeSecurityStateWhenLoadingInsecureContent) { + // Setup a mock certificate verifier. + SetUpMockCertVerifierForHttpsServer(0, net::OK); + + // Load a valid HTTPS page. + auto primary_url = https_server_.GetURL("/empty.html"); + ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), primary_url)); + CheckSecurityInfoForSecure(web_contents(), security_state::SECURE, false, + false, false, + false /* expect cert status error */); + + // Create a fenced frame with a page that displays insecure content. + GURL fenced_frame_url = + https_server_.GetURL("/ssl/page_displays_insecure_content.html"); + content::RenderFrameHost* fenced_frame_host = + fenced_frame_test_helper().CreateFencedFrame( + web_contents()->GetMainFrame(), fenced_frame_url); + EXPECT_NE(nullptr, fenced_frame_host); + + if (IsAutoupgradeEnabled()) { + // The security state of the web contents should not be changed because + // the MixedContentAutoupgrade feature changes the internal insecure url + // from http to https. + CheckSecurityInfoForSecure(web_contents(), security_state::SECURE, false, + false, false, + false /* expect cert status error */); + } else { + // The security state of the web contents should be changed to WARNING. + CheckSecurityInfoForSecure(web_contents(), security_state::WARNING, false, + true, false, + false /* expect cert status error */); + } +} + +// TODO(crbug.com/1282044): This behavior should not be allowed, since it allows +// mixed frames, which are otherwise blocked, once this is fixed, change this +// test so it verifies the navigation is block. +IN_PROC_BROWSER_TEST_P(SecurityStateTabHelperFencedFrameTest, + LoadFencedFrameViaInsecureURL) { + // Setup a mock certificate verifier. + SetUpMockCertVerifierForHttpsServer(0, net::OK); + + // Load a valid HTTPS page. + auto primary_url = https_server_.GetURL("/empty.html"); + + ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), primary_url)); + CheckSecurityInfoForSecure(web_contents(), security_state::SECURE, false, + false, false, + false /* expect cert status error */); + + // Create a fenced frame with an insecure url. + GURL fenced_frame_url = + embedded_test_server()->GetURL("b.com", "/fenced_frames/title1.html"); + + content::RenderFrameHost* fenced_frame_host = + fenced_frame_test_helper().CreateFencedFrame( + web_contents()->GetMainFrame(), fenced_frame_url); + EXPECT_NE(nullptr, fenced_frame_host); + + CheckSecurityInfoForSecure(web_contents(), security_state::DANGEROUS, false, + false, true, false /* expect cert status error */); +} + } // namespace
diff --git a/chrome/browser/ui/android/tab_model/tab_model.h b/chrome/browser/ui/android/tab_model/tab_model.h index 675b4902..af825f1 100644 --- a/chrome/browser/ui/android/tab_model/tab_model.h +++ b/chrome/browser/ui/android/tab_model/tab_model.h
@@ -96,6 +96,9 @@ FROM_LONGPRESS_BACKGROUND_IN_GROUP, // Opened from an app widget. FROM_APP_WIDGET, + // Opened from a Reading list. When going "back" on Android, the Reading + // list should be reopened. + FROM_READING_LIST, // Must be last. SIZE };
diff --git a/chrome/browser/ui/app_list/app_list_sync_model_sanitizer.cc b/chrome/browser/ui/app_list/app_list_sync_model_sanitizer.cc index b2f0e44..8e21422 100644 --- a/chrome/browser/ui/app_list/app_list_sync_model_sanitizer.cc +++ b/chrome/browser/ui/app_list/app_list_sync_model_sanitizer.cc
@@ -12,6 +12,7 @@ #include "base/containers/contains.h" #include "base/guid.h" #include "base/strings/string_util.h" +#include "chrome/browser/ui/app_list/app_list_model_updater.h" #include "chrome/browser/ui/app_list/app_list_syncable_service.h" #include "components/sync/model/string_ordinal.h" @@ -46,23 +47,30 @@ std::vector<std::string> page_breaks_to_remove; std::vector<syncer::StringOrdinal> page_breaks_to_add; + std::map<std::string, syncer::StringOrdinal> resolved_duplicate_positions; size_t current_page_size = 0; syncer::StringOrdinal last_valid_position; - for (auto* item : sync_items) { + for (size_t i = 0; i < sync_items.size(); ++i) { + const AppListSyncableService::SyncItem* item = sync_items[i]; + const std::string item_id = item->item_id; + syncer::StringOrdinal item_ordinal = + resolved_duplicate_positions.count(item_id) + ? resolved_duplicate_positions[item_id] + : item->item_ordinal; // `AppListSyncableService::GetSortedTopLevelSyncItems()` filters out items // with an invalid position. - DCHECK(item->item_ordinal.IsValid()); + DCHECK(item_ordinal.IsValid()); if (item->item_type == sync_pb::AppListSpecifics::TYPE_PAGE_BREAK) { const bool implicit_page_break = - base::StartsWith(item->item_id, kImplicitPageBreakIdPrefix); + base::StartsWith(item_id, kImplicitPageBreakIdPrefix); if (reset_page_breaks && !implicit_page_break) { // When resetting page breaks, remove non-implicit page breaks. // If the page break is required at this position, a new implicit page // break will be created later on, with the difference that the new page // break will be removable by he sanitizer. - page_breaks_to_remove.push_back(item->item_id); + page_breaks_to_remove.push_back(item_id); continue; } @@ -71,20 +79,20 @@ current_page_size == ash::SharedAppListConfig::instance().GetMaxNumOfItemsPerPage()) { current_page_size = 0; - last_valid_position = item->item_ordinal; + last_valid_position = item_ordinal; continue; } // If page is not yet full, and the page break was added to sanitize page // size (i.e. were not a result of an explicit user action in pre // productivity launcher), remove the page break. - page_breaks_to_remove.push_back(item->item_id); + page_breaks_to_remove.push_back(item_id); continue; } if (item->item_type != sync_pb::AppListSpecifics::TYPE_FOLDER && item->item_type != sync_pb::AppListSpecifics::TYPE_APP) { - last_valid_position = item->item_ordinal; + last_valid_position = item_ordinal; continue; } @@ -100,24 +108,44 @@ // could also unexpectedly create partially filled pages where they did not // previously exist (for example, if sync contains items that are not // installed on a portion of the user's devices). - if (!base::Contains(top_level_items, item->item_id)) { - last_valid_position = item->item_ordinal; + if (!base::Contains(top_level_items, item_id)) { + last_valid_position = item_ordinal; continue; } // The item overflows the current page - add a page break just before it. if (current_page_size == ash::SharedAppListConfig::instance().GetMaxNumOfItemsPerPage()) { - current_page_size = 0; + // The page break will be inserted before the current item, so the current + // page contains the current item. + current_page_size = 1; DCHECK(last_valid_position.IsValid()); - page_breaks_to_add.push_back( - last_valid_position.CreateBetween(item->item_ordinal)); + // If page break should be added between items with the same ordinal, + // deduplicate the item ordinals before calculating the new page break + // position. + if (last_valid_position.Equals(item_ordinal)) { + ResolveDuplicatePositionsStartingAtIndex( + sync_items, i, last_valid_position, &resolved_duplicate_positions); + DCHECK(resolved_duplicate_positions.count(item_id)); + + item_ordinal = resolved_duplicate_positions[item_id]; + page_breaks_to_add.push_back( + last_valid_position.CreateBetween(item_ordinal)); + } else { + page_breaks_to_add.push_back( + last_valid_position.CreateBetween(item_ordinal)); + } } else { ++current_page_size; } - last_valid_position = item->item_ordinal; + last_valid_position = item_ordinal; + } + + for (const auto& resolved_position : resolved_duplicate_positions) { + syncable_service_->GetModelUpdater()->SetItemPosition( + resolved_position.first, resolved_position.second); } for (const auto& position : page_breaks_to_add) { @@ -130,4 +158,39 @@ syncable_service_->DeleteSyncItem(id); } +void AppListSyncModelSanitizer::ResolveDuplicatePositionsStartingAtIndex( + const std::vector<AppListSyncableService::SyncItem*>& sync_items, + size_t starting_index, + const syncer::StringOrdinal& starting_ordinal, + std::map<std::string, syncer::StringOrdinal>* resolved_positions) { + DCHECK_LT(starting_index, sync_items.size()); + // Find the next position distinct from `starting_ordinal`, starting at + // `starting_index`. + syncer::StringOrdinal next_valid_position; + // Default to the case a distinct position is not found. + size_t first_distinct_index = sync_items.size(); + for (size_t i = starting_index; i < sync_items.size(); ++i) { + AppListSyncableService::SyncItem* item = sync_items[i]; + if (item->item_ordinal.IsValid() && + !item->item_ordinal.Equals(starting_ordinal)) { + next_valid_position = item->item_ordinal; + first_distinct_index = i; + break; + } + } + + // If all items from starting position to the end of sync items list have the + // same ordinal, next valid position may not have been set. + if (!next_valid_position.IsValid()) + next_valid_position = starting_ordinal.CreateAfter(); + + // Generate new ordinals for all detected duplicate items. + for (size_t current_index = first_distinct_index - 1; + current_index >= starting_index; --current_index) { + next_valid_position = starting_ordinal.CreateBetween(next_valid_position); + AppListSyncableService::SyncItem* item = sync_items[current_index]; + resolved_positions->emplace(item->item_id, next_valid_position); + } +} + } // namespace app_list
diff --git a/chrome/browser/ui/app_list/app_list_sync_model_sanitizer.h b/chrome/browser/ui/app_list/app_list_sync_model_sanitizer.h index 91eb748..5730550 100644 --- a/chrome/browser/ui/app_list/app_list_sync_model_sanitizer.h +++ b/chrome/browser/ui/app_list/app_list_sync_model_sanitizer.h
@@ -5,13 +5,16 @@ #ifndef CHROME_BROWSER_UI_APP_LIST_APP_LIST_SYNC_MODEL_SANITIZER_H_ #define CHROME_BROWSER_UI_APP_LIST_APP_LIST_SYNC_MODEL_SANITIZER_H_ +#include <map> #include <set> #include <string> +#include <vector> + +#include "chrome/browser/ui/app_list/app_list_syncable_service.h" +#include "components/sync/model/string_ordinal.h" namespace app_list { -class AppListSyncableService; - // Utility class for sanitizing app list model sync state in response to model // changes that are result of local user actions. // The main goal is to ensure that sync app list data remains in a sane state @@ -48,6 +51,19 @@ bool reset_page_breaks); private: + // For items in sync_items that have identical position ordinals starting at + // `starting_index` creates new ordinal values to preserve their order in + // `sync_items`. The new item ordinals will be added to `resolved_positions` + // as an item ID -> ordinal value pair. This method will not update the + // associated sync items. + // Expects `sync_items` to be sorted by the item string ordinals (in + // increasing order). + void ResolveDuplicatePositionsStartingAtIndex( + const std::vector<AppListSyncableService::SyncItem*>& sync_items, + size_t starting_index, + const syncer::StringOrdinal& starting_ordinal, + std::map<std::string, syncer::StringOrdinal>* resolved_positions); + AppListSyncableService* const syncable_service_; };
diff --git a/chrome/browser/ui/app_list/app_list_syncable_service_unittest.cc b/chrome/browser/ui/app_list/app_list_syncable_service_unittest.cc index 371edeb..5a35593b 100644 --- a/chrome/browser/ui/app_list/app_list_syncable_service_unittest.cc +++ b/chrome/browser/ui/app_list/app_list_syncable_service_unittest.cc
@@ -2238,6 +2238,408 @@ "Item 25"}})); } +// Verifies that app list model sanitizer gracefully handles the case when page +// break has to be added between sync items that have duplicate item ordinals. +TEST_F(ProductivityLauncherAppListSyncableServiceTest, + PageBreakSanitizationHandlesDuplicateOrdinalsAtPageBreakLocation) { + RemoveAllExistingItems(); + + std::vector<scoped_refptr<extensions::Extension>> initial_apps; + syncer::SyncDataList sync_list; + std::string last_item_id = extensions::kWebStoreAppId; + std::string last_position_string; + for (int i = 0; i < 30; ++i) { + if (i < 18 || i >= 22) + last_position_string = GetLastPositionString(); + last_item_id = CreateNextAppId(last_item_id); + const std::string item_name = base::StringPrintf("Item %d", i); + sync_list.push_back(CreateAppRemoteData(last_item_id, item_name, + /*folder_id=*/"", + last_position_string, kUnset)); + initial_apps.push_back( + MakeApp(item_name, last_item_id, extensions::Extension::NO_FLAGS)); + } + + app_list_syncable_service()->MergeDataAndStartSyncing( + syncer::APP_LIST, sync_list, + std::make_unique<syncer::FakeSyncChangeProcessor>(), + std::make_unique<syncer::SyncErrorFactoryMock>()); + content::RunAllTasksUntilIdle(); + + for (auto app : initial_apps) + InstallExtension(app.get()); + + // Install another app - with productivity launcher enabled, the app gets + // added to front. + last_item_id = CreateNextAppId(last_item_id); + scoped_refptr<extensions::Extension> test_app_1 = + MakeApp("Test app 1", last_item_id, extensions::Extension::NO_FLAGS); + InstallExtension(test_app_1.get()); + + std::vector<std::vector<std::string>> items_per_page = + GetNamesOfSortedItemsPerPageFromSyncableService(); + // Verify a page break was added to sync data. + EXPECT_EQ(2u, items_per_page.size()); + EXPECT_EQ(20u, items_per_page[0].size()); + EXPECT_EQ(11u, items_per_page[1].size()); + + // Verify that the apps whose order is well defined (i.e. that don't have + // identical string ordinals) is preserved. + EXPECT_EQ( + std::vector<std::string>(items_per_page[0].begin(), + items_per_page[0].begin() + 18), + std::vector<std::string>( + {"Test app 1", "Item 0", "Item 1", "Item 2", "Item 3", "Item 4", + "Item 5", "Item 6", "Item 7", "Item 8", "Item 9", "Item 10", + "Item 11", "Item 12", "Item 13", "Item 14", "Item 15", "Item 16"})); + + EXPECT_EQ( + std::vector<std::string>(items_per_page[1].begin() + 3, + items_per_page[1].end()), + std::vector<std::string>({"Item 22", "Item 23", "Item 24", "Item 25", + "Item 26", "Item 27", "Item 28", "Item 29"})); + + // Installing another app will not create a new page - the last item from + // first page will instead be moved to the second page. + last_item_id = CreateNextAppId(last_item_id); + scoped_refptr<extensions::Extension> test_app_2 = + MakeApp("Test app 2", last_item_id, extensions::Extension::NO_FLAGS); + InstallExtension(test_app_2.get()); + + items_per_page = GetNamesOfSortedItemsPerPageFromSyncableService(); + // Verify a page break was added to sync data. + EXPECT_EQ(2u, items_per_page.size()); + EXPECT_EQ(20u, items_per_page[0].size()); + EXPECT_EQ(12u, items_per_page[1].size()); + + // Verify that the apps whose order is well defined (i.e. that don't have + // identical string ordinals) is preserved. + EXPECT_EQ(std::vector<std::string>(items_per_page[0].begin(), + items_per_page[0].begin() + 19), + std::vector<std::string>( + {"Test app 2", "Test app 1", "Item 0", "Item 1", "Item 2", + "Item 3", "Item 4", "Item 5", "Item 6", "Item 7", "Item 8", + "Item 9", "Item 10", "Item 11", "Item 12", "Item 13", + "Item 14", "Item 15", "Item 16"})); + + EXPECT_EQ( + std::vector<std::string>(items_per_page[1].begin() + 4, + items_per_page[1].end()), + std::vector<std::string>({"Item 22", "Item 23", "Item 24", "Item 25", + "Item 26", "Item 27", "Item 28", "Item 29"})); +} + +// Verifies that app list model sanitizer gracefully handles the case when page +// break has to be added between sync items that have duplicate item ordinals, +// where all trailing items have the same ordinal. +TEST_F(ProductivityLauncherAppListSyncableServiceTest, + PageBreakSanitizationHandlesTrailingDuplicateOrdinals) { + RemoveAllExistingItems(); + + std::vector<scoped_refptr<extensions::Extension>> initial_apps; + syncer::SyncDataList sync_list; + std::string last_item_id = extensions::kWebStoreAppId; + std::string last_position_string; + for (int i = 0; i < 30; ++i) { + if (i < 18) + last_position_string = GetLastPositionString(); + last_item_id = CreateNextAppId(last_item_id); + const std::string item_name = base::StringPrintf("Item %d", i); + sync_list.push_back(CreateAppRemoteData(last_item_id, item_name, + /*folder_id=*/"", + last_position_string, kUnset)); + initial_apps.push_back( + MakeApp(item_name, last_item_id, extensions::Extension::NO_FLAGS)); + } + + app_list_syncable_service()->MergeDataAndStartSyncing( + syncer::APP_LIST, sync_list, + std::make_unique<syncer::FakeSyncChangeProcessor>(), + std::make_unique<syncer::SyncErrorFactoryMock>()); + content::RunAllTasksUntilIdle(); + + for (auto app : initial_apps) + InstallExtension(app.get()); + + // Install another app - with productivity launcher enabled, the app gets + // added to front. + last_item_id = CreateNextAppId(last_item_id); + scoped_refptr<extensions::Extension> test_app_1 = + MakeApp("Test app 1", last_item_id, extensions::Extension::NO_FLAGS); + InstallExtension(test_app_1.get()); + + std::vector<std::vector<std::string>> items_per_page = + GetNamesOfSortedItemsPerPageFromSyncableService(); + // Verify a page break was added to sync data. + EXPECT_EQ(2u, items_per_page.size()); + EXPECT_EQ(20u, items_per_page[0].size()); + EXPECT_EQ(11u, items_per_page[1].size()); + + // Verify that the apps whose order is well defined (i.e. that don't have + // identical string ordinals) is preserved. + EXPECT_EQ( + std::vector<std::string>(items_per_page[0].begin(), + items_per_page[0].begin() + 18), + std::vector<std::string>( + {"Test app 1", "Item 0", "Item 1", "Item 2", "Item 3", "Item 4", + "Item 5", "Item 6", "Item 7", "Item 8", "Item 9", "Item 10", + "Item 11", "Item 12", "Item 13", "Item 14", "Item 15", "Item 16"})); + + // Installing another app will not create a new page - the last item from + // first page will instead be moved to the second page. + last_item_id = CreateNextAppId(last_item_id); + scoped_refptr<extensions::Extension> test_app_2 = + MakeApp("Test app 2", last_item_id, extensions::Extension::NO_FLAGS); + InstallExtension(test_app_2.get()); + + items_per_page = GetNamesOfSortedItemsPerPageFromSyncableService(); + EXPECT_EQ(2u, items_per_page.size()); + EXPECT_EQ(20u, items_per_page[0].size()); + EXPECT_EQ(12u, items_per_page[1].size()); + EXPECT_EQ(std::vector<std::string>(items_per_page[0].begin(), + items_per_page[0].begin() + 19), + std::vector<std::string>( + {"Test app 2", "Test app 1", "Item 0", "Item 1", "Item 2", + "Item 3", "Item 4", "Item 5", "Item 6", "Item 7", "Item 8", + "Item 9", "Item 10", "Item 11", "Item 12", "Item 13", + "Item 14", "Item 15", "Item 16"})); +} + +TEST_F(ProductivityLauncherAppListSyncableServiceTest, + PageBreakSanitizationHandlesDuplicateOrdinalsAtTwoBreaks) { + RemoveAllExistingItems(); + + std::vector<scoped_refptr<extensions::Extension>> initial_apps; + syncer::SyncDataList sync_list; + std::string last_item_id = extensions::kWebStoreAppId; + std::string last_position_string; + for (int i = 0; i < 45; ++i) { + if (i < 18 || (i >= 25 && i < 35) || i >= 42) + last_position_string = GetLastPositionString(); + last_item_id = CreateNextAppId(last_item_id); + const std::string item_name = base::StringPrintf("Item %d", i); + sync_list.push_back(CreateAppRemoteData(last_item_id, item_name, + /*folder_id=*/"", + last_position_string, kUnset)); + initial_apps.push_back( + MakeApp(item_name, last_item_id, extensions::Extension::NO_FLAGS)); + } + + app_list_syncable_service()->MergeDataAndStartSyncing( + syncer::APP_LIST, sync_list, + std::make_unique<syncer::FakeSyncChangeProcessor>(), + std::make_unique<syncer::SyncErrorFactoryMock>()); + content::RunAllTasksUntilIdle(); + + for (auto app : initial_apps) + InstallExtension(app.get()); + + // Install another app - with productivity launcher enabled, the app gets + // added to front. + last_item_id = CreateNextAppId(last_item_id); + scoped_refptr<extensions::Extension> test_app_1 = + MakeApp("Test app 1", last_item_id, extensions::Extension::NO_FLAGS); + InstallExtension(test_app_1.get()); + + std::vector<std::vector<std::string>> items_per_page = + GetNamesOfSortedItemsPerPageFromSyncableService(); + EXPECT_EQ(3u, items_per_page.size()); + EXPECT_EQ(20u, items_per_page[0].size()); + EXPECT_EQ(20u, items_per_page[1].size()); + EXPECT_EQ(6u, items_per_page[2].size()); + + // Verify that the apps whose order is well defined (i.e. that don't have + // identical string ordinals) is preserved. + EXPECT_EQ( + std::vector<std::string>(items_per_page[0].begin(), + items_per_page[0].begin() + 18), + std::vector<std::string>( + {"Test app 1", "Item 0", "Item 1", "Item 2", "Item 3", "Item 4", + "Item 5", "Item 6", "Item 7", "Item 8", "Item 9", "Item 10", + "Item 11", "Item 12", "Item 13", "Item 14", "Item 15", "Item 16"})); + EXPECT_EQ(std::vector<std::string>(items_per_page[1].begin() + 6, + items_per_page[1].begin() + 15), + std::vector<std::string>({"Item 25", "Item 26", "Item 27", + "Item 28", "Item 29", "Item 30", + "Item 31", "Item 32", "Item 33"})); + EXPECT_EQ(std::vector<std::string>(items_per_page[2].begin() + 3, + items_per_page[2].end()), + std::vector<std::string>({"Item 42", "Item 43", "Item 44"})); +} + +TEST_F(ProductivityLauncherAppListSyncableServiceTest, + PageBreakSanitizationHandlesFullPageOfDuplicateOrdinals) { + RemoveAllExistingItems(); + + std::vector<scoped_refptr<extensions::Extension>> initial_apps; + syncer::SyncDataList sync_list; + std::string last_item_id = extensions::kWebStoreAppId; + std::string last_position_string; + for (int i = 0; i < 45; ++i) { + if (i < 18 || i >= 42) + last_position_string = GetLastPositionString(); + last_item_id = CreateNextAppId(last_item_id); + const std::string item_name = base::StringPrintf("Item %d", i); + sync_list.push_back(CreateAppRemoteData(last_item_id, item_name, + /*folder_id=*/"", + last_position_string, kUnset)); + initial_apps.push_back( + MakeApp(item_name, last_item_id, extensions::Extension::NO_FLAGS)); + } + + app_list_syncable_service()->MergeDataAndStartSyncing( + syncer::APP_LIST, sync_list, + std::make_unique<syncer::FakeSyncChangeProcessor>(), + std::make_unique<syncer::SyncErrorFactoryMock>()); + content::RunAllTasksUntilIdle(); + + for (auto app : initial_apps) + InstallExtension(app.get()); + + // Install another app - with productivity launcher enabled, the app gets + // added to front. + last_item_id = CreateNextAppId(last_item_id); + scoped_refptr<extensions::Extension> test_app_1 = + MakeApp("Test app 1", last_item_id, extensions::Extension::NO_FLAGS); + InstallExtension(test_app_1.get()); + + std::vector<std::vector<std::string>> items_per_page = + GetNamesOfSortedItemsPerPageFromSyncableService(); + // Verify a page break was added to sync data. + EXPECT_EQ(3u, items_per_page.size()); + EXPECT_EQ(20u, items_per_page[0].size()); + EXPECT_EQ(20u, items_per_page[1].size()); + EXPECT_EQ(6u, items_per_page[2].size()); + + // Verify that the apps whose order is well defined (i.e. that don't have + // identical string ordinals) is preserved. + EXPECT_EQ( + std::vector<std::string>(items_per_page[0].begin(), + items_per_page[0].begin() + 18), + std::vector<std::string>( + {"Test app 1", "Item 0", "Item 1", "Item 2", "Item 3", "Item 4", + "Item 5", "Item 6", "Item 7", "Item 8", "Item 9", "Item 10", + "Item 11", "Item 12", "Item 13", "Item 14", "Item 15", "Item 16"})); + EXPECT_EQ(std::vector<std::string>(items_per_page[2].begin() + 3, + items_per_page[2].end()), + std::vector<std::string>({"Item 42", "Item 43", "Item 44"})); +} + +TEST_F(ProductivityLauncherAppListSyncableServiceTest, + PageBreakSanitizationHandlesPairOfDuplicateOrdinals) { + RemoveAllExistingItems(); + + std::vector<scoped_refptr<extensions::Extension>> initial_apps; + syncer::SyncDataList sync_list; + std::string last_item_id = extensions::kWebStoreAppId; + std::string last_position_string; + for (int i = 0; i < 25; ++i) { + if (i != 19) + last_position_string = GetLastPositionString(); + last_item_id = CreateNextAppId(last_item_id); + const std::string item_name = base::StringPrintf("Item %d", i); + sync_list.push_back(CreateAppRemoteData(last_item_id, item_name, + /*folder_id=*/"", + last_position_string, kUnset)); + initial_apps.push_back( + MakeApp(item_name, last_item_id, extensions::Extension::NO_FLAGS)); + } + + app_list_syncable_service()->MergeDataAndStartSyncing( + syncer::APP_LIST, sync_list, + std::make_unique<syncer::FakeSyncChangeProcessor>(), + std::make_unique<syncer::SyncErrorFactoryMock>()); + content::RunAllTasksUntilIdle(); + + for (auto app : initial_apps) + InstallExtension(app.get()); + + // Install another app - with productivity launcher enabled, the app gets + // added to front. + last_item_id = CreateNextAppId(last_item_id); + scoped_refptr<extensions::Extension> test_app_1 = + MakeApp("Test app 1", last_item_id, extensions::Extension::NO_FLAGS); + InstallExtension(test_app_1.get()); + + std::vector<std::vector<std::string>> items_per_page = + GetNamesOfSortedItemsPerPageFromSyncableService(); + // Verify a page break was added to sync data. + EXPECT_EQ(2u, items_per_page.size()); + EXPECT_EQ(20u, items_per_page[0].size()); + EXPECT_EQ(6u, items_per_page[1].size()); + + // Verify that the apps whose order is well defined (i.e. that don't have + // identical string ordinals) is preserved. + EXPECT_EQ(std::vector<std::string>(items_per_page[0].begin(), + items_per_page[0].begin() + 19), + std::vector<std::string>( + {"Test app 1", "Item 0", "Item 1", "Item 2", "Item 3", "Item 4", + "Item 5", "Item 6", "Item 7", "Item 8", "Item 9", "Item 10", + "Item 11", "Item 12", "Item 13", "Item 14", "Item 15", + "Item 16", "Item 17"})); + EXPECT_EQ(std::vector<std::string>(items_per_page[1].begin() + 1, + items_per_page[1].end()), + std::vector<std::string>( + {"Item 20", "Item 21", "Item 22", "Item 23", "Item 24"})); +} + +TEST_F(ProductivityLauncherAppListSyncableServiceTest, + PageBreakSanitizationHandlesAllDuplicateOrdinals) { + RemoveAllExistingItems(); + + std::vector<scoped_refptr<extensions::Extension>> initial_apps; + syncer::SyncDataList sync_list; + std::string last_item_id = extensions::kWebStoreAppId; + std::string last_position_string = GetLastPositionString(); + for (int i = 0; i < 30; ++i) { + last_item_id = CreateNextAppId(last_item_id); + const std::string item_name = base::StringPrintf("Item %d", i); + sync_list.push_back(CreateAppRemoteData(last_item_id, item_name, + /*folder_id=*/"", + last_position_string, kUnset)); + initial_apps.push_back( + MakeApp(item_name, last_item_id, extensions::Extension::NO_FLAGS)); + } + + app_list_syncable_service()->MergeDataAndStartSyncing( + syncer::APP_LIST, sync_list, + std::make_unique<syncer::FakeSyncChangeProcessor>(), + std::make_unique<syncer::SyncErrorFactoryMock>()); + content::RunAllTasksUntilIdle(); + + for (auto app : initial_apps) + InstallExtension(app.get()); + + // Install another app - with productivity launcher enabled, the app gets + // added to front. + last_item_id = CreateNextAppId(last_item_id); + scoped_refptr<extensions::Extension> test_app_1 = + MakeApp("Test app 1", last_item_id, extensions::Extension::NO_FLAGS); + InstallExtension(test_app_1.get()); + + // Verify a page break was added to sync data. + std::vector<std::vector<std::string>> items_per_page = + GetNamesOfSortedItemsPerPageFromSyncableService(); + EXPECT_EQ(2u, items_per_page.size()); + EXPECT_EQ(20u, items_per_page[0].size()); + EXPECT_EQ(11u, items_per_page[1].size()); + EXPECT_EQ("Test app 1", items_per_page[0][0]); + + // Installing another app will not create a new page - the last item from + // first page will instead be moved to the second page. + last_item_id = CreateNextAppId(last_item_id); + scoped_refptr<extensions::Extension> test_app_2 = + MakeApp("Test app 2", last_item_id, extensions::Extension::NO_FLAGS); + InstallExtension(test_app_2.get()); + + items_per_page = GetNamesOfSortedItemsPerPageFromSyncableService(); + EXPECT_EQ(2u, items_per_page.size()); + EXPECT_EQ(20u, items_per_page[0].size()); + EXPECT_EQ(12u, items_per_page[1].size()); + EXPECT_EQ("Test app 2", items_per_page[0][0]); + EXPECT_EQ("Test app 1", items_per_page[0][1]); +} + // Verifies that sorting works for the mixture of valid and invalid positions. TEST_F(ProductivityLauncherAppListSyncableServiceTest, SortMixedPositionValidityItems) {
diff --git a/chrome/browser/ui/ash/chrome_new_window_client.cc b/chrome/browser/ui/ash/chrome_new_window_client.cc index 89c3bc2..bb74e62 100644 --- a/chrome/browser/ui/ash/chrome_new_window_client.cc +++ b/chrome/browser/ui/ash/chrome_new_window_client.cc
@@ -27,7 +27,6 @@ #include "chrome/browser/apps/intent_helper/metrics/intent_handling_metrics.h" #include "chrome/browser/ash/apps/apk_web_app_service.h" #include "chrome/browser/ash/arc/arc_util.h" -#include "chrome/browser/ash/arc/arc_web_contents_data.h" #include "chrome/browser/ash/arc/fileapi/arc_content_file_system_url_util.h" #include "chrome/browser/ash/arc/intent_helper/custom_tab_session_impl.h" #include "chrome/browser/ash/file_manager/app_id.h" @@ -37,6 +36,7 @@ #include "chrome/browser/ash/profiles/profile_helper.h" #include "chrome/browser/ash/web_applications/calculator_app/calculator_app_utils.h" #include "chrome/browser/ash/web_applications/camera_app/chrome_camera_app_ui_delegate.h" +#include "chrome/browser/chromeos/arc/arc_web_contents_data.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/prefs/incognito_mode_prefs.h" #include "chrome/browser/profiles/profile_manager.h"
diff --git a/chrome/browser/ui/ash/chrome_new_window_client_browsertest.cc b/chrome/browser/ui/ash/chrome_new_window_client_browsertest.cc index 5261e7c8..0d24342 100644 --- a/chrome/browser/ui/ash/chrome_new_window_client_browsertest.cc +++ b/chrome/browser/ui/ash/chrome_new_window_client_browsertest.cc
@@ -6,8 +6,8 @@ #include "chrome/browser/apps/app_service/app_service_proxy.h" #include "chrome/browser/apps/app_service/app_service_proxy_factory.h" -#include "chrome/browser/ash/arc/arc_web_contents_data.h" #include "chrome/browser/ash/profiles/profile_helper.h" +#include "chrome/browser/chromeos/arc/arc_web_contents_data.h" #include "chrome/browser/prefs/incognito_mode_prefs.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/ui/ash/shelf/app_service/app_service_app_window_shelf_controller.cc b/chrome/browser/ui/ash/shelf/app_service/app_service_app_window_shelf_controller.cc index 1638280..38c6ccc4 100644 --- a/chrome/browser/ui/ash/shelf/app_service/app_service_app_window_shelf_controller.cc +++ b/chrome/browser/ui/ash/shelf/app_service/app_service_app_window_shelf_controller.cc
@@ -230,7 +230,7 @@ const void* key, intptr_t old) { if (IgnoreWindow(window)) { - observed_windows_.RemoveObservation(window); + StopHandleWindow(window); return; } if (key != ash::kShelfIDKey) @@ -259,7 +259,7 @@ return; if (IgnoreWindow(window)) { - observed_windows_.RemoveObservation(window); + StopHandleWindow(window); return; } @@ -788,3 +788,12 @@ RegisterWindow(window, shelf_id); } } + +void AppServiceAppWindowShelfController::StopHandleWindow( + aura::Window* window) { + observed_windows_.RemoveObservation(window); + if (arc_tracker_) + arc_tracker_->RemoveCandidateWindow(window); + UnregisterWindow(window); + aura_window_to_app_window_.erase(window); +}
diff --git a/chrome/browser/ui/ash/shelf/app_service/app_service_app_window_shelf_controller.h b/chrome/browser/ui/ash/shelf/app_service/app_service_app_window_shelf_controller.h index 4c7019e..813c0ff 100644 --- a/chrome/browser/ui/ash/shelf/app_service/app_service_app_window_shelf_controller.h +++ b/chrome/browser/ui/ash/shelf/app_service/app_service_app_window_shelf_controller.h
@@ -139,6 +139,10 @@ const ash::ShelfID& shelf_id, content::BrowserContext* browser_context); + // Stop handling browser windows, because BrowserAppShelfController is used to + // handle browser windows. + void StopHandleWindow(aura::Window* window); + AuraWindowToAppWindow aura_window_to_app_window_; base::ScopedMultiSourceObservation<aura::Window, aura::WindowObserver> observed_windows_{this};
diff --git a/chrome/browser/ui/ash/shelf/app_service/exo_app_type_resolver.cc b/chrome/browser/ui/ash/shelf/app_service/exo_app_type_resolver.cc index 34b6ec79..ac707bc 100644 --- a/chrome/browser/ui/ash/shelf/app_service/exo_app_type_resolver.cc +++ b/chrome/browser/ui/ash/shelf/app_service/exo_app_type_resolver.cc
@@ -45,6 +45,8 @@ // of fullscreen. out_properties_container.SetProperty(exo::kRestoreOrMaximizeExitsFullscreen, true); + out_properties_container.SetProperty(app_restore::kLacrosWindowId, + params.app_id); } else if (borealis::BorealisWindowManager::IsBorealisWindowId( params.app_id.empty() ? params.startup_id : params.app_id)) { // TODO(b/165865831): Stop using CROSTINI_APP for borealis windows.
diff --git a/chrome/browser/ui/ash/tablet_mode_page_behavior.cc b/chrome/browser/ui/ash/tablet_mode_page_behavior.cc index 82af617..4196488 100644 --- a/chrome/browser/ui/ash/tablet_mode_page_behavior.cc +++ b/chrome/browser/ui/ash/tablet_mode_page_behavior.cc
@@ -8,7 +8,7 @@ #include "ash/public/cpp/tablet_mode.h" #include "base/bind.h" -#include "chrome/browser/ash/arc/arc_web_contents_data.h" +#include "chrome/browser/chromeos/arc/arc_web_contents_data.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_tab_strip_tracker.h"
diff --git a/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc b/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc index 725e1f5..daa3bcd 100644 --- a/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc +++ b/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc
@@ -63,8 +63,8 @@ previous->container_view() == container_view) { if (base::FeatureList::IsEnabled( features::kAutofillDelayPopupControllerDeletion) && - previous->self_deletion_task_handle_.IsValid()) { - previous->self_deletion_task_handle_.CancelTask(); + previous->self_deletion_weak_ptr_factory_.HasWeakPtrs()) { + previous->self_deletion_weak_ptr_factory_.InvalidateWeakPtrs(); } previous->SetElementBounds(element_bounds); previous->ClearState(); @@ -595,18 +595,16 @@ return; } - if (self_deletion_task_handle_.IsValid()) + if (self_deletion_weak_ptr_factory_.HasWeakPtrs()) return; - self_deletion_task_handle_ = - base::SequencedTaskRunnerHandle::Get()->PostCancelableDelayedTask( - FROM_HERE, - base::BindOnce( - [](WeakPtr<AutofillPopupControllerImpl> weak_this) { - delete weak_this.get(); - }, - weak_ptr_factory_.GetWeakPtr()), - base::TimeDelta()); + base::SequencedTaskRunnerHandle::Get()->PostTask( + FROM_HERE, base::BindOnce( + [](WeakPtr<AutofillPopupControllerImpl> weak_this) { + if (weak_this) + delete weak_this.get(); + }, + self_deletion_weak_ptr_factory_.GetWeakPtr())); } bool AutofillPopupControllerImpl::IsMouseLocked() const {
diff --git a/chrome/browser/ui/autofill/autofill_popup_controller_impl.h b/chrome/browser/ui/autofill/autofill_popup_controller_impl.h index 3cab8b5..232f159a 100644 --- a/chrome/browser/ui/autofill/autofill_popup_controller_impl.h +++ b/chrome/browser/ui/autofill/autofill_popup_controller_impl.h
@@ -15,7 +15,6 @@ #include "base/i18n/rtl.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/task/delayed_task_handle.h" #include "build/build_config.h" #include "chrome/browser/ui/autofill/autofill_popup_controller.h" #include "chrome/browser/ui/autofill/popup_controller_common.h" @@ -219,7 +218,8 @@ // AutofillPopupControllerImpl deletes itself. To simplify memory management, // we delete the object asynchronously if AutofillDelayPopupControllerDeletion // is enabled (TODO(crbug.com/1277218): Remove "if" clause). - base::DelayedTaskHandle self_deletion_task_handle_; + base::WeakPtrFactory<AutofillPopupControllerImpl> + self_deletion_weak_ptr_factory_{this}; base::WeakPtrFactory<AutofillPopupControllerImpl> weak_ptr_factory_{this}; };
diff --git a/chrome/browser/ui/views/plugin_vm/plugin_vm_installer_view.cc b/chrome/browser/ui/views/plugin_vm/plugin_vm_installer_view.cc index a08e4b5..eb5b8fe 100644 --- a/chrome/browser/ui/views/plugin_vm/plugin_vm_installer_view.cc +++ b/chrome/browser/ui/views/plugin_vm/plugin_vm_installer_view.cc
@@ -72,7 +72,7 @@ switch (reason) { default: NOTREACHED(); - FALLTHROUGH; + [[fallthrough]]; case Reason::DOWNLOAD_FAILED_401: return 401; case Reason::DOWNLOAD_FAILED_403: @@ -362,7 +362,7 @@ switch (installing_state_) { case InstallingState::kInactive: NOTREACHED(); - FALLTHROUGH; + [[fallthrough]]; case InstallingState::kCheckingLicense: case InstallingState::kCheckingForExistingVm: case InstallingState::kCheckingDiskSpace:
diff --git a/chrome/browser/ui/webui/settings/chromeos/constants/setting.mojom b/chrome/browser/ui/webui/settings/chromeos/constants/setting.mojom index 4b1ab02..5237f7c1 100644 --- a/chrome/browser/ui/webui/settings/chromeos/constants/setting.mojom +++ b/chrome/browser/ui/webui/settings/chromeos/constants/setting.mojom
@@ -213,7 +213,9 @@ kOfferTranslation = 1205, kAddInputMethod = 1206, kSpellCheck = 1207, - kShowPredictiveWriting = 1208, + // Note: Value 1208 was for deprecated kShowPredictiveWriting. + // Do not reuse. + // TODO(crbug/1058552): Add [Deprecated] attribute once implemented. // Files section. kGoogleDriveConnection = 1300,
diff --git a/chrome/browser/ui/webui/settings/chromeos/languages_section.cc b/chrome/browser/ui/webui/settings/chromeos/languages_section.cc index 03f53301..4553035 100644 --- a/chrome/browser/ui/webui/settings/chromeos/languages_section.cc +++ b/chrome/browser/ui/webui/settings/chromeos/languages_section.cc
@@ -144,21 +144,6 @@ return *tags; } -const std::vector<SearchConcept>& GetPredictiveWritingSearchConcepts() { - static const base::NoDestructor<std::vector<SearchConcept>> tags({ - {IDS_OS_SETTINGS_TAG_LANGUAGES_PREDICTIVE_WRITING, - mojom::kSmartInputsSubpagePath, - mojom::SearchResultIcon::kGlobe, - mojom::SearchResultDefaultRank::kMedium, - mojom::SearchResultType::kSetting, - {.setting = mojom::Setting::kShowPredictiveWriting}, - {IDS_OS_SETTINGS_TAG_LANGUAGES_PREDICTIVE_WRITING_ALT1, - IDS_OS_SETTINGS_TAG_LANGUAGES_PREDICTIVE_WRITING_ALT2, - SearchConcept::kAltTagEnd}}, - }); - return *tags; -} - bool IsAssistivePersonalInfoAllowed() { return !features::IsGuestModeActive() && base::FeatureList::IsEnabled( @@ -185,18 +170,12 @@ {"emojiSuggestionTitle", IDS_SETTINGS_SUGGESTIONS_EMOJI_SUGGESTION_TITLE}, {"emojiSuggestionDescription", IDS_SETTINGS_SUGGESTIONS_EMOJI_SUGGESTION_DESCRIPTION}, - {"predictiveWritingTitle", - IDS_SETTINGS_SUGGESTIONS_PREDICTIVE_WRITING_TITLE}, - {"predictiveWritingDescription", - IDS_SETTINGS_SUGGESTIONS_PREDICTIVE_WRITING_DESCRIPTION}, }; html_source->AddLocalizedStrings(kLocalizedStrings); html_source->AddBoolean("allowAssistivePersonalInfo", IsAssistivePersonalInfoAllowed()); html_source->AddBoolean("allowEmojiSuggestion", is_emoji_suggestion_allowed); - html_source->AddBoolean("allowPredictiveWriting", - IsPredictiveWritingAllowed()); } void AddInputMethodOptionsStrings(content::WebUIDataSource* html_source) { @@ -271,6 +250,8 @@ IDS_SETTINGS_INPUT_METHOD_OPTIONS_KEYBOARD_COLEMAK}, }; html_source->AddLocalizedStrings(kLocalizedStrings); + html_source->AddBoolean("allowPredictiveWriting", + IsPredictiveWritingAllowed()); } void AddLanguagesPageStringsV2(content::WebUIDataSource* html_source) { @@ -425,15 +406,12 @@ updater.AddSearchTags(GetInputPageSearchConceptsV2()); UpdateSpellCheckSearchTags(); - if (IsAssistivePersonalInfoAllowed() || IsEmojiSuggestionAllowed() || - IsPredictiveWritingAllowed()) { + if (IsAssistivePersonalInfoAllowed() || IsEmojiSuggestionAllowed()) { updater.AddSearchTags(GetSmartInputsSearchConcepts()); if (IsAssistivePersonalInfoAllowed()) updater.AddSearchTags(GetAssistivePersonalInfoSearchConcepts()); if (IsEmojiSuggestionAllowed()) updater.AddSearchTags(GetEmojiSuggestionSearchConcepts()); - if (IsPredictiveWritingAllowed()) - updater.AddSearchTags(GetPredictiveWritingSearchConcepts()); } } @@ -562,7 +540,6 @@ static constexpr mojom::Setting kSmartInputsFeaturesSettings[] = { mojom::Setting::kShowPersonalInformationSuggestions, mojom::Setting::kShowEmojiSuggestions, - mojom::Setting::kShowPredictiveWriting, }; RegisterNestedSettingBulk(mojom::Subpage::kSmartInputs, kSmartInputsFeaturesSettings, generator);
diff --git a/chrome/browser/ui/webui/settings/metrics_reporting_handler.cc b/chrome/browser/ui/webui/settings/metrics_reporting_handler.cc index 69420ca..d1fc5ad8e 100644 --- a/chrome/browser/ui/webui/settings/metrics_reporting_handler.cc +++ b/chrome/browser/ui/webui/settings/metrics_reporting_handler.cc
@@ -16,7 +16,6 @@ #include "chrome/browser/metrics/chrome_metrics_service_accessor.h" #include "chrome/browser/metrics/metrics_reporting_state.h" #include "components/metrics/metrics_pref_names.h" -#include "components/policy/policy_constants.h" #include "components/prefs/pref_service.h" #include "content/public/browser/web_ui.h" @@ -49,19 +48,10 @@ g_browser_process->local_state(), base::BindRepeating(&MetricsReportingHandler::OnPrefChanged, base::Unretained(this))); - - policy_registrar_ = std::make_unique<policy::PolicyChangeRegistrar>( - g_browser_process->policy_service(), - policy::PolicyNamespace(policy::POLICY_DOMAIN_CHROME, std::string())); - policy_registrar_->Observe( - policy::key::kMetricsReportingEnabled, - base::BindRepeating(&MetricsReportingHandler::OnPolicyChanged, - base::Unretained(this))); } void MetricsReportingHandler::OnJavascriptDisallowed() { pref_member_.reset(); - policy_registrar_.reset(); } void MetricsReportingHandler::HandleGetMetricsReporting( @@ -134,11 +124,6 @@ #endif // BUILDFLAG(IS_CHROMEOS_LACROS) } -void MetricsReportingHandler::OnPolicyChanged(const base::Value* previous, - const base::Value* current) { - SendMetricsReportingChange(); -} - void MetricsReportingHandler::OnPrefChanged(const std::string& pref_name) { DCHECK_EQ(metrics::prefs::kMetricsReportingEnabled, pref_name); SendMetricsReportingChange();
diff --git a/chrome/browser/ui/webui/settings/metrics_reporting_handler.h b/chrome/browser/ui/webui/settings/metrics_reporting_handler.h index 2deaa91a..e4cebe0 100644 --- a/chrome/browser/ui/webui/settings/metrics_reporting_handler.h +++ b/chrome/browser/ui/webui/settings/metrics_reporting_handler.h
@@ -13,7 +13,6 @@ #include <memory> #include "chrome/browser/ui/webui/settings/settings_page_ui_handler.h" -#include "components/policy/core/common/policy_service.h" #include "components/prefs/pref_member.h" #if BUILDFLAG(IS_CHROMEOS_LACROS) @@ -55,11 +54,6 @@ // |enabled| boolean argument. void HandleSetMetricsReportingEnabled(const base::ListValue* args); - // Called when the policies that affect whether metrics reporting is managed - // change. - void OnPolicyChanged(const base::Value* current_policy, - const base::Value* previous_policy); - // Called when the local state pref controlling metrics reporting changes. void OnPrefChanged(const std::string& pref_name); @@ -70,10 +64,6 @@ // enabled. std::unique_ptr<BooleanPrefMember> pref_member_; - // Used to track policy changes that affect whether metrics reporting is - // enabled or managed. - std::unique_ptr<policy::PolicyChangeRegistrar> policy_registrar_; - #if BUILDFLAG(IS_CHROMEOS_LACROS) // The metrics reporting interface in ash-chrome. mojo::Remote<crosapi::mojom::MetricsReporting> metrics_reporting_remote_;
diff --git a/chrome/browser/ui/webui/settings/metrics_reporting_handler_unittest.cc b/chrome/browser/ui/webui/settings/metrics_reporting_handler_unittest.cc index 9e61775f..bb2f758 100644 --- a/chrome/browser/ui/webui/settings/metrics_reporting_handler_unittest.cc +++ b/chrome/browser/ui/webui/settings/metrics_reporting_handler_unittest.cc
@@ -14,11 +14,6 @@ #include "chrome/test/base/scoped_testing_local_state.h" #include "chrome/test/base/testing_browser_process.h" #include "components/metrics/metrics_pref_names.h" -#include "components/policy/core/browser/browser_policy_connector.h" -#include "components/policy/core/common/mock_configuration_policy_provider.h" -#include "components/policy/core/common/policy_map.h" -#include "components/policy/core/common/policy_types.h" -#include "components/policy/policy_constants.h" #include "components/prefs/pref_service.h" #include "content/public/browser/web_ui.h" #include "content/public/test/browser_task_environment.h" @@ -42,10 +37,6 @@ handler_ = std::make_unique<TestingMetricsReportingHandler>(); handler_->set_web_ui(&test_web_ui_); - - provider_.SetDefaultReturns(/*is_initialization_complete_return=*/true, - /*is_first_policy_load_complete_return=*/true); - policy::BrowserPolicyConnector::SetPolicyProviderForTesting(&provider_); } void SetUp() override { @@ -74,17 +65,12 @@ PrefService* local_state() { return local_state_->Get(); } TestingMetricsReportingHandler* handler() { return handler_.get(); } content::TestWebUI* test_web_ui() { return &test_web_ui_; } - policy::PolicyMap* map() { return &map_; } - policy::MockConfigurationPolicyProvider* provider() { return &provider_; } private: content::BrowserTaskEnvironment task_environment_; content::TestWebUI test_web_ui_; std::unique_ptr<ScopedTestingLocalState> local_state_; std::unique_ptr<TestingMetricsReportingHandler> handler_; - - testing::NiceMock<policy::MockConfigurationPolicyProvider> provider_; - policy::PolicyMap map_; }; TEST_F(MetricsReportingHandlerTest, PrefChangesNotifyPage) { @@ -104,25 +90,6 @@ EXPECT_TRUE(test_web_ui()->call_data().empty()); } -TEST_F(MetricsReportingHandlerTest, PolicyChangesNotifyPage) { - // Change the policy, check that the page was notified. - map()->Set(policy::key::kMetricsReportingEnabled, - policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, base::Value(true), nullptr); - provider()->UpdateChromePolicy(*map()); - EXPECT_EQ(1u, test_web_ui()->call_data().size()); - - test_web_ui()->ClearTrackedCalls(); - handler()->DisallowJavascript(); - - // Policies changing while JavaScript is disabled shouldn't notify the page. - map()->Set(policy::key::kMetricsReportingEnabled, - policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, base::Value(false), nullptr); - provider()->UpdateChromePolicy(*map()); - EXPECT_TRUE(test_web_ui()->call_data().empty()); -} - } // namespace settings #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) && !BUILDFLAG(IS_CHROMEOS_ASH)
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 492b701..7402402 100644 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
@@ -1046,6 +1046,7 @@ IDS_SETTINGS_PASSWORD_DELETED_PASSWORD_FROM_ACCOUNT}, {"passwordDeletedFromAccountAndDevice", IDS_SETTINGS_PASSWORD_DELETED_PASSWORD_FROM_ACCOUNT_AND_DEVICE}, + {"passwordCopiedToClipboard", IDS_SETTINGS_PASSWORD_COPIED_TO_CLIPBOARD}, {"passwordMovePasswordsToAccount", IDS_SETTINGS_PASSWORD_MOVE_PASSWORDS_TO_ACCOUNT}, {"passwordMovePasswordsToAccountDialogBodyText",
diff --git a/chrome/browser/ui/webui/settings/shared_settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/shared_settings_localized_strings_provider.cc index 46371ac9..f00ca1de 100644 --- a/chrome/browser/ui/webui/settings/shared_settings_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/settings/shared_settings_localized_strings_provider.cc
@@ -367,6 +367,8 @@ IDS_SETTINGS_NEARBY_SHARE_FAST_INITIATION_NOTIFICATION_TOGGLE_TITLE}, {"fastInitiationNotificationToggleDescription", IDS_SETTINGS_NEARBY_SHARE_FAST_INITIATION_NOTIFICATION_TOGGLE_DESCRIPTION}, + {"fastInitiationNotificationToggleAriaLabel", + IDS_SETTINGS_NEARBY_SHARE_FAST_INITIATION_NOTIFICATION_TOGGLE_ARIA_LABEL}, {"nearbyShareDeviceNameAriaDescription", IDS_SETTINGS_NEARBY_SHARE_DEVICE_NAME_ARIA_DESCRIPTION}, {"nearbyShareConfirmDeviceName",
diff --git a/chrome/browser/web_applications/app_service/web_app_publisher_helper.cc b/chrome/browser/web_applications/app_service/web_app_publisher_helper.cc index 6e5f3e9c..abdbb21b 100644 --- a/chrome/browser/web_applications/app_service/web_app_publisher_helper.cc +++ b/chrome/browser/web_applications/app_service/web_app_publisher_helper.cc
@@ -61,10 +61,10 @@ #if BUILDFLAG(IS_CHROMEOS_ASH) #include "ash/constants/ash_features.h" -#include "chrome/browser/ash/arc/arc_web_contents_data.h" #include "chrome/browser/ash/crostini/crostini_terminal.h" #include "chrome/browser/ash/crostini/crostini_util.h" #include "chrome/browser/ash/login/demo_mode/demo_session.h" +#include "chrome/browser/chromeos/arc/arc_web_contents_data.h" #include "chrome/browser/web_applications/system_web_apps/system_web_app_manager.h" #include "components/app_restore/app_launch_info.h" #include "components/app_restore/full_restore_save_handler.h"
diff --git a/chrome/browser/web_applications/app_shim_registry_mac.cc b/chrome/browser/web_applications/app_shim_registry_mac.cc index 3929133..5d52962 100644 --- a/chrome/browser/web_applications/app_shim_registry_mac.cc +++ b/chrome/browser/web_applications/app_shim_registry_mac.cc
@@ -103,21 +103,19 @@ std::set<std::string> AppShimRegistry::GetInstalledAppsForProfile( const base::FilePath& profile) const { std::set<std::string> result; - const base::DictionaryValue* app_shims = &base::Value::AsDictionaryValue( - *GetPrefService()->GetDictionary(kAppShims)); + const base::Value* app_shims = GetPrefService()->GetDictionary(kAppShims); if (!app_shims) return result; - for (base::DictionaryValue::Iterator iter_app(*app_shims); - !iter_app.IsAtEnd(); iter_app.Advance()) { + for (const auto iter_app : app_shims->DictItems()) { const base::Value* installed_profiles_list = - iter_app.value().FindListKey(kInstalledProfiles); + iter_app.second.FindListKey(kInstalledProfiles); if (!installed_profiles_list) continue; for (const auto& profile_path_value : installed_profiles_list->GetList()) { if (!profile_path_value.is_string()) continue; if (profile == GetFullProfilePath(profile_path_value.GetString())) { - result.insert(iter_app.key()); + result.insert(iter_app.first); break; } }
diff --git a/chrome/browser/web_applications/daily_metrics_helper.cc b/chrome/browser/web_applications/daily_metrics_helper.cc index 7ac92cc..bbaab87 100644 --- a/chrome/browser/web_applications/daily_metrics_helper.cc +++ b/chrome/browser/web_applications/daily_metrics_helper.cc
@@ -75,7 +75,7 @@ const char kNumSessions[] = "num_sessions"; optional<DailyInteraction> DictToRecord(const std::string& url, - const DictionaryValue& record_dict) { + const Value& record_dict) { GURL gurl(url); if (!gurl.is_valid()) return absl::nullopt; @@ -157,16 +157,14 @@ } void EmitRecords(Profile* profile) { - const DictionaryValue* urls_to_features = &base::Value::AsDictionaryValue( - *profile->GetPrefs()->GetDictionary(prefs::kWebAppsDailyMetrics)); + const Value* urls_to_features = + profile->GetPrefs()->GetDictionary(prefs::kWebAppsDailyMetrics); DCHECK(urls_to_features); - for (DictionaryValue::Iterator iter(*urls_to_features); !iter.IsAtEnd(); - iter.Advance()) { - const std::string& url = iter.key(); - const Value& val = iter.value(); - const DictionaryValue& dict = Value::AsDictionaryValue(val); - optional<DailyInteraction> record = DictToRecord(url, dict); + for (const auto iter : urls_to_features->DictItems()) { + const std::string& url = iter.first; + const Value& val = iter.second; + optional<DailyInteraction> record = DictToRecord(url, val); if (record) EmitRecord(*record, profile); } @@ -190,8 +188,8 @@ const Value* existing_val = urls_to_features->FindDictKey(url); if (existing_val) { // Sum duration and session values from existing record. - const DictionaryValue& dict = Value::AsDictionaryValue(*existing_val); - optional<DailyInteraction> existing_record = DictToRecord(url, dict); + optional<DailyInteraction> existing_record = + DictToRecord(url, *existing_val); if (existing_record) { record.foreground_duration += existing_record->foreground_duration; record.background_duration += existing_record->background_duration;
diff --git a/chrome/browser/web_applications/policy/web_app_policy_manager.cc b/chrome/browser/web_applications/policy/web_app_policy_manager.cc index 0a6ce6e..a052cf0 100644 --- a/chrome/browser/web_applications/policy/web_app_policy_manager.cc +++ b/chrome/browser/web_applications/policy/web_app_policy_manager.cc
@@ -231,8 +231,8 @@ // No need to validate the types or values of the policy members because we // are using a SimpleSchemaValidatingPolicyHandler which should validate them // for us. - const base::DictionaryValue* web_app_dict = &base::Value::AsDictionaryValue( - *pref_service_->GetDictionary(prefs::kWebAppSettings)); + const base::Value* web_app_dict = + pref_service_->GetDictionary(prefs::kWebAppSettings); settings_by_url_.clear(); default_settings_ = std::make_unique<WebAppPolicyManager::WebAppSetting>(); @@ -241,32 +241,31 @@ return; // Read default policy, if provided. - const base::DictionaryValue* default_settings_dict = nullptr; - if (web_app_dict->GetDictionary(kWildcard, &default_settings_dict)) { - if (!default_settings_->Parse(default_settings_dict, true)) { + const base::Value* default_settings_dict = + web_app_dict->FindDictKey(kWildcard); + if (default_settings_dict) { + if (!default_settings_->Parse(*default_settings_dict, true)) { SYSLOG(WARNING) << "Malformed default web app management setting."; default_settings_->ResetSettings(); } } // Read policy for individual web apps - for (base::DictionaryValue::Iterator iter(*web_app_dict); !iter.IsAtEnd(); - iter.Advance()) { - if (iter.key() == kWildcard) + for (const auto iter : web_app_dict->DictItems()) { + if (iter.first == kWildcard) continue; - const base::DictionaryValue* web_app_settings_dict; - if (!iter.value().GetAsDictionary(&web_app_settings_dict)) + if (!iter.second.is_dict()) continue; - GURL url = GURL(iter.key()); + GURL url = GURL(iter.first); if (!url.is_valid()) { - LOG(WARNING) << "Invalid URL: " << iter.key(); + LOG(WARNING) << "Invalid URL: " << iter.first; continue; } WebAppPolicyManager::WebAppSetting by_url(*default_settings_); - if (by_url.Parse(web_app_settings_dict, false)) { + if (by_url.Parse(iter.second, false)) { settings_by_url_[url] = by_url; } else { LOG(WARNING) << "Malformed web app settings for " << url; @@ -360,13 +359,10 @@ custom_manifest_values_by_url_[gurl].SetName(custom_name->GetString()); } - if (custom_icon && gurl.is_valid()) { - const base::DictionaryValue* dict = nullptr; - if (custom_icon->GetAsDictionary(&dict)) { - const std::string* icon_url = dict->FindStringKey(kCustomIconURLKey); - if (icon_url) { - custom_manifest_values_by_url_[gurl].SetIcon(*icon_url); - } + if (custom_icon && custom_icon->is_dict() && gurl.is_valid()) { + const std::string* icon_url = custom_icon->FindStringKey(kCustomIconURLKey); + if (icon_url) { + custom_manifest_values_by_url_[gurl].SetIcon(*icon_url); } } @@ -452,10 +448,9 @@ ResetSettings(); } -bool WebAppPolicyManager::WebAppSetting::Parse( - const base::DictionaryValue* dict, - bool for_default_settings) { - const std::string* run_on_os_login_str = dict->FindStringKey(kRunOnOsLogin); +bool WebAppPolicyManager::WebAppSetting::Parse(const base::Value& dict, + bool for_default_settings) { + const std::string* run_on_os_login_str = dict.FindStringKey(kRunOnOsLogin); if (run_on_os_login_str) { if (*run_on_os_login_str == kAllowed) { run_on_os_login_policy = RunOnOsLoginPolicy::kAllowed;
diff --git a/chrome/browser/web_applications/policy/web_app_policy_manager.h b/chrome/browser/web_applications/policy/web_app_policy_manager.h index 477ec61..549decce 100644 --- a/chrome/browser/web_applications/policy/web_app_policy_manager.h +++ b/chrome/browser/web_applications/policy/web_app_policy_manager.h
@@ -106,7 +106,7 @@ WebAppSetting& operator=(const WebAppSetting&) = default; ~WebAppSetting() = default; - bool Parse(const base::DictionaryValue* dict, bool for_default_settings); + bool Parse(const base::Value& dict, bool for_default_settings); void ResetSettings(); RunOnOsLoginPolicy run_on_os_login_policy;
diff --git a/chrome/browser/webauthn/authenticator_request_dialog_model.cc b/chrome/browser/webauthn/authenticator_request_dialog_model.cc index 59db14e..6990773 100644 --- a/chrome/browser/webauthn/authenticator_request_dialog_model.cc +++ b/chrome/browser/webauthn/authenticator_request_dialog_model.cc
@@ -252,7 +252,9 @@ return; } - next_step_once_ble_powered_ = step; + after_ble_adapter_powered_ = + base::BindOnce(&AuthenticatorRequestDialogModel::SetCurrentStep, + weak_factory_.GetWeakPtr(), step); SetCurrentStep(transport_availability()->can_power_on_ble_adapter ? Step::kBlePowerOnAutomatic : Step::kBlePowerOnManual); @@ -262,9 +264,8 @@ DCHECK(current_step() == Step::kBlePowerOnManual || current_step() == Step::kBlePowerOnAutomatic); DCHECK(ble_adapter_is_powered()); - DCHECK(next_step_once_ble_powered_.has_value()); - SetCurrentStep(*next_step_once_ble_powered_); + std::move(after_ble_adapter_powered_).Run(); } void AuthenticatorRequestDialogModel::PowerOnBleAdapter() { @@ -757,8 +758,23 @@ void AuthenticatorRequestDialogModel::ContactPhoneAfterOffTheRecordInterstitial( std::string name) { + if (!ble_adapter_is_powered()) { + after_ble_adapter_powered_ = base::BindOnce( + &AuthenticatorRequestDialogModel::ContactPhoneAfterBleIsPowered, + weak_factory_.GetWeakPtr(), std::move(name)); + SetCurrentStep(transport_availability()->can_power_on_ble_adapter + ? Step::kBlePowerOnAutomatic + : Step::kBlePowerOnManual); + return; + } + + ContactPhoneAfterBleIsPowered(std::move(name)); +} + +void AuthenticatorRequestDialogModel::ContactPhoneAfterBleIsPowered( + std::string name) { ContactNextPhoneByName(name); - EnsureBleAdapterIsPoweredAndContinueWithStep(Step::kCableActivate); + SetCurrentStep(Step::kCableActivate); } void AuthenticatorRequestDialogModel::StartLocationBarBubbleRequest() {
diff --git a/chrome/browser/webauthn/authenticator_request_dialog_model.h b/chrome/browser/webauthn/authenticator_request_dialog_model.h index a9e10138..a044a79 100644 --- a/chrome/browser/webauthn/authenticator_request_dialog_model.h +++ b/chrome/browser/webauthn/authenticator_request_dialog_model.h
@@ -586,6 +586,7 @@ // Contacts a paired phone. The phone is specified by name. void ContactPhone(const std::string& name, size_t mechanism_index); void ContactPhoneAfterOffTheRecordInterstitial(std::string name); + void ContactPhoneAfterBleIsPowered(std::string name); void StartLocationBarBubbleRequest(); @@ -616,16 +617,15 @@ // may request, e.g., PIN entry prior to that. absl::optional<Step> pending_step_; - // Determines which step to continue with once the Blueooth adapter is - // powered. Only set while the |current_step_| is either kBlePowerOnManual, - // kBlePowerOnAutomatic. - absl::optional<Step> next_step_once_ble_powered_; - // after_off_the_record_interstitial_ contains the closure to run if the user // accepts the interstitial that warns that platform/caBLE authenticators may // record information even in incognito mode. base::OnceClosure after_off_the_record_interstitial_; + // after_ble_adapter_powered_ contains the closure to run if the user + // accepts the interstitial that requests to turn on the BLE adapter. + base::OnceClosure after_ble_adapter_powered_; + base::ObserverList<Observer>::Unchecked observers_; // This field is only filled out once the UX flow is started.
diff --git a/chrome/build/linux.pgo.txt b/chrome/build/linux.pgo.txt index d7692175..f5d1ff0 100644 --- a/chrome/build/linux.pgo.txt +++ b/chrome/build/linux.pgo.txt
@@ -1 +1 @@ -chrome-linux-main-1641318921-0c86e2a71b7d8f34f15c91bbc9b326a1c52464c6.profdata +chrome-linux-main-1641340775-89609077cff1e432d3fcef632922be03841b122a.profdata
diff --git a/chrome/build/mac.pgo.txt b/chrome/build/mac.pgo.txt index 9eb658d..87362ee 100644 --- a/chrome/build/mac.pgo.txt +++ b/chrome/build/mac.pgo.txt
@@ -1 +1 @@ -chrome-mac-main-1641318921-cc1a7ddf6481043e108dec859caaad4a72857d4e.profdata +chrome-mac-main-1641340775-8c548c93d6ad70275b5df4b9c5f10b6e0a2ac5b6.profdata
diff --git a/chrome/build/win32.pgo.txt b/chrome/build/win32.pgo.txt index 2626d65..5a196cb8 100644 --- a/chrome/build/win32.pgo.txt +++ b/chrome/build/win32.pgo.txt
@@ -1 +1 @@ -chrome-win32-main-1641329781-37798b3cf29f7e82d380cd4a400cdc37a5b18612.profdata +chrome-win32-main-1641340775-4e51971760b98c6cec43e4185be396c2c59cf36f.profdata
diff --git a/chrome/build/win64.pgo.txt b/chrome/build/win64.pgo.txt index f2c0521d..606173a5 100644 --- a/chrome/build/win64.pgo.txt +++ b/chrome/build/win64.pgo.txt
@@ -1 +1 @@ -chrome-win64-main-1641285643-0fbc9ceaa0c127fcc2480dc746a7897e488d9ed7.profdata +chrome-win64-main-1641340775-d2e3b869b30691210c88f6e0b016fd64e5700e9a.profdata
diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc index 68449fe..75dd8cd 100644 --- a/chrome/common/chrome_features.cc +++ b/chrome/common/chrome_features.cc
@@ -972,10 +972,6 @@ const base::Feature kSmartDim{"SmartDim", base::FEATURE_DISABLED_BY_DEFAULT}; #endif // BUILDFLAG(IS_CHROMEOS_ASH) -// Enables prewarming a renderer when the primary profile is created. -const base::Feature kSpareRendererOnPrimaryProfileCreation{ - "SpareRendererOnPrimaryProfileCreation", base::FEATURE_DISABLED_BY_DEFAULT}; - // Enables or disables the ability to use the sound content setting to mute a // website. const base::Feature kSoundContentSetting{"SoundContentSetting",
diff --git a/chrome/common/chrome_features.h b/chrome/common/chrome_features.h index 7fc8d75..73dc22583 100644 --- a/chrome/common/chrome_features.h +++ b/chrome/common/chrome_features.h
@@ -655,9 +655,6 @@ #endif COMPONENT_EXPORT(CHROME_FEATURES) -extern const base::Feature kSpareRendererOnPrimaryProfileCreation; - -COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kSoundContentSetting; COMPONENT_EXPORT(CHROME_FEATURES)
diff --git a/chrome/common/extensions/api/_api_features.json b/chrome/common/extensions/api/_api_features.json index 9d51093..a5f0325e 100644 --- a/chrome/common/extensions/api/_api_features.json +++ b/chrome/common/extensions/api/_api_features.json
@@ -535,16 +535,6 @@ "dependencies": ["permission:history"], "contexts": ["blessed_extension"] }, - "i18n": { - "channel": "stable", - "extension_types": ["extension", "legacy_packaged_app", "platform_app", - "login_screen_extension"], - "contexts": ["blessed_extension", "unblessed_extension", "content_script", - "lock_screen_extension"] - }, - "i18n.getMessage": { - "disallow_for_service_workers": true - }, "identity": { "dependencies": ["permission:identity"], "contexts": ["blessed_extension"]
diff --git a/chrome/common/extensions/api/api_sources.gni b/chrome/common/extensions/api/api_sources.gni index d0f2d26..f80c7f36 100644 --- a/chrome/common/extensions/api/api_sources.gni +++ b/chrome/common/extensions/api/api_sources.gni
@@ -34,7 +34,6 @@ "font_settings.json", "gcm.json", "history.json", - "i18n.json", "identity.idl", "identity_private.idl", "image_writer_private.idl",
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn index 9531a79..6fd76bc 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn
@@ -7129,7 +7129,6 @@ "../renderer/extensions/custom_types_unittest.cc", "../renderer/extensions/extension_hooks_delegate_unittest.cc", "../renderer/extensions/extension_localization_peer_unittest.cc", - "../renderer/extensions/i18n_hooks_delegate_unittest.cc", "../renderer/extensions/renderer_permissions_policy_delegate_unittest.cc", "../renderer/extensions/tabs_hooks_delegate_unittest.cc", ]
diff --git a/chrome/test/data/ssl/page_displays_insecure_content.html.mock-http-headers b/chrome/test/data/ssl/page_displays_insecure_content.html.mock-http-headers new file mode 100644 index 0000000..263e89c4 --- /dev/null +++ b/chrome/test/data/ssl/page_displays_insecure_content.html.mock-http-headers
@@ -0,0 +1,2 @@ +HTTP/1.1 200 OK +Supports-Loading-Mode: fenced-frame \ No newline at end of file
diff --git a/chrome/test/data/webui/BUILD.gn b/chrome/test/data/webui/BUILD.gn index f3b4c71..35b9342 100644 --- a/chrome/test/data/webui/BUILD.gn +++ b/chrome/test/data/webui/BUILD.gn
@@ -504,7 +504,6 @@ deps = [ ":closure_compile_local", "cr_components:closure_compile", - "cr_elements:closure_compile", "inline_login:closure_compile", "js/cr:closure_compile", "media_router:closure_compile", @@ -516,6 +515,7 @@ deps += [ "chromeos:closure_compile", "cr_components/chromeos:closure_compile", + "cr_elements:closure_compile", "nearby_share:closure_compile", "nearby_share/shared:closure_compile", "settings/chromeos:closure_compile",
diff --git a/chrome/test/data/webui/cr_elements/BUILD.gn b/chrome/test/data/webui/cr_elements/BUILD.gn index 2bbad23..b179e93 100644 --- a/chrome/test/data/webui/cr_elements/BUILD.gn +++ b/chrome/test/data/webui/cr_elements/BUILD.gn
@@ -9,54 +9,17 @@ import("//ui/webui/resources/tools/generate_grd.gni") import("../namespace_rewrites.gni") -js_type_check("closure_compile") { - is_polymer3 = true - closure_flags = default_closure_args + [ - "js_module_root=../../chrome/test/data/webui/", - "js_module_root=./gen/chrome/test/data/webui/", - ] - - deps = [ - ":cr_container_shadow_behavior_test", - ":cr_scrollable_behavior_tests", - ":iron_list_focus_test", - ] - - if (is_chromeos_ash) { - deps += [ ":cr_searchable_drop_down_tests" ] - } -} - -js_library("cr_container_shadow_behavior_test") { - deps = [ - "..:chai_assert", - "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/cr_elements:cr_container_shadow_behavior.m", - ] - externs_list = [ "$externs_path/mocha-2.5.js" ] -} - -js_library("cr_scrollable_behavior_tests") { - deps = [ - "..:chai_assert", - "..:test_util", - "//third_party/polymer/v3_0/components-chromium/iron-list:iron-list", - "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/cr_elements:cr_scrollable_behavior.m", - ] - externs_list = [ "$externs_path/mocha-2.5.js" ] -} - -js_library("iron_list_focus_test") { - deps = [ - "..:chai_assert", - "//third_party/polymer/v3_0/components-chromium/iron-list:iron-list", - "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - ] - externs_list = [ "$externs_path/mocha-2.5.js" ] -} - if (is_chromeos_ash) { + js_type_check("closure_compile") { + is_polymer3 = true + closure_flags = default_closure_args + [ + "js_module_root=../../chrome/test/data/webui/", + "js_module_root=./gen/chrome/test/data/webui/", + ] + + deps = [ ":cr_searchable_drop_down_tests" ] + } + js_library("cr_searchable_drop_down_tests") { deps = [ "..:chai_assert", @@ -85,11 +48,14 @@ rebase_path("$root_gen_dir/chrome/test/data/webui/tsc/*", target_gen_dir) ] in_files = [ + "cr_a11y_announcer_test.ts", "cr_action_menu_test.ts", "cr_auto_img_test.ts", "cr_button_tests.ts", "cr_card_radio_button_test.ts", "cr_checkbox_test.ts", + "cr_container_shadow_behavior_test.ts", + "cr_container_shadow_mixin_test.ts", "cr_dialog_test.ts", "cr_drawer_tests.ts", "cr_expand_button_tests.ts", @@ -100,6 +66,7 @@ "cr_lazy_render_tests.ts", "cr_link_row_tests.ts", "cr_lottie_tests.ts", + "cr_menu_selector_focus_test.ts", "cr_policy_indicator_behavior_tests.ts", "cr_policy_indicator_tests.ts", "cr_policy_pref_indicator_tests.ts", @@ -108,6 +75,7 @@ "cr_radio_button_test.ts", "cr_radio_group_test.ts", "cr_search_field_tests.ts", + "cr_scrollable_behavior_tests.ts", "cr_slider_test.ts", "cr_splitter_test.ts", "cr_tabs_test.ts", @@ -118,6 +86,7 @@ "cr_toolbar_search_field_tests.ts", "cr_toolbar_test.ts", "cr_view_manager_test.ts", + "iron_list_focus_test.ts", ] definitions = [ "//tools/typescript/definitions/settings_private.d.ts" ] deps = [ "//ui/webui/resources:library" ]
diff --git a/chrome/test/data/webui/cr_elements/cr_a11y_announcer_test.js b/chrome/test/data/webui/cr_elements/cr_a11y_announcer_test.ts similarity index 76% rename from chrome/test/data/webui/cr_elements/cr_a11y_announcer_test.js rename to chrome/test/data/webui/cr_elements/cr_a11y_announcer_test.ts index 728871db..f60c017 100644 --- a/chrome/test/data/webui/cr_elements/cr_a11y_announcer_test.js +++ b/chrome/test/data/webui/cr_elements/cr_a11y_announcer_test.ts
@@ -2,19 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +import 'chrome://resources/cr_elements/cr_a11y_announcer/cr_a11y_announcer.js'; + import {CrA11yAnnouncerElement, TIMEOUT_MS} from 'chrome://resources/cr_elements/cr_a11y_announcer/cr_a11y_announcer.js'; -import {assertEquals, assertFalse, assertNotEquals, assertTrue} from '../chai_assert.js'; +import {assertEquals, assertFalse, assertNotEquals, assertTrue} from 'chrome://webui-test/chai_assert.js'; suite('CrA11yAnnouncerElementTest', () => { setup(() => { document.body.innerHTML = ''; }); - function getMessagesDiv(announcer) { - return announcer.shadowRoot.querySelector('#messages'); - } - test('CreatesAndGetsAnnouncers', () => { const defaultAnnouncer = CrA11yAnnouncerElement.getInstance(); assertEquals(document.body, defaultAnnouncer.parentElement); @@ -29,7 +27,7 @@ test('QueuesMessages', async () => { const announcer = CrA11yAnnouncerElement.getInstance(); - const messagesDiv = announcer.shadowRoot.querySelector('#messages'); + const messagesDiv = announcer.shadowRoot!.querySelector('#messages')!; // Queue up 2 messages at once, and assert they both exist. const message1 = 'Knock knock!'; @@ -37,16 +35,16 @@ announcer.announce(message1); announcer.announce(message2); await new Promise(resolve => setTimeout(resolve, TIMEOUT_MS)); - assertTrue(messagesDiv.textContent.includes(message1)); - assertTrue(messagesDiv.textContent.includes(message2)); + assertTrue(messagesDiv.textContent!.includes(message1)); + assertTrue(messagesDiv.textContent!.includes(message2)); // Queue up 1 message, and assert it clears out previous messages. const message3 = 'No jokes allowed'; announcer.announce(message3); await new Promise(resolve => setTimeout(resolve, TIMEOUT_MS)); - assertFalse(messagesDiv.textContent.includes(message1)); - assertFalse(messagesDiv.textContent.includes(message2)); - assertTrue(messagesDiv.textContent.includes(message3)); + assertFalse(messagesDiv.textContent!.includes(message1)); + assertFalse(messagesDiv.textContent!.includes(message2)); + assertTrue(messagesDiv.textContent!.includes(message3)); }); test('ClearsAnnouncerOnDisconnect', async () => { @@ -55,8 +53,9 @@ announcer.announce(lostMessage); announcer.remove(); await new Promise(resolve => setTimeout(resolve, TIMEOUT_MS)); - assertFalse(announcer.shadowRoot.querySelector('#messages') - .textContent.includes(lostMessage)); + assertFalse( + announcer.shadowRoot!.querySelector('#messages')!.textContent!.includes( + lostMessage)); // Creates new announcer since previous announcer is removed from instances. assertNotEquals(announcer, CrA11yAnnouncerElement.getInstance());
diff --git a/chrome/test/data/webui/cr_elements/cr_container_shadow_behavior_test.js b/chrome/test/data/webui/cr_elements/cr_container_shadow_behavior_test.js deleted file mode 100644 index f136973..0000000 --- a/chrome/test/data/webui/cr_elements/cr_container_shadow_behavior_test.js +++ /dev/null
@@ -1,66 +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. - -// clang-format off -import {CrContainerShadowBehavior} from 'chrome://resources/cr_elements/cr_container_shadow_behavior.m.js'; -import {html, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; - -import {assertFalse, assertTrue} from '../chai_assert.js'; -// clang-format on - -suite('CrContainerShadowBehavior', function() { - suiteSetup(function() { - Polymer({ - is: 'test-element', - - _template: html` - <style> - #container { - height: 50px; - } - </style> - <div id="before"></div> - <div id="container" show-bottom-shadow$="[[showBottomShadow]]"></div> - <div id="after"></div> - `, - - properties: { - showBottomShadow: Boolean, - }, - - behaviors: [CrContainerShadowBehavior], - }); - }); - - setup(function() { - document.body.innerHTML = ''; - }); - - test('no bottom shadow', function() { - const element = /** @type {TestElementElement} */ ( - document.createElement('test-element')); - document.body.appendChild(element); - - // Should not have a bottom shadow div. - assertFalse(!!element.$$('#cr-container-shadow-bottom')); - assertTrue(!!element.$$('#cr-container-shadow-top')); - - element.showBottomShadow = true; - - // Still no bottom shadow since this is only checked in attached(); - assertFalse(!!element.$$('#cr-container-shadow-bottom')); - assertTrue(!!element.$$('#cr-container-shadow-top')); - }); - - test('show bottom shadow', function() { - const element = /** @type {TestElementElement} */ ( - document.createElement('test-element')); - element.showBottomShadow = true; - document.body.appendChild(element); - - // Has both shadows. - assertTrue(!!element.$$('#cr-container-shadow-bottom')); - assertTrue(!!element.$$('#cr-container-shadow-top')); - }); -});
diff --git a/chrome/test/data/webui/cr_elements/cr_container_shadow_behavior_test.ts b/chrome/test/data/webui/cr_elements/cr_container_shadow_behavior_test.ts new file mode 100644 index 0000000..2e2d514 --- /dev/null +++ b/chrome/test/data/webui/cr_elements/cr_container_shadow_behavior_test.ts
@@ -0,0 +1,76 @@ +// 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. + +// clang-format off +import {CrContainerShadowBehavior} from 'chrome://resources/cr_elements/cr_container_shadow_behavior.m.js'; +import {html, mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; +import {assertFalse, assertTrue} from 'chrome://webui-test/chai_assert.js'; + +// clang-format on + +suite('CrContainerShadowBehavior', function() { + const TestElementBase = + mixinBehaviors([CrContainerShadowBehavior], PolymerElement) as + {new (): PolymerElement & CrContainerShadowBehavior}; + + class TestElement extends TestElementBase { + static get is() { + return 'test-element'; + } + + static get template() { + return html` + <style> + #container { + height: 50px; + } + </style> + <div id="before"></div> + <div id="container" show-bottom-shadow$="[[showBottomShadow]]"></div> + <div id="after"></div> + `; + } + + static get properties() { + return { + showBottomShadow: Boolean, + }; + } + + showBottomShadow: boolean = false; + } + customElements.define(TestElement.is, TestElement); + + setup(function() { + document.body.innerHTML = ''; + }); + + test('no bottom shadow', function() { + const element = document.createElement('test-element') as TestElement; + document.body.appendChild(element); + + // Should not have a bottom shadow div. + assertFalse( + !!element.shadowRoot!.querySelector('#cr-container-shadow-bottom')); + assertTrue(!!element.shadowRoot!.querySelector('#cr-container-shadow-top')); + + element.showBottomShadow = true; + + // Still no bottom shadow since this is only checked in attached(); + assertFalse( + !!element.shadowRoot!.querySelector('#cr-container-shadow-bottom')); + assertTrue(!!element.shadowRoot!.querySelector('#cr-container-shadow-top')); + }); + + test('show bottom shadow', function() { + const element = document.createElement('test-element') as TestElement; + element.showBottomShadow = true; + document.body.appendChild(element); + + // Has both shadows. + assertTrue( + !!element.shadowRoot!.querySelector('#cr-container-shadow-bottom')); + assertTrue(!!element.shadowRoot!.querySelector('#cr-container-shadow-top')); + }); +});
diff --git a/chrome/test/data/webui/cr_elements/cr_container_shadow_mixin_test.js b/chrome/test/data/webui/cr_elements/cr_container_shadow_mixin_test.ts similarity index 64% rename from chrome/test/data/webui/cr_elements/cr_container_shadow_mixin_test.js rename to chrome/test/data/webui/cr_elements/cr_container_shadow_mixin_test.ts index 6ccb02f..32890c4 100644 --- a/chrome/test/data/webui/cr_elements/cr_container_shadow_mixin_test.js +++ b/chrome/test/data/webui/cr_elements/cr_container_shadow_mixin_test.ts
@@ -6,18 +6,12 @@ import {CrContainerShadowMixin} from 'chrome://resources/cr_elements/cr_container_shadow_mixin.js'; import {html, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; -import {assertFalse, assertTrue} from '../chai_assert.js'; +import {assertFalse, assertTrue} from 'chrome://webui-test/chai_assert.js'; // clang-format on suite('CrContainerShadowBehavior', function() { - /** - * @constructor - * @extends {PolymerElement} - * @implements {CrContainerShadowMixinInterface} - */ const TestElementBase = CrContainerShadowMixin(PolymerElement); - /** @polymer */ class TestElement extends TestElementBase { static get is() { return 'test-element'; @@ -41,6 +35,8 @@ showBottomShadow: Boolean, }; } + + showBottomShadow: boolean = false; } customElements.define(TestElement.is, TestElement); @@ -50,32 +46,30 @@ }); test('no bottom shadow', function() { - const element = - /** @type {!TestElement} */ (document.createElement('test-element')); + const element = document.createElement('test-element') as TestElement; document.body.appendChild(element); // Should not have a bottom shadow div. assertFalse( - !!element.shadowRoot.querySelector('#cr-container-shadow-bottom')); - assertTrue(!!element.shadowRoot.querySelector('#cr-container-shadow-top')); + !!element.shadowRoot!.querySelector('#cr-container-shadow-bottom')); + assertTrue(!!element.shadowRoot!.querySelector('#cr-container-shadow-top')); element.showBottomShadow = true; // Still no bottom shadow since this is only checked in attached(); assertFalse( - !!element.shadowRoot.querySelector('#cr-container-shadow-bottom')); - assertTrue(!!element.shadowRoot.querySelector('#cr-container-shadow-top')); + !!element.shadowRoot!.querySelector('#cr-container-shadow-bottom')); + assertTrue(!!element.shadowRoot!.querySelector('#cr-container-shadow-top')); }); test('show bottom shadow', function() { - const element = /** @type {TestElementElement} */ ( - document.createElement('test-element')); + const element = document.createElement('test-element') as TestElement; element.showBottomShadow = true; document.body.appendChild(element); // Has both shadows. assertTrue( - !!element.shadowRoot.querySelector('#cr-container-shadow-bottom')); - assertTrue(!!element.shadowRoot.querySelector('#cr-container-shadow-top')); + !!element.shadowRoot!.querySelector('#cr-container-shadow-bottom')); + assertTrue(!!element.shadowRoot!.querySelector('#cr-container-shadow-top')); }); });
diff --git a/chrome/test/data/webui/cr_elements/cr_elements_browsertest.js b/chrome/test/data/webui/cr_elements/cr_elements_browsertest.js index f2817cc..8836b11 100644 --- a/chrome/test/data/webui/cr_elements/cr_elements_browsertest.js +++ b/chrome/test/data/webui/cr_elements/cr_elements_browsertest.js
@@ -29,7 +29,7 @@ var CrElementsA11yAnnouncerTest = class extends CrElementsBrowserTest { /** @override */ get browsePreload() { - return 'chrome://test/test_loader.html?module=cr_elements/cr_a11y_announcer_test.js'; + return 'chrome://test/test_loader.html?module=cr_elements/cr_a11y_announcer_test.js&host=webui-test'; } }; @@ -52,7 +52,7 @@ class extends CrElementsBrowserTest { /** @override */ get browsePreload() { - return 'chrome://test/test_loader.html?module=cr_elements/cr_container_shadow_behavior_test.js'; + return 'chrome://test/test_loader.html?module=cr_elements/cr_container_shadow_behavior_test.js&host=webui-test'; } }; @@ -63,7 +63,7 @@ var CrElementsContainerShadowMixinTest = class extends CrElementsBrowserTest { /** @override */ get browsePreload() { - return 'chrome://test/test_loader.html?module=cr_elements/cr_container_shadow_mixin_test.js'; + return 'chrome://test/test_loader.html?module=cr_elements/cr_container_shadow_mixin_test.js&host=webui-test'; } }; @@ -228,7 +228,7 @@ var CrElementsScrollableBehaviorTest = class extends CrElementsBrowserTest { /** @override */ get browsePreload() { - return 'chrome://test/test_loader.html?module=cr_elements/cr_scrollable_behavior_tests.js'; + return 'chrome://test/test_loader.html?module=cr_elements/cr_scrollable_behavior_tests.js&host=webui-test'; } };
diff --git a/chrome/test/data/webui/cr_elements/cr_elements_focus_test.js b/chrome/test/data/webui/cr_elements/cr_elements_focus_test.js index c4cbe0b..4a8bc952 100644 --- a/chrome/test/data/webui/cr_elements/cr_elements_focus_test.js +++ b/chrome/test/data/webui/cr_elements/cr_elements_focus_test.js
@@ -110,7 +110,7 @@ var IronListFocusTest = class extends CrElementsFocusTest { /** @override */ get browsePreload() { - return 'chrome://test/test_loader.html?module=cr_elements/iron_list_focus_test.js'; + return 'chrome://test/test_loader.html?module=cr_elements/iron_list_focus_test.js&host=webui-test'; } }; @@ -134,7 +134,7 @@ var CrElementsMenuSelectorFocusTest = class extends CrElementsFocusTest { /** @override */ get browsePreload() { - return 'chrome://test/test_loader.html?module=cr_elements/cr_menu_selector_focus_test.js'; + return 'chrome://test/test_loader.html?module=cr_elements/cr_menu_selector_focus_test.js&host=webui-test'; } };
diff --git a/chrome/test/data/webui/cr_elements/cr_menu_selector_focus_test.js b/chrome/test/data/webui/cr_elements/cr_menu_selector_focus_test.js deleted file mode 100644 index 6ad3343..0000000 --- a/chrome/test/data/webui/cr_elements/cr_menu_selector_focus_test.js +++ /dev/null
@@ -1,133 +0,0 @@ -// 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 {CrMenuSelector} from 'chrome://resources/cr_elements/cr_menu_selector/cr_menu_selector.js'; -import {FocusOutlineManager} from 'chrome://resources/js/cr/ui/focus_outline_manager.m.js'; -import {getDeepActiveElement} from 'chrome://resources/js/util.m.js'; -import {keyDownOn} from 'chrome://resources/polymer/v3_0/iron-test-helpers/mock-interactions.js'; - -import {assertEquals, assertFalse} from '../chai_assert.js'; -import {eventToPromise} from '../test_util.js'; - -suite('CrMenuSelectorFocusTest', () => { - /** @type {!CrMenuSelector} */ - let element; - - setup(() => { - document.body.innerHTML = ''; - element = document.createElement('cr-menu-selector'); - - // Slot some menu items. - for (let i = 0; i < 3; i++) { - const item = document.createElement('button'); - item.setAttribute('role', 'menuitem'); - item.id = i; - element.appendChild(item); - } - - document.body.appendChild(element); - }); - - test('ArrowKeysMoveFocus', () => { - // The focus is not in any of the children yet, so the first arrow down - // should focus the first menu item. - keyDownOn(element.children[0], 0, [], 'ArrowDown'); - assertEquals(element.children[0], getDeepActiveElement()); - - keyDownOn(element.children[0], 0, [], 'ArrowDown'); - assertEquals(element.children[1], getDeepActiveElement()); - - keyDownOn(element.children[1], 0, [], 'ArrowUp'); - assertEquals(element.children[0], getDeepActiveElement()); - }); - - test('HomeMovesFocusToFirstElement', () => { - element.children[0].focus(); - keyDownOn(element.children[0], 0, [], 'ArrowDown'); - keyDownOn(element.children[2], 0, [], 'Home'); - assertEquals(element.children[0], getDeepActiveElement()); - }); - - test('EndMovesFocusToFirstElement', () => { - element.children[0].focus(); - keyDownOn(element.children[2], 0, [], 'End'); - assertEquals(element.children[2], getDeepActiveElement()); - }); - - test('WrapsFocusWhenReachingEnds', () => { - element.children[0].focus(); - keyDownOn(element.children[0], 0, [], 'ArrowUp'); - assertEquals(element.children[2], getDeepActiveElement()); - - keyDownOn(element.children[0], 0, [], 'ArrowDown'); - assertEquals(element.children[0], getDeepActiveElement()); - }); - - test('SkipsDisabledElements', () => { - element.children[0].focus(); - element.children[1].disabled = true; - keyDownOn(element.children[0], 0, [], 'ArrowDown'); - assertEquals(element.children[2], getDeepActiveElement()); - }); - - test('SkipsHiddenElements', () => { - element.children[0].focus(); - element.children[1].hidden = true; - keyDownOn(element.children[0], 0, [], 'ArrowDown'); - assertEquals(element.children[2], getDeepActiveElement()); - }); - - test('SkipsNonMenuItems', () => { - element.children[0].focus(); - element.children[1].setAttribute('role', 'presentation'); - keyDownOn(element.children[0], 0, [], 'ArrowDown'); - assertEquals(element.children[2], getDeepActiveElement()); - }); - - test('FocusingIntoByKeyboardAlwaysFocusesFirstItem', () => { - const outsideElement = document.createElement('button'); - document.body.appendChild(outsideElement); - outsideElement.focus(); - - // Mock document as having been focused by keyboard. - FocusOutlineManager.forDocument(document).visible = true; - - element.children[2].focus(); - assertEquals(element.children[0], getDeepActiveElement()); - }); - - test('FocusingIntoByClickDoesNotFocusFirstItem', () => { - const outsideElement = document.createElement('button'); - document.body.appendChild(outsideElement); - outsideElement.focus(); - - // Mock document as not having been focused by keyboard. - FocusOutlineManager.forDocument(document).visible = false; - - element.children[2].focus(); - assertEquals(element.children[2], getDeepActiveElement()); - }); - - test('TabMovesFocusToLastElement', async () => { - element.children[0].focus(); - - const tabEventPromise = eventToPromise('keydown', element.children[0]); - keyDownOn(element.children[0], 0, [], 'Tab'); - const tabEvent = await tabEventPromise; - assertEquals(element.children[2], getDeepActiveElement()); - assertFalse(tabEvent.defaultPrevented); - }); - - test('ShiftTabMovesFocusToFirstElement', async () => { - // First, mock focus on last element. - element.children[0].focus(); - keyDownOn(element.children[0], 0, [], 'End'); - - const shiftTabEventPromise = eventToPromise('keydown', element.children[2]); - keyDownOn(element.children[2], 0, ['shift'], 'Tab'); - const shiftTabEvent = await shiftTabEventPromise; - assertEquals(element.children[0], getDeepActiveElement()); - assertFalse(shiftTabEvent.defaultPrevented); - }); -});
diff --git a/chrome/test/data/webui/cr_elements/cr_menu_selector_focus_test.ts b/chrome/test/data/webui/cr_elements/cr_menu_selector_focus_test.ts new file mode 100644 index 0000000..f7edc2b8 --- /dev/null +++ b/chrome/test/data/webui/cr_elements/cr_menu_selector_focus_test.ts
@@ -0,0 +1,138 @@ +// 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 'chrome://resources/cr_elements/cr_menu_selector/cr_menu_selector.js'; + +import {CrMenuSelector} from 'chrome://resources/cr_elements/cr_menu_selector/cr_menu_selector.js'; +import {FocusOutlineManager} from 'chrome://resources/js/cr/ui/focus_outline_manager.m.js'; +import {getDeepActiveElement} from 'chrome://resources/js/util.m.js'; +import {keyDownOn} from 'chrome://resources/polymer/v3_0/iron-test-helpers/mock-interactions.js'; + +import {assertEquals, assertFalse} from 'chrome://webui-test/chai_assert.js'; +import {eventToPromise} from 'chrome://webui-test/test_util.js'; + +suite('CrMenuSelectorFocusTest', () => { + let element: CrMenuSelector; + + setup(() => { + document.body.innerHTML = ''; + element = document.createElement('cr-menu-selector') as CrMenuSelector; + + // Slot some menu items. + for (let i = 0; i < 3; i++) { + const item = document.createElement('button'); + item.setAttribute('role', 'menuitem'); + item.id = i.toString(); + element.appendChild(item); + } + + document.body.appendChild(element); + }); + + function getChild(index: number): HTMLButtonElement { + return (element.children as HTMLCollectionOf<HTMLButtonElement>)[index]!; + } + + test('ArrowKeysMoveFocus', () => { + // The focus is not in any of the children yet, so the first arrow down + // should focus the first menu item. + keyDownOn(getChild(0), 0, [], 'ArrowDown'); + assertEquals(getChild(0), getDeepActiveElement()); + + keyDownOn(getChild(0), 0, [], 'ArrowDown'); + assertEquals(getChild(1), getDeepActiveElement()); + + keyDownOn(getChild(1), 0, [], 'ArrowUp'); + assertEquals(getChild(0), getDeepActiveElement()); + }); + + test('HomeMovesFocusToFirstElement', () => { + getChild(0).focus(); + keyDownOn(getChild(0), 0, [], 'ArrowDown'); + keyDownOn(getChild(2), 0, [], 'Home'); + assertEquals(getChild(0), getDeepActiveElement()); + }); + + test('EndMovesFocusToFirstElement', () => { + getChild(0).focus(); + keyDownOn(getChild(2), 0, [], 'End'); + assertEquals(getChild(2), getDeepActiveElement()); + }); + + test('WrapsFocusWhenReachingEnds', () => { + getChild(0).focus(); + keyDownOn(getChild(0), 0, [], 'ArrowUp'); + assertEquals(getChild(2), getDeepActiveElement()); + + keyDownOn(getChild(0), 0, [], 'ArrowDown'); + assertEquals(getChild(0), getDeepActiveElement()); + }); + + test('SkipsDisabledElements', () => { + getChild(0).focus(); + getChild(1).disabled = true; + keyDownOn(getChild(0), 0, [], 'ArrowDown'); + assertEquals(getChild(2), getDeepActiveElement()); + }); + + test('SkipsHiddenElements', () => { + getChild(0).focus(); + getChild(1).hidden = true; + keyDownOn(getChild(0), 0, [], 'ArrowDown'); + assertEquals(getChild(2), getDeepActiveElement()); + }); + + test('SkipsNonMenuItems', () => { + getChild(0).focus(); + getChild(1).setAttribute('role', 'presentation'); + keyDownOn(getChild(0), 0, [], 'ArrowDown'); + assertEquals(getChild(2), getDeepActiveElement()); + }); + + test('FocusingIntoByKeyboardAlwaysFocusesFirstItem', () => { + const outsideElement = document.createElement('button'); + document.body.appendChild(outsideElement); + outsideElement.focus(); + + // Mock document as having been focused by keyboard. + FocusOutlineManager.forDocument(document).visible = true; + + getChild(2).focus(); + assertEquals(getChild(0), getDeepActiveElement()); + }); + + test('FocusingIntoByClickDoesNotFocusFirstItem', () => { + const outsideElement = document.createElement('button'); + document.body.appendChild(outsideElement); + outsideElement.focus(); + + // Mock document as not having been focused by keyboard. + FocusOutlineManager.forDocument(document).visible = false; + + getChild(2).focus(); + assertEquals(getChild(2), getDeepActiveElement()); + }); + + test('TabMovesFocusToLastElement', async () => { + getChild(0).focus(); + + const tabEventPromise = eventToPromise('keydown', getChild(0)); + keyDownOn(getChild(0), 0, [], 'Tab'); + const tabEvent = await tabEventPromise; + assertEquals(getChild(2), getDeepActiveElement()); + assertFalse(tabEvent.defaultPrevented); + }); + + test('ShiftTabMovesFocusToFirstElement', async () => { + // First, mock focus on last element. + getChild(0).focus(); + keyDownOn(getChild(0), 0, [], 'End'); + + const shiftTabEventPromise = eventToPromise('keydown', getChild(2)); + keyDownOn(getChild(2), 0, ['shift'], 'Tab'); + const shiftTabEvent = await shiftTabEventPromise; + assertEquals(getChild(0), getDeepActiveElement()); + assertFalse(shiftTabEvent.defaultPrevented); + }); +});
diff --git a/chrome/test/data/webui/cr_elements/cr_scrollable_behavior_tests.js b/chrome/test/data/webui/cr_elements/cr_scrollable_behavior_tests.ts similarity index 62% rename from chrome/test/data/webui/cr_elements/cr_scrollable_behavior_tests.js rename to chrome/test/data/webui/cr_elements/cr_scrollable_behavior_tests.ts index e78348e..3c0952e 100644 --- a/chrome/test/data/webui/cr_elements/cr_scrollable_behavior_tests.js +++ b/chrome/test/data/webui/cr_elements/cr_scrollable_behavior_tests.ts
@@ -3,23 +3,28 @@ // found in the LICENSE file. // clang-format off -import {CrScrollableBehavior} from 'chrome://resources/cr_elements/cr_scrollable_behavior.m.js'; -import { Base, flush, html,Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; +import 'chrome://resources/polymer/v3_0/iron-list/iron-list.js'; -import {assertEquals, assertFalse, assertTrue} from '../chai_assert.js'; -import {waitBeforeNextRender} from '../test_util.js'; +import {CrScrollableBehavior} from 'chrome://resources/cr_elements/cr_scrollable_behavior.m.js'; +import {IronListElement} from 'chrome://resources/polymer/v3_0/iron-list/iron-list.js'; +import {flush, html, mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; +import {assertEquals, assertFalse, assertTrue} from 'chrome://webui-test/chai_assert.js'; +import {waitBeforeNextRender} from 'chrome://webui-test/test_util.js'; + // clang-format on suite('cr-scrollable-behavior', function() { - /** @type {!TestElementElement} */ let testElement; - /** @type {!HTMLDivElement} */ let container; - /** @type {!IronListElement} */ let ironList; + const TestElementBase = + mixinBehaviors([CrScrollableBehavior], PolymerElement) as + {new (): PolymerElement & CrScrollableBehavior}; - suiteSetup(function() { - Polymer({ - is: 'test-element', + class TestElement extends TestElementBase { + static get is() { + return 'test-element'; + } - _template: html` + static get template() { + return html` <style> #container { height: 30px; @@ -33,29 +38,31 @@ </template> </iron-list> </div> - `, + `; + } - properties: { - items: { - type: Array, - value: function() { - return ['apple', 'bannana', 'cucumber', 'doughnut']; - }, - }, - }, + static get properties() { + return { + items: Array, + }; + } - behaviors: [CrScrollableBehavior], - }); - }); + items: string[] = ['apple', 'bannana', 'cucumber', 'doughnut']; + } + customElements.define(TestElement.is, TestElement); + + let testElement: TestElement; + let container: HTMLElement; + let ironList: IronListElement; setup(function(done) { document.body.innerHTML = ''; - testElement = /** @type {!TestElementElement} */ ( - document.createElement('test-element')); + testElement = document.createElement('test-element') as TestElement; document.body.appendChild(testElement); - container = /** @type {!HTMLDivElement} */ (testElement.$$('#container')); - ironList = /** @type {!IronListElement} */ (testElement.$$('iron-list')); + container = + testElement.shadowRoot!.querySelector<HTMLElement>('#container')!; + ironList = testElement.shadowRoot!.querySelector('iron-list')!; // Wait for CrScrollableBehavior to set the initial scrollable class // properties. @@ -66,7 +73,7 @@ // There is no MockInteractions scroll event, and simlating a scroll is messy, // so instead scroll ironList and send a 'scroll' event to the container. - function scrollToIndex(index) { + function scrollToIndex(index: number) { ironList.scrollToIndex(index); container.dispatchEvent(new CustomEvent('scroll')); flush(); @@ -92,7 +99,7 @@ testElement.items = ['apple', 'bannana', 'cactus', 'cucumber', 'doughnut']; testElement.restoreScroll(ironList); flush(); - Base.async(function() { + window.setTimeout(() => { assertEquals(scrollTop, container.scrollTop); done(); });
diff --git a/chrome/test/data/webui/cr_elements/iron_list_focus_test.js b/chrome/test/data/webui/cr_elements/iron_list_focus_test.ts similarity index 66% rename from chrome/test/data/webui/cr_elements/iron_list_focus_test.js rename to chrome/test/data/webui/cr_elements/iron_list_focus_test.ts index 6b78b71a..bc0058f 100644 --- a/chrome/test/data/webui/cr_elements/iron_list_focus_test.js +++ b/chrome/test/data/webui/cr_elements/iron_list_focus_test.ts
@@ -5,49 +5,49 @@ // clang-format off import 'chrome://resources/polymer/v3_0/iron-list/iron-list.js'; +import {IronListElement} from 'chrome://resources/polymer/v3_0/iron-list/iron-list.js'; import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; -import {assertEquals, assertNotEquals, assertTrue} from '../chai_assert.js'; +import {assertEquals, assertNotEquals, assertTrue} from 'chrome://webui-test/chai_assert.js'; // clang-format on // test-iron-focusable is a native custom element in order to maintain // compatibility between Polymer v2 and Polymer v3. -customElements.define('test-iron-focusable', class extends HTMLElement { +class TestElement extends HTMLElement { constructor() { super(); this.attachShadow({mode: 'open'}); } set text(value) { - const button = this.shadowRoot.querySelector('button'); + const button = this.shadowRoot!.querySelector('button')!; assertTrue(!!button); button.textContent = value; } get text() { - const button = this.shadowRoot.querySelector('button'); + const button = this.shadowRoot!.querySelector('button'); assertTrue(!!button); - return button.textContent; + return button!.textContent; } // Pass focus to child in shadowRoot b/c iron-list expects that. focus() { - const button = this.shadowRoot.querySelector('button'); + const button = this.shadowRoot!.querySelector('button'); assertTrue(!!button); - button.focus(); + button!.focus(); } connectedCallback() { const button = document.createElement('button'); - this.shadowRoot.appendChild(button); + this.shadowRoot!.appendChild(button); } -}); +} +customElements.define('test-iron-focusable', TestElement); suite('iron-list-focus-test', function() { - let testDiv = null; - - /** @type {!IronListElement} */ - let testIronList; + let testDiv: HTMLElement; + let testIronList: IronListElement; setup(function() { document.body.innerHTML = ` @@ -60,9 +60,8 @@ </iron-list> </div>`; - testDiv = document.querySelector('#testDiv'); - testIronList = - /** @type {!IronListElement} */ (document.querySelector('iron-list')); + testDiv = document.querySelector('#testDiv')!; + testIronList = document.querySelector('iron-list')!; assertTrue(!!testDiv); assertTrue(!!testIronList); @@ -72,7 +71,8 @@ }); test('test focus is NOT preserved', function() { - const initialFocus = testIronList.querySelector('[tabindex="0"]'); + const initialFocus = + testIronList.querySelector<TestElement>('[tabindex="0"]')!; initialFocus.focus(); flush(); assertEquals('item0', initialFocus.text); @@ -81,7 +81,7 @@ testIronList.splice('items', 0, 1); // Remove the item from the list. flush(); - const newFocus = testIronList.querySelector('[tabindex="0"]'); + const newFocus = testIronList.querySelector<TestElement>('[tabindex="0"]')!; assertEquals('item1', newFocus.text); assertNotEquals(newFocus, document.activeElement); @@ -91,7 +91,8 @@ testIronList.splice('items', 5, 1); // Remove a different item. flush(); - const sameFocus = testIronList.querySelector('[tabindex="0"]'); + const sameFocus = + testIronList.querySelector<TestElement>('[tabindex="0"]')!; assertEquals('item1', sameFocus.text); assertNotEquals(sameFocus, document.activeElement); }); @@ -99,7 +100,8 @@ test('test focus is preserved', function() { testIronList.preserveFocus = true; - const initialFocus = testIronList.querySelector('[tabindex="0"]'); + const initialFocus = + testIronList.querySelector<TestElement>('[tabindex="0"]')!; initialFocus.focus(); flush(); assertEquals('item0', initialFocus.text); @@ -108,14 +110,15 @@ testIronList.splice('items', 0, 1); // Remove the item from the list. flush(); - const newFocus = testIronList.querySelector('[tabindex="0"]'); + const newFocus = testIronList.querySelector<TestElement>('[tabindex="0"]')!; assertEquals('item1', newFocus.text); assertEquals(newFocus, document.activeElement); testIronList.splice('items', 5, 1); // Remove a different item. flush(); - const sameFocus = testIronList.querySelector('[tabindex="0"]'); + const sameFocus = + testIronList.querySelector<TestElement>('[tabindex="0"]')!; assertEquals('item1', sameFocus.text); assertEquals(sameFocus, document.activeElement); });
diff --git a/chrome/test/data/webui/cr_elements/settings_private_test_constants.js b/chrome/test/data/webui/cr_elements/settings_private_test_constants.js deleted file mode 100644 index 00789b54..0000000 --- a/chrome/test/data/webui/cr_elements/settings_private_test_constants.js +++ /dev/null
@@ -1,34 +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. - -// Define chrome.settingsPrivate enums, normally provided by chrome WebUI. -// NOTE: These need to be kept in sync with settings_private.idl. - -chrome.settingsPrivate = chrome.settingsPrivate || {}; - -/** @enum {string} */ -chrome.settingsPrivate.ControlledBy = { - DEVICE_POLICY: 'DEVICE_POLICY', - USER_POLICY: 'USER_POLICY', - OWNER: 'OWNER', - PRIMARY_USER: 'PRIMARY_USER', - EXTENSION: 'EXTENSION', -}; - -/** @enum {string} */ -chrome.settingsPrivate.Enforcement = { - ENFORCED: 'ENFORCED', - RECOMMENDED: 'RECOMMENDED', - PARENT_SUPERVISED: 'PARENT_SUPERVISED', -}; - -/** @enum {string} */ -chrome.settingsPrivate.PrefType = { - BOOLEAN: 'BOOLEAN', - NUMBER: 'NUMBER', - STRING: 'STRING', - URL: 'URL', - LIST: 'LIST', - DICTIONARY: 'DICTIONARY', -};
diff --git a/chrome/test/data/webui/settings/chromeos/smart_inputs_page_test.js b/chrome/test/data/webui/settings/chromeos/smart_inputs_page_test.js index 9b97b40..3e334d8 100644 --- a/chrome/test/data/webui/settings/chromeos/smart_inputs_page_test.js +++ b/chrome/test/data/webui/settings/chromeos/smart_inputs_page_test.js
@@ -73,39 +73,4 @@ deepLinkElement, getDeepActiveElement(), 'Emoji suggestion toggle should be focused for settingId=1203.'); }); - - test('predictiveWritingNotNullWhenAllowPredictiveWritingIsTrue', function() { - loadTimeData.overrideValues({allowPredictiveWriting: true}); - createSmartInputsPage(); - assertTrue(!!smartInputsPage.$$('#predictiveWriting')); - }); - - test('predictiveWritingNullWhenAllowPredictiveWritingIsFalse', function() { - loadTimeData.overrideValues({allowPredictiveWriting: false}); - createSmartInputsPage(); - assertFalse(!!smartInputsPage.$$('#predictiveWriting')); - }); - - test('deep link to predictive writing toggle', async () => { - const PREDICTIVE_WRITING_SETTING_ID = '1208'; - - loadTimeData.overrideValues({ - allowPredictiveWriting: true, - }); - createSmartInputsPage(); - - const params = new URLSearchParams; - params.append('settingId', PREDICTIVE_WRITING_SETTING_ID); - settings.Router.getInstance().navigateTo( - settings.routes.OS_LANGUAGES_SMART_INPUTS, params); - - Polymer.dom.flush(); - - const deepLinkElement = smartInputsPage.$$('#predictiveWriting') - .shadowRoot.querySelector('cr-toggle'); - await test_util.waitAfterNextRender(deepLinkElement); - assertEquals( - deepLinkElement, getDeepActiveElement(), - 'Predictive writing toggle should be focused for settingId=1208.'); - }); });
diff --git a/chrome/test/data/webui/settings/passwords_section_test.js b/chrome/test/data/webui/settings/passwords_section_test.js index 3ccf7d43..a1dcabe7 100644 --- a/chrome/test/data/webui/settings/passwords_section_test.js +++ b/chrome/test/data/webui/settings/passwords_section_test.js
@@ -1135,7 +1135,7 @@ createPasswordEntry({url: 'goo.gl', username: 'bart'}); const passwordsSection = elementFactory.createPasswordsSection( passwordManager, [passwordEntry], []); - const toastManager = passwordsSection.$.passwordsListHandler.$.toast; + const toastManager = passwordsSection.$.passwordsListHandler.$.removalToast; // Click the remove button on the first password and assert that an undo // toast is shown.
diff --git a/chromecast/browser/BUILD.gn b/chromecast/browser/BUILD.gn index fe55900e9..16b530e 100644 --- a/chromecast/browser/BUILD.gn +++ b/chromecast/browser/BUILD.gn
@@ -393,8 +393,6 @@ "extensions/api/command_line_private/command_line_private_api.h", "extensions/api/history/history_api.cc", "extensions/api/history/history_api.h", - "extensions/api/i18n/i18n_api.cc", - "extensions/api/i18n/i18n_api.h", "extensions/api/identity/identity_api.cc", "extensions/api/identity/identity_api.h", "extensions/api/login_state/login_state.cc",
diff --git a/chromecast/browser/cast_http_user_agent_settings.cc b/chromecast/browser/cast_http_user_agent_settings.cc index 587c5b1..032374a 100644 --- a/chromecast/browser/cast_http_user_agent_settings.cc +++ b/chromecast/browser/cast_http_user_agent_settings.cc
@@ -46,29 +46,6 @@ namespace chromecast { namespace shell { -CastHttpUserAgentSettings::CastHttpUserAgentSettings() { - DCHECK_CURRENTLY_ON(content::BrowserThread::UI); -} - -CastHttpUserAgentSettings::~CastHttpUserAgentSettings() { - DCHECK_CURRENTLY_ON(content::BrowserThread::UI); -} - -std::string CastHttpUserAgentSettings::GetAcceptLanguage() const { - DCHECK_CURRENTLY_ON(content::BrowserThread::IO); - std::string new_locale(GetLocale()); - if (new_locale != last_locale_ || accept_language_.empty()) { - last_locale_ = new_locale; - accept_language_ = LocaleToAcceptLanguage(new_locale); - LOG(INFO) << "Locale changed: accept_language=" << accept_language_; - } - return accept_language_; -} - -std::string CastHttpUserAgentSettings::GetUserAgent() const { - return chromecast::GetUserAgent(); -} - std::string CastHttpUserAgentSettings::AcceptLanguage() { return LocaleToAcceptLanguage(GetLocale()); }
diff --git a/chromecast/browser/cast_http_user_agent_settings.h b/chromecast/browser/cast_http_user_agent_settings.h index b1a5a7f8..9936f52 100644 --- a/chromecast/browser/cast_http_user_agent_settings.h +++ b/chromecast/browser/cast_http_user_agent_settings.h
@@ -8,32 +8,22 @@ #include <string> #include "base/compiler_specific.h" -#include "net/base/http_user_agent_settings.h" namespace chromecast { namespace shell { -class CastHttpUserAgentSettings : public net::HttpUserAgentSettings { +class CastHttpUserAgentSettings { public: - CastHttpUserAgentSettings(); - + CastHttpUserAgentSettings() = delete; CastHttpUserAgentSettings(const CastHttpUserAgentSettings&) = delete; CastHttpUserAgentSettings& operator=(const CastHttpUserAgentSettings&) = delete; - ~CastHttpUserAgentSettings() override; - - // net::HttpUserAgentSettings implementation: - std::string GetAcceptLanguage() const override; - std::string GetUserAgent() const override; + ~CastHttpUserAgentSettings() = delete; // Returns the same value as GetAcceptLanguage(), but is static and can be // called on any thread. static std::string AcceptLanguage(); - - private: - mutable std::string last_locale_; - mutable std::string accept_language_; }; } // namespace shell
diff --git a/chromecast/browser/extensions/api/i18n/i18n_api.cc b/chromecast/browser/extensions/api/i18n/i18n_api.cc deleted file mode 100644 index 6163c6c..0000000 --- a/chromecast/browser/extensions/api/i18n/i18n_api.cc +++ /dev/null
@@ -1,29 +0,0 @@ -// Copyright (c) 2012 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 "chromecast/browser/extensions/api/i18n/i18n_api.h" - -#include <algorithm> -#include <string> -#include <vector> - -#include "base/lazy_instance.h" -#include "base/strings/string_piece.h" -#include "base/strings/string_split.h" -#include "chromecast/common/extensions_api/i18n.h" -#include "components/prefs/pref_service.h" - -namespace GetAcceptLanguages = extensions::cast::api::i18n::GetAcceptLanguages; - -namespace extensions { - -ExtensionFunction::ResponseAction I18nGetAcceptLanguagesFunction::Run() { - std::vector<std::string> accept_languages; - - // TODO(rmrossi) Stubbed for now. - return RespondNow( - ArgumentList(GetAcceptLanguages::Results::Create(accept_languages))); -} - -} // namespace extensions
diff --git a/chromecast/browser/extensions/api/i18n/i18n_api.h b/chromecast/browser/extensions/api/i18n/i18n_api.h deleted file mode 100644 index 7d41a85..0000000 --- a/chromecast/browser/extensions/api/i18n/i18n_api.h +++ /dev/null
@@ -1,20 +0,0 @@ -// Copyright (c) 2012 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 CHROMECAST_BROWSER_EXTENSIONS_API_I18N_I18N_API_H_ -#define CHROMECAST_BROWSER_EXTENSIONS_API_I18N_I18N_API_H_ - -#include "extensions/browser/extension_function.h" - -namespace extensions { - -class I18nGetAcceptLanguagesFunction : public ExtensionFunction { - ~I18nGetAcceptLanguagesFunction() override {} - ResponseAction Run() override; - DECLARE_EXTENSION_FUNCTION("i18n.getAcceptLanguages", I18N_GETACCEPTLANGUAGES) -}; - -} // namespace extensions - -#endif // CHROMECAST_BROWSER_EXTENSIONS_API_I18N_I18N_API_H_
diff --git a/chromecast/common/extensions_api/BUILD.gn b/chromecast/common/extensions_api/BUILD.gn index 599ac7d..cca59526 100644 --- a/chromecast/common/extensions_api/BUILD.gn +++ b/chromecast/common/extensions_api/BUILD.gn
@@ -19,7 +19,6 @@ "braille_display_private.idl", "command_line_private.json", "history.json", - "i18n.json", "identity.idl", "login_state.idl", "notifications.idl",
diff --git a/chromecast/common/extensions_api/_api_features.json b/chromecast/common/extensions_api/_api_features.json index 7a62b52..fa3f5852 100644 --- a/chromecast/common/extensions_api/_api_features.json +++ b/chromecast/common/extensions_api/_api_features.json
@@ -19,12 +19,6 @@ "dependencies": ["permission:commandLinePrivate"], "contexts": ["blessed_extension"] }, - "i18n": { - "channel": "stable", - "extension_types": ["extension", "legacy_packaged_app", "platform_app"], - "contexts": ["blessed_extension", "unblessed_extension", "content_script", - "lock_screen_extension"] - }, "extension": { "channel": "stable", "extension_types": ["extension", "legacy_packaged_app"],
diff --git a/chromecast/common/extensions_api/i18n.json b/chromecast/common/extensions_api/i18n.json deleted file mode 100644 index d819d311..0000000 --- a/chromecast/common/extensions_api/i18n.json +++ /dev/null
@@ -1,130 +0,0 @@ -// Copyright (c) 2012 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. - -[ - { - "namespace": "i18n", - "description": "Use the <code>chrome.i18n</code> infrastructure to implement internationalization across your whole app or extension.", - "types": [ - { - "id": "LanguageCode", - "type": "string", - "description": "An ISO language code such as <code>en</code> or <code>fr</code>. For a complete list of languages supported by this method, see <a href='http://src.chromium.org/viewvc/chrome/trunk/src/third_party/cld/languages/internal/languages.cc'>kLanguageInfoTable</a>. For an unknown language, <code>und</code> will be returned, which means that [percentage] of the text is unknown to CLD" - } - ], - "functions": [ - { - "name": "getAcceptLanguages", - "type": "function", - "description": "Gets the accept-languages of the browser. This is different from the locale used by the browser; to get the locale, use $(ref:i18n.getUILanguage).", - "parameters": [ - { - "type": "function", - "name": "callback", - "parameters": [ - {"name": "languages", "type": "array", "items": {"$ref": "LanguageCode"}, "description": "Array of LanguageCode"} - ] - } - ] - }, - { - "name": "getMessage", - "nocompile": true, - "type": "function", - "description": "Gets the localized string for the specified message. If the message is missing, this method returns an empty string (''). If the format of the <code>getMessage()</code> call is wrong — for example, <em>messageName</em> is not a string or the <em>substitutions</em> array has more than 9 elements — this method returns <code>undefined</code>.", - "parameters": [ - { - "type": "string", - "name": "messageName", - "description": "The name of the message, as specified in the <a href='i18n-messages'><code>messages.json</code></a> file." - }, - { - "type": "any", - "name": "substitutions", - "optional": true, - "description": "Up to 9 substitution strings, if the message requires any." - }, - { - "type": "object", - "name": "options", - "optional": true, - "properties": { - "escapeLt": { - "type": "boolean", - "optional": true, - "description": "Escape <code><</code> in translation to <code>&lt;</code>. This applies only to the message itself, not to the placeholders. Developers might want to use this if the translation is used in an HTML context. Closure Templates used with Closure Compiler generate this automatically." - } - } - } - ], - "returns": { - "type": "string", - "description": "Message localized for current locale." - } - }, - { - "name": "getUILanguage", - "type": "function", - "nocompile": true, - "description": "Gets the browser UI language of the browser. This is different from $(ref:i18n.getAcceptLanguages) which returns the preferred user languages.", - "parameters": [], - "returns": { - "type": "string", - "description": "The browser UI language code such as en-US or fr-FR." - } - }, - { - "name": "detectLanguage", - "type": "function", - "nocompile": true, - "description": "Detects the language of the provided text using CLD.", - "parameters": [ - { - "type": "string", - "name": "text", - "minimum": 0, - "description": "User input string to be translated." - }, - { - "type": "function", - "name": "callback", - "parameters": [ - { - "type": "object", - "name": "result", - "description": "LanguageDetectionResult object that holds detected langugae reliability and array of DetectedLanguage", - "properties": { - "isReliable": { "type": "boolean", "description": "CLD detected language reliability" }, - "languages": - { - "type": "array", - "description": "array of detectedLanguage", - "items": - { - "type": "object", - "description": "DetectedLanguage object that holds detected ISO language code and its percentage in the input string", - "properties": - { - "language": - { - "$ref": "LanguageCode" - }, - "percentage": - { - "type": "integer", - "description": "The percentage of the detected language" - } - } - } - } - } - } - ] - } - ] - } - ], - "events": [] - } -]
diff --git a/chromeos/services/device_sync/cryptauth_device_manager_impl.cc b/chromeos/services/device_sync/cryptauth_device_manager_impl.cc index 828c69e..49e7ed1d 100644 --- a/chromeos/services/device_sync/cryptauth_device_manager_impl.cc +++ b/chromeos/services/device_sync/cryptauth_device_manager_impl.cc
@@ -16,6 +16,7 @@ #include "base/memory/ptr_util.h" #include "base/metrics/histogram_macros.h" #include "base/strings/string_number_conversions.h" +#include "base/values.h" #include "chromeos/components/multidevice/logging/logging.h" #include "chromeos/components/multidevice/software_feature_state.h" #include "chromeos/services/device_sync/cryptauth_client.h" @@ -204,14 +205,12 @@ // Converts an unlock key proto to a dictionary that can be stored in user // prefs. -std::unique_ptr<base::DictionaryValue> UnlockKeyToDictionary( - const cryptauth::ExternalDeviceInfo& device) { +base::Value UnlockKeyToDictionary(const cryptauth::ExternalDeviceInfo& device) { + base::Value dictionary{base::Value::Type::DICTIONARY}; + // The device public key is a required value. if (!device.has_public_key()) - return nullptr; - - std::unique_ptr<base::DictionaryValue> dictionary( - new base::DictionaryValue()); + return dictionary; // Note that the device public key, name, and Bluetooth addresses are stored // in Base64Url form because dictionary values must be valid UTF8 strings. @@ -220,14 +219,14 @@ base::Base64UrlEncode(device.public_key(), base::Base64UrlEncodePolicy::INCLUDE_PADDING, &public_key_b64); - dictionary->SetString(kExternalDeviceKeyPublicKey, public_key_b64); + dictionary.SetStringKey(kExternalDeviceKeyPublicKey, public_key_b64); if (device.has_friendly_device_name()) { std::string device_name_b64; base::Base64UrlEncode(device.friendly_device_name(), base::Base64UrlEncodePolicy::INCLUDE_PADDING, &device_name_b64); - dictionary->SetString(kExternalDeviceKeyDeviceName, device_name_b64); + dictionary.SetStringKey(kExternalDeviceKeyDeviceName, device_name_b64); } if (device.has_bluetooth_address()) { @@ -235,37 +234,37 @@ base::Base64UrlEncode(device.bluetooth_address(), base::Base64UrlEncodePolicy::INCLUDE_PADDING, &bluetooth_address_b64); - dictionary->SetString(kExternalDeviceKeyBluetoothAddress, - bluetooth_address_b64); + dictionary.SetStringKey(kExternalDeviceKeyBluetoothAddress, + bluetooth_address_b64); } if (device.has_unlockable()) { - dictionary->SetBoolean(kExternalDeviceKeyUnlockable, device.unlockable()); + dictionary.SetBoolKey(kExternalDeviceKeyUnlockable, device.unlockable()); } if (device.has_last_update_time_millis()) { - dictionary->SetString(kExternalDeviceKeyLastUpdateTimeMillis, - std::to_string(device.last_update_time_millis())); + dictionary.SetStringKey(kExternalDeviceKeyLastUpdateTimeMillis, + std::to_string(device.last_update_time_millis())); } if (device.has_device_type() && cryptauth::DeviceType_IsValid( DeviceTypeStringToEnum(device.device_type()))) { - dictionary->SetInteger(kExternalDeviceKeyDeviceType, - DeviceTypeStringToEnum(device.device_type())); + dictionary.SetIntKey(kExternalDeviceKeyDeviceType, + DeviceTypeStringToEnum(device.device_type())); } - dictionary->SetKey(kExternalDeviceKeyBeaconSeeds, - base::Value::FromUniquePtrValue( - BeaconSeedsToListValue(device.beacon_seeds()))); + dictionary.SetKey(kExternalDeviceKeyBeaconSeeds, + base::Value::FromUniquePtrValue( + BeaconSeedsToListValue(device.beacon_seeds()))); if (device.has_arc_plus_plus()) { - dictionary->SetBoolean(kExternalDeviceKeyArcPlusPlus, - device.arc_plus_plus()); + dictionary.SetBoolKey(kExternalDeviceKeyArcPlusPlus, + device.arc_plus_plus()); } if (device.has_pixel_phone()) { - dictionary->SetBoolean(kExternalDeviceKeyPixelPhone, device.pixel_phone()); + dictionary.SetBoolKey(kExternalDeviceKeyPixelPhone, device.pixel_phone()); } if (device.has_no_pii_device_name()) { @@ -273,8 +272,8 @@ base::Base64UrlEncode(device.no_pii_device_name(), base::Base64UrlEncodePolicy::INCLUDE_PADDING, &no_pii_device_name_b64); - dictionary->SetString(kExternalDeviceKeyNoPiiDeviceName, - no_pii_device_name_b64); + dictionary.SetStringKey(kExternalDeviceKeyNoPiiDeviceName, + no_pii_device_name_b64); } // In the case that the CryptAuth server is not yet serving SoftwareFeatures, @@ -285,7 +284,7 @@ bool legacy_mobile_hotspot_supported = device.has_mobile_hotspot_supported() && device.mobile_hotspot_supported(); - dictionary->SetKey( + dictionary.SetKey( kDictionaryKeySoftwareFeatures, base::Value::FromUniquePtrValue( SupportedAndEnabledSoftwareFeaturesToDictionaryValue( @@ -297,7 +296,7 @@ } void AddBeaconSeedsToExternalDevice( - const base::ListValue& beacon_seeds, + const base::Value& beacon_seeds, cryptauth::ExternalDeviceInfo* external_device) { for (const base::Value& seed_dictionary : beacon_seeds.GetList()) { if (!seed_dictionary.is_dict()) { @@ -344,7 +343,7 @@ } void AddSoftwareFeaturesToExternalDevice( - const base::DictionaryValue& software_features_dictionary, + const base::Value& software_features_dictionary, cryptauth::ExternalDeviceInfo* external_device, bool old_unlock_key_value_from_prefs, bool old_mobile_hotspot_supported_from_prefs) { @@ -416,17 +415,18 @@ // Converts an unlock key dictionary stored in user prefs to an // cryptauth::ExternalDeviceInfo proto. Returns true if the dictionary is valid, // and the parsed proto is written to |external_device|. -bool DictionaryToUnlockKey(const base::DictionaryValue& dictionary, +bool DictionaryToUnlockKey(const base::Value& dictionary, cryptauth::ExternalDeviceInfo* external_device) { - std::string public_key_b64; - if (!dictionary.GetString(kExternalDeviceKeyPublicKey, &public_key_b64)) { + const std::string* public_key_b64 = + dictionary.FindStringKey(kExternalDeviceKeyPublicKey); + if (!public_key_b64) { // The public key is a required field, so if it is absent, there is no // valid data to return. return false; } std::string public_key; - if (!base::Base64UrlDecode(public_key_b64, + if (!base::Base64UrlDecode(*public_key_b64, base::Base64UrlDecodePolicy::REQUIRE_PADDING, &public_key)) { // The public key is stored as a Base64Url, so if it cannot be decoded, @@ -435,21 +435,22 @@ } external_device->set_public_key(public_key); - std::string device_name_b64; - if (dictionary.GetString(kExternalDeviceKeyDeviceName, &device_name_b64)) { + const std::string* device_name_b64 = + dictionary.FindStringKey(kExternalDeviceKeyDeviceName); + if (device_name_b64) { std::string device_name; - if (base::Base64UrlDecode(device_name_b64, + if (base::Base64UrlDecode(*device_name_b64, base::Base64UrlDecodePolicy::REQUIRE_PADDING, &device_name)) { external_device->set_friendly_device_name(device_name); } } - std::string bluetooth_address_b64; - if (dictionary.GetString(kExternalDeviceKeyBluetoothAddress, - &bluetooth_address_b64)) { + const std::string* bluetooth_address_b64 = + dictionary.FindStringKey(kExternalDeviceKeyBluetoothAddress); + if (bluetooth_address_b64) { std::string bluetooth_address; - if (base::Base64UrlDecode(bluetooth_address_b64, + if (base::Base64UrlDecode(*bluetooth_address_b64, base::Base64UrlDecodePolicy::REQUIRE_PADDING, &bluetooth_address)) { external_device->set_bluetooth_address(bluetooth_address); @@ -463,28 +464,30 @@ if (unlockable.has_value()) external_device->set_unlockable(unlockable.value()); - std::string last_update_time_millis_str; - if (dictionary.GetString(kExternalDeviceKeyLastUpdateTimeMillis, - &last_update_time_millis_str)) { + const std::string* last_update_time_millis_str = + dictionary.FindStringKey(kExternalDeviceKeyLastUpdateTimeMillis); + if (last_update_time_millis_str) { int64_t last_update_time_millis; - if (base::StringToInt64(last_update_time_millis_str, + if (base::StringToInt64(*last_update_time_millis_str, &last_update_time_millis)) { external_device->set_last_update_time_millis(last_update_time_millis); } else { PA_LOG(WARNING) << "Unable to convert stored update time to int64_t: " - << last_update_time_millis_str; + << *last_update_time_millis_str; } } - int device_type; - if (dictionary.GetInteger(kExternalDeviceKeyDeviceType, &device_type) && - cryptauth::DeviceType_IsValid(device_type)) { + absl::optional<int> device_type = + dictionary.FindIntKey(kExternalDeviceKeyDeviceType); + if (device_type.has_value() && + cryptauth::DeviceType_IsValid(device_type.value())) { external_device->set_device_type(DeviceTypeEnumToString( - static_cast<cryptauth::DeviceType>(device_type))); + static_cast<cryptauth::DeviceType>(device_type.value()))); } - const base::ListValue* beacon_seeds; - if (dictionary.GetList(kExternalDeviceKeyBeaconSeeds, &beacon_seeds)) + const base::Value* beacon_seeds = + dictionary.FindListKey(kExternalDeviceKeyBeaconSeeds); + if (beacon_seeds) AddBeaconSeedsToExternalDevice(*beacon_seeds, external_device); absl::optional<bool> arc_plus_plus = @@ -497,11 +500,11 @@ if (pixel_phone.has_value()) external_device->set_pixel_phone(pixel_phone.value()); - std::string no_pii_device_name_b64; - if (dictionary.GetString(kExternalDeviceKeyNoPiiDeviceName, - &no_pii_device_name_b64)) { + const std::string* no_pii_device_name_b64 = + dictionary.FindStringKey(kExternalDeviceKeyNoPiiDeviceName); + if (no_pii_device_name_b64) { std::string no_pii_device_name; - if (base::Base64UrlDecode(no_pii_device_name_b64, + if (base::Base64UrlDecode(*no_pii_device_name_b64, base::Base64UrlDecodePolicy::REQUIRE_PADDING, &no_pii_device_name)) { external_device->set_no_pii_device_name(no_pii_device_name); @@ -513,9 +516,9 @@ absl::optional<bool> mobile_hotspot_supported = dictionary.FindBoolKey(kExternalDeviceKeyMobileHotspotSupported); - const base::DictionaryValue* software_features_dictionary; - if (dictionary.GetDictionary(kDictionaryKeySoftwareFeatures, - &software_features_dictionary)) { + const base::Value* software_features_dictionary = + dictionary.FindDictKey(kDictionaryKeySoftwareFeatures); + if (software_features_dictionary) { AddSoftwareFeaturesToExternalDevice( *software_features_dictionary, external_device, unlock_key.value_or(false), mobile_hotspot_supported.value_or(false)); @@ -700,14 +703,13 @@ } for (const auto& device : response.devices()) { - std::unique_ptr<base::DictionaryValue> device_dictionary = - UnlockKeyToDictionary(device); + base::Value device_dictionary = UnlockKeyToDictionary(device); const std::string& device_name = device.has_friendly_device_name() ? device.friendly_device_name() : "[unknown]"; PA_LOG(INFO) << "Synced device '" << device_name - << "': " << *device_dictionary; + << "': " << device_dictionary; devices_as_list->Append(std::move(device_dictionary)); } @@ -756,23 +758,19 @@ } void CryptAuthDeviceManagerImpl::UpdateUnlockKeysFromPrefs() { - const base::ListValue* unlock_key_list = &base::Value::AsListValue( - *pref_service_->GetList(prefs::kCryptAuthDeviceSyncUnlockKeys)); + const base::Value* unlock_key_list = + pref_service_->GetList(prefs::kCryptAuthDeviceSyncUnlockKeys); synced_devices_.clear(); - for (size_t i = 0; i < unlock_key_list->GetList().size(); ++i) { - const base::DictionaryValue* unlock_key_dictionary; - if (unlock_key_list->GetDictionary(i, &unlock_key_dictionary)) { + for (const auto& it : unlock_key_list->GetList()) { + if (it.is_dict()) { cryptauth::ExternalDeviceInfo unlock_key; - if (DictionaryToUnlockKey(*unlock_key_dictionary, &unlock_key)) { + if (DictionaryToUnlockKey(it, &unlock_key)) { synced_devices_.push_back(unlock_key); } else { - PA_LOG(ERROR) << "Unable to deserialize unlock key dictionary " - << "(index=" << i << "):\n" - << *unlock_key_dictionary; + PA_LOG(ERROR) << "Unable to deserialize unlock key dictionary:\n" << it; } } else { - PA_LOG(ERROR) << "Can not get dictionary in list of unlock keys " - << "(index=" << i << "):\n" + PA_LOG(ERROR) << "Can not get dictionary in list of unlock keys:\n" << *unlock_key_list; } }
diff --git a/components/app_restore/BUILD.gn b/components/app_restore/BUILD.gn index efc2efe..829ef7e 100644 --- a/components/app_restore/BUILD.gn +++ b/components/app_restore/BUILD.gn
@@ -31,6 +31,8 @@ "full_restore_save_handler.h", "full_restore_utils.cc", "full_restore_utils.h", + "lacros_save_handler.cc", + "lacros_save_handler.h", "restore_data.cc", "restore_data.h", "window_info.cc",
diff --git a/components/app_restore/features.h b/components/app_restore/features.h index 00e9ba5..32f59c1 100644 --- a/components/app_restore/features.h +++ b/components/app_restore/features.h
@@ -29,6 +29,8 @@ COMPONENT_EXPORT(APP_RESTORE) bool IsArcGhostWindowEnabled(); +COMPONENT_EXPORT(APP_RESTORE) bool IsArcWindowPredictorEnabled(); + COMPONENT_EXPORT(APP_RESTORE) bool IsFullRestoreEnabled(); COMPONENT_EXPORT(APP_RESTORE) bool IsFullRestoreForLacrosEnabled();
diff --git a/components/app_restore/full_restore_save_handler.cc b/components/app_restore/full_restore_save_handler.cc index 06c69a4..b0021fa 100644 --- a/components/app_restore/full_restore_save_handler.cc +++ b/components/app_restore/full_restore_save_handler.cc
@@ -12,6 +12,7 @@ #include "base/task/sequenced_task_runner.h" #include "base/time/time.h" #include "components/app_restore/app_launch_info.h" +#include "components/app_restore/features.h" #include "components/app_restore/full_restore_file_handler.h" #include "components/app_restore/full_restore_info.h" #include "components/app_restore/full_restore_read_handler.h" @@ -64,6 +65,10 @@ const base::FilePath& profile_path) { primary_profile_path_ = profile_path; arc_save_handler_ = std::make_unique<ArcSaveHandler>(primary_profile_path_); + if (::full_restore::features::IsFullRestoreForLacrosEnabled()) { + lacros_save_handler_ = + std::make_unique<LacrosSaveHandler>(primary_profile_path_); + } } void FullRestoreSaveHandler::SetActiveProfilePath( @@ -110,6 +115,15 @@ return; } + if (window->GetProperty(aura::client::kAppType) == + static_cast<int>(ash::AppType::LACROS)) { + observed_windows_.AddObservation(window); + + if (lacros_save_handler_) + lacros_save_handler_->OnWindowInitialized(window); + return; + } + int32_t window_id = window->GetProperty(app_restore::kWindowIdKey); if (!SessionID::IsValidValue(window_id)) return; @@ -122,22 +136,12 @@ if (app_id_str) { // For Chrome apps, launched via event, get the app id from the window's // property, then find the app launch info from - // |app_id_to_app_launch_infos_| to save the app launch info for |app_id| + // `app_id_to_app_launch_infos_` to save the app launch info for |app_id| // and |window_id|. - auto it = app_id_to_app_launch_infos_.find(*app_id_str); - if (it == app_id_to_app_launch_infos_.end()) + app_launch_info = FetchAppLaunchInfo(active_profile_path_, *app_id_str); + if (!app_launch_info) return; - - auto launch_it = it->second.find(active_profile_path_); - if (launch_it == it->second.end()) - return; - - DCHECK(!launch_it->second.empty()); - app_launch_info = std::move(*launch_it->second.begin()); app_launch_info->window_id = window_id; - it->second.erase(active_profile_path_); - if (it->second.empty()) - app_id_to_app_launch_infos_.erase(it); } else { app_launch_info = std::make_unique<app_restore::AppLaunchInfo>( extension_misc::kChromeAppId, window_id); @@ -183,6 +187,13 @@ return; } + if (window->GetProperty(aura::client::kAppType) == + static_cast<int>(ash::AppType::LACROS)) { + if (lacros_save_handler_) + lacros_save_handler_->OnWindowDestroyed(window); + return; + } + DCHECK(SessionID::IsValidValue(window_id)); RemoveAppRestoreData(window_id); @@ -289,9 +300,7 @@ // app id, and move window info to the record of the system web app id. auto it = window_id_to_app_restore_info_.find(window_id); if (it != window_id_to_app_restore_info_.end()) { - window_info = - profile_path_to_restore_data_[it->second.first].GetWindowInfo( - it->second.second, window_id); + window_info = GetWindowInfo(profile_path, app_id, window_id); RemoveAppRestoreData(window_id); } } @@ -509,6 +518,35 @@ } } +std::unique_ptr<app_restore::AppLaunchInfo> +FullRestoreSaveHandler::FetchAppLaunchInfo(const base::FilePath& profile_path, + const std::string& app_id) { + auto it = app_id_to_app_launch_infos_.find(app_id); + if (it == app_id_to_app_launch_infos_.end()) + return nullptr; + + auto launch_it = it->second.find(profile_path); + if (launch_it == it->second.end()) + return nullptr; + + DCHECK(!launch_it->second.empty()); + auto app_launch_info = std::move(*launch_it->second.begin()); + it->second.erase(profile_path); + if (it->second.empty()) + app_id_to_app_launch_infos_.erase(it); + return app_launch_info; +} + +std::unique_ptr<app_restore::WindowInfo> FullRestoreSaveHandler::GetWindowInfo( + const base::FilePath& profile_path, + const std::string& app_id, + int window_id) { + auto it = profile_path_to_restore_data_.find(profile_path); + return it != profile_path_to_restore_data_.end() + ? it->second.GetWindowInfo(app_id, window_id) + : nullptr; +} + void FullRestoreSaveHandler::ClearForTesting() { profile_path_to_file_handler_.clear(); profile_path_to_restore_data_.clear();
diff --git a/components/app_restore/full_restore_save_handler.h b/components/app_restore/full_restore_save_handler.h index 689706e..5036788 100644 --- a/components/app_restore/full_restore_save_handler.h +++ b/components/app_restore/full_restore_save_handler.h
@@ -5,12 +5,14 @@ #ifndef COMPONENTS_APP_RESTORE_FULL_RESTORE_SAVE_HANDLER_H_ #define COMPONENTS_APP_RESTORE_FULL_RESTORE_SAVE_HANDLER_H_ +#include <list> #include <map> #include <memory> #include <set> #include <utility> #include "base/component_export.h" +#include "base/containers/flat_map.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/scoped_multi_source_observation.h" @@ -18,6 +20,7 @@ #include "base/timer/timer.h" #include "components/app_restore/app_restore_arc_info.h" #include "components/app_restore/arc_save_handler.h" +#include "components/app_restore/lacros_save_handler.h" #include "ui/aura/env.h" #include "ui/aura/env_observer.h" #include "ui/aura/window.h" @@ -172,6 +175,18 @@ // the window's associated AppRestoreData. std::string GetAppId(aura::Window* window); + // Fetches the app launch information from `app_id_to_app_launch_infos_` for + // the given `profile_path` and `app_id`. `app_id` should be a Chrome app id. + AppLaunchInfoPtr FetchAppLaunchInfo(const base::FilePath& profile_path, + const std::string& app_id); + + // Returns the window information from the restore data of `profile_path` for + // `app_id` and `window_id`. + std::unique_ptr<app_restore::WindowInfo> GetWindowInfo( + const base::FilePath& profile_path, + const std::string& app_id, + int window_id); + base::OneShotTimer* GetTimerForTesting() { return &save_timer_; } // Since this is a singleton, tests may need to clear it between tests. @@ -183,7 +198,8 @@ friend class ash::full_restore::FullRestoreAppLaunchHandlerArcAppBrowserTest; // Map from a profile path to AppLaunchInfos. - using AppLaunchInfos = std::map<base::FilePath, std::list<AppLaunchInfoPtr>>; + using AppLaunchInfos = + base::flat_map<base::FilePath, std::list<AppLaunchInfoPtr>>; // Starts the timer that invokes Save (if timer isn't already running). void MaybeStartSaveTimer(const base::FilePath& profile_path); @@ -224,11 +240,11 @@ // The file handler for each user's profile to write the restore data to the // full restore file for each user. The key is the profile path. - std::map<base::FilePath, scoped_refptr<FullRestoreFileHandler>> + base::flat_map<base::FilePath, scoped_refptr<FullRestoreFileHandler>> profile_path_to_file_handler_; // The AppRegistryCache for each user's profile. The key is the profile path. - std::map<base::FilePath, apps::AppRegistryCache*> + base::flat_map<base::FilePath, apps::AppRegistryCache*> profile_path_to_app_registry_cache_; // The map from the window id to the full restore file path and the app id. @@ -262,6 +278,8 @@ std::unique_ptr<ArcSaveHandler> arc_save_handler_; + std::unique_ptr<LacrosSaveHandler> lacros_save_handler_; + bool is_shut_down_ = false; // Due to the system crash or upgrading, the system might restart or reboot
diff --git a/components/app_restore/lacros_save_handler.cc b/components/app_restore/lacros_save_handler.cc new file mode 100644 index 0000000..876ec8e --- /dev/null +++ b/components/app_restore/lacros_save_handler.cc
@@ -0,0 +1,47 @@ +// Copyright 2022 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "components/app_restore/lacros_save_handler.h" + +#include "components/app_restore/app_launch_info.h" +#include "components/app_restore/full_restore_save_handler.h" +#include "components/app_restore/window_properties.h" +#include "extensions/common/constants.h" +#include "ui/aura/window.h" + +namespace full_restore { + +LacrosSaveHandler::LacrosSaveHandler(const base::FilePath& profile_path) + : profile_path_(profile_path) {} + +LacrosSaveHandler::~LacrosSaveHandler() = default; + +void LacrosSaveHandler::OnWindowInitialized(aura::Window* window) { + const std::string* lacros_window_id = + window->GetProperty(app_restore::kLacrosWindowId); + DCHECK(lacros_window_id); + window_candidates_[*lacros_window_id].app_id = extension_misc::kLacrosAppId; + window_candidates_[*lacros_window_id].window_id = ++window_id_; + + auto app_launch_info = std::make_unique<app_restore::AppLaunchInfo>( + extension_misc::kLacrosAppId, window_id_); + FullRestoreSaveHandler::GetInstance()->AddAppLaunchInfo( + profile_path_, std::move(app_launch_info)); +} + +void LacrosSaveHandler::OnWindowDestroyed(aura::Window* window) { + const std::string* lacros_window_id = + window->GetProperty(app_restore::kLacrosWindowId); + DCHECK(lacros_window_id); + auto it = window_candidates_.find(*lacros_window_id); + if (it == window_candidates_.end()) + return; + + FullRestoreSaveHandler::GetInstance()->RemoveAppRestoreData( + profile_path_, it->second.app_id, it->second.window_id); + + window_candidates_.erase(it); +} + +} // namespace full_restore
diff --git a/components/app_restore/lacros_save_handler.h b/components/app_restore/lacros_save_handler.h new file mode 100644 index 0000000..192e78f --- /dev/null +++ b/components/app_restore/lacros_save_handler.h
@@ -0,0 +1,61 @@ +// Copyright 2022 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef COMPONENTS_APP_RESTORE_LACROS_SAVE_HANDLER_H_ +#define COMPONENTS_APP_RESTORE_LACROS_SAVE_HANDLER_H_ + +#include <map> + +#include "base/component_export.h" +#include "base/files/file_path.h" + +namespace aura { +class Window; +} + +namespace full_restore { + +// LacrosSaveHandler is a helper class for FullRestoreSaveHandler to handle +// Lacros windows special cases, e.g. Lacros window id, etc. +// TODO(crbug.com/1239984): +// 1. Save app launch info for Chrome app windows opened with Lacros windows. +// 2. Save window info for Chrome app windows opened with Lacros windows. +// 3. Use the browser session id as the window id. +class COMPONENT_EXPORT(APP_RESTORE) LacrosSaveHandler { + public: + explicit LacrosSaveHandler(const base::FilePath& profile_path); + LacrosSaveHandler(const LacrosSaveHandler&) = delete; + LacrosSaveHandler& operator=(const LacrosSaveHandler&) = delete; + ~LacrosSaveHandler(); + + // Invoked when `window` is initialized. + void OnWindowInitialized(aura::Window* window); + + // Invoked when `window` is destroyed. + void OnWindowDestroyed(aura::Window* window); + + private: + struct WindowData { + std::string app_id; + int32_t window_id; + }; + + // The primary user profile path. + base::FilePath profile_path_; + + // `window_id_` is used to record the current used window id. When a new + // Lacros window is created, ++window_id to generate the new window id. + int32_t window_id_ = 0; + + // |window_candidates_| is used to record the map from the exo application id + // to `app_id` and `window_id`. `app_id` might be changed for Chrome app + // windows because the Lacros app id is set for all Lacros windows, and when + // OnAppWindowAdded is called, `app_id` is modified to the Chrome app id. The + // record is removed when the window is destroyed. + std::map<std::string, WindowData> window_candidates_; +}; + +} // namespace full_restore + +#endif // COMPONENTS_APP_RESTORE_LACROS_SAVE_HANDLER_H_
diff --git a/components/app_restore/restore_data.h b/components/app_restore/restore_data.h index 1623fd3..fa3bb24 100644 --- a/components/app_restore/restore_data.h +++ b/components/app_restore/restore_data.h
@@ -23,11 +23,6 @@ // This class is responsible for saving all app launch and app windows // information. It can be converted to JSON format to be written to the // FullRestoreData file. -// -// TODO(crbug.com/1146900): -// 1. Add the interface to modify LaunchAndWindowInfo when the window -// information is updated. -// 2. Add the interface to remove LaunchAndWindowInfo. class COMPONENT_EXPORT(APP_RESTORE) RestoreData { public: // Map from a window id to AppRestoreData.
diff --git a/components/app_restore/window_properties.cc b/components/app_restore/window_properties.cc index 160ebf7d..5cda130 100644 --- a/components/app_restore/window_properties.cc +++ b/components/app_restore/window_properties.cc
@@ -17,6 +17,7 @@ DEFINE_UI_CLASS_PROPERTY_KEY(bool, kAppTypeBrowser, false) DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(std::string, kBrowserAppNameKey, nullptr) DEFINE_UI_CLASS_PROPERTY_KEY(int32_t, kGhostWindowSessionIdKey, 0) +DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(std::string, kLacrosWindowId, nullptr) DEFINE_UI_CLASS_PROPERTY_KEY(bool, kLaunchedFromFullRestoreKey, false) DEFINE_UI_CLASS_PROPERTY_KEY(bool, kParentToHiddenContainerKey, false) DEFINE_UI_CLASS_PROPERTY_KEY(bool, kRealArcTaskWindow, true)
diff --git a/components/app_restore/window_properties.h b/components/app_restore/window_properties.h index f4f94d93..551813ad 100644 --- a/components/app_restore/window_properties.h +++ b/components/app_restore/window_properties.h
@@ -41,6 +41,10 @@ COMPONENT_EXPORT(APP_RESTORE) extern const ui::ClassProperty<int32_t>* const kGhostWindowSessionIdKey; +// A property key to store the window id for a Lacros window. +COMPONENT_EXPORT(APP_RESTORE) +extern const ui::ClassProperty<std::string*>* const kLacrosWindowId; + // A property key indicating whether a window was launched from full restore. // These windows will not be activatable until they are shown. COMPONENT_EXPORT(APP_RESTORE)
diff --git a/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/ContextMenuDialog.java b/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/ContextMenuDialog.java index 8a87564..05862c1 100644 --- a/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/ContextMenuDialog.java +++ b/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/ContextMenuDialog.java
@@ -52,8 +52,9 @@ private float mContextMenuSourceXPx; private float mContextMenuSourceYPx; private int mContextMenuFirstLocationYPx; - private AnchoredPopupWindow mPopupWindow; + private @Nullable AnchoredPopupWindow mPopupWindow; private View mLayout; + private OnLayoutChangeListener mOnLayoutChangeListener; private int mTopMarginPx; private int mBottomMarginPx; @@ -137,7 +138,7 @@ layoutParams.topMargin = mTopMarginPx; } - (mIsPopup ? mLayout : mContentView).addOnLayoutChangeListener(new OnLayoutChangeListener() { + mOnLayoutChangeListener = new OnLayoutChangeListener() { @Override public void onLayoutChange(View v, int left, int top, int right, int bottom, int oldLeft, int oldTop, int oldRight, int oldBottom) { @@ -168,8 +169,10 @@ startEnterAnimation(); } v.removeOnLayoutChangeListener(this); + mOnLayoutChangeListener = null; } - }); + }; + (mIsPopup ? mLayout : mContentView).addOnLayoutChangeListener(mOnLayoutChangeListener); } private void startEnterAnimation() { @@ -195,12 +198,23 @@ @Override public void dismiss() { if (mIsPopup) { - mPopupWindow.dismiss(); + if (mPopupWindow != null) { + mPopupWindow.dismiss(); + mPopupWindow = null; + } + if (mOnLayoutChangeListener != null) { + mLayout.removeOnLayoutChangeListener(mOnLayoutChangeListener); + mOnLayoutChangeListener = null; + } super.dismiss(); return; } + if (mOnLayoutChangeListener != null) { + mContentView.removeOnLayoutChangeListener(mOnLayoutChangeListener); + mOnLayoutChangeListener = null; + } int[] contextMenuFinalLocationPx = new int[2]; mContentView.getLocationOnScreen(contextMenuFinalLocationPx); // Recalculate mContextMenuDestinationY because the context menu's final location may not be
diff --git a/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/ContextMenuDialogUnitTest.java b/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/ContextMenuDialogUnitTest.java index 3055a0d0..c31766e 100644 --- a/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/ContextMenuDialogUnitTest.java +++ b/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/ContextMenuDialogUnitTest.java
@@ -4,49 +4,78 @@ package org.chromium.components.browser_ui.widget; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; + import android.app.ActionBar.LayoutParams; import android.app.Activity; +import android.view.Gravity; import android.view.View; import android.view.WindowManager; import android.widget.FrameLayout; +import android.widget.PopupWindow; import android.widget.TextView; import org.junit.Assert; import org.junit.Before; +import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.mockito.Spy; +import org.mockito.junit.MockitoJUnit; +import org.mockito.junit.MockitoRule; import org.robolectric.Robolectric; import org.robolectric.Shadows; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowPhoneWindow; import org.chromium.base.test.BaseRobolectricTestRunner; +import org.chromium.ui.widget.UiWidgetFactory; /** Unit test for {@link ContextMenuDialog}. */ @RunWith(BaseRobolectricTestRunner.class) @Config(manifest = Config.NONE, shadows = {ShadowPhoneWindow.class}) public class ContextMenuDialogUnitTest { + @Rule + public MockitoRule mockitoRule = MockitoJUnit.rule(); + ContextMenuDialog mDialog; Activity mActivity; - View mMenuContentView; + FrameLayout mMenuContentView; View mRootView; + @Mock + UiWidgetFactory mMockUiWidgetFactory; + @Spy + PopupWindow mSpyPopupWindow; + @Before public void setup() { mActivity = Robolectric.buildActivity(Activity.class).setup().get(); mRootView = new FrameLayout(mActivity); TextView textView = new TextView(mActivity); textView.setText("Test String"); - mMenuContentView = textView; + mMenuContentView = new FrameLayout(mActivity); + mMenuContentView.addView(textView); mActivity.setContentView( mRootView, new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)); + + mSpyPopupWindow = Mockito.spy(UiWidgetFactory.getInstance().createPopupWindow(mActivity)); + UiWidgetFactory.setInstance(mMockUiWidgetFactory); + Mockito.when(mMockUiWidgetFactory.createPopupWindow(any())).thenReturn(mSpyPopupWindow); + Mockito.doNothing() + .when(mSpyPopupWindow) + .showAtLocation(any(View.class), anyInt(), anyInt(), anyInt()); } @Test public void testCreate_usePopupStyle() { - mDialog = new ContextMenuDialog(mActivity, 0, 0, 0, 0, 0, 0, mRootView, mMenuContentView, - /*isPopup=*/false, /*shouldRemoveScrim=*/true, 0, 0); + mDialog = createContextMenuDialog(/*isPopup=*/false, /*shouldRemoveScrim=*/true); mDialog.show(); ShadowPhoneWindow window = (ShadowPhoneWindow) Shadows.shadowOf(mDialog.getWindow()); @@ -67,8 +96,7 @@ @Test public void testCreateDialog_useRegularStyle() { - mDialog = new ContextMenuDialog(mActivity, 0, 0, 0, 0, 0, 0, mRootView, mMenuContentView, - /*isPopup=*/false, /*shouldRemoveScrim=*/false, 0, 0); + mDialog = createContextMenuDialog(/*isPopup=*/false, /*shouldRemoveScrim=*/false); mDialog.show(); // Only checks the flag is unset to make sure the setup for |shouldRemoveScrim| is not ran. @@ -78,4 +106,45 @@ Assert.assertFalse("FLAG_NOT_TOUCH_MODAL is in window flags.", window.getFlag(WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL)); } + + @Test + public void testShowPopupWindow() { + mDialog = createContextMenuDialog(/*isPopup=*/true, /*shouldRemoveScrim=*/false); + mDialog.show(); + // Request layout so #onLayoutChange is triggered. + mRootView.requestLayout(); + + final ArgumentCaptor<Integer> gravityCaptor = ArgumentCaptor.forClass(Integer.class); + Mockito.verify(mSpyPopupWindow) + .showAtLocation( + eq(mRootView.getRootView()), gravityCaptor.capture(), anyInt(), anyInt()); + + Assert.assertEquals("Popup gravity should have Gravity.START.", Gravity.START, + (gravityCaptor.getValue() & Gravity.START)); + Assert.assertEquals("Popup gravity should have Gravity.TOP.", Gravity.TOP, + (gravityCaptor.getValue() & Gravity.TOP), Gravity.TOP); + + mDialog.dismiss(); + Mockito.verify(mSpyPopupWindow).dismiss(); + } + + /** + * Inspired by https://crbug.com/1281011. If popup context menu is dismissed before + * #onLayoutRequest for the root view, popup menu should not get invoked. + */ + @Test + public void testShowPopupWindow_BeforeOnLayout() { + mDialog = createContextMenuDialog(/*isPopup=*/true, /*shouldRemoveScrim=*/false); + mDialog.show(); + + mDialog.dismiss(); + // Spy popup is not invoked because the dialog does not manage to create the popup window. + Mockito.verify(mSpyPopupWindow, Mockito.times(0)).dismiss(); + } + + private ContextMenuDialog createContextMenuDialog(boolean isPopup, boolean shouldRemoveScrim) { + return new ContextMenuDialog(mActivity, 0, 0, 0, 0, ContextMenuDialog.NO_CUSTOM_MARGIN, + ContextMenuDialog.NO_CUSTOM_MARGIN, mRootView, mMenuContentView, isPopup, + shouldRemoveScrim, 0, 0); + } }
diff --git a/components/feed/core/v2/api_test/feed_api_subscriptions_unittest.cc b/components/feed/core/v2/api_test/feed_api_subscriptions_unittest.cc index 354b582..f1dbd1c 100644 --- a/components/feed/core/v2/api_test/feed_api_subscriptions_unittest.cc +++ b/components/feed/core/v2/api_test/feed_api_subscriptions_unittest.cc
@@ -137,6 +137,7 @@ auto sent_request = network_.GetApiRequestSent<FollowWebFeedDiscoverApi>(); ASSERT_THAT(sent_request->page_rss_uris(), testing::ElementsAre("http://rss1/", "http://rss2/")); + EXPECT_EQ(sent_request->canonical_uri(), ""); EXPECT_EQ("token", sent_request->consistency_token().token()); EXPECT_EQ( "WebFeedMetadata{ id=id_cats title=Title cats " @@ -157,6 +158,19 @@ "ContentSuggestions.Feed.WebFeed.NewFollow.IsRecommended", 0, 1); } +TEST_F(FeedApiSubscriptionsTest, FollowWebFeedSendsCanonicalUrl) { + network_.InjectResponse(SuccessfulFollowResponse("cats")); + CallbackReceiver<WebFeedSubscriptions::FollowWebFeedResult> callback; + WebFeedPageInformation page_info = + MakeWebFeedPageInformation("http://cats.com"); + page_info.SetCanonicalUrl(GURL("http://felis-catus.com")); + subscriptions().FollowWebFeed(page_info, callback.Bind()); + callback.RunUntilCalled(); + + auto sent_request = network_.GetApiRequestSent<FollowWebFeedDiscoverApi>(); + EXPECT_EQ("http://felis-catus.com/", sent_request->canonical_uri()); +} + TEST_F(FeedApiSubscriptionsTest, FollowRecommendedWebFeedById) { base::HistogramTester histograms; WriteRecommendedFeeds(*store_, {MakeWebFeedInfo("catfood")});
diff --git a/components/feed/core/v2/public/public_types.cc b/components/feed/core/v2/public/public_types.cc index 34224ae..ee95906 100644 --- a/components/feed/core/v2/public/public_types.cc +++ b/components/feed/core/v2/public/public_types.cc
@@ -29,7 +29,11 @@ clear_ref.ClearRef(); url_ = url.ReplaceComponents(clear_ref); } - +void WebFeedPageInformation::SetCanonicalUrl(const GURL& url) { + url::Replacements<char> clear_ref; + clear_ref.ClearRef(); + canonical_url_ = url.ReplaceComponents(clear_ref); +} void WebFeedPageInformation::SetRssUrls(const std::vector<GURL>& rss_urls) { rss_urls_ = rss_urls; } @@ -37,6 +41,9 @@ std::ostream& operator<<(std::ostream& os, const WebFeedPageInformation& value) { os << "{ " << value.url() << " "; + if (value.canonical_url().is_valid()) { + os << "canonical=" << value.canonical_url() << ' '; + } os << "RSS:\n"; for (const GURL& url : value.GetRssUrls()) { os << url << '\n';
diff --git a/components/feed/core/v2/public/public_types_unittest.cc b/components/feed/core/v2/public/public_types_unittest.cc index e02959e..7a2421c1 100644 --- a/components/feed/core/v2/public/public_types_unittest.cc +++ b/components/feed/core/v2/public/public_types_unittest.cc
@@ -98,4 +98,10 @@ EXPECT_EQ(GURL("https://chromium.org"), info.url()); } +TEST(WebFeedPageInformation, SetCanonicalUrlStripsFragment) { + WebFeedPageInformation info; + info.SetCanonicalUrl(GURL("https://chromium.org#1")); + EXPECT_EQ(GURL("https://chromium.org"), info.canonical_url()); +} + } // namespace feed
diff --git a/components/feed/core/v2/public/types.h b/components/feed/core/v2/public/types.h index ef1b791..6dcf6a7 100644 --- a/components/feed/core/v2/public/types.h +++ b/components/feed/core/v2/public/types.h
@@ -112,16 +112,23 @@ // The URL for the page. `url().has_ref()` is always false. const GURL& url() const { return url_; } + // The Canonical URL for the page, if one was found. `url().has_ref()` is + // always false + const GURL& canonical_url() const { return canonical_url_; } // The list of RSS urls embedded in the page with the <link> tag. const std::vector<GURL>& GetRssUrls() const { return rss_urls_; } // Set the URL for the page. Trims off the URL ref. void SetUrl(const GURL& url); + // Set the canonical URL for the page. Trims off the URL ref. + void SetCanonicalUrl(const GURL& url); + void SetRssUrls(const std::vector<GURL>& rss_urls); private: GURL url_; + GURL canonical_url_; std::vector<GURL> rss_urls_; }; std::ostream& operator<<(std::ostream& os, const WebFeedPageInformation& value);
diff --git a/components/feed/core/v2/web_feed_subscriptions/subscribe_to_web_feed_task.cc b/components/feed/core/v2/web_feed_subscriptions/subscribe_to_web_feed_task.cc index 146aeb9..8b7370d03 100644 --- a/components/feed/core/v2/web_feed_subscriptions/subscribe_to_web_feed_task.cc +++ b/components/feed/core/v2/web_feed_subscriptions/subscribe_to_web_feed_task.cc
@@ -67,6 +67,9 @@ feedwire::webfeed::FollowWebFeedRequest request; SetConsistencyToken(request, stream_.GetMetadata().consistency_token()); request.set_web_page_uri(request_.page_info.url().spec()); + if (request_.page_info.canonical_url().is_valid()) { + request.set_canonical_uri(request_.page_info.canonical_url().spec()); + } for (const GURL& rss_url : request_.page_info.GetRssUrls()) { request.add_page_rss_uris(rss_url.spec()); }
diff --git a/components/language/core/browser/ulp_metrics_logger.cc b/components/language/core/browser/ulp_metrics_logger.cc index 5e54831..374be3a 100644 --- a/components/language/core/browser/ulp_metrics_logger.cc +++ b/components/language/core/browser/ulp_metrics_logger.cc
@@ -33,4 +33,35 @@ overlap_ratio_percent); } +ULPLanguageStatus ULPMetricsLogger::DetermineLanguageStatus( + const std::string& language, + const std::vector<std::string>& ulp_languages) { + std::vector<std::string>::const_iterator i = + std::find(ulp_languages.begin(), ulp_languages.end(), language); + if (i == ulp_languages.end()) { + return ULPLanguageStatus::kLanguageNotInULP; + } else if (i == ulp_languages.begin()) { + return ULPLanguageStatus::kTopULPLanguage; + } else { + return ULPLanguageStatus::kNonTopULPLanguage; + } +} + +int ULPMetricsLogger::ULPLanguagesInAcceptLanguagesRatio( + const std::vector<std::string> accept_languages, + const std::vector<std::string> ulp_languages) { + if (ulp_languages.size() <= 0) { + return 0; + } + + int num_ulp_languages_also_in_accept_languages = 0; + for (const std::string& ulp_language : ulp_languages) { + if (std::find(accept_languages.begin(), accept_languages.end(), + ulp_language) != accept_languages.end()) { + ++num_ulp_languages_also_in_accept_languages; + } + } + return (100 * num_ulp_languages_also_in_accept_languages) / + ulp_languages.size(); +} } // namespace language
diff --git a/components/language/core/browser/ulp_metrics_logger.h b/components/language/core/browser/ulp_metrics_logger.h index 180baf0..3a72c37 100644 --- a/components/language/core/browser/ulp_metrics_logger.h +++ b/components/language/core/browser/ulp_metrics_logger.h
@@ -5,6 +5,9 @@ #ifndef COMPONENTS_LANGUAGE_CORE_BROWSER_ULP_METRICS_LOGGER_H_ #define COMPONENTS_LANGUAGE_CORE_BROWSER_ULP_METRICS_LOGGER_H_ +#include <string> +#include <vector> + namespace language { const char kInitiationLanguageCountHistogram[] = @@ -53,6 +56,18 @@ // languages at init. virtual void RecordInitiationAcceptLanguagesULPOverlap( int overlap_ratio_percent); + + // Returns an enum that indicates whether `language` is present in + // `ulp_languages` and, if so, whether it was the first entry. + virtual ULPLanguageStatus DetermineLanguageStatus( + const std::string& language, + const std::vector<std::string>& ulp_languages); + + // Returns a number from 0-100 that indicates the ratio of ulp_languages that + // are present in accept_languages. + virtual int ULPLanguagesInAcceptLanguagesRatio( + const std::vector<std::string> accept_languages, + const std::vector<std::string> ulp_languages); }; } // namespace language
diff --git a/components/language/core/common/language_experiments.cc b/components/language/core/common/language_experiments.cc index e7494f9..42261a28 100644 --- a/components/language/core/common/language_experiments.cc +++ b/components/language/core/common/language_experiments.cc
@@ -7,6 +7,7 @@ #include <map> #include <string> +#include "base/feature_list.h" #include "base/metrics/field_trial_params.h" #include "base/metrics/histogram_macros.h" #include "base/strings/string_number_conversions.h" @@ -46,6 +47,8 @@ "DetectedSourceLanguageOption", base::FEATURE_ENABLED_BY_DEFAULT}; const base::Feature kContentLanguagesInLanguagePicker{ "ContentLanguagesInLanguagePicker", base::FEATURE_DISABLED_BY_DEFAULT}; +const base::Feature kUseULPLanguagesInChrome{"UseULPLanguagesInChrome", + base::FEATURE_ENABLED_BY_DEFAULT}; // Params: const char kBackoffThresholdKey[] = "backoff_threshold";
diff --git a/components/language/core/common/language_experiments.h b/components/language/core/common/language_experiments.h index 6a09a65..9f36a45 100644 --- a/components/language/core/common/language_experiments.h +++ b/components/language/core/common/language_experiments.h
@@ -59,6 +59,9 @@ // This feature enables an intent that starts translating the foreground tab. extern const base::Feature kContentLanguagesInLanguagePicker; +// This feature enables use of ULP language data in Chrome. +extern const base::Feature kUseULPLanguagesInChrome; + enum class OverrideLanguageModel { DEFAULT, FLUENT,
diff --git a/components/language/core/language_model/ulp_language_model.cc b/components/language/core/language_model/ulp_language_model.cc index e2bb7b5..349089c 100644 --- a/components/language/core/language_model/ulp_language_model.cc +++ b/components/language/core/language_model/ulp_language_model.cc
@@ -18,7 +18,9 @@ void ULPLanguageModel::AddULPLanguage(std::string language, float score) { // Languages must be added in order by score. - DCHECK(lang_details_.back().score >= score); + if (!lang_details_.empty()) { + DCHECK(lang_details_.back().score >= score); + } lang_details_.emplace_back(language, score); }
diff --git a/components/messages/android/messages_feature.cc b/components/messages/android/messages_feature.cc index 8790a24..59e9117b 100644 --- a/components/messages/android/messages_feature.cc +++ b/components/messages/android/messages_feature.cc
@@ -55,7 +55,7 @@ &kMessagesForAndroidSaveCard, "save_card_message_use_gpay_icon", true}; const base::Feature kMessagesForAndroidSyncError{ - "MessagesForAndroidSyncError", base::FEATURE_DISABLED_BY_DEFAULT}; + "MessagesForAndroidSyncError", base::FEATURE_ENABLED_BY_DEFAULT}; const base::Feature kMessagesForAndroidUpdatePassword{ "MessagesForAndroidUpdatePassword", base::FEATURE_DISABLED_BY_DEFAULT};
diff --git a/components/net_log/net_export_file_writer_unittest.cc b/components/net_log/net_export_file_writer_unittest.cc index ad661544..e1fa0ae 100644 --- a/components/net_log/net_export_file_writer_unittest.cc +++ b/components/net_log/net_export_file_writer_unittest.cc
@@ -193,7 +193,7 @@ // 640 rather than 644. int expected_permissions = base::FILE_PERMISSION_READ_BY_USER | base::FILE_PERMISSION_WRITE_BY_USER -#if BUILDFLAG(IS_CHROMEOS_ASH) +#if defined(OS_CHROMEOS) | base::FILE_PERMISSION_READ_BY_GROUP | base::FILE_PERMISSION_READ_BY_OTHERS #endif
diff --git a/components/viz/service/frame_sinks/external_begin_frame_source_mojo.cc b/components/viz/service/frame_sinks/external_begin_frame_source_mojo.cc index d0d35587..9ce1f5a1 100644 --- a/components/viz/service/frame_sinks/external_begin_frame_source_mojo.cc +++ b/components/viz/service/frame_sinks/external_begin_frame_source_mojo.cc
@@ -31,6 +31,7 @@ bool force, base::OnceCallback<void(const BeginFrameAck&)> callback) { DCHECK(!pending_frame_callback_) << "Got overlapping IssueExternalBeginFrame"; + DCHECK(pending_frame_sinks_.empty()); original_source_id_ = args.frame_id.source_id; OnBeginFrame(args); @@ -76,6 +77,12 @@ return; if (!pending_frame_callback_) return; + + if (pending_ack_) { + DispatchFrameCallback(*pending_ack_); + pending_ack_.reset(); + return; + } // If there aren't pending surfaces and the root frame is not missing, // the display scheduler is likely to produce proper frame, so let it do // its work. Otherwise, fire the pending frame callback early. @@ -84,29 +91,37 @@ return; } - frame_sink_manager_->DiscardPendingCopyOfOutputRequests(this); - // All frame sinks are done with frame, yet the root frame is still missing, // the display won't draw, so resolve callback now. BeginFrameAck nak(last_begin_frame_args_.frame_id.source_id, last_begin_frame_args_.frame_id.sequence_number, /*has_damage=*/false); + DispatchFrameCallback(nak); +} + +void ExternalBeginFrameSourceMojo::DispatchFrameCallback( + const BeginFrameAck& ack) { + // If there are pending copy output requests that have not been fulfilled, + // cancel them, as they won't be served till the next frame. This prevents + // the client for waiting for them indefinitely. + frame_sink_manager_->DiscardPendingCopyOfOutputRequests(this); // Prevent missing begin frames from being sent to sinks that came late, // as this may result in two overlapping frames being sent, which is not // supported with full pipeline mode. last_begin_frame_args_ = BeginFrameArgs(); - std::move(pending_frame_callback_).Run(nak); + std::move(pending_frame_callback_).Run(ack); } void ExternalBeginFrameSourceMojo::OnDisplayDidFinishFrame( const BeginFrameAck& ack) { if (!pending_frame_callback_) return; - std::move(pending_frame_callback_).Run(ack); - // If there are pending copy output requests that have not been fulfilled, - // cancel them, as they won't be served till the next frame. This prevents - // the client for waiting for them indefinitely. - frame_sink_manager_->DiscardPendingCopyOfOutputRequests(this); + if (!pending_frame_sinks_.empty()) { + DCHECK(!pending_ack_); + pending_ack_ = ack; + return; + } + DispatchFrameCallback(ack); } void ExternalBeginFrameSourceMojo::OnDisplayDestroyed() {
diff --git a/components/viz/service/frame_sinks/external_begin_frame_source_mojo.h b/components/viz/service/frame_sinks/external_begin_frame_source_mojo.h index 592907a4..ce01240 100644 --- a/components/viz/service/frame_sinks/external_begin_frame_source_mojo.h +++ b/components/viz/service/frame_sinks/external_begin_frame_source_mojo.h
@@ -14,6 +14,7 @@ #include "mojo/public/cpp/bindings/associated_receiver.h" #include "mojo/public/cpp/bindings/pending_associated_receiver.h" #include "services/viz/privileged/mojom/compositing/external_begin_frame_controller.mojom.h" +#include "third_party/abseil-cpp/absl/types/optional.h" namespace viz { @@ -72,6 +73,7 @@ const BeginFrameArgs& args) override; void MaybeProduceFrameCallback(); + void DispatchFrameCallback(const BeginFrameAck& ack); const raw_ptr<FrameSinkManagerImpl> frame_sink_manager_; @@ -88,6 +90,7 @@ uint64_t original_source_id_ = BeginFrameArgs::kStartingSourceId; base::flat_set<FrameSinkId> pending_frame_sinks_; + absl::optional<BeginFrameAck> pending_ack_; raw_ptr<Display> display_ = nullptr; };
diff --git a/content/browser/back_forward_cache_internal_browsertest.cc b/content/browser/back_forward_cache_internal_browsertest.cc index 9b5cc1b0..b0cb199e 100644 --- a/content/browser/back_forward_cache_internal_browsertest.cc +++ b/content/browser/back_forward_cache_internal_browsertest.cc
@@ -476,7 +476,10 @@ EXPECT_EQ(url_c, controller.GetLastCommittedEntry()->GetURL()); } -IN_PROC_BROWSER_TEST_F(BackForwardCacheBrowserTest, LogIpcPostedToCachedFrame) { +// Flaky on Android, see crbug.com/1135601 and on other platforms, see +// crbug.com/1128772. +IN_PROC_BROWSER_TEST_F(BackForwardCacheBrowserTest, + DISABLED_LogIpcPostedToCachedFrame) { ASSERT_TRUE(embedded_test_server()->Start()); // 1) Navigate to a page.
diff --git a/content/browser/renderer_host/mixed_content_navigation_throttle.cc b/content/browser/renderer_host/mixed_content_navigation_throttle.cc index ff453e4a..e225012 100644 --- a/content/browser/renderer_host/mixed_content_navigation_throttle.cc +++ b/content/browser/renderer_host/mixed_content_navigation_throttle.cc
@@ -65,7 +65,8 @@ // mixed content for now. Once/if the browser should also check form submits // for mixed content than this will be allowed to happen and this DCHECK // should be updated. - DCHECK(navigation_request->frame_tree_node()->parent()); + DCHECK(navigation_request->GetParentFrameOrOuterDocument()); + RenderFrameHostImpl* rfh = navigation_request->frame_tree_node()->current_frame_host(); DCHECK(!navigation_request->GetRedirectChain().empty()); @@ -252,10 +253,11 @@ RenderFrameHostImpl* MixedContentNavigationThrottle::InWhichFrameIsContentMixed( FrameTreeNode* node, const GURL& url) { - // Main frame navigations cannot be mixed content. + // Main frame navigations cannot be mixed content. But, fenced frame + // navigations should be considered as well because it can be mixed content. // TODO(carlosk): except for form submissions which might be supported in the // future. - if (node->IsMainFrame()) + if (!node->GetParentOrOuterDocument()) return nullptr; // There's no mixed content if any of these are true: @@ -266,8 +268,9 @@ // exist, here they are partially fulfilled here and partially replaced by // DoesOriginSchemeRestrictMixedContent. RenderFrameHostImpl* mixed_content_frame = nullptr; - RenderFrameHostImpl* root = node->parent()->GetMainFrame(); - RenderFrameHostImpl* parent = node->parent(); + RenderFrameHostImpl* parent = node->GetParentOrOuterDocument(); + RenderFrameHostImpl* root = parent->GetOutermostMainFrame(); + if (!IsUrlPotentiallySecure(url)) { // TODO(carlosk): we might need to check more than just the immediate parent // and the root. See https://crbug.com/623486.
diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc index 5ba43e5..9565646 100644 --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc
@@ -4513,19 +4513,8 @@ // Give SpareRenderProcessHostManager a heads-up about the most recently used // BrowserContext. This is mostly needed to make sure the spare is warmed-up // if it wasn't done in RenderProcessHostImpl::GetProcessHostForSiteInstance. -#if defined(OS_ANDROID) - // If we're in the experiment to always create a spare renderer on Android - // don't start it right away since the system is busy; this will happen when - // the page stops loading. - bool should_notify_spare_manager = - !base::FeatureList::IsEnabled(features::kSpareRenderer); -#else - bool should_notify_spare_manager = true; -#endif - if (should_notify_spare_manager) { - RenderProcessHostImpl::NotifySpareManagerAboutRecentlyUsedBrowserContext( - render_frame_host_->GetSiteInstance()->GetBrowserContext()); - } + RenderProcessHostImpl::NotifySpareManagerAboutRecentlyUsedBrowserContext( + render_frame_host_->GetSiteInstance()->GetBrowserContext()); SendDeferredConsoleMessages(); }
diff --git a/content/browser/renderer_host/render_frame_host_manager.cc b/content/browser/renderer_host/render_frame_host_manager.cc index 857f6f2..e532add2 100644 --- a/content/browser/renderer_host/render_frame_host_manager.cc +++ b/content/browser/renderer_host/render_frame_host_manager.cc
@@ -1914,16 +1914,8 @@ if (new_instance == current_instance) { // If we're navigating to the same site instance, we won't need to use the // current spare RenderProcessHost. -#if defined(OS_ANDROID) - // If we're in the experiment to always create a spare renderer on Android - // don't start it right away on since the system is busy; this will happen - // when the page stops loading. - if (!base::FeatureList::IsEnabled(features::kSpareRenderer)) -#endif - { - RenderProcessHostImpl::NotifySpareManagerAboutRecentlyUsedBrowserContext( - browser_context); - } + RenderProcessHostImpl::NotifySpareManagerAboutRecentlyUsedBrowserContext( + browser_context); } // Double-check that the new SiteInstance is associated with the right
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc index c771969..71d29f9 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -3111,10 +3111,6 @@ // static bool RenderProcessHostImpl::IsSpareProcessKeptAtAllTimes() { -#if defined(OS_ANDROID) - if (base::FeatureList::IsEnabled(features::kSpareRenderer)) - return true; -#endif if (!SiteIsolationPolicy::UseDedicatedProcessesForAllSites()) return false; @@ -4628,14 +4624,7 @@ // spawning two processes at the same time. In this case the call to // PrepareForFutureRequests will be postponed until later (e.g. until the // navigation commits or a cross-site redirect happens). - if (spare_was_taken -#if defined(OS_ANDROID) - // If we're in the experiment to always create a spare renderer on Android - // don't start it right away on since the system is busy; this will happen - // when the page stops loading. - && !base::FeatureList::IsEnabled(features::kSpareRenderer) -#endif - ) { + if (spare_was_taken) { spare_process_manager.PrepareForFutureRequests(browser_context); }
diff --git a/content/browser/ssl/ssl_manager.cc b/content/browser/ssl/ssl_manager.cc index b862001..d529c1db 100644 --- a/content/browser/ssl/ssl_manager.cc +++ b/content/browser/ssl/ssl_manager.cc
@@ -437,7 +437,24 @@ void SSLManager::UpdateLastCommittedEntry(int add_content_status_flags, int remove_content_status_flags) { - NavigationEntryImpl* entry = controller_->GetLastCommittedEntry(); + NavigationEntryImpl* entry; + if (controller_->frame_tree().type() == FrameTree::Type::kFencedFrame) { + // Only the primary frame tree's NavigationEntries are exposed outside of + // content, so the primary frame tree's NavigationController needs to + // represent an aggregate view of the security state of its inner frame + // trees. + RenderFrameHost* rfh = + controller_->frame_tree().root()->current_frame_host(); + DCHECK(rfh); + WebContentsImpl* contents = static_cast<WebContentsImpl*>( + WebContents::FromRenderFrameHost(rfh->GetOutermostMainFrame())); + // TODO(crbug.com/1232528): Ensure only fenced frames owned by active pages + // can modify this. + entry = contents->GetController().GetLastCommittedEntry(); + } else { + entry = controller_->GetLastCommittedEntry(); + } + if (!entry) return; UpdateEntry(entry, add_content_status_flags, remove_content_status_flags);
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc index dd011bf..f8894ca 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc
@@ -7282,13 +7282,6 @@ } LoadingStateChanged(true /* should_show_loading_ui */, details.get()); - -#if defined(OS_ANDROID) - if (base::FeatureList::IsEnabled(features::kSpareRenderer)) { - RenderProcessHostImpl::NotifySpareManagerAboutRecentlyUsedBrowserContext( - GetBrowserContext()); - } -#endif } void WebContentsImpl::DidChangeLoadProgress() {
diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc index bca6665..7a0026d 100644 --- a/content/public/common/content_features.cc +++ b/content/public/common/content_features.cc
@@ -858,15 +858,6 @@ const base::Feature kDisableProcessReuse{"DisableProcessReuse", base::FEATURE_DISABLED_BY_DEFAULT}; -#if defined(OS_ANDROID) -// Controls whether Android tries to always have a warm spare renderer process -// around for the most recently requested BrowserContext. Unlike desktop which -// creates a spare renderer as soon as the previous one is used, Android creates -// it after a page stops loading. -const base::Feature kSpareRenderer{"SpareRenderer", - base::FEATURE_DISABLED_BY_DEFAULT}; -#endif - // Controls whether SpareRenderProcessHostManager tries to always have a warm // spare renderer process around for the most recently requested BrowserContext. // This feature is only consulted in site-per-process mode.
diff --git a/content/public/common/content_features.h b/content/public/common/content_features.h index 864ae833..4bb2105 100644 --- a/content/public/common/content_features.h +++ b/content/public/common/content_features.h
@@ -203,9 +203,6 @@ CONTENT_EXPORT extern const base::Feature kWebOTP; CONTENT_EXPORT extern const base::Feature kWebOTPAssertionFeaturePolicy; CONTENT_EXPORT extern const base::Feature kServiceWorkerSubresourceFilter; -#if defined(OS_ANDROID) -CONTENT_EXPORT extern const base::Feature kSpareRenderer; -#endif CONTENT_EXPORT extern const base::Feature kSpareRendererForSitePerProcess; CONTENT_EXPORT extern const base::Feature kStopVideoCaptureOnScreenLock; CONTENT_EXPORT extern const base::Feature kStorageServiceOutOfProcess;
diff --git a/docs/gpu/gpu_testing_bot_details.md b/docs/gpu/gpu_testing_bot_details.md index 056ad217..d93ec8a 100644 --- a/docs/gpu/gpu_testing_bot_details.md +++ b/docs/gpu/gpu_testing_bot_details.md
@@ -412,8 +412,9 @@ don't run on certain Win bots because of missing OpenGL extensions. 1. Run [`generate_buildbot_json.py`][generate_buildbot_json.py] to regenerate `src/testing/buildbot/chromium.gpu.fyi.json`. - 1. Updates [`ci.star`][ci.star] and its related generated files - [`cr-buildbucket.cfg`][cr-buildbucket.cfg], + 1. Updates [`chromium.gpu.star`][chromium.gpu.star] or + [`chromium.gpu.fyi.star`][chromium.gpu.fyi.star] and its related + generated files [`cr-buildbucket.cfg`][cr-buildbucket.cfg], [`luci-scheduler.cfg`][luci-scheduler.cfg], and [`luci-milo.cfg`][luci-milo.cfg]: * Use the appropriate definition for the type of the bot being added, @@ -484,9 +485,8 @@ [How to add a new manually-triggered trybot]: https://chromium.googlesource.com/chromium/src/+/main/docs/gpu/gpu_testing_bot_details.md#How-to-add-a-new-manually_triggered-trybot -[ci.star]: https://chromium.googlesource.com/chromium/src/+/main/infra/config/subprojects/ci.star -[chromium.gpu.star]: https://chromium.googlesource.com/chromium/src/+/main/infra/config/consoles/chromium.gpu.star -[chromium.gpu.fyi.star]: https://chromium.googlesource.com/chromium/src/+/main/infra/config/consoles/chromium.gpu.fyi.star +[chromium.gpu.star]: https://chromium.googlesource.com/chromium/src/+/main/infra/config/subprojects/ci/chromium.gpu.star +[chromium.gpu.fyi.star]: https://chromium.googlesource.com/chromium/src/+/main/infra/config/subprojects/ci/chromium.gpu.fyi.star [cr-buildbucket.cfg]: https://chromium.googlesource.com/chromium/src/+/main/infra/config/generated/cr-buildbucket.cfg [luci-scheduler.cfg]: https://chromium.googlesource.com/chromium/src/+/main/infra/config/generated/luci-scheduler.cfg [luci-milo.cfg]: https://chromium.googlesource.com/chromium/src/+/main/infra/config/generated/luci-milo.cfg @@ -683,10 +683,12 @@ waterfall](#How-to-add-a-new-tester-bot-to-the-chromium_gpu_fyi-waterfall) to deploy one. However, you do not need to request additional GCE resources since there should be enough spare capacity in the GPU builderless pool to - handle them. -1. If an "experimental" version does already exist, move it from the - `chromium.gpu.experimental` console to its default console in - [`ci.star`][ci.star] and unpause it in the [luci scheduler]. + handle them. Additionally, ensure that the bot definition in + [`chromium.gpu.fyi.star`][chromium.gpu.fyi.star] includes a `list_view` + argument specifying `chromium.gpu.experimental`. +1. If an "experimental" version does already exist, re-add it to its default + console in [`chromium.gpu.fyi.star`][chromium.gpu.fyi.star] by uncommenting + its `console_view_entry` argument and unpause it in the [luci scheduler]. 1. Have this experimental bot target the new version of the driver or the OS in [`waterfalls.pyl`][waterfalls.pyl] and [`mixins.pyl`][mixins.pyl]. [Sample CL][sample driver cl]. @@ -724,9 +726,8 @@ 1. Remove the old driver or OS version from the `_stable` mixin, leaving just the new stable version. 1. Clean up the "experimental" version of the bot by pausing it in the - [luci scheduler] and moving it to the `chromium.gpu.experimental` console in - [`ci.star`][ci.star]. This is done by adding a `console_view` argument to - its `console_view_entry`. + [luci scheduler] and commenting out its `console_view_entry` argument in + [`chromium.gpu.fyi.star`][chromium.gpu.fyi.star]. Note that we leave the experimental bot in place. We could reclaim it, but it seems worthwhile to continuously test the "next" version of graphics drivers as
diff --git a/docs/media/gpu/video_decoder_perf_test_usage.md b/docs/media/gpu/video_decoder_perf_test_usage.md index 85cc029..d964d32 100644 --- a/docs/media/gpu/video_decoder_perf_test_usage.md +++ b/docs/media/gpu/video_decoder_perf_test_usage.md
@@ -86,29 +86,29 @@ -v enable verbose mode, e.g. -v=2. --vmodule enable verbose mode for the specified module, - e.g. --vmodule=*media/gpu*=2. + e.g. --vmodule=*media/gpu*=2. --output_folder overwrite the output folder used to store - performance metrics, if not specified results - will be stored in the current working directory. + performance metrics, if not specified results + will be stored in the current working directory. --use-legacy use the legacy VDA-based video decoders. --use_vd use the new VD-based video decoders. - (enabled by default) + (enabled by default) --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. + wrapper that translates to the VDA interface, + used to test interaction with older components + expecting the VDA interface. --linear_output use linear buffers as the final output of the - decoder which may require the use of an image - processor internally. This flag only works in - conjunction with --use_vd_vda. - Disabled by default. - --disable_vaapi_lock disable the global VA-API wrapper lock if applicable, - i.e., only on devices that use the VA-API with a libva - backend that's known to be thread-safe and only in - portions of the Chrome stack that should be able to - deal with the absence of the lock - (not the VaapiVideoDecodeAccelerator). + decoder which may require the use of an image + processor internally. This flag only works in + conjunction with --use_vd_vda. + Disabled by default. + --disable_vaapi_lock disable the global VA-API lock if applicable, + i.e., only on devices that use the VA-API with a libva + backend that's known to be thread-safe and only in + portions of the Chrome stack that should be able to + deal with the absence of the lock + (not the VaapiVideoDecodeAccelerator). --gtest_help display the gtest help and exit. --help display this help and exit.
diff --git a/docs/media/gpu/video_decoder_test_usage.md b/docs/media/gpu/video_decoder_test_usage.md index f2e8cf3..8afe559 100644 --- a/docs/media/gpu/video_decoder_test_usage.md +++ b/docs/media/gpu/video_decoder_test_usage.md
@@ -58,11 +58,11 @@ ## Command line options Multiple command line arguments can be given to the command: - -v enable verbose mode, e.g. -v=2. + -v enable verbose mode, e.g. -v=2. --vmodule enable verbose mode for the specified module, e.g. --vmodule=*media/gpu*=2. - --validator_type validate decoded frames, possible values are + --validator_type validate decoded frames, possible values are md5 (default, compare against md5hash of expected frames), ssim (compute SSIM against expected frames, currently allowed for AV1 streams only)
diff --git a/docs/security/rust-toolchain.md b/docs/security/rust-toolchain.md index 65b09925..fdcc4b648 100644 --- a/docs/security/rust-toolchain.md +++ b/docs/security/rust-toolchain.md
@@ -162,6 +162,8 @@ existing test infrastructure, but this is something we're working on. - At present, the bot integration only supports reporting whether the tests passed or failed, and doesn't capture results or output of individual tests. +- At present, there is no support for running native Rust unit tests on + Android. # Third party dependencies
diff --git a/docs/testing/web_tests.md b/docs/testing/web_tests.md index 899bc04..38b86ba6 100644 --- a/docs/testing/web_tests.md +++ b/docs/testing/web_tests.md
@@ -174,8 +174,7 @@ | `--debug` | Run the debug build of the test shell (default is release). Equivalent to `-t Debug` | | `--nocheck-sys-deps` | Don't check system dependencies; this allows faster iteration. | | `--verbose` | Produce more verbose output, including a list of tests that pass. | -| `--reset-results` | Overwrite the current baselines (`-expected.{png|txt|wav}` files) with actual results, or create new baselines if there are no existing baselines. | -| `--renderer-startup-dialog` | Bring up a modal dialog before running the test, useful for attaching a debugger. | +| `--reset-results` | Overwrite the current baselines (`-expected.{png`|`txt`|`wav}` files) with actual results, or create new baselines if there are no existing baselines. | | `--fully-parallel` | Run tests in parallel using as many child processes as the system has cores. | | `--driver-logging` | Print C++ logs (LOG(WARNING), etc). |
diff --git a/extensions/browser/api/BUILD.gn b/extensions/browser/api/BUILD.gn index b542783..c2344720 100644 --- a/extensions/browser/api/BUILD.gn +++ b/extensions/browser/api/BUILD.gn
@@ -135,6 +135,7 @@ "//extensions/browser/api/feedback_private", "//extensions/browser/api/file_handlers", "//extensions/browser/api/file_system", + "//extensions/browser/api/i18n", "//extensions/browser/api/idle", "//extensions/browser/api/management", "//extensions/browser/api/messaging",
diff --git a/extensions/browser/api/i18n/BUILD.gn b/extensions/browser/api/i18n/BUILD.gn new file mode 100644 index 0000000..7291644 --- /dev/null +++ b/extensions/browser/api/i18n/BUILD.gn
@@ -0,0 +1,24 @@ +# Copyright 2021 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("//extensions/buildflags/buildflags.gni") + +assert(enable_extensions, + "Cannot depend on extensions because enable_extensions=false.") + +source_set("i18n") { + sources = [ + "i18n_api.cc", + "i18n_api.h", + ] + + deps = [ + "//base", + "//components/language/core/browser:browser", + "//components/prefs", + "//extensions/common/api", + ] + + public_deps = [ "//extensions/browser:browser_sources" ] +}
diff --git a/extensions/browser/api/i18n/DEPS b/extensions/browser/api/i18n/DEPS new file mode 100644 index 0000000..f381eeb --- /dev/null +++ b/extensions/browser/api/i18n/DEPS
@@ -0,0 +1,3 @@ +include_rules = [ + "+components/language/core/browser/pref_names.h", +]
diff --git a/chrome/browser/extensions/api/i18n/i18n_api.cc b/extensions/browser/api/i18n/i18n_api.cc similarity index 61% rename from chrome/browser/extensions/api/i18n/i18n_api.cc rename to extensions/browser/api/i18n/i18n_api.cc index ea6a36b..fccaa77e 100644 --- a/chrome/browser/extensions/api/i18n/i18n_api.cc +++ b/extensions/browser/api/i18n/i18n_api.cc
@@ -2,20 +2,18 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/extensions/api/i18n/i18n_api.h" +#include "extensions/browser/api/i18n/i18n_api.h" #include <algorithm> #include <string> #include <vector> #include "base/containers/cxx20_erase.h" -#include "base/lazy_instance.h" -#include "base/strings/string_piece.h" #include "base/strings/string_split.h" -#include "chrome/browser/profiles/profile.h" -#include "chrome/common/extensions/api/i18n.h" #include "components/language/core/browser/pref_names.h" #include "components/prefs/pref_service.h" +#include "extensions/browser/extensions_browser_client.h" +#include "extensions/common/api/i18n.h" namespace GetAcceptLanguages = extensions::api::i18n::GetAcceptLanguages; @@ -26,23 +24,24 @@ // Errors. static const char kEmptyAcceptLanguagesError[] = "accept-languages is empty."; -} +} // namespace ExtensionFunction::ResponseAction I18nGetAcceptLanguagesFunction::Run() { + PrefService* pref_service = + ExtensionsBrowserClient::Get()->GetPrefServiceForContext( + browser_context()); std::string accept_languages = - Profile::FromBrowserContext(browser_context()) - ->GetPrefs() - ->GetString(language::prefs::kAcceptLanguages); + pref_service->GetString(language::prefs::kAcceptLanguages); // Currently, there are 2 ways to set browser's accept-languages: through UI // or directly modify the preference file. The accept-languages set through // UI is guaranteed to be valid, and the accept-languages string returned from - // profile()->GetPrefs()->GetString(language::prefs::kAcceptLanguages) is - // guaranteed to be valid and well-formed, which means each accept-language is - // a valid code, and accept-languages are separated by "," without - // surrrounding spaces. But we do not do any validation (either the format or - // the validity of the language code) on accept-languages set through editing - // preference file directly. So, here, we're adding extra checks to be - // resistant to crashes caused by data corruption. + // pref_service->GetString(language::prefs::kAcceptLanguages) is guaranteed + // to be valid and well-formed, which means each accept-language is a valid + // code, and accept-languages are separated by "," without surrrounding + // spaces. But we do not do any validation (either the format or the validity + // of the language code) on accept-languages set through editing preference + // file directly. So, here, we're adding extra checks to be resistant to + // crashes caused by data corruption. if (accept_languages.empty()) return RespondNow(Error(kEmptyAcceptLanguagesError));
diff --git a/chrome/browser/extensions/api/i18n/i18n_api.h b/extensions/browser/api/i18n/i18n_api.h similarity index 74% rename from chrome/browser/extensions/api/i18n/i18n_api.h rename to extensions/browser/api/i18n/i18n_api.h index 88ed709..7fac0c1 100644 --- a/chrome/browser/extensions/api/i18n/i18n_api.h +++ b/extensions/browser/api/i18n/i18n_api.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_EXTENSIONS_API_I18N_I18N_API_H_ -#define CHROME_BROWSER_EXTENSIONS_API_I18N_I18N_API_H_ +#ifndef EXTENSIONS_BROWSER_API_I18N_I18N_API_H_ +#define EXTENSIONS_BROWSER_API_I18N_I18N_API_H_ #include "extensions/browser/extension_function.h" @@ -17,4 +17,4 @@ } // namespace extensions -#endif // CHROME_BROWSER_EXTENSIONS_API_I18N_I18N_API_H_ +#endif // EXTENSIONS_BROWSER_API_I18N_I18N_API_H_
diff --git a/extensions/common/api/_api_features.json b/extensions/common/api/_api_features.json index 4802374..192687f 100644 --- a/extensions/common/api/_api_features.json +++ b/extensions/common/api/_api_features.json
@@ -247,6 +247,16 @@ "channel": "dev", "dependencies": ["permission:hid"] }, + "i18n": { + "channel": "stable", + "extension_types": ["extension", "legacy_packaged_app", "platform_app", + "login_screen_extension"], + "contexts": ["blessed_extension", "unblessed_extension", "content_script", + "lock_screen_extension"] + }, + "i18n.getMessage": { + "disallow_for_service_workers": true + }, "idle": { "dependencies": ["permission:idle"], "contexts": ["blessed_extension"]
diff --git a/chrome/common/extensions/api/i18n.json b/extensions/common/api/i18n.json similarity index 100% rename from chrome/common/extensions/api/i18n.json rename to extensions/common/api/i18n.json
diff --git a/extensions/common/api/schema.gni b/extensions/common/api/schema.gni index a61e668f..ba1d6d3 100644 --- a/extensions/common/api/schema.gni +++ b/extensions/common/api/schema.gni
@@ -29,6 +29,7 @@ "guest_view_internal.json", "management.json", "hid.idl", + "i18n.json", "idle.json", "metrics_private.json", "mime_handler_private.idl",
diff --git a/extensions/renderer/BUILD.gn b/extensions/renderer/BUILD.gn index 5e0d9115..2180db1 100644 --- a/extensions/renderer/BUILD.gn +++ b/extensions/renderer/BUILD.gn
@@ -350,6 +350,7 @@ "feature_cache_unittest.cc", "gc_callback_unittest.cc", "gin_port_unittest.cc", + "i18n_hooks_delegate_unittest.cc", "messaging_util_unittest.cc", "module_system_test.cc", "module_system_test.h",
diff --git a/extensions/renderer/bindings/OWNERS b/extensions/renderer/bindings/OWNERS index 9d2a3d1a..4834bd8e 100644 --- a/extensions/renderer/bindings/OWNERS +++ b/extensions/renderer/bindings/OWNERS
@@ -1,2 +1,3 @@ rdevlin.cronin@chromium.org +tjudkins@chromium.org lazyboy@chromium.org
diff --git a/chrome/renderer/extensions/i18n_hooks_delegate_unittest.cc b/extensions/renderer/i18n_hooks_delegate_unittest.cc similarity index 100% rename from chrome/renderer/extensions/i18n_hooks_delegate_unittest.cc rename to extensions/renderer/i18n_hooks_delegate_unittest.cc
diff --git a/infra/config/generated/builders/ci/fuchsia-fyi-x64-asan/properties.textpb b/infra/config/generated/builders/ci/fuchsia-fyi-x64-asan/properties.textpb new file mode 100644 index 0000000..fc3bce3 --- /dev/null +++ b/infra/config/generated/builders/ci/fuchsia-fyi-x64-asan/properties.textpb
@@ -0,0 +1,17 @@ +{ + "$build/goma": { + "enable_ats": true, + "rpc_extra_params": "?prod", + "server_host": "goma.chromium.org", + "use_luci_auth": true + }, + "$recipe_engine/resultdb/test_presentation": { + "column_keys": [], + "grouping_keys": [ + "status", + "v.test_suite" + ] + }, + "builder_group": "chromium.fyi", + "recipe": "chromium" +} \ No newline at end of file
diff --git a/infra/config/generated/cq-builders.md b/infra/config/generated/cq-builders.md index c0f51df..4a3de488 100644 --- a/infra/config/generated/cq-builders.md +++ b/infra/config/generated/cq-builders.md
@@ -489,5 +489,5 @@ * Experiment percentage: 1.0 * [mac11-arm64-rel](https://ci.chromium.org/p/chromium/builders/try/mac11-arm64-rel) ([definition](https://cs.chromium.org/search?q=+file:/try.star$+""mac11-arm64-rel"")) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+""mac11-arm64-rel"")) - * Experiment percentage: 50.0 + * Experiment percentage: 100.0
diff --git a/infra/config/generated/luci/commit-queue.cfg b/infra/config/generated/luci/commit-queue.cfg index 7dbf544..b0c9a08 100644 --- a/infra/config/generated/luci/commit-queue.cfg +++ b/infra/config/generated/luci/commit-queue.cfg
@@ -1690,7 +1690,7 @@ } builders { name: "chromium/try/mac11-arm64-rel" - experiment_percentage: 50 + experiment_percentage: 100 location_regexp: ".*" location_regexp_exclude: ".+/[+]/docs/.+" location_regexp_exclude: ".+/[+]/infra/config/.+"
diff --git a/infra/config/generated/luci/cr-buildbucket.cfg b/infra/config/generated/luci/cr-buildbucket.cfg index 10b67d2e..d3887edf 100644 --- a/infra/config/generated/luci/cr-buildbucket.cfg +++ b/infra/config/generated/luci/cr-buildbucket.cfg
@@ -30019,6 +30019,89 @@ } } builders { + name: "fuchsia-fyi-x64-asan" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" + exe { + cipd_package: "infra/chromium/bootstrapper/${platform}" + cipd_version: "latest" + cmd: "bootstrapper" + } + properties: + '{' + ' "$bootstrap/exe": {' + ' "exe": {' + ' "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",' + ' "cipd_version": "refs/heads/main",' + ' "cmd": [' + ' "luciexe"' + ' ]' + ' }' + ' },' + ' "$bootstrap/properties": {' + ' "properties_file": "infra/config/generated/builders/ci/fuchsia-fyi-x64-asan/properties.textpb",' + ' "top_level_project": {' + ' "ref": "refs/heads/main",' + ' "repo": {' + ' "host": "chromium.googlesource.com",' + ' "project": "chromium/src"' + ' }' + ' }' + ' },' + ' "builder_group": "chromium.fyi",' + ' "led_builder_is_bootstrapped": true,' + ' "recipe": "chromium"' + '}' + execution_timeout_secs: 36000 + build_numbers: YES + service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } + experiments { + key: "luci.use_realms" + value: 100 + } + resultdb { + enable: true + bq_exports { + project: "chrome-luci-data" + dataset: "chromium" + table: "ci_test_results" + test_results {} + } + bq_exports { + project: "chrome-luci-data" + dataset: "chromium" + table: "gpu_ci_test_results" + test_results { + predicate { + test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+" + } + } + } + bq_exports { + project: "chrome-luci-data" + dataset: "chromium" + table: "blink_web_tests_ci_test_results" + test_results { + predicate { + test_id_regexp: "ninja://[^/]*blink_web_tests/.+" + } + } + } + history_options { + use_invocation_timestamp: true + } + } + } + builders { name: "fuchsia-fyi-x64-dbg" swarming_host: "chromium-swarm.appspot.com" dimensions: "builderless:1"
diff --git a/infra/config/generated/luci/luci-milo.cfg b/infra/config/generated/luci/luci-milo.cfg index da1d2d89..efce230 100644 --- a/infra/config/generated/luci/luci-milo.cfg +++ b/infra/config/generated/luci/luci-milo.cfg
@@ -1696,6 +1696,11 @@ short_name: "a64-size" } builders { + name: "buildbucket/luci.chromium.ci/fuchsia-fyi-x64-asan" + category: "fyi" + short_name: "asan" + } + builders { name: "buildbucket/luci.chrome.ci/fuchsia-perf-fyi" category: "fyi" short_name: "ast-perf" @@ -5278,21 +5283,11 @@ short_name: "x64" } builders { - name: "buildbucket/luci.chromium.ci/Dawn Mac x64 Experimental Release (AMD)" - category: "ToT|Mac|AMD" - short_name: "exp" - } - builders { name: "buildbucket/luci.chromium.ci/Dawn Mac x64 Release (AMD)" category: "ToT|Mac|AMD" short_name: "x64" } builders { - name: "buildbucket/luci.chromium.ci/Dawn Mac x64 Experimental Release (Intel)" - category: "ToT|Mac|Intel" - short_name: "exp" - } - builders { name: "buildbucket/luci.chromium.ci/Dawn Mac x64 Release (Intel)" category: "ToT|Mac|Intel" short_name: "x64" @@ -6266,6 +6261,11 @@ short_name: "rel" } builders { + name: "buildbucket/luci.chromium.ci/fuchsia-fyi-x64-asan" + category: "fuchsia|x64" + short_name: "asan" + } + builders { name: "buildbucket/luci.chromium.ci/fuchsia-fyi-x64-dbg" category: "fuchsia|x64" short_name: "dbg" @@ -7976,6 +7976,38 @@ } } consoles { + id: "chromium.gpu.experimental" + name: "chromium.gpu.experimental" + builders { + name: "buildbucket/luci.chromium.ci/Dawn Mac x64 Experimental Release (AMD)" + } + builders { + name: "buildbucket/luci.chromium.ci/Dawn Mac x64 Experimental Release (Intel)" + } + builders { + name: "buildbucket/luci.chromium.ci/Linux FYI Experimental Release (Intel HD 630)" + } + builders { + name: "buildbucket/luci.chromium.ci/Linux FYI Experimental Release (NVIDIA)" + } + builders { + name: "buildbucket/luci.chromium.ci/Mac FYI Experimental Release (Intel)" + } + builders { + name: "buildbucket/luci.chromium.ci/Mac FYI Experimental Retina Release (AMD)" + } + builders { + name: "buildbucket/luci.chromium.ci/Mac FYI Experimental Retina Release (NVIDIA)" + } + builders { + name: "buildbucket/luci.chromium.ci/Win10 FYI x64 Exp Release (Intel HD 630)" + } + builders { + name: "buildbucket/luci.chromium.ci/Win10 FYI x64 Exp Release (NVIDIA)" + } + builder_view_only: true +} +consoles { id: "chromium.gpu.fyi" name: "chromium.gpu.fyi" repo_url: "https://chromium.googlesource.com/chromium/src" @@ -8022,11 +8054,6 @@ short_name: "rel" } builders { - name: "buildbucket/luci.chromium.ci/Win10 FYI x64 Exp Release (Intel HD 630)" - category: "Windows|10|x64|Intel" - short_name: "exp" - } - builders { name: "buildbucket/luci.chromium.ci/Win10 FYI x64 Release (NVIDIA)" category: "Windows|10|x64|Nvidia" short_name: "rel" @@ -8037,11 +8064,6 @@ short_name: "dbg" } builders { - name: "buildbucket/luci.chromium.ci/Win10 FYI x64 Exp Release (NVIDIA)" - category: "Windows|10|x64|Nvidia" - short_name: "exp" - } - builders { name: "buildbucket/luci.chromium.ci/Win10 FYI x64 SkiaRenderer Dawn Release (NVIDIA)" category: "Windows|10|x64|Nvidia" short_name: "skd" @@ -8142,11 +8164,6 @@ short_name: "dbg" } builders { - name: "buildbucket/luci.chromium.ci/Mac FYI Experimental Release (Intel)" - category: "Mac|Intel" - short_name: "exp" - } - builders { name: "buildbucket/luci.chromium.ci/Mac FYI ASAN (Intel)" category: "Mac|Intel" short_name: "asn" @@ -8162,11 +8179,6 @@ short_name: "dbg" } builders { - name: "buildbucket/luci.chromium.ci/Mac FYI Experimental Retina Release (NVIDIA)" - category: "Mac|Nvidia" - short_name: "exp" - } - builders { name: "buildbucket/luci.chromium.ci/Linux FYI GPU TSAN Release" category: "Linux" short_name: "tsn" @@ -8222,11 +8234,6 @@ short_name: "dbg" } builders { - name: "buildbucket/luci.chromium.ci/Linux FYI Experimental Release (NVIDIA)" - category: "Linux|Nvidia" - short_name: "exp" - } - builders { name: "buildbucket/luci.chromium.ci/Linux FYI SkiaRenderer Vulkan (NVIDIA)" category: "Linux|Nvidia" short_name: "skv"
diff --git a/infra/config/generated/luci/luci-notify.cfg b/infra/config/generated/luci/luci-notify.cfg index 1014407b..236d7c6 100644 --- a/infra/config/generated/luci/luci-notify.cfg +++ b/infra/config/generated/luci/luci-notify.cfg
@@ -2825,6 +2825,19 @@ } builders { bucket: "ci" + name: "fuchsia-fyi-x64-asan" + repository: "https://chromium.googlesource.com/chromium/src" + } +} +notifiers { + notifications { + on_change: true + email { + recipients: "chrome-fuchsia-gardener@grotations.appspotmail.com" + } + } + builders { + bucket: "ci" name: "fuchsia-fyi-x64-dbg" repository: "https://chromium.googlesource.com/chromium/src" }
diff --git a/infra/config/generated/luci/luci-scheduler.cfg b/infra/config/generated/luci/luci-scheduler.cfg index 5b0e17ea..7b2686c 100644 --- a/infra/config/generated/luci/luci-scheduler.cfg +++ b/infra/config/generated/luci/luci-scheduler.cfg
@@ -4905,6 +4905,16 @@ } } job { + id: "fuchsia-fyi-x64-asan" + realm: "ci" + acl_sets: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "luci.chromium.ci" + builder: "fuchsia-fyi-x64-asan" + } +} +job { id: "fuchsia-fyi-x64-dbg" realm: "ci" acl_sets: "ci" @@ -7164,6 +7174,7 @@ triggers: "fuchsia-fyi-arm64-dbg" triggers: "fuchsia-fyi-arm64-femu" triggers: "fuchsia-fyi-arm64-rel" + triggers: "fuchsia-fyi-x64-asan" triggers: "fuchsia-fyi-x64-dbg" triggers: "fuchsia-fyi-x64-rel" triggers: "fuchsia-official"
diff --git a/infra/config/subprojects/chromium/ci.star b/infra/config/subprojects/chromium/ci.star index 2ef05571..7ade4e88 100644 --- a/infra/config/subprojects/chromium/ci.star +++ b/infra/config/subprojects/chromium/ci.star
@@ -135,6 +135,7 @@ exec("./ci/chromium.fuzz.star") exec("./ci/chromium.fyi.star") exec("./ci/chromium.gpu.star") +exec("./ci/chromium.gpu.experimental.star") exec("./ci/chromium.gpu.fyi.star") exec("./ci/chromium.linux.star") exec("./ci/chromium.mac.star")
diff --git a/infra/config/subprojects/chromium/ci/chromium.dawn.star b/infra/config/subprojects/chromium/ci/chromium.dawn.star index e56c5a2..cbf5d64c 100644 --- a/infra/config/subprojects/chromium/ci/chromium.dawn.star +++ b/infra/config/subprojects/chromium/ci/chromium.dawn.star
@@ -144,19 +144,23 @@ ci.thin_tester( name = "Dawn Mac x64 Experimental Release (AMD)", - console_view_entry = consoles.console_view_entry( - category = "ToT|Mac|AMD", - short_name = "exp", - ), + # Uncomment this entry when this experimental tester is actually in use. + # console_view_entry = consoles.console_view_entry( + # category = "ToT|Mac|AMD", + # short_name = "exp", + # ), + list_view = "chromium.gpu.experimental", triggered_by = ["Dawn Mac x64 Builder"], ) ci.thin_tester( name = "Dawn Mac x64 Experimental Release (Intel)", - console_view_entry = consoles.console_view_entry( - category = "ToT|Mac|Intel", - short_name = "exp", - ), + # Uncomment this entry when this experimental tester is actually in use. + # console_view_entry = consoles.console_view_entry( + # category = "ToT|Mac|Intel", + # short_name = "exp", + # ), + list_view = "chromium.gpu.experimental", triggered_by = ["Dawn Mac x64 Builder"], )
diff --git a/infra/config/subprojects/chromium/ci/chromium.fyi.star b/infra/config/subprojects/chromium/ci/chromium.fyi.star index 6944b84..3cec4cb 100644 --- a/infra/config/subprojects/chromium/ci/chromium.fyi.star +++ b/infra/config/subprojects/chromium/ci/chromium.fyi.star
@@ -185,6 +185,24 @@ ) ci.builder( + name = "fuchsia-fyi-x64-asan", + console_view_entry = [ + consoles.console_view_entry( + category = "fuchsia|x64", + short_name = "asan", + ), + consoles.console_view_entry( + branch_selector = branches.MAIN, + console_view = "sheriff.fuchsia", + category = "fyi", + short_name = "asan", + ), + ], + notifies = ["cr-fuchsia"], + os = os.LINUX_BIONIC_SWITCH_TO_DEFAULT, +) + +ci.builder( name = "fuchsia-fyi-x64-dbg", console_view_entry = [ consoles.console_view_entry(
diff --git a/infra/config/subprojects/chromium/ci/chromium.gpu.experimental.star b/infra/config/subprojects/chromium/ci/chromium.gpu.experimental.star new file mode 100644 index 0000000..dbf58a7 --- /dev/null +++ b/infra/config/subprojects/chromium/ci/chromium.gpu.experimental.star
@@ -0,0 +1,12 @@ +# Copyright 2021 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. +"""Definitions of builders in the chromium.gpu.experimental builder group.""" + +load("//lib/consoles.star", "consoles") + +# This view is intended for parking inactive experimental testers until they are +# needed again in order to declutter chromium.gpu.fyi. +consoles.list_view( + name = "chromium.gpu.experimental", +)
diff --git a/infra/config/subprojects/chromium/ci/chromium.gpu.fyi.star b/infra/config/subprojects/chromium/ci/chromium.gpu.fyi.star index ba06a0e..653d9cb 100644 --- a/infra/config/subprojects/chromium/ci/chromium.gpu.fyi.star +++ b/infra/config/subprojects/chromium/ci/chromium.gpu.fyi.star
@@ -265,15 +265,18 @@ category = "Linux|Intel", short_name = "exp", ), + list_view = "chromium.gpu.experimental", triggered_by = ["GPU FYI Linux Builder"], ) ci.thin_tester( name = "Linux FYI Experimental Release (NVIDIA)", - console_view_entry = consoles.console_view_entry( - category = "Linux|Nvidia", - short_name = "exp", - ), + # Uncomment this entry when this experimental tester is actually in use. + # console_view_entry = consoles.console_view_entry( + # category = "Linux|Nvidia", + # short_name = "exp", + # ), + list_view = "chromium.gpu.experimental", triggered_by = ["GPU FYI Linux Builder"], ) @@ -345,10 +348,12 @@ ci.thin_tester( name = "Mac FYI Experimental Release (Intel)", - console_view_entry = consoles.console_view_entry( - category = "Mac|Intel", - short_name = "exp", - ), + # Uncomment this entry when this experimental tester is actually in use. + # console_view_entry = consoles.console_view_entry( + # category = "Mac|Intel", + # short_name = "exp", + # ), + list_view = "chromium.gpu.experimental", triggered_by = ["GPU FYI Mac Builder"], ) @@ -358,15 +363,18 @@ category = "Mac|AMD|Retina", short_name = "exp", ), + list_view = "chromium.gpu.experimental", triggered_by = ["GPU FYI Mac Builder"], ) ci.thin_tester( name = "Mac FYI Experimental Retina Release (NVIDIA)", - console_view_entry = consoles.console_view_entry( - category = "Mac|Nvidia", - short_name = "exp", - ), + # Uncomment this entry when this experimental tester is actually in use. + # console_view_entry = consoles.console_view_entry( + # category = "Mac|Nvidia", + # short_name = "exp", + # ), + list_view = "chromium.gpu.experimental", # This bot has one machine backing its tests at the moment. # If it gets more, this can be removed. # See crbug.com/853307 for more context. @@ -484,19 +492,23 @@ ci.thin_tester( name = "Win10 FYI x64 Exp Release (Intel HD 630)", - console_view_entry = consoles.console_view_entry( - category = "Windows|10|x64|Intel", - short_name = "exp", - ), + # Uncomment this entry when this experimental tester is actually in use. + # console_view_entry = consoles.console_view_entry( + # category = "Windows|10|x64|Intel", + # short_name = "exp", + # ), + list_view = "chromium.gpu.experimental", triggered_by = ["GPU FYI Win x64 Builder"], ) ci.thin_tester( name = "Win10 FYI x64 Exp Release (NVIDIA)", - console_view_entry = consoles.console_view_entry( - category = "Windows|10|x64|Nvidia", - short_name = "exp", - ), + # Uncomment this entry when this experimental tester is actually in use. + # console_view_entry = consoles.console_view_entry( + # category = "Windows|10|x64|Nvidia", + # short_name = "exp", + # ), + list_view = "chromium.gpu.experimental", triggered_by = ["GPU FYI Win x64 Builder"], )
diff --git a/infra/config/subprojects/chromium/try/tryserver.chromium.mac.star b/infra/config/subprojects/chromium/try/tryserver.chromium.mac.star index b617bbb..5fbb7616 100644 --- a/infra/config/subprojects/chromium/try/tryserver.chromium.mac.star +++ b/infra/config/subprojects/chromium/try/tryserver.chromium.mac.star
@@ -72,7 +72,7 @@ main_list_view = "try", orchestrator_cores = 2, orchestrator_tryjob = try_.job( - experiment_percentage = 50, + experiment_percentage = 100, ), compilator_goma_jobs = goma.jobs.J150, os = os.MAC_11,
diff --git a/ios/chrome/browser/notification_promo.cc b/ios/chrome/browser/notification_promo.cc index 2bb1962..99c93492 100644 --- a/ios/chrome/browser/notification_promo.cc +++ b/ios/chrome/browser/notification_promo.cc
@@ -150,14 +150,14 @@ double first_view_time, int views, bool closed) { - auto ntp_promo = std::make_unique<base::DictionaryValue>(); - ntp_promo->SetDouble(kPrefPromoFirstViewTime, first_view_time); - ntp_promo->SetInteger(kPrefPromoViews, views); - ntp_promo->SetBoolean(kPrefPromoClosed, closed); + base::Value ntp_promo{base::Value::Type::DICTIONARY}; + ntp_promo.SetDoubleKey(kPrefPromoFirstViewTime, first_view_time); + ntp_promo.SetIntKey(kPrefPromoViews, views); + ntp_promo.SetBoolKey(kPrefPromoClosed, closed); - base::DictionaryValue promo_dict; + base::Value promo_dict{base::Value::Type::DICTIONARY}; promo_dict.MergeDictionary(local_state_->GetDictionary(kPrefPromoObject)); - promo_dict.Set(base::NumberToString(promo_id), std::move(ntp_promo)); + promo_dict.SetKey(base::NumberToString(promo_id), std::move(ntp_promo)); local_state_->Set(kPrefPromoObject, promo_dict); DVLOG(1) << "WritePrefs " << promo_dict; } @@ -167,19 +167,20 @@ if (promo_id_ == -1) return; - const base::DictionaryValue* promo_dict = &base::Value::AsDictionaryValue( - *local_state_->GetDictionary(kPrefPromoObject)); + const base::Value* promo_dict = local_state_->GetDictionary(kPrefPromoObject); if (!promo_dict) return; - const base::DictionaryValue* ntp_promo = NULL; - promo_dict->GetDictionary(base::NumberToString(promo_id_), &ntp_promo); + const base::Value* ntp_promo = + promo_dict->FindDictKey(base::NumberToString(promo_id_)); if (!ntp_promo) return; first_view_time_ = ntp_promo->FindDoubleKey(kPrefPromoFirstViewTime) .value_or(first_view_time_); - ntp_promo->GetInteger(kPrefPromoViews, &views_); + absl::optional<int> maybe_views = ntp_promo->FindIntKey(kPrefPromoViews); + if (maybe_views.has_value()) + views_ = maybe_views.value(); closed_ = ntp_promo->FindBoolPath(kPrefPromoClosed).value_or(closed_); }
diff --git a/media/capture/video/linux/fake_v4l2_impl.cc b/media/capture/video/linux/fake_v4l2_impl.cc index 245d11a..bda8321 100644 --- a/media/capture/video/linux/fake_v4l2_impl.cc +++ b/media/capture/video/linux/fake_v4l2_impl.cc
@@ -16,7 +16,9 @@ #include "base/threading/thread.h" #include "media/base/video_frame.h" +#ifndef KERNEL_VERSION #define KERNEL_VERSION(a, b, c) (((a) << 16) + ((b) << 8) + (c)) +#endif namespace media {
diff --git a/media/gpu/chromeos/fourcc.cc b/media/gpu/chromeos/fourcc.cc index 79bc688..410f4e5 100644 --- a/media/gpu/chromeos/fourcc.cc +++ b/media/gpu/chromeos/fourcc.cc
@@ -82,7 +82,7 @@ return Fourcc(P010); case PIXEL_FORMAT_UYVY: NOTREACHED(); - FALLTHROUGH; + [[fallthrough]]; case PIXEL_FORMAT_I420A: case PIXEL_FORMAT_I444: case PIXEL_FORMAT_RGB24: @@ -117,7 +117,7 @@ return Fourcc(NM21); case PIXEL_FORMAT_UYVY: NOTREACHED(); - FALLTHROUGH; + [[fallthrough]]; case PIXEL_FORMAT_I420A: case PIXEL_FORMAT_I444: case PIXEL_FORMAT_YUY2:
diff --git a/media/gpu/test/video_encoder/decoder_buffer_validator.cc b/media/gpu/test/video_encoder/decoder_buffer_validator.cc index 3996c36..57b5994 100644 --- a/media/gpu/test/video_encoder/decoder_buffer_validator.cc +++ b/media/gpu/test/video_encoder/decoder_buffer_validator.cc
@@ -118,7 +118,7 @@ return false; } - FALLTHROUGH; + [[fallthrough]]; case H264NALU::kNonIDRSlice: { if (!seen_idr_) { LOG(ERROR) << "Non IDR frame before IDR frame";
diff --git a/media/gpu/test/video_encoder/video_encoder_test_environment.cc b/media/gpu/test/video_encoder/video_encoder_test_environment.cc index c123991..e92aa35 100644 --- a/media/gpu/test/video_encoder/video_encoder_test_environment.cc +++ b/media/gpu/test/video_encoder/video_encoder_test_environment.cc
@@ -173,7 +173,7 @@ media::kVaapiEnforceVideoMinMaxResolution); #endif -#if BUILDFLAG(IS_CHROMEOS_ASH) && defined(ARCH_CPU_X86_FAMILY) +#if BUILDFLAG(IS_CHROMEOS_ASH) && BUILDFLAG(USE_VAAPI) // TODO(crbug.com/1186051): remove once enabled by default. combined_enabled_features.push_back(media::kVaapiVp9kSVCHWEncoding); #endif
diff --git a/media/gpu/vaapi/vaapi_picture_factory.cc b/media/gpu/vaapi/vaapi_picture_factory.cc index 41783b5..5de3bce 100644 --- a/media/gpu/vaapi/vaapi_picture_factory.cc +++ b/media/gpu/vaapi/vaapi_picture_factory.cc
@@ -145,7 +145,7 @@ break; #else // ozone or egl must be used to use the DRM implementation. - FALLTHROUGH; + [[fallthrough]]; #endif default: NOTREACHED();
diff --git a/media/gpu/vaapi/vaapi_video_decoder.cc b/media/gpu/vaapi/vaapi_video_decoder.cc index f6ddc829..548fcdb 100644 --- a/media/gpu/vaapi/vaapi_video_decoder.cc +++ b/media/gpu/vaapi/vaapi_video_decoder.cc
@@ -1175,7 +1175,7 @@ break; case State::kWaitingForProtected: DCHECK(!!cdm_context_ref_); - FALLTHROUGH; + [[fallthrough]]; case State::kWaitingForOutput: DCHECK(current_decode_task_); DCHECK_EQ(state_, State::kDecoding);
diff --git a/media/gpu/video_encode_accelerator_tests.cc b/media/gpu/video_encode_accelerator_tests.cc index 458a0dc..909840a 100644 --- a/media/gpu/video_encode_accelerator_tests.cc +++ b/media/gpu/video_encode_accelerator_tests.cc
@@ -47,7 +47,7 @@ [--output_folder=<filepath>] [--output_limit=<number>] [--disable_vaapi_lock] [-v=<level>] [--vmodule=<config>] - [--gtest_help] [--help] + [--gtest_help] [--help] [<video path>] [<video metadata path>] )";
diff --git a/net/reporting/mock_persistent_reporting_store.cc b/net/reporting/mock_persistent_reporting_store.cc index 6fb1c7d..1cb84d0 100644 --- a/net/reporting/mock_persistent_reporting_store.cc +++ b/net/reporting/mock_persistent_reporting_store.cc
@@ -73,7 +73,7 @@ UPDATE_REPORTING_ENDPOINT_DETAILS: case MockPersistentReportingStore::Command::Type::DELETE_REPORTING_ENDPOINT: equal &= (lhs.url == rhs.url); - FALLTHROUGH; + [[fallthrough]]; // For endpoint group operations, check the group key only. case MockPersistentReportingStore::Command::Type:: ADD_REPORTING_ENDPOINT_GROUP:
diff --git a/net/reporting/reporting_header_parser.cc b/net/reporting/reporting_header_parser.cc index 0e10f6a..3bd3d1a 100644 --- a/net/reporting/reporting_header_parser.cc +++ b/net/reporting/reporting_header_parser.cc
@@ -73,39 +73,35 @@ const ReportingEndpointGroupKey& group_key, const base::Value& value, ReportingEndpoint::EndpointInfo* endpoint_info_out) { - const base::DictionaryValue* dict = nullptr; - if (!value.GetAsDictionary(&dict)) + if (!value.is_dict()) return false; - DCHECK(dict); - std::string endpoint_url_string; - if (!dict->HasKey(kUrlKey)) - return false; - if (!dict->GetString(kUrlKey, &endpoint_url_string)) + const std::string* endpoint_url_string = value.FindStringKey(kUrlKey); + if (!endpoint_url_string) return false; GURL endpoint_url; - if (!ProcessEndpointURLString(endpoint_url_string, group_key.origin, + if (!ProcessEndpointURLString(*endpoint_url_string, group_key.origin, endpoint_url)) { return false; } endpoint_info_out->url = std::move(endpoint_url); int priority = ReportingEndpoint::EndpointInfo::kDefaultPriority; - if (const base::Value* value = dict->FindKey(kPriorityKey)) { - if (!value->is_int()) + if (const base::Value* priority_value = value.FindKey(kPriorityKey)) { + if (!priority_value->is_int()) return false; - priority = value->GetInt(); + priority = priority_value->GetInt(); } if (priority < 0) return false; endpoint_info_out->priority = priority; int weight = ReportingEndpoint::EndpointInfo::kDefaultWeight; - if (const base::Value* value = dict->FindKey(kWeightKey)) { - if (!value->is_int()) + if (const base::Value* weight_value = value.FindKey(kWeightKey)) { + if (!weight_value->is_int()) return false; - weight = value->GetInt(); + weight = weight_value->GetInt(); } if (weight < 0) return false; @@ -127,19 +123,20 @@ const url::Origin& origin, const base::Value& value, ReportingEndpointGroup* parsed_endpoint_group_out) { - const base::DictionaryValue* dict = nullptr; - if (!value.GetAsDictionary(&dict)) + if (!value.is_dict()) return false; - DCHECK(dict); std::string group_name = kDefaultGroupName; - if (dict->HasKey(kGroupKey) && !dict->GetString(kGroupKey, &group_name)) - return false; + if (const base::Value* maybe_group_name = value.FindKey(kGroupKey)) { + if (!maybe_group_name->is_string()) + return false; + group_name = maybe_group_name->GetString(); + } ReportingEndpointGroupKey group_key(network_isolation_key, origin, group_name); parsed_endpoint_group_out->group_key = group_key; - int ttl_sec = dict->FindIntKey(kMaxAgeKey).value_or(-1); + int ttl_sec = value.FindIntKey(kMaxAgeKey).value_or(-1); if (ttl_sec < 0) return false; // max_age: 0 signifies removal of the endpoint group. @@ -150,7 +147,7 @@ parsed_endpoint_group_out->ttl = base::Seconds(ttl_sec); absl::optional<bool> subdomains_bool = - dict->FindBoolKey(kIncludeSubdomainsKey); + value.FindBoolKey(kIncludeSubdomainsKey); if (subdomains_bool && subdomains_bool.value()) { // Disallow eTLDs from setting include_subdomains endpoint groups. if (registry_controlled_domains::GetRegistryLength( @@ -163,10 +160,8 @@ parsed_endpoint_group_out->include_subdomains = OriginSubdomains::INCLUDE; } - const base::ListValue* endpoint_list = nullptr; - if (!dict->HasKey(kEndpointsKey)) - return false; - if (!dict->GetList(kEndpointsKey, &endpoint_list)) + const base::Value* endpoint_list = value.FindListKey(kEndpointsKey); + if (!endpoint_list) return false; std::vector<ReportingEndpoint::EndpointInfo> endpoints;
diff --git a/remoting/ios/app/notification_presenter.mm b/remoting/ios/app/notification_presenter.mm index 6ddf6a7..1ef169c 100644 --- a/remoting/ios/app/notification_presenter.mm +++ b/remoting/ios/app/notification_presenter.mm
@@ -34,6 +34,12 @@ // kUserDidUpdate event. constexpr base::TimeDelta kFetchNotificationDelay = base::Seconds(2); +// The "Don't show again" checkbox only appears if the notification has been +// shown for at least |kTimesShownRequiredToAllowSilencing| times. Note that +// this means the checkbox shows up starting from the +// (|kTimesShownRequiredToAllowSilencing| + 1)th app launch. +constexpr unsigned int kTimesShownRequiredToAllowSilencing = 2u; + enum NotificationUiState : unsigned int { NOT_SHOWN = 0, SHOWN = 1, @@ -135,10 +141,21 @@ ui_state = NOT_SHOWN; [RemotingPreferences.instance setObject:UiStateToNSNumber(ui_state) forFlag:RemotingFlagNotificationUiState]; + [RemotingPreferences.instance setObject:@(0u) + forFlag:RemotingFlagNotificationShownTimes]; [RemotingPreferences.instance synchronizeFlags]; } - BOOL allowSilence = notification->allow_silence && ui_state == SHOWN; + NSNumber* notificationShownTimesNsNumber = [RemotingPreferences.instance + objectForFlag:RemotingFlagNotificationShownTimes]; + unsigned int notification_shown_times = + notificationShownTimesNsNumber + ? notificationShownTimesNsNumber.unsignedIntValue + : 0u; + + BOOL allowSilence = + notification->allow_silence && ui_state == SHOWN && + notification_shown_times >= kTimesShownRequiredToAllowSilencing; NotificationDialogViewController* dialogVc = [[NotificationDialogViewController alloc] initWithNotificationMessage:*notification @@ -147,6 +164,8 @@ NotificationUiState new_ui_state = isSilenced ? SILENCED : SHOWN; [RemotingPreferences.instance setObject:UiStateToNSNumber(new_ui_state) forFlag:RemotingFlagNotificationUiState]; + [RemotingPreferences.instance setObject:@(notification_shown_times + 1) + forFlag:RemotingFlagNotificationShownTimes]; [RemotingPreferences.instance synchronizeFlags]; }]; }
diff --git a/remoting/ios/persistence/remoting_preferences.h b/remoting/ios/persistence/remoting_preferences.h index de6fd95..70f5a60 100644 --- a/remoting/ios/persistence/remoting_preferences.h +++ b/remoting/ios/persistence/remoting_preferences.h
@@ -13,6 +13,7 @@ extern RemotingFlag const RemotingFlagUseWebRTC; extern RemotingFlag const RemotingFlagLastSeenNotificationMessageId; extern RemotingFlag const RemotingFlagNotificationUiState; +extern RemotingFlag const RemotingFlagNotificationShownTimes; // |RemotingPreferences| is the centralized place to ask for information about // defaults and preferences.
diff --git a/remoting/ios/persistence/remoting_preferences.mm b/remoting/ios/persistence/remoting_preferences.mm index 16cea4a8..507800c0 100644 --- a/remoting/ios/persistence/remoting_preferences.mm +++ b/remoting/ios/persistence/remoting_preferences.mm
@@ -21,6 +21,8 @@ RemotingFlag const RemotingFlagLastSeenNotificationMessageId = @"LastSeenNotificationMessageId"; RemotingFlag const RemotingFlagNotificationUiState = @"NotificationUiState"; +RemotingFlag const RemotingFlagNotificationShownTimes = + @"NotificationShownTimes"; static NSString* KeyWithPrefix(NSString* prefix, NSString* key) { return [NSString stringWithFormat:@"%@-%@", prefix, key];
diff --git a/testing/buildbot/chromium.fyi.json b/testing/buildbot/chromium.fyi.json index 21601ca..405e3c1 100644 --- a/testing/buildbot/chromium.fyi.json +++ b/testing/buildbot/chromium.fyi.json
@@ -22484,6 +22484,1305 @@ } ] }, + "fuchsia-fyi-x64-asan": { + "gtest_tests": [ + { + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "absl_hardening_tests", + "test_id_prefix": "ninja://third_party/abseil-cpp:absl_hardening_tests/" + }, + { + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "accessibility_unittests", + "test_id_prefix": "ninja://ui/accessibility:accessibility_unittests/" + }, + { + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "aura_unittests", + "test_id_prefix": "ninja://ui/aura:aura_unittests/" + }, + { + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "base_unittests", + "test_id_prefix": "ninja://base:base_unittests/" + }, + { + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "blink_common_unittests", + "test_id_prefix": "ninja://third_party/blink/common:blink_common_unittests/" + }, + { + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "blink_heap_unittests", + "test_id_prefix": "ninja://third_party/blink/renderer/platform/heap:blink_heap_unittests/" + }, + { + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "blink_platform_unittests", + "test_id_prefix": "ninja://third_party/blink/renderer/platform:blink_platform_unittests/" + }, + { + "args": [ + "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.blink_unittests.filter" + ], + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "blink_unittests", + "test_id_prefix": "ninja://third_party/blink/renderer/controller:blink_unittests/" + }, + { + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "boringssl_crypto_tests", + "test_id_prefix": "ninja://third_party/boringssl:boringssl_crypto_tests/" + }, + { + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "boringssl_ssl_tests", + "test_id_prefix": "ninja://third_party/boringssl:boringssl_ssl_tests/" + }, + { + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "capture_unittests", + "test_id_prefix": "ninja://media/capture:capture_unittests/" + }, + { + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "cast_runner_browsertests", + "test_id_prefix": "ninja://fuchsia/runners:cast_runner_browsertests/" + }, + { + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "cast_runner_integration_tests", + "test_id_prefix": "ninja://fuchsia/runners:cast_runner_integration_tests/" + }, + { + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "cast_runner_unittests", + "test_id_prefix": "ninja://fuchsia/runners:cast_runner_unittests/" + }, + { + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", + "shards": 2 + }, + "test": "cc_unittests", + "test_id_prefix": "ninja://cc:cc_unittests/" + }, + { + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "color_unittests", + "test_id_prefix": "ninja://ui/color:color_unittests/" + }, + { + "args": [ + "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.components_unittests.filter" + ], + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", + "shards": 2 + }, + "test": "components_unittests", + "test_id_prefix": "ninja://components:components_unittests/" + }, + { + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "compositor_unittests", + "test_id_prefix": "ninja://ui/compositor:compositor_unittests/" + }, + { + "args": [ + "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.content_unittests.filter" + ], + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "content_unittests", + "test_id_prefix": "ninja://content/test:content_unittests/" + }, + { + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "courgette_unittests", + "test_id_prefix": "ninja://courgette:courgette_unittests/" + }, + { + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "cr_fuchsia_base_unittests", + "test_id_prefix": "ninja://fuchsia/base:cr_fuchsia_base_unittests/" + }, + { + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "cronet_tests", + "test_id_prefix": "ninja://components/cronet:cronet_tests/" + }, + { + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "cronet_unittests", + "test_id_prefix": "ninja://components/cronet:cronet_unittests/" + }, + { + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "crypto_unittests", + "test_id_prefix": "ninja://crypto:crypto_unittests/" + }, + { + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "display_unittests", + "test_id_prefix": "ninja://ui/display:display_unittests/" + }, + { + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "events_unittests", + "test_id_prefix": "ninja://ui/events:events_unittests/" + }, + { + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "extensions_unittests", + "test_id_prefix": "ninja://extensions:extensions_unittests/" + }, + { + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "fuchsia_mojo_unittests", + "test_id_prefix": "ninja://fuchsia/mojom:fuchsia_mojo_unittests/" + }, + { + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "gcm_unit_tests", + "test_id_prefix": "ninja://google_apis/gcm:gcm_unit_tests/" + }, + { + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "gfx_unittests", + "test_id_prefix": "ninja://ui/gfx:gfx_unittests/" + }, + { + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "gin_unittests", + "test_id_prefix": "ninja://gin:gin_unittests/" + }, + { + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "google_apis_unittests", + "test_id_prefix": "ninja://google_apis:google_apis_unittests/" + }, + { + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "gpu_unittests", + "test_id_prefix": "ninja://gpu:gpu_unittests/" + }, + { + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "gwp_asan_unittests", + "test_id_prefix": "ninja://components/gwp_asan:gwp_asan_unittests/" + }, + { + "args": [ + "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.headless_browsertests.filter" + ], + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "headless_browsertests", + "test_id_prefix": "ninja://headless:headless_browsertests/" + }, + { + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "headless_unittests", + "test_id_prefix": "ninja://headless:headless_unittests/" + }, + { + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "ipc_tests", + "test_id_prefix": "ninja://ipc:ipc_tests/" + }, + { + "args": [ + "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.jingle_unittests.filter" + ], + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "jingle_unittests", + "test_id_prefix": "ninja://jingle:jingle_unittests/" + }, + { + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "latency_unittests", + "test_id_prefix": "ninja://ui/latency:latency_unittests/" + }, + { + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "media_unittests", + "test_id_prefix": "ninja://media:media_unittests/" + }, + { + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "message_center_unittests", + "test_id_prefix": "ninja://ui/message_center:message_center_unittests/" + }, + { + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "midi_unittests", + "test_id_prefix": "ninja://media/midi:midi_unittests/" + }, + { + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "mojo_unittests", + "test_id_prefix": "ninja://mojo:mojo_unittests/" + }, + { + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "native_theme_unittests", + "test_id_prefix": "ninja://ui/native_theme:native_theme_unittests/" + }, + { + "args": [ + "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.net_unittests.filter", + "--use-run" + ], + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", + "shards": 4 + }, + "test": "net_unittests", + "test_id_prefix": "ninja://net:net_unittests/" + }, + { + "args": [ + "--child-arg=--ozone-platform=headless" + ], + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "ozone_gl_unittests", + "test_id_prefix": "ninja://ui/ozone/gl:ozone_gl_unittests/" + }, + { + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "ozone_unittests", + "test_id_prefix": "ninja://ui/ozone:ozone_unittests/" + }, + { + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "perfetto_unittests", + "test_id_prefix": "ninja://third_party/perfetto:perfetto_unittests/" + }, + { + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "service_manager_unittests", + "test_id_prefix": "ninja://services/service_manager/tests:service_manager_unittests/" + }, + { + "args": [ + "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.services_unittests.filter" + ], + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "services_unittests", + "test_id_prefix": "ninja://services:services_unittests/" + }, + { + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "shell_dialogs_unittests", + "test_id_prefix": "ninja://ui/shell_dialogs:shell_dialogs_unittests/" + }, + { + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "skia_unittests", + "test_id_prefix": "ninja://skia:skia_unittests/" + }, + { + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "snapshot_unittests", + "test_id_prefix": "ninja://ui/snapshot:snapshot_unittests/" + }, + { + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "sql_unittests", + "test_id_prefix": "ninja://sql:sql_unittests/" + }, + { + "args": [ + "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.storage_unittests.filter" + ], + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "storage_unittests", + "test_id_prefix": "ninja://storage:storage_unittests/" + }, + { + "args": [ + "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.ui_base_unittests.filter" + ], + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "ui_base_unittests", + "test_id_prefix": "ninja://ui/base:ui_base_unittests/" + }, + { + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "ui_touch_selection_unittests", + "test_id_prefix": "ninja://ui/touch_selection:ui_touch_selection_unittests/" + }, + { + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "url_unittests", + "test_id_prefix": "ninja://url:url_unittests/" + }, + { + "args": [ + "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.views_examples_unittests.filter" + ], + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "views_examples_unittests", + "test_id_prefix": "ninja://ui/views/examples:views_examples_unittests/" + }, + { + "args": [ + "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.views_unittests.filter" + ], + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "views_unittests", + "test_id_prefix": "ninja://ui/views:views_unittests/" + }, + { + "args": [ + "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.viz_unittests.filter" + ], + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "viz_unittests", + "test_id_prefix": "ninja://components/viz:viz_unittests/" + }, + { + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "web_engine_browsertests", + "test_id_prefix": "ninja://fuchsia/engine:web_engine_browsertests/" + }, + { + "args": [ + "--child-arg=--vmodule=test_navigation_listener=1" + ], + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "web_engine_integration_tests", + "test_id_prefix": "ninja://fuchsia/engine:web_engine_integration_tests/" + }, + { + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "web_engine_unittests", + "test_id_prefix": "ninja://fuchsia/engine:web_engine_unittests/" + }, + { + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "web_runner_integration_tests", + "test_id_prefix": "ninja://fuchsia/runners:web_runner_integration_tests/" + }, + { + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "wm_unittests", + "test_id_prefix": "ninja://ui/wm:wm_unittests/" + }, + { + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "wtf_unittests", + "test_id_prefix": "ninja://third_party/blink/renderer/platform/wtf:wtf_unittests/" + }, + { + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "zlib_unittests", + "test_id_prefix": "ninja://third_party/zlib:zlib_unittests/" + } + ], + "isolated_scripts": [ + { + "args": [ + "bin/run_angle_unittests", + "--logs-dir=${ISOLATED_OUTDIR}/logs" + ], + "isolate_name": "angle_unittests", + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "name": "angle_unittests", + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "kvm": "1", + "os": "Ubuntu-18.04" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test_id_prefix": "ninja://third_party/angle/src/tests:angle_unittests/" + } + ] + }, "fuchsia-fyi-x64-dbg": { "additional_compile_targets": [ "all"
diff --git a/testing/buildbot/chromium.gpu.fyi.json b/testing/buildbot/chromium.gpu.fyi.json index 0badd93f..a8250d9 100644 --- a/testing/buildbot/chromium.gpu.fyi.json +++ b/testing/buildbot/chromium.gpu.fyi.json
@@ -18134,48 +18134,6 @@ "--browser=release", "--passthrough", "-v", - "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle --use-angle=metal --use-cmd-decoder=passthrough --force_high_performance_gpu --disable-metal-shader-cache", - "--webgl-conformance-version=2.0.1", - "--read-abbreviated-json-results-from=../../content/test/data/gpu/webgl2_conformance_tests_output.json", - "--is-asan" - ], - "isolate_name": "telemetry_gpu_integration_test", - "merge": { - "args": [], - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "webgl2_conformance_metal_passthrough_tests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "should_retry_with_patch": false, - "swarming": { - "can_use_on_swarming_builders": true, - "containment_type": "AUTO", - "dimension_sets": [ - { - "cpu": "x86-64", - "display_attached": "1", - "gpu": "1002:6821", - "hidpi": "1", - "os": "Mac-11.4", - "pool": "chromium.tests.gpu" - } - ], - "idempotent": false, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", - "shards": 20 - }, - "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/" - }, - { - "args": [ - "webgl_conformance", - "--show-stdout", - "--browser=release", - "--passthrough", - "-v", "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=validating --force_high_performance_gpu", "--webgl-conformance-version=2.0.1", "--read-abbreviated-json-results-from=../../content/test/data/gpu/webgl2_conformance_tests_output.json", @@ -18259,47 +18217,6 @@ "--browser=release", "--passthrough", "-v", - "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle --use-angle=metal --use-cmd-decoder=passthrough --force_high_performance_gpu --disable-metal-shader-cache", - "--read-abbreviated-json-results-from=../../content/test/data/gpu/webgl_conformance_tests_output.json", - "--is-asan" - ], - "isolate_name": "telemetry_gpu_integration_test", - "merge": { - "args": [], - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "webgl_conformance_metal_passthrough_tests", - "resultdb": { - "enable": true, - "has_native_resultdb_integration": true - }, - "should_retry_with_patch": false, - "swarming": { - "can_use_on_swarming_builders": true, - "containment_type": "AUTO", - "dimension_sets": [ - { - "cpu": "x86-64", - "display_attached": "1", - "gpu": "1002:6821", - "hidpi": "1", - "os": "Mac-11.4", - "pool": "chromium.tests.gpu" - } - ], - "idempotent": false, - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", - "shards": 3 - }, - "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/" - }, - { - "args": [ - "webgl_conformance", - "--show-stdout", - "--browser=release", - "--passthrough", - "-v", "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle --use-angle=swiftshader --use-cmd-decoder=passthrough --force_high_performance_gpu", "--test-filter=conformance/rendering/gl-drawelements.html", "--is-asan"
diff --git a/testing/buildbot/chromium.rust.json b/testing/buildbot/chromium.rust.json index b208acc..eee9e984 100644 --- a/testing/buildbot/chromium.rust.json +++ b/testing/buildbot/chromium.rust.json
@@ -65,6 +65,22 @@ "test": "test_serde_jsonrc", "test_id_prefix": "ninja://build/rust/tests/test_serde_jsonrc:test_serde_jsonrc/" } + ], + "isolated_scripts": [ + { + "isolate_name": "build_rust_tests", + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "name": "build_rust_tests", + "swarming": { + "can_use_on_swarming_builders": true, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "build_rust_tests", + "test_id_prefix": "ninja://build/rust/tests:build_rust_tests/" + } ] } }
diff --git a/testing/buildbot/gn_isolate_map.pyl b/testing/buildbot/gn_isolate_map.pyl index 289c90c..abebe3c 100644 --- a/testing/buildbot/gn_isolate_map.pyl +++ b/testing/buildbot/gn_isolate_map.pyl
@@ -1337,6 +1337,10 @@ "label": "//components/nacl/loader:nacl_loader_unittests", "type": "console_test_launcher", }, + "build_rust_tests": { + "label": "//build/rust/tests:build_rust_tests", + "type": "generated_script", + }, "native_theme_unittests": { "label": "//ui/native_theme:native_theme_unittests", "type": "windowed_test_launcher",
diff --git a/testing/buildbot/test_suite_exceptions.pyl b/testing/buildbot/test_suite_exceptions.pyl index c2bb18a..ebc61fc 100644 --- a/testing/buildbot/test_suite_exceptions.pyl +++ b/testing/buildbot/test_suite_exceptions.pyl
@@ -3265,7 +3265,9 @@ }, 'webgl2_conformance_metal_passthrough_tests': { 'remove_from': [ - 'Mac FYI ASAN (Intel)', # crbug.com/1270755 + # crbug.com/1270755 + 'Mac FYI ASAN (Intel)', + 'Mac FYI Retina ASAN (AMD)', # Not enough capacity. 'Mac FYI Retina Release (NVIDIA)', ], @@ -3317,7 +3319,9 @@ }, 'webgl_conformance_metal_passthrough_tests': { 'remove_from': [ - 'Mac FYI ASAN (Intel)', # crbug.com/1270755 + # crbug.com/1270755 + 'Mac FYI ASAN (Intel)', + 'Mac FYI Retina ASAN (AMD)', # crbug.com/1158857: re-enable when switching to Metal by default. 'Mac FYI Retina Release (NVIDIA)', ],
diff --git a/testing/buildbot/test_suites.pyl b/testing/buildbot/test_suites.pyl index d702e89..309a8e4 100644 --- a/testing/buildbot/test_suites.pyl +++ b/testing/buildbot/test_suites.pyl
@@ -4847,7 +4847,7 @@ } }, - 'rust_unittests': { + 'rust_gtests': { 'test_cpp_including_rust_unittests': { 'swarming': {}, 'test': 'test_cpp_including_rust_unittests', @@ -4858,6 +4858,13 @@ }, }, + 'rust_native_tests': { + 'build_rust_tests': { + 'swarming': {}, + 'test': 'build_rust_tests', + }, + }, + 'site_isolation_android_fyi_gtests': { 'site_per_process_android_browsertests': { 'args': [
diff --git a/testing/buildbot/waterfalls.pyl b/testing/buildbot/waterfalls.pyl index bc5fb9f..0a3216dd 100644 --- a/testing/buildbot/waterfalls.pyl +++ b/testing/buildbot/waterfalls.pyl
@@ -2863,6 +2863,22 @@ 'linux-focal', ], }, + 'fuchsia-fyi-x64-asan': { + 'mixins': [ + 'linux-bionic', + ], + 'swarming': { + 'dimension_sets': [ + { + 'kvm': '1', + }, + ], + }, + 'test_suites': { + 'gtest_tests': 'fuchsia_gtests', + 'isolated_scripts': 'gpu_angle_fuchsia_unittests_isolated_scripts', + }, + }, 'fuchsia-fyi-x64-dbg': { 'additional_compile_targets': [ 'all', @@ -5362,7 +5378,10 @@ 'rust_build_tests', ], 'test_suites': { - 'gtest_tests': 'rust_unittests', + 'gtest_tests': 'rust_gtests', + # Currently `build_rust_unit_tests` is false on Android (because + # `rustc_can_link` is false). + # TODO(https://crbug.com/1260120): Cover `rust_native_tests` here. }, }, 'linux-rust-x64-rel' : { @@ -5370,7 +5389,8 @@ 'rust_build_tests', ], 'test_suites': { - 'gtest_tests': 'rust_unittests', + 'gtest_tests': 'rust_gtests', + 'isolated_scripts': 'rust_native_tests', }, }, },
diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variations/fieldtrial_testing_config.json index 79fde64..c51b516c2 100644 --- a/testing/variations/fieldtrial_testing_config.json +++ b/testing/variations/fieldtrial_testing_config.json
@@ -606,21 +606,6 @@ ] } ], - "AndroidMessagesSyncError": [ - { - "platforms": [ - "android" - ], - "experiments": [ - { - "name": "Enabled", - "enable_features": [ - "MessagesForAndroidSyncError" - ] - } - ] - } - ], "AndroidPictureInPictureAPI": [ { "platforms": [ @@ -3513,6 +3498,7 @@ "platforms": [ "android", "android_weblayer", + "android_webview", "chromeos", "chromeos_lacros", "linux", @@ -3529,6 +3515,27 @@ ] } ], + "EarlyEstablishGpuChannel": [ + { + "platforms": [ + "android", + "android_weblayer", + "chromeos", + "chromeos_lacros", + "linux", + "mac", + "windows" + ], + "experiments": [ + { + "name": "Enabled", + "enable_features": [ + "EarlyEstablishGpuChannel" + ] + } + ] + } + ], "EarlyHintsPreloadForNavigation": [ { "platforms": [ @@ -5653,6 +5660,21 @@ ] } ], + "OptimizeEarlyNavigation": [ + { + "platforms": [ + "android" + ], + "experiments": [ + { + "name": "Enabled", + "enable_features": [ + "OptimizeEarlyNavigation" + ] + } + ] + } + ], "OptimizeLookalikeUrlNavigationThrottle": [ { "platforms": [ @@ -6260,6 +6282,23 @@ ] } ], + "PrefetchAndroidFonts": [ + { + "platforms": [ + "android", + "android_weblayer", + "android_webview" + ], + "experiments": [ + { + "name": "Enabled", + "enable_features": [ + "PrefetchAndroidFonts" + ] + } + ] + } + ], "PrefetchSRPAndroid": [ { "platforms": [
diff --git a/third_party/blink/renderer/build/scripts/templates/runtime_enabled_features.h.tmpl b/third_party/blink/renderer/build/scripts/templates/runtime_enabled_features.h.tmpl index 898ba62f..3e7f60ff 100644 --- a/third_party/blink/renderer/build/scripts/templates/runtime_enabled_features.h.tmpl +++ b/third_party/blink/renderer/build/scripts/templates/runtime_enabled_features.h.tmpl
@@ -88,10 +88,8 @@ {% endfor %} - // TODO(crbug.com/471333): This is temporary during removal of - // pre-CompositeAfterPaint code after M97 branch, to reduce chance of conflict - // when merging into M97. This will be removed before M98 branch. - static bool CompositeAfterPaintEnabled() { return true; } + // TODO(crbug.com/471333): This is temporary to assist in the removal of + // the pre-CullRectUpdate code and will be removed shortly. static bool CullRectUpdateEnabled() { return true; } protected:
diff --git a/third_party/blink/renderer/core/editing/finder/text_finder.cc b/third_party/blink/renderer/core/editing/finder/text_finder.cc index f2275e0a..2abd761 100644 --- a/third_party/blink/renderer/core/editing/finder/text_finder.cc +++ b/third_party/blink/renderer/core/editing/finder/text_finder.cc
@@ -83,15 +83,13 @@ bool needs_style_and_layout = false; bool needs_layout_shift_allowance = false; - // TODO(crbug.com/1280097): Rework this, since it is only used for - // bookkeeping. - DisplayLockUtilities::ActivateFindInPageMatchRangeIfNeeded( - EphemeralRangeInFlatTree(range)); - - // We need to update the style and layout since the event dispatched may - // have modified it, and we need up-to-date layout to ScrollRectToVisible - // below. - needs_style_and_layout = true; + // If the target text is in a content-visibility:auto subtree, then activate + // it so we can scroll to it. + if (DisplayLockUtilities::ActivateFindInPageMatchRangeIfNeeded( + EphemeralRangeInFlatTree(range))) { + needs_style_and_layout = true; + needs_layout_shift_allowance = true; + } // If the active match is hidden inside a <details> element, then we should // expand it so find-in-page can scroll to it. @@ -149,6 +147,8 @@ if (frame_needs_style_and_layout) { frame_element->GetDocument().UpdateStyleAndLayoutForNode( frame_element, DocumentUpdateReason::kFindInPage); + needs_style_and_layout = true; + needs_layout_shift_allowance = true; } } else { // TODO(crbug.com/1250847): Implement an IPC signal to expand in parent
diff --git a/third_party/blink/renderer/core/exported/web_dev_tools_agent_impl.h b/third_party/blink/renderer/core/exported/web_dev_tools_agent_impl.h index 2e9a8ef..43e56b3 100644 --- a/third_party/blink/renderer/core/exported/web_dev_tools_agent_impl.h +++ b/third_party/blink/renderer/core/exported/web_dev_tools_agent_impl.h
@@ -74,7 +74,7 @@ bool HasOverlays() const { return !overlay_agents_.IsEmpty(); } void UpdateOverlaysPrePaint(); - void PaintOverlays(GraphicsContext&); // For CompositeAfterPaint. + void PaintOverlays(GraphicsContext&); WebInputEventResult HandleInputEvent(const WebInputEvent&); void DispatchBufferedTouchEvents();
diff --git a/third_party/blink/renderer/core/exported/web_view_test.cc b/third_party/blink/renderer/core/exported/web_view_test.cc index bdae12c..bb96c028 100644 --- a/third_party/blink/renderer/core/exported/web_view_test.cc +++ b/third_party/blink/renderer/core/exported/web_view_test.cc
@@ -553,8 +553,7 @@ view->GetLayoutView()->GetDocument().Lifecycle().AdvanceTo( DocumentLifecycle::kInPaint); PaintLayerPainter(*root_layer) - .PaintLayerContents(builder->Context(), painting_info, - kPaintLayerPaintingCompositingAllPhases); + .PaintLayerContents(builder->Context(), painting_info, kPaintLayerNoFlag); view->GetLayoutView()->GetDocument().Lifecycle().AdvanceTo( DocumentLifecycle::kPaintClean); builder->EndRecording()->Playback(&canvas);
diff --git a/third_party/blink/renderer/core/frame/deprecation.cc b/third_party/blink/renderer/core/frame/deprecation.cc index e0a1fa2..9485d842 100644 --- a/third_party/blink/renderer/core/frame/deprecation.cc +++ b/third_party/blink/renderer/core/frame/deprecation.cc
@@ -686,9 +686,11 @@ case WebFeature::kWebCodecsVideoFrameDefaultTimestamp: return DeprecationInfo::WithDetails( "WebCodecsVideoFrameDefaultTimestamp", kUnknown, - "A VideoFrame was constructed without a timestamp. Support for this " - "may be removed in the future. Please provide an explicit timestamp " - "via VideoFrameInit."); + "Constructing a VideoFrame without a timestamp is deprecated and " + "support will be removed in M99. Please provide a timestamp via " + "VideoFrameInit. See " + "https://www.chromestatus.com/feature/5667793157488640 for more " + "details."); case WebFeature::kDocumentDomainSettingWithoutOriginAgentClusterHeader: return DeprecationInfo::WithDetails(
diff --git a/third_party/blink/renderer/core/frame/frame_overlay.h b/third_party/blink/renderer/core/frame/frame_overlay.h index 5d392ac6..78447e1 100644 --- a/third_party/blink/renderer/core/frame/frame_overlay.h +++ b/third_party/blink/renderer/core/frame/frame_overlay.h
@@ -53,8 +53,7 @@ virtual void PaintFrameOverlay(const FrameOverlay&, GraphicsContext&, const gfx::Size& view_size) const = 0; - // For CompositeAfterPaint. Invalidates composited layers managed by the - // delegate if any. + // Invalidates composited layers managed by the delegate, if any. virtual void Invalidate() {} // Service any animations managed by the delegate. @@ -69,7 +68,6 @@ void UpdatePrePaint(); - // For CompositeAfterPaint. void Paint(GraphicsContext&) const; // FrameOverlay is always the same size as the viewport.
diff --git a/third_party/blink/renderer/core/frame/local_frame.h b/third_party/blink/renderer/core/frame/local_frame.h index b52d6d57..dbb0f87e0 100644 --- a/third_party/blink/renderer/core/frame/local_frame.h +++ b/third_party/blink/renderer/core/frame/local_frame.h
@@ -309,7 +309,7 @@ // All public functions below this point are candidates to move out of // LocalFrame into another class. - // See GraphicsLayerClient.h for accepted flags. + // See layers_as_json.h for accepted flags. String GetLayerTreeAsTextForTesting(unsigned flags = 0) const; // Begin printing with the given page size information. @@ -563,7 +563,6 @@ void SetSubframeColorOverlay(SkColor color); void UpdateFrameColorOverlayPrePaint(); - // For CompositeAfterPaint. void PaintFrameColorOverlay(GraphicsContext&); // To be called from OomInterventionImpl.
diff --git a/third_party/blink/renderer/core/frame/local_frame_view.cc b/third_party/blink/renderer/core/frame/local_frame_view.cc index 3cc6259b..147bc5f2 100644 --- a/third_party/blink/renderer/core/frame/local_frame_view.cc +++ b/third_party/blink/renderer/core/frame/local_frame_view.cc
@@ -2357,8 +2357,7 @@ if (!run_more_lifecycle_phases) return; - // TODO(pdr): PrePaint should be under the "Paint" devtools timeline step - // when CompositeAfterPaint is enabled. + // TODO(pdr): PrePaint should be under the "Paint" devtools timeline step. run_more_lifecycle_phases = RunPrePaintLifecyclePhase(target_state); DCHECK(ShouldThrottleRendering() || Lifecycle().GetState() >= DocumentLifecycle::kPrePaintClean);
diff --git a/third_party/blink/renderer/core/frame/local_frame_view.h b/third_party/blink/renderer/core/frame/local_frame_view.h index 0ac100da..75ab65c 100644 --- a/third_party/blink/renderer/core/frame/local_frame_view.h +++ b/third_party/blink/renderer/core/frame/local_frame_view.h
@@ -83,7 +83,6 @@ class FragmentAnchor; class Frame; class FrameViewAutoSizeInfo; -class GraphicsLayer; class HTMLVideoElement; class JSONObject; class KURL; @@ -545,12 +544,11 @@ PhysicalRect FrameToDocument(const PhysicalRect&) const; // Normally a LocalFrameView synchronously paints during full lifecycle - // updates, into the local frame root's PaintController (CompositeAfterPaint) - // or the PaintControllers of GraphicsLayers (pre-CompositeAfterPaint) - // However, in some cases (e.g. when printing) we need to paint the frame view - // into a PaintController other than the default one(s). The following - // functions are provided for these cases. This frame view must be in - // PrePaintClean or PaintClean state when these functions are called. + // updates, into the local frame root's PaintController. However, in some + // cases (e.g. when printing) we need to paint the frame view into a + // PaintController other than the default one(s). The following functions are + // provided for these cases. This frame view must be in PrePaintClean or + // PaintClean state when these functions are called. void PaintOutsideOfLifecycle( GraphicsContext&, const GlobalPaintFlags, @@ -560,7 +558,7 @@ void PaintForTest(const CullRect&); // Get the PaintRecord based on the cached paint artifact generated during - // the last paint in lifecycle update. For CompositeAfterPaint only. + // the last paint in lifecycle update. sk_sp<cc::PaintRecord> GetPaintRecord() const; void Show() override; @@ -643,7 +641,6 @@ void SetNeedsEnqueueScrollEvent(PaintLayerScrollableArea*); - // Only for CompositeAfterPaint. std::unique_ptr<JSONObject> CompositedLayersAsJSON(LayerTreeFlags); String MainThreadScrollingReasonsAsText(); @@ -1123,11 +1120,8 @@ // For testing. bool is_tracking_raster_invalidations_ = false; - // Currently used in PushPaintArtifactToCompositor() to collect composited - // layers as foreign layers. It's transient, but may live across frame updates - // until SetForeignLayerListNeedsUpdate() is called. - // For CompositeAfterPaint, we use it in PaintTree() for all paintings of the - // frame tree in PaintTree(). It caches display items and subsequences across + // Used by |PaintTree()| to collect the updated |PaintArtifact| which will be + // passed to the compositor. It caches display items and subsequences across // frame updates and repaints. std::unique_ptr<PaintController> paint_controller_; std::unique_ptr<PaintArtifactCompositor> paint_artifact_compositor_;
diff --git a/third_party/blink/renderer/core/frame/local_frame_view_test.cc b/third_party/blink/renderer/core/frame/local_frame_view_test.cc index 878a176..a222e012 100644 --- a/third_party/blink/renderer/core/frame/local_frame_view_test.cc +++ b/third_party/blink/renderer/core/frame/local_frame_view_test.cc
@@ -26,7 +26,6 @@ using blink::test::RunPendingTasks; using testing::_; -using testing::AnyNumber; namespace blink { namespace { @@ -36,8 +35,6 @@ AnimationMockChromeClient() : has_scheduled_animation_(false) {} // ChromeClient - MOCK_METHOD2(AttachRootGraphicsLayer, - void(GraphicsLayer*, LocalFrame* localRoot)); MOCK_METHOD3(MockUpdateTooltipUnderCursor, void(LocalFrame*, const String&, TextDirection)); void UpdateTooltipUnderCursor(LocalFrame& frame, @@ -57,10 +54,7 @@ protected: LocalFrameViewTest() : RenderingTest(MakeGarbageCollected<SingleChildLocalFrameClient>()), - chrome_client_(MakeGarbageCollected<AnimationMockChromeClient>()) { - EXPECT_CALL(GetAnimationMockChromeClient(), AttachRootGraphicsLayer(_, _)) - .Times(AnyNumber()); - } + chrome_client_(MakeGarbageCollected<AnimationMockChromeClient>()) {} ~LocalFrameViewTest() override { testing::Mock::VerifyAndClearExpectations(&GetAnimationMockChromeClient());
diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.h b/third_party/blink/renderer/core/frame/web_local_frame_impl.h index acdd80b..45c6211 100644 --- a/third_party/blink/renderer/core/frame/web_local_frame_impl.h +++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.h
@@ -430,7 +430,7 @@ bool HasDevToolsOverlays() const; void UpdateDevToolsOverlaysPrePaint(); - void PaintDevToolsOverlays(GraphicsContext&); // For CompositeAfterPaint. + void PaintDevToolsOverlays(GraphicsContext&); void CreateFrameView();
diff --git a/third_party/blink/renderer/core/html/media/html_video_element_test.cc b/third_party/blink/renderer/core/html/media/html_video_element_test.cc index 4186a5b..7225e41 100644 --- a/third_party/blink/renderer/core/html/media/html_video_element_test.cc +++ b/third_party/blink/renderer/core/html/media/html_video_element_test.cc
@@ -160,25 +160,24 @@ auto layer1 = cc::Layer::Create(); SetFakeCcLayer(layer1.get()); - ASSERT_TRUE(video()->GetLayoutObject()->HasLayer()); - auto* paint_layer = - To<LayoutBoxModelObject>(video()->GetLayoutObject())->Layer(); - EXPECT_TRUE(paint_layer->SelfNeedsRepaint()); + auto* painting_layer = + To<LayoutBoxModelObject>(video()->GetLayoutObject())->PaintingLayer(); + EXPECT_TRUE(painting_layer->SelfNeedsRepaint()); UpdateAllLifecyclePhasesForTest(); - EXPECT_FALSE(paint_layer->SelfNeedsRepaint()); + EXPECT_FALSE(painting_layer->SelfNeedsRepaint()); // Change to another cc layer. auto layer2 = cc::Layer::Create(); SetFakeCcLayer(layer2.get()); - EXPECT_TRUE(paint_layer->SelfNeedsRepaint()); + EXPECT_TRUE(painting_layer->SelfNeedsRepaint()); UpdateAllLifecyclePhasesForTest(); - EXPECT_FALSE(paint_layer->SelfNeedsRepaint()); + EXPECT_FALSE(painting_layer->SelfNeedsRepaint()); // Remove cc layer. SetFakeCcLayer(nullptr); - EXPECT_TRUE(paint_layer->SelfNeedsRepaint()); + EXPECT_TRUE(painting_layer->SelfNeedsRepaint()); UpdateAllLifecyclePhasesForTest(); - EXPECT_FALSE(paint_layer->SelfNeedsRepaint()); + EXPECT_FALSE(painting_layer->SelfNeedsRepaint()); } TEST_P(HTMLVideoElementTest, HasAvailableVideoFrameChecksWMP) {
diff --git a/third_party/blink/renderer/core/inspector/inspector_overlay_agent.h b/third_party/blink/renderer/core/inspector/inspector_overlay_agent.h index ee9963d..ec4259a 100644 --- a/third_party/blink/renderer/core/inspector/inspector_overlay_agent.h +++ b/third_party/blink/renderer/core/inspector/inspector_overlay_agent.h
@@ -272,7 +272,6 @@ String EvaluateInOverlayForTest(const String&); void UpdatePrePaint(); - // For CompositeAfterPaint. void PaintOverlay(GraphicsContext&); bool IsInspectorLayer(const cc::Layer*) const;
diff --git a/third_party/blink/renderer/core/layout/layout_block_flow.cc b/third_party/blink/renderer/core/layout/layout_block_flow.cc index cec1d072..eba5631 100644 --- a/third_party/blink/renderer/core/layout/layout_block_flow.cc +++ b/third_party/blink/renderer/core/layout/layout_block_flow.cc
@@ -2524,12 +2524,6 @@ quads.push_back(FloatQuad(gfx::RectF(local_rect))); } -LayoutObject* LayoutBlockFlow::HoverAncestor() const { - NOT_DESTROYED(); - return IsAnonymousBlockContinuation() ? Continuation() - : LayoutBlock::HoverAncestor(); -} - RootInlineBox* LayoutBlockFlow::CreateAndAppendRootInlineBox() { NOT_DESTROYED(); RootInlineBox* root_box = CreateRootInlineBox();
diff --git a/third_party/blink/renderer/core/layout/layout_block_flow.h b/third_party/blink/renderer/core/layout/layout_block_flow.h index fa9cc54..0a46751 100644 --- a/third_party/blink/renderer/core/layout/layout_block_flow.h +++ b/third_party/blink/renderer/core/layout/layout_block_flow.h
@@ -566,7 +566,6 @@ void LocalQuadsForSelf(Vector<FloatQuad>& quads) const override; void AbsoluteQuadsForSelf(Vector<FloatQuad>& quads, MapCoordinatesFlags mode = 0) const override; - LayoutObject* HoverAncestor() const final; LayoutUnit LogicalRightOffsetForLine( LayoutUnit logical_top,
diff --git a/third_party/blink/renderer/core/layout/layout_media.h b/third_party/blink/renderer/core/layout/layout_media.h index a3005a3d..3dea509 100644 --- a/third_party/blink/renderer/core/layout/layout_media.h +++ b/third_party/blink/renderer/core/layout/layout_media.h
@@ -86,12 +86,6 @@ NOT_DESTROYED(); return Children(); } - - PaintLayerType LayerTypeRequired() const override { - NOT_DESTROYED(); - return kNormalPaintLayer; - } - bool CanHaveChildren() const final { NOT_DESTROYED(); return true;
diff --git a/third_party/blink/renderer/core/layout/layout_object.h b/third_party/blink/renderer/core/layout/layout_object.h index ae111dc..f60cef5 100644 --- a/third_party/blink/renderer/core/layout/layout_object.h +++ b/third_party/blink/renderer/core/layout/layout_object.h
@@ -1975,11 +1975,6 @@ // This value gets cached by bitfields_.can_contain_fixed_position_objects_. bool ComputeIsFixedContainer(const ComputedStyle* style) const; - virtual LayoutObject* HoverAncestor() const { - NOT_DESTROYED(); - return Parent(); - } - Element* OffsetParent(const Element* = nullptr) const; // Mark this object needing to re-run |CollectInlines()|. Ancestors may be @@ -4285,8 +4280,7 @@ unsigned subtree_paint_property_update_reasons_ : kSubtreePaintPropertyUpdateReasonsBitfieldWidth; - // For LayoutBox. Updated during CompositingUpdate in - // pre-CompositeAfterPaint, or PrePaint in CompositeAfterPaint. + // For LayoutBox. It's updated during PrePaint. unsigned background_paint_location_ : 2; // BackgroundPaintLocation. unsigned overflow_clip_axes_ : 2;
diff --git a/third_party/blink/renderer/core/layout/ng/ng_fragmentation_utils.h b/third_party/blink/renderer/core/layout/ng/ng_fragmentation_utils.h index 88680e5..10e27d23 100644 --- a/third_party/blink/renderer/core/layout/ng/ng_fragmentation_utils.h +++ b/third_party/blink/renderer/core/layout/ng/ng_fragmentation_utils.h
@@ -359,9 +359,7 @@ // nullptr if this is the first fragment. Note that this operation is O(n) // (number of fragments generated from the node), and should be avoided when // possible. This function should no longer be necessary once everything has -// been properly converted to LayoutNG, and we have also gotten rid of the -// fragment stitching of composited objects (will be fixed by -// CompositeAfterPaint). +// been properly converted to LayoutNG. const NGBlockBreakToken* FindPreviousBreakToken(const NGPhysicalBoxFragment&); // Return the index of the fragmentainer preceding the first fragmentainer
diff --git a/third_party/blink/renderer/core/page/scrolling/sticky_position_scrolling_constraints.h b/third_party/blink/renderer/core/page/scrolling/sticky_position_scrolling_constraints.h index f361b58..eec2ca9 100644 --- a/third_party/blink/renderer/core/page/scrolling/sticky_position_scrolling_constraints.h +++ b/third_party/blink/renderer/core/page/scrolling/sticky_position_scrolling_constraints.h
@@ -98,8 +98,7 @@ // position before scroll. // // This method exists for performance (to avoid recomputing the sticky offset) - // and must only be called when compositing inputs are clean for the sticky - // element. (Or after prepaint for CompositeAfterPaint). + // and must only be called after prepaint. PhysicalOffset GetOffsetForStickyPosition(const StickyConstraintsMap&) const; void Trace(Visitor* visitor) const;
diff --git a/third_party/blink/renderer/core/page/validation_message_client.h b/third_party/blink/renderer/core/page/validation_message_client.h index 2fad6e8..44134c29 100644 --- a/third_party/blink/renderer/core/page/validation_message_client.h +++ b/third_party/blink/renderer/core/page/validation_message_client.h
@@ -65,7 +65,6 @@ virtual void ServiceScriptedAnimations(base::TimeTicks) {} virtual void LayoutOverlay() {} virtual void UpdatePrePaint() {} - // For CompositeAfterPaint. virtual void PaintOverlay(GraphicsContext&) {} void Trace(Visitor* visitor) const override {}
diff --git a/third_party/blink/renderer/core/paint/compositing/compositing_reason_finder.cc b/third_party/blink/renderer/core/paint/compositing/compositing_reason_finder.cc index c781ec4..5de95b1 100644 --- a/third_party/blink/renderer/core/paint/compositing/compositing_reason_finder.cc +++ b/third_party/blink/renderer/core/paint/compositing/compositing_reason_finder.cc
@@ -192,7 +192,7 @@ if (object.CanHaveAdditionalCompositingReasons()) reasons |= object.AdditionalCompositingReasons(); - // TODO(wangxianzhu): Don't depend on PaintLayer for CompositeAfterPaint. + // TODO(wangxianzhu): Don't depend on PaintLayer. if (!object.HasLayer()) { if (object.IsSVGChild()) reasons |= DirectReasonsForSVGChildPaintProperties(object); @@ -248,10 +248,9 @@ if (reasons_except_scrolling != CompositingReason::kNone) return true; - // In CompositeAfterPaint though we don't treat hidden backface as a direct - // compositing reason, it's very likely that the object will be composited, - // and it also indicates preference of compositing, so we prefer composited - // scrolling here. + // Though we don't treat hidden backface as a direct compositing reason, it's + // very likely that the object will be composited, and it also indicates + // preference of compositing, so we prefer composited scrolling here. if (object.StyleRef().BackfaceVisibility() == EBackfaceVisibility::kHidden) return true;
diff --git a/third_party/blink/renderer/core/paint/outline_painter.cc b/third_party/blink/renderer/core/paint/outline_painter.cc index 53dc63f..8888468 100644 --- a/third_party/blink/renderer/core/paint/outline_painter.cc +++ b/third_party/blink/renderer/core/paint/outline_painter.cc
@@ -937,11 +937,6 @@ .Max(0); } -int OutlinePainter::FocusRingWidthInsideBorderBox(const ComputedStyle& style) { - // Not sure why '+1'. - return std::ceil(blink::FocusRingInnerStrokeWidth(style)) + 1; -} - void OutlinePainter::IterateRightAnglePathForTesting( const SkPath& path, const base::RepeatingCallback<void(const Vector<Line>&)>& contour_action) {
diff --git a/third_party/blink/renderer/core/paint/outline_painter.h b/third_party/blink/renderer/core/paint/outline_painter.h index 5e07c3a..4c4a21d8 100644 --- a/third_party/blink/renderer/core/paint/outline_painter.h +++ b/third_party/blink/renderer/core/paint/outline_painter.h
@@ -39,9 +39,6 @@ static int OutlineOutsetExtent(const ComputedStyle&); - // For pre-CompositeAfterPaint only. - static int FocusRingWidthInsideBorderBox(const ComputedStyle&); - struct Line { SkPoint start; SkPoint end;
diff --git a/third_party/blink/renderer/core/paint/paint_info.h b/third_party/blink/renderer/core/paint/paint_info.h index 5fe4163..112b4ee 100644 --- a/third_party/blink/renderer/core/paint/paint_info.h +++ b/third_party/blink/renderer/core/paint/paint_info.h
@@ -103,13 +103,13 @@ } bool ShouldSkipBackground() const { - return paint_flags_ & kPaintLayerPaintingSkipRootBackground; + return paint_flags_ & kPaintLayerPaintingSkipBackground; } void SetSkipsBackground(bool b) { if (b) - paint_flags_ |= kPaintLayerPaintingSkipRootBackground; + paint_flags_ |= kPaintLayerPaintingSkipBackground; else - paint_flags_ &= ~kPaintLayerPaintingSkipRootBackground; + paint_flags_ &= ~kPaintLayerPaintingSkipBackground; } bool ShouldAddUrlMetadata() const {
diff --git a/third_party/blink/renderer/core/paint/paint_layer.cc b/third_party/blink/renderer/core/paint/paint_layer.cc index 5582faa9..e06b771 100644 --- a/third_party/blink/renderer/core/paint/paint_layer.cc +++ b/third_party/blink/renderer/core/paint/paint_layer.cc
@@ -2674,9 +2674,8 @@ if (PaintLayerScrollableArea* ancestor_scrollable_area = AncestorScrollContainerLayer()->GetScrollableArea()) { - // TODO(pdr): When CompositeAfterPaint is enabled, we will need to - // invalidate the scroll paint property subtree for this so main thread - // scroll reasons are recomputed. + // TODO(pdr): We will need to invalidate the scroll paint property subtree + // for this so main thread scroll reasons are recomputed. ancestor_scrollable_area->InvalidateStickyConstraintsFor(this); } }
diff --git a/third_party/blink/renderer/core/paint/paint_layer_painter.cc b/third_party/blink/renderer/core/paint/paint_layer_painter.cc index 8b124de9..446e4e3 100644 --- a/third_party/blink/renderer/core/paint/paint_layer_painter.cc +++ b/third_party/blink/renderer/core/paint/paint_layer_painter.cc
@@ -118,7 +118,6 @@ return kFullyPainted; } - paint_flags |= kPaintLayerPaintingCompositingAllPhases; return PaintLayerContents(context, painting_info, paint_flags); } @@ -279,10 +278,8 @@ // transform space from the current root layer. Use the current layer as // the new root layer. painting_info.root_layer = &paint_layer_; - // These flags no longer apply for the new root layer. - paint_flags &= ~kPaintLayerPaintingSkipRootBackground; + // This flag no longer applies for the new root layer. paint_flags &= ~kPaintLayerPaintingOverflowContents; - paint_flags &= ~kPaintLayerPaintingCompositingScrollingPhase; if (first_fragment.PaintProperties() && first_fragment.PaintProperties()->PaintOffsetTranslation()) { @@ -348,24 +345,8 @@ bool is_self_painting_layer = paint_layer_.IsSelfPaintingLayer(); bool is_painting_overlay_overflow_controls = paint_flags & kPaintLayerPaintingOverlayOverflowControls; - bool is_painting_scrolling_content = - paint_flags & kPaintLayerPaintingCompositingScrollingPhase; - bool is_painting_composited_foreground = - paint_flags & kPaintLayerPaintingCompositingForegroundPhase; - bool is_painting_composited_background = - paint_flags & kPaintLayerPaintingCompositingBackgroundPhase; - bool is_painting_composited_decoration = - paint_flags & kPaintLayerPaintingCompositingDecorationPhase; bool is_painting_overflow_contents = paint_flags & kPaintLayerPaintingOverflowContents; - bool is_painting_mask = paint_flags & kPaintLayerPaintingCompositingMaskPhase; - - // Outline always needs to be painted even if we have no visible content. - // It is painted as part of the decoration phase which paints content that - // is not scrolled and should be above scrolled content. - bool should_paint_self_outline = - is_self_painting_layer && !is_painting_overlay_overflow_controls && - is_painting_composited_decoration && object.StyleRef().HasOutline(); bool should_paint_content = paint_layer_.HasVisibleContent() && @@ -434,23 +415,6 @@ subsequence_recorder.emplace(context, paint_layer_); } - bool is_painting_root_layer = (&paint_layer_) == painting_info.root_layer; - bool should_paint_background = - should_paint_content && !selection_drag_image_only && - (is_painting_composited_background || - (is_painting_root_layer && - !(paint_flags & kPaintLayerPaintingSkipRootBackground))); - bool should_paint_neg_z_order_list = - !is_painting_overlay_overflow_controls && - (is_painting_scrolling_content ? is_painting_overflow_contents - : is_painting_composited_background); - bool should_paint_own_contents = - is_painting_composited_foreground && should_paint_content; - bool should_paint_normal_flow_and_pos_z_order_lists = - is_painting_composited_foreground && - !is_painting_overlay_overflow_controls; - bool is_video = IsA<LayoutVideo>(object); - absl::optional<ScopedEffectivelyInvisible> effectively_invisible; if (PaintedOutputInvisible(object.StyleRef())) effectively_invisible.emplace(context.GetPaintController()); @@ -465,18 +429,21 @@ DisplayItem::kLayerChunk); } + bool should_paint_background = + should_paint_content && !selection_drag_image_only; if (should_paint_background) { PaintWithPhase(PaintPhase::kSelfBlockBackgroundOnly, context, local_painting_info, paint_flags); } - if (should_paint_neg_z_order_list) { + bool should_paint_children = !is_painting_overlay_overflow_controls; + if (should_paint_children) { if (PaintChildren(kNegativeZOrderChildren, context, painting_info, paint_flags) == kMayBeClippedByCullRect) result = kMayBeClippedByCullRect; } - if (should_paint_own_contents) { + if (should_paint_content) { // If the negative-z-order children created paint chunks, this gives the // foreground paint chunk a stable id. ScopedPaintChunkProperties foreground_properties( @@ -492,12 +459,18 @@ } } + // Outline always needs to be painted even if we have no visible content. + bool should_paint_self_outline = is_self_painting_layer && + !is_painting_overlay_overflow_controls && + object.StyleRef().HasOutline(); + + bool is_video = IsA<LayoutVideo>(object); if (!is_video && should_paint_self_outline) { PaintWithPhase(PaintPhase::kSelfOutlineOnly, context, local_painting_info, paint_flags); } - if (should_paint_normal_flow_and_pos_z_order_lists) { + if (should_paint_children) { if (PaintChildren(kNormalFlowAndPositiveZOrderChildren, context, painting_info, paint_flags) == kMayBeClippedByCullRect) result = kMayBeClippedByCullRect; @@ -519,7 +492,7 @@ paint_flags); } - if (is_painting_mask && should_paint_content && !selection_drag_image_only) { + if (should_paint_content && !selection_drag_image_only) { if (const auto* properties = object.FirstFragment().PaintProperties()) { if (properties->Mask()) { PaintWithPhase(PaintPhase::kMask, context, local_painting_info,
diff --git a/third_party/blink/renderer/core/paint/paint_layer_painting_info.h b/third_party/blink/renderer/core/paint/paint_layer_painting_info.h index e719b87..d210ef6 100644 --- a/third_party/blink/renderer/core/paint/paint_layer_painting_info.h +++ b/third_party/blink/renderer/core/paint/paint_layer_painting_info.h
@@ -45,11 +45,8 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_PAINT_PAINT_LAYER_PAINTING_INFO_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_PAINT_PAINT_LAYER_PAINTING_INFO_H_ -#include "base/check_op.h" #include "base/dcheck_is_on.h" #include "third_party/blink/renderer/core/layout/geometry/physical_offset.h" -#include "third_party/blink/renderer/core/paint/paint_phase.h" -#include "third_party/blink/renderer/platform/graphics/paint/cull_rect.h" #include "third_party/blink/renderer/platform/wtf/allocator/allocator.h" #if DCHECK_IS_ON() @@ -63,21 +60,11 @@ enum PaintLayerFlag { kPaintLayerNoFlag = 0, - kPaintLayerPaintingOverlayOverflowControls = 1 << 3, - kPaintLayerPaintingCompositingBackgroundPhase = 1 << 4, - kPaintLayerPaintingCompositingForegroundPhase = 1 << 5, - kPaintLayerPaintingCompositingMaskPhase = 1 << 6, - kPaintLayerPaintingCompositingScrollingPhase = 1 << 7, - kPaintLayerPaintingOverflowContents = 1 << 8, - kPaintLayerPaintingSkipRootBackground = 1 << 10, - kPaintLayerPaintingRenderingClipPathAsMask = 1 << 13, - kPaintLayerPaintingCompositingDecorationPhase = 1 << 14, - kPaintLayerPaintingRenderingResourceSubtree = 1 << 15, - kPaintLayerPaintingCompositingAllPhases = - (kPaintLayerPaintingCompositingBackgroundPhase | - kPaintLayerPaintingCompositingForegroundPhase | - kPaintLayerPaintingCompositingMaskPhase | - kPaintLayerPaintingCompositingDecorationPhase) + kPaintLayerPaintingOverlayOverflowControls = 1 << 0, + kPaintLayerPaintingOverflowContents = 1 << 1, + kPaintLayerPaintingSkipBackground = 1 << 2, + kPaintLayerPaintingRenderingClipPathAsMask = 1 << 3, + kPaintLayerPaintingRenderingResourceSubtree = 1 << 4, }; typedef unsigned PaintLayerFlags; @@ -118,27 +105,12 @@ need_separator = true; }; - if (flags & kPaintLayerPaintingCompositingAllPhases) { - append("kPaintLayerPaintingCompositingAllPhases"); - } else { - if (flags & kPaintLayerPaintingCompositingBackgroundPhase) - append("kPaintLayerPaintingCompositingBackgroundPhase"); - if (flags & kPaintLayerPaintingCompositingForegroundPhase) - append("kPaintLayerPaintingCompositingForegroundPhase"); - if (flags & kPaintLayerPaintingCompositingMaskPhase) - append("kPaintLayerPaintingCompositingMaskPhase"); - if (flags & kPaintLayerPaintingCompositingDecorationPhase) - append("kPaintLayerPaintingCompositingDecorationPhase"); - } - if (flags & kPaintLayerPaintingOverlayOverflowControls) append("kPaintLayerPaintingOverlayOverflowControls"); - if (flags & kPaintLayerPaintingCompositingScrollingPhase) - append("kPaintLayerPaintingCompositingScrollingPhase"); if (flags & kPaintLayerPaintingOverflowContents) append("kPaintLayerPaintingOverflowContents"); - if (flags & kPaintLayerPaintingSkipRootBackground) - append("kPaintLayerPaintingSkipRootBackground"); + if (flags & kPaintLayerPaintingSkipBackground) + append("kPaintLayerPaintingSkipBackground"); if (flags & kPaintLayerPaintingRenderingClipPathAsMask) append("kPaintLayerPaintingRenderingClipPathAsMask"); if (flags & kPaintLayerPaintingRenderingResourceSubtree)
diff --git a/third_party/blink/renderer/core/paint/paint_layer_scrollable_area.h b/third_party/blink/renderer/core/paint/paint_layer_scrollable_area.h index 4ad32d8..b00decec 100644 --- a/third_party/blink/renderer/core/paint/paint_layer_scrollable_area.h +++ b/third_party/blink/renderer/core/paint/paint_layer_scrollable_area.h
@@ -596,7 +596,6 @@ void SetTickmarksOverride(Vector<gfx::Rect> tickmarks); - // For CompositeAfterPaint. bool ShouldDirectlyCompositeScrollbar(const Scrollbar&) const; void EstablishScrollbarRoot(bool freeze_horizontal, bool freeze_vertical);
diff --git a/third_party/blink/renderer/core/probe/core_probes.pidl b/third_party/blink/renderer/core/probe/core_probes.pidl index 9324d0b..0d61590 100644 --- a/third_party/blink/renderer/core/probe/core_probes.pidl +++ b/third_party/blink/renderer/core/probe/core_probes.pidl
@@ -138,7 +138,6 @@ void WebTransportClosed(ExecutionContext*, uint64_t transport_id); /* This is for pre-BlinkGenPropertyTrees. TODO(wangxianzhu): Remove this function for BlinkGenPropertyTrees. */ void LayerTreeDidChange(LocalFrame*); - /* For BlinkGenPropertyTrees/CompositeAfterPaint. */ void LayerTreePainted(LocalFrame*); void PseudoElementCreated([Keep] PseudoElement*); void PseudoElementDestroyed([Keep] PseudoElement*);
diff --git a/third_party/blink/renderer/core/scroll/scrollable_area.h b/third_party/blink/renderer/core/scroll/scrollable_area.h index 92341851..b48984f 100644 --- a/third_party/blink/renderer/core/scroll/scrollable_area.h +++ b/third_party/blink/renderer/core/scroll/scrollable_area.h
@@ -437,8 +437,7 @@ MaximumScrollOffset(orientation)); } - // Note that in CompositeAfterPaint, these methods always return nullptr - // except for VisualViewport. + // These methods always return nullptr except for VisualViewport. virtual cc::Layer* LayerForHorizontalScrollbar() const { return nullptr; } virtual cc::Layer* LayerForVerticalScrollbar() const { return nullptr; } virtual cc::Layer* LayerForScrollCorner() const { return nullptr; }
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 d0c04e85..23a692b 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
@@ -271,8 +271,8 @@ new_content_layer_clients.push_back(std::move(content_layer_client)); // Set properties that foreign layers would normally control for themselves - // here to avoid changing foreign layers. This includes things set by - // GraphicsLayer on the ContentsLayer() or by video clients etc. + // here to avoid changing foreign layers. This includes things set by video + // clients etc. bool contents_opaque = pending_layer.RectKnownToBeOpaque().Contains( gfx::RectF(gfx::PointAtOffsetFromOrigin(layer_offset), gfx::SizeF(layer_bounds)));
diff --git a/third_party/blink/renderer/platform/graphics/compositing/paint_chunks_to_cc_layer.cc b/third_party/blink/renderer/platform/graphics/compositing/paint_chunks_to_cc_layer.cc index ef98b196..a4f93b4 100644 --- a/third_party/blink/renderer/platform/graphics/compositing/paint_chunks_to_cc_layer.cc +++ b/third_party/blink/renderer/platform/graphics/compositing/paint_chunks_to_cc_layer.cc
@@ -342,8 +342,8 @@ if (!state_stack_.size() || state_stack_.back().type != StateEntry::kClip) { // TODO(crbug.com/803649): We still have clip hierarchy issues with // fragment clips. See crbug.com/1240080 for the test case. Will change - // the above condition to DCHECK after both CompositeAfterPaint and - // LayoutNGBlockFragmentation are fully launched. + // the above condition to DCHECK after LayoutNGBlockFragmentation is fully + // launched. #if DCHECK_IS_ON() DLOG(ERROR) << "Error: Chunk has a clip that escaped its layer's or " << "effect's clip.\ntarget_clip:\n" @@ -459,8 +459,8 @@ if (!state_stack_.size()) { // TODO(crbug.com/803649): We still have clip hierarchy issues with // fragment clips. See crbug.com/1240080 for the test case. Will change - // the above condition to DCHECK after both CompositeAfterPaint and - // LayoutNGBlockFragmentation are fully launched. + // the above condition to DCHECK after LayoutNGBlockFragmentation is fully + // launched. #if DCHECK_IS_ON() DLOG(ERROR) << "Error: Chunk has an effect that escapes layer's effect.\n" << "target_effect:\n"
diff --git a/third_party/blink/renderer/platform/graphics/compositing/property_tree_manager.cc b/third_party/blink/renderer/platform/graphics/compositing/property_tree_manager.cc index e816f5d..1f1c890 100644 --- a/third_party/blink/renderer/platform/graphics/compositing/property_tree_manager.cc +++ b/third_party/blink/renderer/platform/graphics/compositing/property_tree_manager.cc
@@ -937,8 +937,8 @@ if (!IsCurrentCcEffectSynthetic()) { // TODO(crbug.com/803649): We still have clip hierarchy issues with // fragment clips. See crbug.com/1238656 for the test case. Will change - // the above condition to DCHECK after both CompositeAfterPaint and - // LayoutNGBlockFragmentation are fully launched. + // the above condition to DCHECK after LayoutNGBlockFragmentation is + // fully launched. return cc::EffectTree::kInvalidNodeId; } const auto* pre_exit_clip = current_.clip; @@ -964,8 +964,8 @@ if (!clip) { // TODO(crbug.com/803649): We still have clip hierarchy issues with // fragment clips. See crbug.com/1238656 for the test case. Will change - // the above condition to DCHECK after both CompositeAfterPaint and - // LayoutNGBlockFragmentation are fully launched. + // the above condition to DCHECK after LayoutNGBlockFragmentation is fully + // launched. return cc::EffectTree::kInvalidNodeId; }
diff --git a/third_party/blink/renderer/platform/graphics/compositing_reasons.h b/third_party/blink/renderer/platform/graphics/compositing_reasons.h index 5a38e80..4cfec46 100644 --- a/third_party/blink/renderer/platform/graphics/compositing_reasons.h +++ b/third_party/blink/renderer/platform/graphics/compositing_reasons.h
@@ -90,7 +90,7 @@ V(LayerForMask) \ /* Composited layer painted on top of all other layers as decoration. */ \ V(LayerForDecoration) \ - /* Used in CompositeAfterPaint for link highlight, frame overlay, etc. */ \ + /* Link highlight, frame overlay, etc. */ \ V(LayerForOther) \ /* DocumentTransition shared element. \ See third_party/blink/renderer/core/document_transition/README.md. */ \
diff --git a/third_party/blink/renderer/platform/graphics/paint/geometry_mapper.cc b/third_party/blink/renderer/platform/graphics/paint/geometry_mapper.cc index 09071a9..95ee8f7 100644 --- a/third_party/blink/renderer/platform/graphics/paint/geometry_mapper.cc +++ b/third_party/blink/renderer/platform/graphics/paint/geometry_mapper.cc
@@ -275,8 +275,8 @@ // TODO(crbug.com/803649): We still have clip hierarchy issues with fragment // clips. See crbug.com/1228364 for the test cases. Will remove the following - // statement (leaving success==false) after both CompositeAfterPaint and - // LayoutNGBlockFragmentation are fully launched. + // statement (leaving success==false) after LayoutNGBlockFragmentation is + // fully launched. success = true; rect_to_map.ClearIsTight(); @@ -427,8 +427,8 @@ if (!clip_node) { // TODO(crbug.com/803649): We still have clip hierarchy issues with // fragment clips. See crbug.com/1228364 for the test cases. Will change - // the following to "success = false" after both CompositeAfterPaint and - // LayoutNGBlockFragmentation are fully launched. + // the following to "success = false" after LayoutNGBlockFragmentation is + // fully launched. success = true; return InfiniteLooseFloatClipRect(); }
diff --git a/third_party/blink/renderer/platform/graphics/paint/geometry_mapper_test.cc b/third_party/blink/renderer/platform/graphics/paint/geometry_mapper_test.cc index bdb551e..e2891b0 100644 --- a/third_party/blink/renderer/platform/graphics/paint/geometry_mapper_test.cc +++ b/third_party/blink/renderer/platform/graphics/paint/geometry_mapper_test.cc
@@ -768,9 +768,8 @@ LocalToAncestorVisualRectInternal(transform1_state, transform2_and_clip_state, result, success); // Fails, because the clip of the destination state is not an ancestor of the - // clip of the source state. Known bugs in pre-CompositeAfterPaint or - // CompositeAfterPaint without LayoutNGBlockFragmentation would make such - // query. In such cases, no clips are applied. + // clip of the source state. Known bugs pre-LayoutNGBlockFragmentation would + // make such a query. In such cases, no clips are applied. EXPECT_TRUE(success); FloatClipRect expected(gfx::RectF(-100, 0, 100, 100)); expected.ClearIsTight();
diff --git a/third_party/blink/renderer/platform/graphics/paint/paint_controller.h b/third_party/blink/renderer/platform/graphics/paint/paint_controller.h index 65867a2..7fefb78 100644 --- a/third_party/blink/renderer/platform/graphics/paint/paint_controller.h +++ b/third_party/blink/renderer/platform/graphics/paint/paint_controller.h
@@ -308,7 +308,6 @@ friend class PaintControllerTestBase; friend class PaintControllerPaintTestBase; friend class PaintUnderInvalidationChecker; - friend class GraphicsLayer; // Temporary for ClientCacheIsValid(). // Called before painting to optimize memory allocation by reserving space in // |new_paint_artifact_| and |new_subsequences_| based on the size of the
diff --git a/third_party/blink/web_tests/editing/text-iterator/content-visibility-auto-expected.html b/third_party/blink/web_tests/editing/text-iterator/content-visibility-auto-expected.html new file mode 100644 index 0000000..9cf4a6f --- /dev/null +++ b/third_party/blink/web_tests/editing/text-iterator/content-visibility-auto-expected.html
@@ -0,0 +1,12 @@ +<!DOCTYPE html> +<link rel=author href="mailto:jarhar@chromium.org"> + +<div style="height: 4000px"></div> +<div> + <div style="height: 2000px"></div> + <div>target</div> +</div> + +<script> +testRunner.findString('target', []); +</script>
diff --git a/third_party/blink/web_tests/editing/text-iterator/content-visibility-auto.html b/third_party/blink/web_tests/editing/text-iterator/content-visibility-auto.html new file mode 100644 index 0000000..824ddab --- /dev/null +++ b/third_party/blink/web_tests/editing/text-iterator/content-visibility-auto.html
@@ -0,0 +1,22 @@ +<!DOCTYPE html> +<link rel=author href="mailto:jarhar@chromium.org"> + +<div id=spacer style="height: 4000px">spacer</div> +<div id=locked style="content-visibility:auto"> + <div style="height: 2000px"></div> + <div>target</div> +</div> + +<script> +// Make sure the displaylock is working first. +if (document.body.offsetHeight >= 6000) { + spacer.remove(); + locked.remove(); + const div = document.createElement('div'); + div.textContent = + 'FAIL: document.body.offsetHeight: ' + document.body.offsetHeight; + document.body.insertAdjacentElement('afterbegin', div); +} else { + testRunner.findString('target', []); +} +</script>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/normal-flow/video-paint-order-ref.html b/third_party/blink/web_tests/external/wpt/css/CSS2/normal-flow/video-paint-order-ref.html new file mode 100644 index 0000000..9f5eebe --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/css/CSS2/normal-flow/video-paint-order-ref.html
@@ -0,0 +1,16 @@ +<!DOCTYPE html> +<style> + video { + width: 95px; + height: 95px; + } + #negative-margin { + display: inline-block; + width: 100px; + height: 100px; + background: green; + margin-left: -100px; + } +</style> +<video></video> +<div id="negative-margin"></div>
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/normal-flow/video-paint-order.html b/third_party/blink/web_tests/external/wpt/css/CSS2/normal-flow/video-paint-order.html new file mode 100644 index 0000000..5c25960 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/css/CSS2/normal-flow/video-paint-order.html
@@ -0,0 +1,22 @@ +<!DOCTYPE html> +<title>Video paint order</title> +<link rel="author" title="Philip Rogers" href="pdr@chromium.org"> +<link rel="help" href="https://www.w3.org/TR/CSS2/zindex.html"> +<link rel="match" href="video-paint-order-ref.html"> +<style> + video { + background: red; + width: 95px; + height: 95px; + } + #negative-margin { + display: inline-block; + width: 100px; + height: 100px; + background: green; + margin-left: -100px; + } +</style> +<video></video> +<!-- #negative-margin should paint fully on top of the video. --> +<div id="negative-margin"></div>
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.copy.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.copy.html index d0af5f4..bab39234a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.copy.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.copy.html
@@ -17,11 +17,11 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -var offscreenCanvas2 = new OffscreenCanvas(offscreenCanvas.width, offscreenCanvas.height); +var offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height); var ctx2 = offscreenCanvas2.getContext('2d'); var promise = new Promise(function(resolve, reject) { var xhr = new XMLHttpRequest(); @@ -39,7 +39,7 @@ ctx.fillRect(0, 0, 100, 50); ctx.globalCompositeOperation = 'copy'; ctx.drawImage(offscreenCanvas2, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 255,255,0,191, "50,25", "255,255,0,191", 5); + _assertPixelApprox(canvas, 50,25, 255,255,0,191, "50,25", "255,255,0,191", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.copy.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.copy.worker.js index 02044ed..ecf7afd 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.copy.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.copy.worker.js
@@ -13,11 +13,11 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -var offscreenCanvas2 = new OffscreenCanvas(offscreenCanvas.width, offscreenCanvas.height); +var offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height); var ctx2 = offscreenCanvas2.getContext('2d'); var promise = new Promise(function(resolve, reject) { var xhr = new XMLHttpRequest(); @@ -35,7 +35,7 @@ ctx.fillRect(0, 0, 100, 50); ctx.globalCompositeOperation = 'copy'; ctx.drawImage(offscreenCanvas2, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 255,255,0,191, "50,25", "255,255,0,191", 5); + _assertPixelApprox(canvas, 50,25, 255,255,0,191, "50,25", "255,255,0,191", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.destination-atop.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.destination-atop.html index 16c3f7666..feb3080 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.destination-atop.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.destination-atop.html
@@ -17,11 +17,11 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -var offscreenCanvas2 = new OffscreenCanvas(offscreenCanvas.width, offscreenCanvas.height); +var offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height); var ctx2 = offscreenCanvas2.getContext('2d'); var promise = new Promise(function(resolve, reject) { var xhr = new XMLHttpRequest(); @@ -39,7 +39,7 @@ ctx.fillRect(0, 0, 100, 50); ctx.globalCompositeOperation = 'destination-atop'; ctx.drawImage(offscreenCanvas2, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 128,255,128,191, "50,25", "128,255,128,191", 5); + _assertPixelApprox(canvas, 50,25, 128,255,128,191, "50,25", "128,255,128,191", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.destination-atop.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.destination-atop.worker.js index 0cddf60f5..f6c64225 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.destination-atop.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.destination-atop.worker.js
@@ -13,11 +13,11 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -var offscreenCanvas2 = new OffscreenCanvas(offscreenCanvas.width, offscreenCanvas.height); +var offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height); var ctx2 = offscreenCanvas2.getContext('2d'); var promise = new Promise(function(resolve, reject) { var xhr = new XMLHttpRequest(); @@ -35,7 +35,7 @@ ctx.fillRect(0, 0, 100, 50); ctx.globalCompositeOperation = 'destination-atop'; ctx.drawImage(offscreenCanvas2, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 128,255,128,191, "50,25", "128,255,128,191", 5); + _assertPixelApprox(canvas, 50,25, 128,255,128,191, "50,25", "128,255,128,191", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.destination-in.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.destination-in.html index c12cb30..b357921 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.destination-in.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.destination-in.html
@@ -17,11 +17,11 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -var offscreenCanvas2 = new OffscreenCanvas(offscreenCanvas.width, offscreenCanvas.height); +var offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height); var ctx2 = offscreenCanvas2.getContext('2d'); var promise = new Promise(function(resolve, reject) { var xhr = new XMLHttpRequest(); @@ -39,7 +39,7 @@ ctx.fillRect(0, 0, 100, 50); ctx.globalCompositeOperation = 'destination-in'; ctx.drawImage(offscreenCanvas2, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 0,255,255,96, "50,25", "0,255,255,96", 5); + _assertPixelApprox(canvas, 50,25, 0,255,255,96, "50,25", "0,255,255,96", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.destination-in.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.destination-in.worker.js index 6999487e..d150bff 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.destination-in.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.destination-in.worker.js
@@ -13,11 +13,11 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -var offscreenCanvas2 = new OffscreenCanvas(offscreenCanvas.width, offscreenCanvas.height); +var offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height); var ctx2 = offscreenCanvas2.getContext('2d'); var promise = new Promise(function(resolve, reject) { var xhr = new XMLHttpRequest(); @@ -35,7 +35,7 @@ ctx.fillRect(0, 0, 100, 50); ctx.globalCompositeOperation = 'destination-in'; ctx.drawImage(offscreenCanvas2, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 0,255,255,96, "50,25", "0,255,255,96", 5); + _assertPixelApprox(canvas, 50,25, 0,255,255,96, "50,25", "0,255,255,96", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.destination-out.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.destination-out.html index 4f853d8c..401a9e0d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.destination-out.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.destination-out.html
@@ -17,11 +17,11 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -var offscreenCanvas2 = new OffscreenCanvas(offscreenCanvas.width, offscreenCanvas.height); +var offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height); var ctx2 = offscreenCanvas2.getContext('2d'); var promise = new Promise(function(resolve, reject) { var xhr = new XMLHttpRequest(); @@ -39,7 +39,7 @@ ctx.fillRect(0, 0, 100, 50); ctx.globalCompositeOperation = 'destination-out'; ctx.drawImage(offscreenCanvas2, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 0,255,255,32, "50,25", "0,255,255,32", 5); + _assertPixelApprox(canvas, 50,25, 0,255,255,32, "50,25", "0,255,255,32", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.destination-out.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.destination-out.worker.js index bc7c5362..cbdcfde4 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.destination-out.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.destination-out.worker.js
@@ -13,11 +13,11 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -var offscreenCanvas2 = new OffscreenCanvas(offscreenCanvas.width, offscreenCanvas.height); +var offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height); var ctx2 = offscreenCanvas2.getContext('2d'); var promise = new Promise(function(resolve, reject) { var xhr = new XMLHttpRequest(); @@ -35,7 +35,7 @@ ctx.fillRect(0, 0, 100, 50); ctx.globalCompositeOperation = 'destination-out'; ctx.drawImage(offscreenCanvas2, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 0,255,255,32, "50,25", "0,255,255,32", 5); + _assertPixelApprox(canvas, 50,25, 0,255,255,32, "50,25", "0,255,255,32", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.destination-over.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.destination-over.html index 93bc5a1..079f74e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.destination-over.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.destination-over.html
@@ -17,11 +17,11 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -var offscreenCanvas2 = new OffscreenCanvas(offscreenCanvas.width, offscreenCanvas.height); +var offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height); var ctx2 = offscreenCanvas2.getContext('2d'); var promise = new Promise(function(resolve, reject) { var xhr = new XMLHttpRequest(); @@ -39,7 +39,7 @@ ctx.fillRect(0, 0, 100, 50); ctx.globalCompositeOperation = 'destination-over'; ctx.drawImage(offscreenCanvas2, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 109,255,146,223, "50,25", "109,255,146,223", 5); + _assertPixelApprox(canvas, 50,25, 109,255,146,223, "50,25", "109,255,146,223", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.destination-over.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.destination-over.worker.js index 6bb6ab8d..3ae7bdb 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.destination-over.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.destination-over.worker.js
@@ -13,11 +13,11 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -var offscreenCanvas2 = new OffscreenCanvas(offscreenCanvas.width, offscreenCanvas.height); +var offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height); var ctx2 = offscreenCanvas2.getContext('2d'); var promise = new Promise(function(resolve, reject) { var xhr = new XMLHttpRequest(); @@ -35,7 +35,7 @@ ctx.fillRect(0, 0, 100, 50); ctx.globalCompositeOperation = 'destination-over'; ctx.drawImage(offscreenCanvas2, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 109,255,146,223, "50,25", "109,255,146,223", 5); + _assertPixelApprox(canvas, 50,25, 109,255,146,223, "50,25", "109,255,146,223", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.lighter.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.lighter.html index 073ee18..0a3862a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.lighter.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.lighter.html
@@ -17,11 +17,11 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -var offscreenCanvas2 = new OffscreenCanvas(offscreenCanvas.width, offscreenCanvas.height); +var offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height); var ctx2 = offscreenCanvas2.getContext('2d'); var promise = new Promise(function(resolve, reject) { var xhr = new XMLHttpRequest(); @@ -39,7 +39,7 @@ ctx.fillRect(0, 0, 100, 50); ctx.globalCompositeOperation = 'lighter'; ctx.drawImage(offscreenCanvas2, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 191,255,128,255, "50,25", "191,255,128,255", 5); + _assertPixelApprox(canvas, 50,25, 191,255,128,255, "50,25", "191,255,128,255", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.lighter.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.lighter.worker.js index d538bbfd..2c217ce 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.lighter.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.lighter.worker.js
@@ -13,11 +13,11 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -var offscreenCanvas2 = new OffscreenCanvas(offscreenCanvas.width, offscreenCanvas.height); +var offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height); var ctx2 = offscreenCanvas2.getContext('2d'); var promise = new Promise(function(resolve, reject) { var xhr = new XMLHttpRequest(); @@ -35,7 +35,7 @@ ctx.fillRect(0, 0, 100, 50); ctx.globalCompositeOperation = 'lighter'; ctx.drawImage(offscreenCanvas2, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 191,255,128,255, "50,25", "191,255,128,255", 5); + _assertPixelApprox(canvas, 50,25, 191,255,128,255, "50,25", "191,255,128,255", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.source-atop.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.source-atop.html index 3611524..092e191 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.source-atop.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.source-atop.html
@@ -17,11 +17,11 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -var offscreenCanvas2 = new OffscreenCanvas(offscreenCanvas.width, offscreenCanvas.height); +var offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height); var ctx2 = offscreenCanvas2.getContext('2d'); var promise = new Promise(function(resolve, reject) { var xhr = new XMLHttpRequest(); @@ -39,7 +39,7 @@ ctx.fillRect(0, 0, 100, 50); ctx.globalCompositeOperation = 'source-atop'; ctx.drawImage(offscreenCanvas2, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 191,255,64,128, "50,25", "191,255,64,128", 5); + _assertPixelApprox(canvas, 50,25, 191,255,64,128, "50,25", "191,255,64,128", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.source-atop.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.source-atop.worker.js index c19b718..2664155 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.source-atop.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.source-atop.worker.js
@@ -13,11 +13,11 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -var offscreenCanvas2 = new OffscreenCanvas(offscreenCanvas.width, offscreenCanvas.height); +var offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height); var ctx2 = offscreenCanvas2.getContext('2d'); var promise = new Promise(function(resolve, reject) { var xhr = new XMLHttpRequest(); @@ -35,7 +35,7 @@ ctx.fillRect(0, 0, 100, 50); ctx.globalCompositeOperation = 'source-atop'; ctx.drawImage(offscreenCanvas2, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 191,255,64,128, "50,25", "191,255,64,128", 5); + _assertPixelApprox(canvas, 50,25, 191,255,64,128, "50,25", "191,255,64,128", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.source-in.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.source-in.html index 782ae3f..ee053857 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.source-in.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.source-in.html
@@ -17,11 +17,11 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -var offscreenCanvas2 = new OffscreenCanvas(offscreenCanvas.width, offscreenCanvas.height); +var offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height); var ctx2 = offscreenCanvas2.getContext('2d'); var promise = new Promise(function(resolve, reject) { var xhr = new XMLHttpRequest(); @@ -39,7 +39,7 @@ ctx.fillRect(0, 0, 100, 50); ctx.globalCompositeOperation = 'source-in'; ctx.drawImage(offscreenCanvas2, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 255,255,0,96, "50,25", "255,255,0,96", 5); + _assertPixelApprox(canvas, 50,25, 255,255,0,96, "50,25", "255,255,0,96", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.source-in.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.source-in.worker.js index 56c65a6..4c9731d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.source-in.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.source-in.worker.js
@@ -13,11 +13,11 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -var offscreenCanvas2 = new OffscreenCanvas(offscreenCanvas.width, offscreenCanvas.height); +var offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height); var ctx2 = offscreenCanvas2.getContext('2d'); var promise = new Promise(function(resolve, reject) { var xhr = new XMLHttpRequest(); @@ -35,7 +35,7 @@ ctx.fillRect(0, 0, 100, 50); ctx.globalCompositeOperation = 'source-in'; ctx.drawImage(offscreenCanvas2, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 255,255,0,96, "50,25", "255,255,0,96", 5); + _assertPixelApprox(canvas, 50,25, 255,255,0,96, "50,25", "255,255,0,96", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.source-out.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.source-out.html index f3d75d9..95b77f5 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.source-out.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.source-out.html
@@ -17,11 +17,11 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -var offscreenCanvas2 = new OffscreenCanvas(offscreenCanvas.width, offscreenCanvas.height); +var offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height); var ctx2 = offscreenCanvas2.getContext('2d'); var promise = new Promise(function(resolve, reject) { var xhr = new XMLHttpRequest(); @@ -39,7 +39,7 @@ ctx.fillRect(0, 0, 100, 50); ctx.globalCompositeOperation = 'source-out'; ctx.drawImage(offscreenCanvas2, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 255,255,0,96, "50,25", "255,255,0,96", 5); + _assertPixelApprox(canvas, 50,25, 255,255,0,96, "50,25", "255,255,0,96", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.source-out.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.source-out.worker.js index 10671d7..0d2da83 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.source-out.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.source-out.worker.js
@@ -13,11 +13,11 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -var offscreenCanvas2 = new OffscreenCanvas(offscreenCanvas.width, offscreenCanvas.height); +var offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height); var ctx2 = offscreenCanvas2.getContext('2d'); var promise = new Promise(function(resolve, reject) { var xhr = new XMLHttpRequest(); @@ -35,7 +35,7 @@ ctx.fillRect(0, 0, 100, 50); ctx.globalCompositeOperation = 'source-out'; ctx.drawImage(offscreenCanvas2, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 255,255,0,96, "50,25", "255,255,0,96", 5); + _assertPixelApprox(canvas, 50,25, 255,255,0,96, "50,25", "255,255,0,96", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.source-over.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.source-over.html index d0e6db29..cb93a986f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.source-over.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.source-over.html
@@ -17,11 +17,11 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -var offscreenCanvas2 = new OffscreenCanvas(offscreenCanvas.width, offscreenCanvas.height); +var offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height); var ctx2 = offscreenCanvas2.getContext('2d'); var promise = new Promise(function(resolve, reject) { var xhr = new XMLHttpRequest(); @@ -39,7 +39,7 @@ ctx.fillRect(0, 0, 100, 50); ctx.globalCompositeOperation = 'source-over'; ctx.drawImage(offscreenCanvas2, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 219,255,36,223, "50,25", "219,255,36,223", 5); + _assertPixelApprox(canvas, 50,25, 219,255,36,223, "50,25", "219,255,36,223", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.source-over.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.source-over.worker.js index 6cb1cfa..85ff012 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.source-over.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.source-over.worker.js
@@ -13,11 +13,11 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -var offscreenCanvas2 = new OffscreenCanvas(offscreenCanvas.width, offscreenCanvas.height); +var offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height); var ctx2 = offscreenCanvas2.getContext('2d'); var promise = new Promise(function(resolve, reject) { var xhr = new XMLHttpRequest(); @@ -35,7 +35,7 @@ ctx.fillRect(0, 0, 100, 50); ctx.globalCompositeOperation = 'source-over'; ctx.drawImage(offscreenCanvas2, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 219,255,36,223, "50,25", "219,255,36,223", 5); + _assertPixelApprox(canvas, 50,25, 219,255,36,223, "50,25", "219,255,36,223", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.xor.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.xor.html index 867bd00..d9e57fc 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.xor.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.xor.html
@@ -17,11 +17,11 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -var offscreenCanvas2 = new OffscreenCanvas(offscreenCanvas.width, offscreenCanvas.height); +var offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height); var ctx2 = offscreenCanvas2.getContext('2d'); var promise = new Promise(function(resolve, reject) { var xhr = new XMLHttpRequest(); @@ -39,7 +39,7 @@ ctx.fillRect(0, 0, 100, 50); ctx.globalCompositeOperation = 'xor'; ctx.drawImage(offscreenCanvas2, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 191,255,64,128, "50,25", "191,255,64,128", 5); + _assertPixelApprox(canvas, 50,25, 191,255,64,128, "50,25", "191,255,64,128", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.xor.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.xor.worker.js index 440649b2..eedd05d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.xor.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.canvas.xor.worker.js
@@ -13,11 +13,11 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -var offscreenCanvas2 = new OffscreenCanvas(offscreenCanvas.width, offscreenCanvas.height); +var offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height); var ctx2 = offscreenCanvas2.getContext('2d'); var promise = new Promise(function(resolve, reject) { var xhr = new XMLHttpRequest(); @@ -35,7 +35,7 @@ ctx.fillRect(0, 0, 100, 50); ctx.globalCompositeOperation = 'xor'; ctx.drawImage(offscreenCanvas2, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 191,255,64,128, "50,25", "191,255,64,128", 5); + _assertPixelApprox(canvas, 50,25, 191,255,64,128, "50,25", "191,255,64,128", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.copy.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.copy.html index 9bb7305..0023597 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.copy.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.copy.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; @@ -28,8 +28,8 @@ ctx.clip(); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 50, 50); -_assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.copy.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.copy.worker.js index 5b2fb54..6803969 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.copy.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.copy.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; @@ -24,8 +24,8 @@ ctx.clip(); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 50, 50); -_assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.destination-atop.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.destination-atop.html index 44787c7..e72e962 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.destination-atop.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.destination-atop.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; @@ -28,8 +28,8 @@ ctx.clip(); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 50, 50); -_assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.destination-atop.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.destination-atop.worker.js index e497532..67bea9f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.destination-atop.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.destination-atop.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; @@ -24,8 +24,8 @@ ctx.clip(); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 50, 50); -_assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.destination-in.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.destination-in.html index 6544f1a..d808d13 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.destination-in.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.destination-in.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; @@ -28,8 +28,8 @@ ctx.clip(); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 50, 50); -_assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.destination-in.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.destination-in.worker.js index f60db52..7576ba5 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.destination-in.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.destination-in.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; @@ -24,8 +24,8 @@ ctx.clip(); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 50, 50); -_assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.destination-out.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.destination-out.html index db135fbb..292c7b0c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.destination-out.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.destination-out.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; @@ -28,8 +28,8 @@ ctx.clip(); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 50, 50); -_assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.destination-out.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.destination-out.worker.js index aab300de..2d2b58ef 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.destination-out.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.destination-out.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; @@ -24,8 +24,8 @@ ctx.clip(); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 50, 50); -_assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.destination-over.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.destination-over.html index cd5c738..61a508e5 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.destination-over.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.destination-over.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; @@ -28,8 +28,8 @@ ctx.clip(); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 50, 50); -_assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.destination-over.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.destination-over.worker.js index 16bb2e6..79dc3f7 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.destination-over.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.destination-over.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; @@ -24,8 +24,8 @@ ctx.clip(); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 50, 50); -_assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.lighter.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.lighter.html index 5f13da2c..1e8c347 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.lighter.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.lighter.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; @@ -28,8 +28,8 @@ ctx.clip(); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 50, 50); -_assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.lighter.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.lighter.worker.js index b569896a..267030c8 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.lighter.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.lighter.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; @@ -24,8 +24,8 @@ ctx.clip(); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 50, 50); -_assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.source-atop.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.source-atop.html index b4ad839..1d23968 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.source-atop.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.source-atop.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; @@ -28,8 +28,8 @@ ctx.clip(); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 50, 50); -_assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.source-atop.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.source-atop.worker.js index 24475c6..8b869b1 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.source-atop.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.source-atop.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; @@ -24,8 +24,8 @@ ctx.clip(); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 50, 50); -_assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.source-in.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.source-in.html index 49507a8..43f9304 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.source-in.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.source-in.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; @@ -28,8 +28,8 @@ ctx.clip(); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 50, 50); -_assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.source-in.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.source-in.worker.js index 21eb452..a8d2e58 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.source-in.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.source-in.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; @@ -24,8 +24,8 @@ ctx.clip(); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 50, 50); -_assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.source-out.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.source-out.html index 09e3fe5..b4872e5 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.source-out.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.source-out.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; @@ -28,8 +28,8 @@ ctx.clip(); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 50, 50); -_assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.source-out.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.source-out.worker.js index 6cbef1a..42dcb8e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.source-out.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.source-out.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; @@ -24,8 +24,8 @@ ctx.clip(); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 50, 50); -_assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.source-over.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.source-over.html index 252e3945..1da6f53 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.source-over.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.source-over.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; @@ -28,8 +28,8 @@ ctx.clip(); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 50, 50); -_assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.source-over.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.source-over.worker.js index bdfff6a..aac34989 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.source-over.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.source-over.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; @@ -24,8 +24,8 @@ ctx.clip(); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 50, 50); -_assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.xor.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.xor.html index 423fffc0..ce92ac6 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.xor.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.xor.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; @@ -28,8 +28,8 @@ ctx.clip(); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 50, 50); -_assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.xor.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.xor.worker.js index 16de13e..38a33a35 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.xor.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.clip.xor.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; @@ -24,8 +24,8 @@ ctx.clip(); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 50, 50); -_assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.copy.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.copy.html index f39b347c..b6ee1ff 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.copy.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.copy.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 0.5)'; @@ -36,7 +36,7 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 255,255,0,191, "50,25", "255,255,0,191", 5); + _assertPixelApprox(canvas, 50,25, 255,255,0,191, "50,25", "255,255,0,191", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.copy.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.copy.worker.js index ae8c1b7..82f3cdb 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.copy.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.copy.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 0.5)'; @@ -32,7 +32,7 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 255,255,0,191, "50,25", "255,255,0,191", 5); + _assertPixelApprox(canvas, 50,25, 255,255,0,191, "50,25", "255,255,0,191", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.destination-atop.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.destination-atop.html index 374749a..91b1922e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.destination-atop.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.destination-atop.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 0.5)'; @@ -36,7 +36,7 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 128,255,128,191, "50,25", "128,255,128,191", 5); + _assertPixelApprox(canvas, 50,25, 128,255,128,191, "50,25", "128,255,128,191", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.destination-atop.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.destination-atop.worker.js index 6efb0e2..b69c558 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.destination-atop.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.destination-atop.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 0.5)'; @@ -32,7 +32,7 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 128,255,128,191, "50,25", "128,255,128,191", 5); + _assertPixelApprox(canvas, 50,25, 128,255,128,191, "50,25", "128,255,128,191", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.destination-in.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.destination-in.html index 25a1bd9..ec6b1b0 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.destination-in.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.destination-in.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 0.5)'; @@ -36,7 +36,7 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 0,255,255,96, "50,25", "0,255,255,96", 5); + _assertPixelApprox(canvas, 50,25, 0,255,255,96, "50,25", "0,255,255,96", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.destination-in.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.destination-in.worker.js index 3e42489efa..58d4049 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.destination-in.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.destination-in.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 0.5)'; @@ -32,7 +32,7 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 0,255,255,96, "50,25", "0,255,255,96", 5); + _assertPixelApprox(canvas, 50,25, 0,255,255,96, "50,25", "0,255,255,96", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.destination-out.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.destination-out.html index c576700..e383b18 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.destination-out.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.destination-out.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 0.5)'; @@ -36,7 +36,7 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 0,255,255,32, "50,25", "0,255,255,32", 5); + _assertPixelApprox(canvas, 50,25, 0,255,255,32, "50,25", "0,255,255,32", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.destination-out.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.destination-out.worker.js index 41ca78a..95936bd 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.destination-out.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.destination-out.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 0.5)'; @@ -32,7 +32,7 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 0,255,255,32, "50,25", "0,255,255,32", 5); + _assertPixelApprox(canvas, 50,25, 0,255,255,32, "50,25", "0,255,255,32", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.destination-over.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.destination-over.html index a0e8c16..f96cfb70 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.destination-over.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.destination-over.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 0.5)'; @@ -36,7 +36,7 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 109,255,146,223, "50,25", "109,255,146,223", 5); + _assertPixelApprox(canvas, 50,25, 109,255,146,223, "50,25", "109,255,146,223", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.destination-over.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.destination-over.worker.js index 27aceae6..65dc9a7 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.destination-over.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.destination-over.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 0.5)'; @@ -32,7 +32,7 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 109,255,146,223, "50,25", "109,255,146,223", 5); + _assertPixelApprox(canvas, 50,25, 109,255,146,223, "50,25", "109,255,146,223", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.lighter.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.lighter.html index 9d50278..f0db5b4 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.lighter.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.lighter.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 0.5)'; @@ -36,7 +36,7 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 191,255,128,255, "50,25", "191,255,128,255", 5); + _assertPixelApprox(canvas, 50,25, 191,255,128,255, "50,25", "191,255,128,255", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.lighter.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.lighter.worker.js index b21dbae..cca47e90 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.lighter.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.lighter.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 0.5)'; @@ -32,7 +32,7 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 191,255,128,255, "50,25", "191,255,128,255", 5); + _assertPixelApprox(canvas, 50,25, 191,255,128,255, "50,25", "191,255,128,255", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.source-atop.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.source-atop.html index 02bc24b..1547e10 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.source-atop.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.source-atop.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 0.5)'; @@ -36,7 +36,7 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 191,255,64,128, "50,25", "191,255,64,128", 5); + _assertPixelApprox(canvas, 50,25, 191,255,64,128, "50,25", "191,255,64,128", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.source-atop.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.source-atop.worker.js index 7e5833b..434eeb7 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.source-atop.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.source-atop.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 0.5)'; @@ -32,7 +32,7 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 191,255,64,128, "50,25", "191,255,64,128", 5); + _assertPixelApprox(canvas, 50,25, 191,255,64,128, "50,25", "191,255,64,128", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.source-in.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.source-in.html index ed10332..6529b90 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.source-in.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.source-in.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 0.5)'; @@ -36,7 +36,7 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 255,255,0,96, "50,25", "255,255,0,96", 5); + _assertPixelApprox(canvas, 50,25, 255,255,0,96, "50,25", "255,255,0,96", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.source-in.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.source-in.worker.js index aaed6502..869a6b94 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.source-in.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.source-in.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 0.5)'; @@ -32,7 +32,7 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 255,255,0,96, "50,25", "255,255,0,96", 5); + _assertPixelApprox(canvas, 50,25, 255,255,0,96, "50,25", "255,255,0,96", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.source-out.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.source-out.html index 9161aba..fde8083 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.source-out.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.source-out.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 0.5)'; @@ -36,7 +36,7 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 255,255,0,96, "50,25", "255,255,0,96", 5); + _assertPixelApprox(canvas, 50,25, 255,255,0,96, "50,25", "255,255,0,96", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.source-out.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.source-out.worker.js index a5080d9..3793476 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.source-out.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.source-out.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 0.5)'; @@ -32,7 +32,7 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 255,255,0,96, "50,25", "255,255,0,96", 5); + _assertPixelApprox(canvas, 50,25, 255,255,0,96, "50,25", "255,255,0,96", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.source-over.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.source-over.html index 61ddd46..67c0839 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.source-over.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.source-over.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 0.5)'; @@ -36,7 +36,7 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 219,255,36,223, "50,25", "219,255,36,223", 5); + _assertPixelApprox(canvas, 50,25, 219,255,36,223, "50,25", "219,255,36,223", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.source-over.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.source-over.worker.js index eff0cbf..e337f4d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.source-over.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.source-over.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 0.5)'; @@ -32,7 +32,7 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 219,255,36,223, "50,25", "219,255,36,223", 5); + _assertPixelApprox(canvas, 50,25, 219,255,36,223, "50,25", "219,255,36,223", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.xor.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.xor.html index de2847c..800a6155 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.xor.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.xor.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 0.5)'; @@ -36,7 +36,7 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 191,255,64,128, "50,25", "191,255,64,128", 5); + _assertPixelApprox(canvas, 50,25, 191,255,64,128, "50,25", "191,255,64,128", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.xor.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.xor.worker.js index fa92703..0793948 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.xor.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.image.xor.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 0.5)'; @@ -32,7 +32,7 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 191,255,64,128, "50,25", "191,255,64,128", 5); + _assertPixelApprox(canvas, 50,25, 191,255,64,128, "50,25", "191,255,64,128", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.copy.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.copy.html index d8c37c36..b9e3400 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.copy.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.copy.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 1.0)'; @@ -26,7 +26,7 @@ ctx.globalCompositeOperation = 'copy'; ctx.fillStyle = 'rgba(255, 255, 0, 1.0)'; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 255,255,0,255, "50,25", "255,255,0,255", 5); +_assertPixelApprox(canvas, 50,25, 255,255,0,255, "50,25", "255,255,0,255", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.copy.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.copy.worker.js index 8f225e4b..2baab28 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.copy.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.copy.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 1.0)'; @@ -22,7 +22,7 @@ ctx.globalCompositeOperation = 'copy'; ctx.fillStyle = 'rgba(255, 255, 0, 1.0)'; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 255,255,0,255, "50,25", "255,255,0,255", 5); +_assertPixelApprox(canvas, 50,25, 255,255,0,255, "50,25", "255,255,0,255", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.destination-atop.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.destination-atop.html index 608c9bb..6fae26d9 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.destination-atop.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.destination-atop.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 1.0)'; @@ -26,7 +26,7 @@ ctx.globalCompositeOperation = 'destination-atop'; ctx.fillStyle = 'rgba(255, 255, 0, 1.0)'; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 0,255,255,255, "50,25", "0,255,255,255", 5); +_assertPixelApprox(canvas, 50,25, 0,255,255,255, "50,25", "0,255,255,255", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.destination-atop.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.destination-atop.worker.js index 15965d51..e9cc3f9 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.destination-atop.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.destination-atop.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 1.0)'; @@ -22,7 +22,7 @@ ctx.globalCompositeOperation = 'destination-atop'; ctx.fillStyle = 'rgba(255, 255, 0, 1.0)'; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 0,255,255,255, "50,25", "0,255,255,255", 5); +_assertPixelApprox(canvas, 50,25, 0,255,255,255, "50,25", "0,255,255,255", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.destination-in.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.destination-in.html index 8ee35fc..72b51c6 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.destination-in.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.destination-in.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 1.0)'; @@ -26,7 +26,7 @@ ctx.globalCompositeOperation = 'destination-in'; ctx.fillStyle = 'rgba(255, 255, 0, 1.0)'; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 0,255,255,255, "50,25", "0,255,255,255", 5); +_assertPixelApprox(canvas, 50,25, 0,255,255,255, "50,25", "0,255,255,255", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.destination-in.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.destination-in.worker.js index 57f7fa95..d4b5560 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.destination-in.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.destination-in.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 1.0)'; @@ -22,7 +22,7 @@ ctx.globalCompositeOperation = 'destination-in'; ctx.fillStyle = 'rgba(255, 255, 0, 1.0)'; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 0,255,255,255, "50,25", "0,255,255,255", 5); +_assertPixelApprox(canvas, 50,25, 0,255,255,255, "50,25", "0,255,255,255", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.destination-out.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.destination-out.html index b43fa089..7fe711d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.destination-out.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.destination-out.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 1.0)'; @@ -26,7 +26,7 @@ ctx.globalCompositeOperation = 'destination-out'; ctx.fillStyle = 'rgba(255, 255, 0, 1.0)'; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); +_assertPixelApprox(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.destination-out.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.destination-out.worker.js index 18f4f21..de9811e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.destination-out.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.destination-out.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 1.0)'; @@ -22,7 +22,7 @@ ctx.globalCompositeOperation = 'destination-out'; ctx.fillStyle = 'rgba(255, 255, 0, 1.0)'; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); +_assertPixelApprox(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.destination-over.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.destination-over.html index f55decb..1d7e0fb0 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.destination-over.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.destination-over.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 1.0)'; @@ -26,7 +26,7 @@ ctx.globalCompositeOperation = 'destination-over'; ctx.fillStyle = 'rgba(255, 255, 0, 1.0)'; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 0,255,255,255, "50,25", "0,255,255,255", 5); +_assertPixelApprox(canvas, 50,25, 0,255,255,255, "50,25", "0,255,255,255", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.destination-over.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.destination-over.worker.js index 9fc8ae0..60464d2 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.destination-over.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.destination-over.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 1.0)'; @@ -22,7 +22,7 @@ ctx.globalCompositeOperation = 'destination-over'; ctx.fillStyle = 'rgba(255, 255, 0, 1.0)'; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 0,255,255,255, "50,25", "0,255,255,255", 5); +_assertPixelApprox(canvas, 50,25, 0,255,255,255, "50,25", "0,255,255,255", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.lighter.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.lighter.html index 973da9a8..5bb9593 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.lighter.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.lighter.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 1.0)'; @@ -26,7 +26,7 @@ ctx.globalCompositeOperation = 'lighter'; ctx.fillStyle = 'rgba(255, 255, 0, 1.0)'; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 255,255,255,255, "50,25", "255,255,255,255", 5); +_assertPixelApprox(canvas, 50,25, 255,255,255,255, "50,25", "255,255,255,255", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.lighter.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.lighter.worker.js index ff477cc..23a34fc 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.lighter.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.lighter.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 1.0)'; @@ -22,7 +22,7 @@ ctx.globalCompositeOperation = 'lighter'; ctx.fillStyle = 'rgba(255, 255, 0, 1.0)'; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 255,255,255,255, "50,25", "255,255,255,255", 5); +_assertPixelApprox(canvas, 50,25, 255,255,255,255, "50,25", "255,255,255,255", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.source-atop.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.source-atop.html index 6077e538..5360ac58 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.source-atop.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.source-atop.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 1.0)'; @@ -26,7 +26,7 @@ ctx.globalCompositeOperation = 'source-atop'; ctx.fillStyle = 'rgba(255, 255, 0, 1.0)'; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 255,255,0,255, "50,25", "255,255,0,255", 5); +_assertPixelApprox(canvas, 50,25, 255,255,0,255, "50,25", "255,255,0,255", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.source-atop.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.source-atop.worker.js index 7571902..79ce54ef2 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.source-atop.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.source-atop.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 1.0)'; @@ -22,7 +22,7 @@ ctx.globalCompositeOperation = 'source-atop'; ctx.fillStyle = 'rgba(255, 255, 0, 1.0)'; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 255,255,0,255, "50,25", "255,255,0,255", 5); +_assertPixelApprox(canvas, 50,25, 255,255,0,255, "50,25", "255,255,0,255", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.source-in.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.source-in.html index e9c9e32..80ecf3a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.source-in.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.source-in.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 1.0)'; @@ -26,7 +26,7 @@ ctx.globalCompositeOperation = 'source-in'; ctx.fillStyle = 'rgba(255, 255, 0, 1.0)'; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 255,255,0,255, "50,25", "255,255,0,255", 5); +_assertPixelApprox(canvas, 50,25, 255,255,0,255, "50,25", "255,255,0,255", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.source-in.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.source-in.worker.js index fce8b49c..1cfedc9 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.source-in.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.source-in.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 1.0)'; @@ -22,7 +22,7 @@ ctx.globalCompositeOperation = 'source-in'; ctx.fillStyle = 'rgba(255, 255, 0, 1.0)'; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 255,255,0,255, "50,25", "255,255,0,255", 5); +_assertPixelApprox(canvas, 50,25, 255,255,0,255, "50,25", "255,255,0,255", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.source-out.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.source-out.html index d905076..8bab40a14 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.source-out.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.source-out.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 1.0)'; @@ -26,7 +26,7 @@ ctx.globalCompositeOperation = 'source-out'; ctx.fillStyle = 'rgba(255, 255, 0, 1.0)'; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); +_assertPixelApprox(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.source-out.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.source-out.worker.js index f803a16..7a64d43b 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.source-out.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.source-out.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 1.0)'; @@ -22,7 +22,7 @@ ctx.globalCompositeOperation = 'source-out'; ctx.fillStyle = 'rgba(255, 255, 0, 1.0)'; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); +_assertPixelApprox(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.source-over.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.source-over.html index 7064210..6a77533 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.source-over.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.source-over.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 1.0)'; @@ -26,7 +26,7 @@ ctx.globalCompositeOperation = 'source-over'; ctx.fillStyle = 'rgba(255, 255, 0, 1.0)'; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 255,255,0,255, "50,25", "255,255,0,255", 5); +_assertPixelApprox(canvas, 50,25, 255,255,0,255, "50,25", "255,255,0,255", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.source-over.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.source-over.worker.js index 8ffd9a6..db6f5c3c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.source-over.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.source-over.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 1.0)'; @@ -22,7 +22,7 @@ ctx.globalCompositeOperation = 'source-over'; ctx.fillStyle = 'rgba(255, 255, 0, 1.0)'; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 255,255,0,255, "50,25", "255,255,0,255", 5); +_assertPixelApprox(canvas, 50,25, 255,255,0,255, "50,25", "255,255,0,255", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.xor.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.xor.html index 056c7abe4..12a5ab8 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.xor.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.xor.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 1.0)'; @@ -26,7 +26,7 @@ ctx.globalCompositeOperation = 'xor'; ctx.fillStyle = 'rgba(255, 255, 0, 1.0)'; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); +_assertPixelApprox(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.xor.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.xor.worker.js index 12b9e85..3da6e4d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.xor.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.solid.xor.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 1.0)'; @@ -22,7 +22,7 @@ ctx.globalCompositeOperation = 'xor'; ctx.fillStyle = 'rgba(255, 255, 0, 1.0)'; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); +_assertPixelApprox(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.copy.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.copy.html index 6310aece..1f15d77 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.copy.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.copy.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 0, 0.5)'; @@ -26,7 +26,7 @@ ctx.globalCompositeOperation = 'copy'; ctx.fillStyle = 'rgba(0, 0, 255, 0.75)'; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 0,0,255,191, "50,25", "0,0,255,191", 5); +_assertPixelApprox(canvas, 50,25, 0,0,255,191, "50,25", "0,0,255,191", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.copy.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.copy.worker.js index 6f07e56f..0c954b0 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.copy.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.copy.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 0, 0.5)'; @@ -22,7 +22,7 @@ ctx.globalCompositeOperation = 'copy'; ctx.fillStyle = 'rgba(0, 0, 255, 0.75)'; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 0,0,255,191, "50,25", "0,0,255,191", 5); +_assertPixelApprox(canvas, 50,25, 0,0,255,191, "50,25", "0,0,255,191", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.destination-atop.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.destination-atop.html index 71f1f1c..b6f5e88 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.destination-atop.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.destination-atop.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 0, 0.5)'; @@ -26,7 +26,7 @@ ctx.globalCompositeOperation = 'destination-atop'; ctx.fillStyle = 'rgba(0, 0, 255, 0.75)'; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 0,128,128,191, "50,25", "0,128,128,191", 5); +_assertPixelApprox(canvas, 50,25, 0,128,128,191, "50,25", "0,128,128,191", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.destination-atop.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.destination-atop.worker.js index 6c7dab1..d2909e4 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.destination-atop.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.destination-atop.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 0, 0.5)'; @@ -22,7 +22,7 @@ ctx.globalCompositeOperation = 'destination-atop'; ctx.fillStyle = 'rgba(0, 0, 255, 0.75)'; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 0,128,128,191, "50,25", "0,128,128,191", 5); +_assertPixelApprox(canvas, 50,25, 0,128,128,191, "50,25", "0,128,128,191", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.destination-in.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.destination-in.html index 5155c2b..4ba2c25 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.destination-in.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.destination-in.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 0, 0.5)'; @@ -26,7 +26,7 @@ ctx.globalCompositeOperation = 'destination-in'; ctx.fillStyle = 'rgba(0, 0, 255, 0.75)'; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,96, "50,25", "0,255,0,96", 5); +_assertPixelApprox(canvas, 50,25, 0,255,0,96, "50,25", "0,255,0,96", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.destination-in.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.destination-in.worker.js index 2045254..a62b40e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.destination-in.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.destination-in.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 0, 0.5)'; @@ -22,7 +22,7 @@ ctx.globalCompositeOperation = 'destination-in'; ctx.fillStyle = 'rgba(0, 0, 255, 0.75)'; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,96, "50,25", "0,255,0,96", 5); +_assertPixelApprox(canvas, 50,25, 0,255,0,96, "50,25", "0,255,0,96", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.destination-out.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.destination-out.html index 39a5aa9..e5dcfed8 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.destination-out.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.destination-out.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 0, 0.5)'; @@ -26,7 +26,7 @@ ctx.globalCompositeOperation = 'destination-out'; ctx.fillStyle = 'rgba(0, 0, 255, 0.75)'; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,32, "50,25", "0,255,0,32", 5); +_assertPixelApprox(canvas, 50,25, 0,255,0,32, "50,25", "0,255,0,32", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.destination-out.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.destination-out.worker.js index 64ae624..49f968da 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.destination-out.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.destination-out.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 0, 0.5)'; @@ -22,7 +22,7 @@ ctx.globalCompositeOperation = 'destination-out'; ctx.fillStyle = 'rgba(0, 0, 255, 0.75)'; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,32, "50,25", "0,255,0,32", 5); +_assertPixelApprox(canvas, 50,25, 0,255,0,32, "50,25", "0,255,0,32", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.destination-over.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.destination-over.html index 5abb902..0b81d54 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.destination-over.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.destination-over.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 0, 0.5)'; @@ -26,7 +26,7 @@ ctx.globalCompositeOperation = 'destination-over'; ctx.fillStyle = 'rgba(0, 0, 255, 0.75)'; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 0,146,109,223, "50,25", "0,146,109,223", 5); +_assertPixelApprox(canvas, 50,25, 0,146,109,223, "50,25", "0,146,109,223", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.destination-over.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.destination-over.worker.js index 6e9d3aa9..3ef1433d1 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.destination-over.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.destination-over.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 0, 0.5)'; @@ -22,7 +22,7 @@ ctx.globalCompositeOperation = 'destination-over'; ctx.fillStyle = 'rgba(0, 0, 255, 0.75)'; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 0,146,109,223, "50,25", "0,146,109,223", 5); +_assertPixelApprox(canvas, 50,25, 0,146,109,223, "50,25", "0,146,109,223", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.lighter.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.lighter.html index e1547bf..b74c593 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.lighter.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.lighter.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 0, 0.5)'; @@ -26,7 +26,7 @@ ctx.globalCompositeOperation = 'lighter'; ctx.fillStyle = 'rgba(0, 0, 255, 0.75)'; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 0,128,191,255, "50,25", "0,128,191,255", 5); +_assertPixelApprox(canvas, 50,25, 0,128,191,255, "50,25", "0,128,191,255", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.lighter.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.lighter.worker.js index 9240db0..239ad65 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.lighter.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.lighter.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 0, 0.5)'; @@ -22,7 +22,7 @@ ctx.globalCompositeOperation = 'lighter'; ctx.fillStyle = 'rgba(0, 0, 255, 0.75)'; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 0,128,191,255, "50,25", "0,128,191,255", 5); +_assertPixelApprox(canvas, 50,25, 0,128,191,255, "50,25", "0,128,191,255", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.source-atop.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.source-atop.html index 0334efe..ba61962 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.source-atop.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.source-atop.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 0, 0.5)'; @@ -26,7 +26,7 @@ ctx.globalCompositeOperation = 'source-atop'; ctx.fillStyle = 'rgba(0, 0, 255, 0.75)'; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 0,64,191,128, "50,25", "0,64,191,128", 5); +_assertPixelApprox(canvas, 50,25, 0,64,191,128, "50,25", "0,64,191,128", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.source-atop.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.source-atop.worker.js index b2e3710c..517942b 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.source-atop.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.source-atop.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 0, 0.5)'; @@ -22,7 +22,7 @@ ctx.globalCompositeOperation = 'source-atop'; ctx.fillStyle = 'rgba(0, 0, 255, 0.75)'; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 0,64,191,128, "50,25", "0,64,191,128", 5); +_assertPixelApprox(canvas, 50,25, 0,64,191,128, "50,25", "0,64,191,128", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.source-in.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.source-in.html index bdd1c6f..501d597 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.source-in.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.source-in.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 0, 0.5)'; @@ -26,7 +26,7 @@ ctx.globalCompositeOperation = 'source-in'; ctx.fillStyle = 'rgba(0, 0, 255, 0.75)'; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 0,0,255,96, "50,25", "0,0,255,96", 5); +_assertPixelApprox(canvas, 50,25, 0,0,255,96, "50,25", "0,0,255,96", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.source-in.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.source-in.worker.js index 5bb7468..7e3964a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.source-in.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.source-in.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 0, 0.5)'; @@ -22,7 +22,7 @@ ctx.globalCompositeOperation = 'source-in'; ctx.fillStyle = 'rgba(0, 0, 255, 0.75)'; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 0,0,255,96, "50,25", "0,0,255,96", 5); +_assertPixelApprox(canvas, 50,25, 0,0,255,96, "50,25", "0,0,255,96", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.source-out.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.source-out.html index 9f9ffcf9..09e2f3f6 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.source-out.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.source-out.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 0, 0.5)'; @@ -26,7 +26,7 @@ ctx.globalCompositeOperation = 'source-out'; ctx.fillStyle = 'rgba(0, 0, 255, 0.75)'; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 0,0,255,96, "50,25", "0,0,255,96", 5); +_assertPixelApprox(canvas, 50,25, 0,0,255,96, "50,25", "0,0,255,96", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.source-out.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.source-out.worker.js index 6dba1b6b..f0660fe 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.source-out.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.source-out.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 0, 0.5)'; @@ -22,7 +22,7 @@ ctx.globalCompositeOperation = 'source-out'; ctx.fillStyle = 'rgba(0, 0, 255, 0.75)'; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 0,0,255,96, "50,25", "0,0,255,96", 5); +_assertPixelApprox(canvas, 50,25, 0,0,255,96, "50,25", "0,0,255,96", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.source-over.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.source-over.html index b56522d..291355d1 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.source-over.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.source-over.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 0, 0.5)'; @@ -26,7 +26,7 @@ ctx.globalCompositeOperation = 'source-over'; ctx.fillStyle = 'rgba(0, 0, 255, 0.75)'; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 0,36,219,223, "50,25", "0,36,219,223", 5); +_assertPixelApprox(canvas, 50,25, 0,36,219,223, "50,25", "0,36,219,223", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.source-over.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.source-over.worker.js index c772fa9..126e80741 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.source-over.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.source-over.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 0, 0.5)'; @@ -22,7 +22,7 @@ ctx.globalCompositeOperation = 'source-over'; ctx.fillStyle = 'rgba(0, 0, 255, 0.75)'; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 0,36,219,223, "50,25", "0,36,219,223", 5); +_assertPixelApprox(canvas, 50,25, 0,36,219,223, "50,25", "0,36,219,223", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.xor.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.xor.html index c8af939..b9100d6 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.xor.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.xor.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 0, 0.5)'; @@ -26,7 +26,7 @@ ctx.globalCompositeOperation = 'xor'; ctx.fillStyle = 'rgba(0, 0, 255, 0.75)'; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 0,64,191,128, "50,25", "0,64,191,128", 5); +_assertPixelApprox(canvas, 50,25, 0,64,191,128, "50,25", "0,64,191,128", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.xor.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.xor.worker.js index 67f3a2b..d97d3a9 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.xor.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.transparent.xor.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 0, 0.5)'; @@ -22,7 +22,7 @@ ctx.globalCompositeOperation = 'xor'; ctx.fillStyle = 'rgba(0, 0, 255, 0.75)'; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 0,64,191,128, "50,25", "0,64,191,128", 5); +_assertPixelApprox(canvas, 50,25, 0,64,191,128, "50,25", "0,64,191,128", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.copy.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.copy.html index 32617b3..ea7f416f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.copy.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.copy.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 0, 0.5)'; @@ -27,7 +27,7 @@ ctx.fillStyle = 'rgba(0, 0, 255, 0.75)'; ctx.translate(0, 25); ctx.fillRect(0, 50, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); +_assertPixelApprox(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.copy.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.copy.worker.js index c680524d..6d8b4c22 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.copy.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.copy.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 0, 0.5)'; @@ -23,7 +23,7 @@ ctx.fillStyle = 'rgba(0, 0, 255, 0.75)'; ctx.translate(0, 25); ctx.fillRect(0, 50, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); +_assertPixelApprox(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.destination-atop.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.destination-atop.html index c07085b..37d3ffb 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.destination-atop.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.destination-atop.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 0, 0.5)'; @@ -27,7 +27,7 @@ ctx.fillStyle = 'rgba(0, 0, 255, 0.75)'; ctx.translate(0, 25); ctx.fillRect(0, 50, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); +_assertPixelApprox(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.destination-atop.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.destination-atop.worker.js index 3971cd0..9312298 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.destination-atop.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.destination-atop.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 0, 0.5)'; @@ -23,7 +23,7 @@ ctx.fillStyle = 'rgba(0, 0, 255, 0.75)'; ctx.translate(0, 25); ctx.fillRect(0, 50, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); +_assertPixelApprox(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.destination-in.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.destination-in.html index b6fc0b9..690a03fc 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.destination-in.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.destination-in.html
@@ -18,8 +18,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 0, 0.5)'; @@ -28,7 +28,7 @@ ctx.fillStyle = 'rgba(0, 0, 255, 0.75)'; ctx.translate(0, 25); ctx.fillRect(0, 50, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); +_assertPixelApprox(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.destination-in.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.destination-in.worker.js index f4555f7..5e7b3b3d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.destination-in.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.destination-in.worker.js
@@ -14,8 +14,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 0, 0.5)'; @@ -24,7 +24,7 @@ ctx.fillStyle = 'rgba(0, 0, 255, 0.75)'; ctx.translate(0, 25); ctx.fillRect(0, 50, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); +_assertPixelApprox(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.source-in.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.source-in.html index c366f08..7042214 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.source-in.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.source-in.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 0, 0.5)'; @@ -27,7 +27,7 @@ ctx.fillStyle = 'rgba(0, 0, 255, 0.75)'; ctx.translate(0, 25); ctx.fillRect(0, 50, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); +_assertPixelApprox(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.source-in.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.source-in.worker.js index fe9c259..79153081 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.source-in.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.source-in.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 0, 0.5)'; @@ -23,7 +23,7 @@ ctx.fillStyle = 'rgba(0, 0, 255, 0.75)'; ctx.translate(0, 25); ctx.fillRect(0, 50, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); +_assertPixelApprox(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.source-out.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.source-out.html index a7e6744..d9f6365 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.source-out.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.source-out.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 0, 0.5)'; @@ -27,7 +27,7 @@ ctx.fillStyle = 'rgba(0, 0, 255, 0.75)'; ctx.translate(0, 25); ctx.fillRect(0, 50, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); +_assertPixelApprox(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.source-out.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.source-out.worker.js index 39833cd..f77835a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.source-out.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.fill.source-out.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 0, 0.5)'; @@ -23,7 +23,7 @@ ctx.fillStyle = 'rgba(0, 0, 255, 0.75)'; ctx.translate(0, 25); ctx.fillRect(0, 50, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); +_assertPixelApprox(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.image.copy.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.image.copy.html index cd94e01..30d9022 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.image.copy.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.image.copy.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 0.5)'; @@ -36,8 +36,8 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 40, 40, 10, 10, 40, 50, 10, 10); - _assertPixelApprox(offscreenCanvas, 15,15, 0,0,0,0, "15,15", "0,0,0,0", 5); - _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); + _assertPixelApprox(canvas, 15,15, 0,0,0,0, "15,15", "0,0,0,0", 5); + _assertPixelApprox(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.image.copy.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.image.copy.worker.js index 7a11a360..bd07d4d3 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.image.copy.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.image.copy.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 0.5)'; @@ -32,8 +32,8 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 40, 40, 10, 10, 40, 50, 10, 10); - _assertPixelApprox(offscreenCanvas, 15,15, 0,0,0,0, "15,15", "0,0,0,0", 5); - _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); + _assertPixelApprox(canvas, 15,15, 0,0,0,0, "15,15", "0,0,0,0", 5); + _assertPixelApprox(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.image.destination-atop.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.image.destination-atop.html index dbedb78..a444168 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.image.destination-atop.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.image.destination-atop.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 0.5)'; @@ -36,8 +36,8 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 40, 40, 10, 10, 40, 50, 10, 10); - _assertPixelApprox(offscreenCanvas, 15,15, 0,0,0,0, "15,15", "0,0,0,0", 5); - _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); + _assertPixelApprox(canvas, 15,15, 0,0,0,0, "15,15", "0,0,0,0", 5); + _assertPixelApprox(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.image.destination-atop.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.image.destination-atop.worker.js index 4295ebe..d12ca85 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.image.destination-atop.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.image.destination-atop.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 0.5)'; @@ -32,8 +32,8 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 40, 40, 10, 10, 40, 50, 10, 10); - _assertPixelApprox(offscreenCanvas, 15,15, 0,0,0,0, "15,15", "0,0,0,0", 5); - _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); + _assertPixelApprox(canvas, 15,15, 0,0,0,0, "15,15", "0,0,0,0", 5); + _assertPixelApprox(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.image.destination-in.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.image.destination-in.html index a7b8df8..9257ff9 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.image.destination-in.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.image.destination-in.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 0.5)'; @@ -36,8 +36,8 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 40, 40, 10, 10, 40, 50, 10, 10); - _assertPixelApprox(offscreenCanvas, 15,15, 0,0,0,0, "15,15", "0,0,0,0", 5); - _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); + _assertPixelApprox(canvas, 15,15, 0,0,0,0, "15,15", "0,0,0,0", 5); + _assertPixelApprox(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.image.destination-in.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.image.destination-in.worker.js index 241b5ce..eb11965 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.image.destination-in.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.image.destination-in.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 0.5)'; @@ -32,8 +32,8 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 40, 40, 10, 10, 40, 50, 10, 10); - _assertPixelApprox(offscreenCanvas, 15,15, 0,0,0,0, "15,15", "0,0,0,0", 5); - _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); + _assertPixelApprox(canvas, 15,15, 0,0,0,0, "15,15", "0,0,0,0", 5); + _assertPixelApprox(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.image.source-in.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.image.source-in.html index d44d4fe..954f9be 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.image.source-in.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.image.source-in.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 0.5)'; @@ -36,8 +36,8 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 40, 40, 10, 10, 40, 50, 10, 10); - _assertPixelApprox(offscreenCanvas, 15,15, 0,0,0,0, "15,15", "0,0,0,0", 5); - _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); + _assertPixelApprox(canvas, 15,15, 0,0,0,0, "15,15", "0,0,0,0", 5); + _assertPixelApprox(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.image.source-in.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.image.source-in.worker.js index cadf47d..b5344ee1 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.image.source-in.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.image.source-in.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 0.5)'; @@ -32,8 +32,8 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 40, 40, 10, 10, 40, 50, 10, 10); - _assertPixelApprox(offscreenCanvas, 15,15, 0,0,0,0, "15,15", "0,0,0,0", 5); - _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); + _assertPixelApprox(canvas, 15,15, 0,0,0,0, "15,15", "0,0,0,0", 5); + _assertPixelApprox(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.image.source-out.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.image.source-out.html index 582135b9..7c9060c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.image.source-out.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.image.source-out.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 0.5)'; @@ -36,8 +36,8 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 40, 40, 10, 10, 40, 50, 10, 10); - _assertPixelApprox(offscreenCanvas, 15,15, 0,0,0,0, "15,15", "0,0,0,0", 5); - _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); + _assertPixelApprox(canvas, 15,15, 0,0,0,0, "15,15", "0,0,0,0", 5); + _assertPixelApprox(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.image.source-out.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.image.source-out.worker.js index fe989416b..06fdd5a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.image.source-out.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.image.source-out.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 0.5)'; @@ -32,8 +32,8 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 40, 40, 10, 10, 40, 50, 10, 10); - _assertPixelApprox(offscreenCanvas, 15,15, 0,0,0,0, "15,15", "0,0,0,0", 5); - _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); + _assertPixelApprox(canvas, 15,15, 0,0,0,0, "15,15", "0,0,0,0", 5); + _assertPixelApprox(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.copy.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.copy.html index 088d8b3..81e72a0 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.copy.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.copy.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 0.5)'; @@ -26,7 +26,7 @@ ctx.globalCompositeOperation = 'copy'; var offscreenCanvas2 = new OffscreenCanvas(100, 50); ctx.drawImage(offscreenCanvas2, 0, 0); -_assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); +_assertPixelApprox(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.copy.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.copy.worker.js index c00189f..85b5e3b 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.copy.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.copy.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 0.5)'; @@ -22,7 +22,7 @@ ctx.globalCompositeOperation = 'copy'; var offscreenCanvas2 = new OffscreenCanvas(100, 50); ctx.drawImage(offscreenCanvas2, 0, 0); -_assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); +_assertPixelApprox(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.destination-atop.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.destination-atop.html index 58247bc..1083a87 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.destination-atop.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.destination-atop.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 0.5)'; @@ -26,7 +26,7 @@ ctx.globalCompositeOperation = 'destination-atop'; var offscreenCanvas2 = new OffscreenCanvas(100, 50); ctx.drawImage(offscreenCanvas2, 0, 0); -_assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); +_assertPixelApprox(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.destination-atop.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.destination-atop.worker.js index db099be..3b26653a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.destination-atop.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.destination-atop.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 0.5)'; @@ -22,7 +22,7 @@ ctx.globalCompositeOperation = 'destination-atop'; var offscreenCanvas2 = new OffscreenCanvas(100, 50); ctx.drawImage(offscreenCanvas2, 0, 0); -_assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); +_assertPixelApprox(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.destination-in.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.destination-in.html index 3d2eaae3..ceac0e58d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.destination-in.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.destination-in.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 0.5)'; @@ -26,7 +26,7 @@ ctx.globalCompositeOperation = 'destination-in'; var offscreenCanvas2 = new OffscreenCanvas(100, 50); ctx.drawImage(offscreenCanvas2, 0, 0); -_assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); +_assertPixelApprox(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.destination-in.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.destination-in.worker.js index 92449f7..ed739a8 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.destination-in.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.destination-in.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 0.5)'; @@ -22,7 +22,7 @@ ctx.globalCompositeOperation = 'destination-in'; var offscreenCanvas2 = new OffscreenCanvas(100, 50); ctx.drawImage(offscreenCanvas2, 0, 0); -_assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); +_assertPixelApprox(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.source-in.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.source-in.html index ff43a3c..d114ee2d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.source-in.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.source-in.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 0.5)'; @@ -26,7 +26,7 @@ ctx.globalCompositeOperation = 'source-in'; var offscreenCanvas2 = new OffscreenCanvas(100, 50); ctx.drawImage(offscreenCanvas2, 0, 0); -_assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); +_assertPixelApprox(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.source-in.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.source-in.worker.js index 023a172..77d2e44 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.source-in.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.source-in.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 0.5)'; @@ -22,7 +22,7 @@ ctx.globalCompositeOperation = 'source-in'; var offscreenCanvas2 = new OffscreenCanvas(100, 50); ctx.drawImage(offscreenCanvas2, 0, 0); -_assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); +_assertPixelApprox(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.source-out.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.source-out.html index 707a5bf..d8ec902 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.source-out.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.source-out.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 0.5)'; @@ -26,7 +26,7 @@ ctx.globalCompositeOperation = 'source-out'; var offscreenCanvas2 = new OffscreenCanvas(100, 50); ctx.drawImage(offscreenCanvas2, 0, 0); -_assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); +_assertPixelApprox(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.source-out.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.source-out.worker.js index 1b82d47..1696690 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.source-out.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.nocontext.source-out.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 0.5)'; @@ -22,7 +22,7 @@ ctx.globalCompositeOperation = 'source-out'; var offscreenCanvas2 = new OffscreenCanvas(100, 50); ctx.drawImage(offscreenCanvas2, 0, 0); -_assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); +_assertPixelApprox(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.copy.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.copy.html index ae3172aa..db3ca440 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.copy.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.copy.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 0.5)'; @@ -37,7 +37,7 @@ createImageBitmap(response).then(bitmap => { ctx.fillStyle = ctx.createPattern(bitmap, 'no-repeat'); ctx.fillRect(0, 50, 100, 50); - _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); + _assertPixelApprox(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.copy.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.copy.worker.js index d4399f9..209e56b 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.copy.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.copy.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 0.5)'; @@ -33,7 +33,7 @@ createImageBitmap(response).then(bitmap => { ctx.fillStyle = ctx.createPattern(bitmap, 'no-repeat'); ctx.fillRect(0, 50, 100, 50); - _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); + _assertPixelApprox(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.destination-atop.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.destination-atop.html index 9440f896..7615381 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.destination-atop.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.destination-atop.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 0.5)'; @@ -37,7 +37,7 @@ createImageBitmap(response).then(bitmap => { ctx.fillStyle = ctx.createPattern(bitmap, 'no-repeat'); ctx.fillRect(0, 50, 100, 50); - _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); + _assertPixelApprox(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.destination-atop.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.destination-atop.worker.js index fefdeeb..774fbc0 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.destination-atop.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.destination-atop.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 0.5)'; @@ -33,7 +33,7 @@ createImageBitmap(response).then(bitmap => { ctx.fillStyle = ctx.createPattern(bitmap, 'no-repeat'); ctx.fillRect(0, 50, 100, 50); - _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); + _assertPixelApprox(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.destination-in.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.destination-in.html index 627ac33..9951cef 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.destination-in.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.destination-in.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 0.5)'; @@ -37,7 +37,7 @@ createImageBitmap(response).then(bitmap => { ctx.fillStyle = ctx.createPattern(bitmap, 'no-repeat'); ctx.fillRect(0, 50, 100, 50); - _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); + _assertPixelApprox(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.destination-in.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.destination-in.worker.js index 3c03436..2eafc21 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.destination-in.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.destination-in.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 0.5)'; @@ -33,7 +33,7 @@ createImageBitmap(response).then(bitmap => { ctx.fillStyle = ctx.createPattern(bitmap, 'no-repeat'); ctx.fillRect(0, 50, 100, 50); - _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); + _assertPixelApprox(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.source-in.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.source-in.html index ea08664..e6117e2 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.source-in.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.source-in.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 0.5)'; @@ -37,7 +37,7 @@ createImageBitmap(response).then(bitmap => { ctx.fillStyle = ctx.createPattern(bitmap, 'no-repeat'); ctx.fillRect(0, 50, 100, 50); - _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); + _assertPixelApprox(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.source-in.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.source-in.worker.js index 925f1a9..90394a1 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.source-in.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.source-in.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 0.5)'; @@ -33,7 +33,7 @@ createImageBitmap(response).then(bitmap => { ctx.fillStyle = ctx.createPattern(bitmap, 'no-repeat'); ctx.fillRect(0, 50, 100, 50); - _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); + _assertPixelApprox(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.source-out.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.source-out.html index 69b7512..a0856ad 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.source-out.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.source-out.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 0.5)'; @@ -37,7 +37,7 @@ createImageBitmap(response).then(bitmap => { ctx.fillStyle = ctx.createPattern(bitmap, 'no-repeat'); ctx.fillRect(0, 50, 100, 50); - _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); + _assertPixelApprox(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.source-out.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.source-out.worker.js index 9ef0b5f6ad..515411d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.source-out.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.source-out.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 255, 0.5)'; @@ -33,7 +33,7 @@ createImageBitmap(response).then(bitmap => { ctx.fillStyle = ctx.createPattern(bitmap, 'no-repeat'); ctx.fillRect(0, 50, 100, 50); - _assertPixelApprox(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); + _assertPixelApprox(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.3arg.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.3arg.html index 7e096ec9..15d7b73 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.3arg.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.3arg.html
@@ -18,8 +18,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var promise1 = new Promise(function(resolve, reject) { var xhr = new XMLHttpRequest(); @@ -48,10 +48,10 @@ ctx.drawImage(bitmap1, 100, 0); ctx.drawImage(bitmap1, 0, -50); ctx.drawImage(bitmap1, 0, 50); - _assertPixelApprox(offscreenCanvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2); + _assertPixelApprox(canvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 2); + _assertPixelApprox(canvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2); + _assertPixelApprox(canvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2); + _assertPixelApprox(canvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.3arg.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.3arg.worker.js index 219e90d..875e618 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.3arg.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.3arg.worker.js
@@ -14,8 +14,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var promise1 = new Promise(function(resolve, reject) { var xhr = new XMLHttpRequest(); @@ -44,10 +44,10 @@ ctx.drawImage(bitmap1, 100, 0); ctx.drawImage(bitmap1, 0, -50); ctx.drawImage(bitmap1, 0, 50); - _assertPixelApprox(offscreenCanvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2); + _assertPixelApprox(canvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 2); + _assertPixelApprox(canvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2); + _assertPixelApprox(canvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2); + _assertPixelApprox(canvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.5arg.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.5arg.html index f2dcb2db..046e38f2 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.5arg.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.5arg.html
@@ -18,8 +18,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -49,10 +49,10 @@ ctx.drawImage(bitmap1, 0, 0, 50, 50); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 50, 50); - _assertPixelApprox(offscreenCanvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2); + _assertPixelApprox(canvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 2); + _assertPixelApprox(canvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2); + _assertPixelApprox(canvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2); + _assertPixelApprox(canvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.5arg.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.5arg.worker.js index 005235a..d5dad45 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.5arg.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.5arg.worker.js
@@ -14,8 +14,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -45,10 +45,10 @@ ctx.drawImage(bitmap1, 0, 0, 50, 50); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 50, 50); - _assertPixelApprox(offscreenCanvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2); + _assertPixelApprox(canvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 2); + _assertPixelApprox(canvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2); + _assertPixelApprox(canvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2); + _assertPixelApprox(canvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.basic.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.basic.html index b71f68f..c1b927df 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.basic.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.basic.html
@@ -18,8 +18,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -35,10 +35,10 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 0, 0, 100, 50, 0, 0, 100, 50); - _assertPixelApprox(offscreenCanvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2); + _assertPixelApprox(canvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 2); + _assertPixelApprox(canvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2); + _assertPixelApprox(canvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2); + _assertPixelApprox(canvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.basic.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.basic.worker.js index 3f26c72..c392330 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.basic.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.basic.worker.js
@@ -14,8 +14,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -31,10 +31,10 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 0, 0, 100, 50, 0, 0, 100, 50); - _assertPixelApprox(offscreenCanvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2); + _assertPixelApprox(canvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 2); + _assertPixelApprox(canvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2); + _assertPixelApprox(canvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2); + _assertPixelApprox(canvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.destpos.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.destpos.html index df8f39a9..4c0dc527 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.destpos.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.destpos.html
@@ -18,8 +18,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -50,10 +50,10 @@ ctx.drawImage(bitmap1, 0, 0, 100, 50, 100, 0, 100, 50); ctx.drawImage(bitmap1, 0, 0, 100, 50, 0, -50, 100, 50); ctx.drawImage(bitmap1, 0, 0, 100, 50, 0, 50, 100, 50); - _assertPixelApprox(offscreenCanvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2); + _assertPixelApprox(canvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 2); + _assertPixelApprox(canvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2); + _assertPixelApprox(canvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2); + _assertPixelApprox(canvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.destpos.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.destpos.worker.js index ed9a725..292b1134 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.destpos.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.destpos.worker.js
@@ -14,8 +14,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -46,10 +46,10 @@ ctx.drawImage(bitmap1, 0, 0, 100, 50, 100, 0, 100, 50); ctx.drawImage(bitmap1, 0, 0, 100, 50, 0, -50, 100, 50); ctx.drawImage(bitmap1, 0, 0, 100, 50, 0, 50, 100, 50); - _assertPixelApprox(offscreenCanvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2); + _assertPixelApprox(canvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 2); + _assertPixelApprox(canvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2); + _assertPixelApprox(canvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2); + _assertPixelApprox(canvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.destsize.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.destsize.html index 0a542c0a..96d7666 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.destsize.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.destsize.html
@@ -18,8 +18,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -50,10 +50,10 @@ ctx.drawImage(bitmap1, 0, 0, 100, 50, 100, 0, 50, 50); ctx.drawImage(bitmap1, 0, 0, 100, 50, 0, -25, 100, 25); ctx.drawImage(bitmap1, 0, 0, 100, 50, 0, 50, 100, 25); - _assertPixelApprox(offscreenCanvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2); + _assertPixelApprox(canvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 2); + _assertPixelApprox(canvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2); + _assertPixelApprox(canvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2); + _assertPixelApprox(canvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.destsize.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.destsize.worker.js index 8cc7748..32a87f9 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.destsize.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.destsize.worker.js
@@ -14,8 +14,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -46,10 +46,10 @@ ctx.drawImage(bitmap1, 0, 0, 100, 50, 100, 0, 50, 50); ctx.drawImage(bitmap1, 0, 0, 100, 50, 0, -25, 100, 25); ctx.drawImage(bitmap1, 0, 0, 100, 50, 0, 50, 100, 25); - _assertPixelApprox(offscreenCanvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2); + _assertPixelApprox(canvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 2); + _assertPixelApprox(canvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2); + _assertPixelApprox(canvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2); + _assertPixelApprox(canvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcepos.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcepos.html index d97ff8ba..53f9dcf 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcepos.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcepos.html
@@ -18,8 +18,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -35,10 +35,10 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 140, 20, 100, 50, 0, 0, 100, 50); - _assertPixelApprox(offscreenCanvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2); + _assertPixelApprox(canvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 2); + _assertPixelApprox(canvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2); + _assertPixelApprox(canvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2); + _assertPixelApprox(canvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcepos.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcepos.worker.js index 6697bfe..79604b1 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcepos.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcepos.worker.js
@@ -14,8 +14,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -31,10 +31,10 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 140, 20, 100, 50, 0, 0, 100, 50); - _assertPixelApprox(offscreenCanvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2); + _assertPixelApprox(canvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 2); + _assertPixelApprox(canvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2); + _assertPixelApprox(canvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2); + _assertPixelApprox(canvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcesize.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcesize.html index 42e2515..1ba1c45 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcesize.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcesize.html
@@ -18,8 +18,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -38,14 +38,14 @@ ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 51, 26); ctx.fillRect(49, 24, 51, 26); - _assertPixelApprox(offscreenCanvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 20,20, 0,255,0,255, "20,20", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 80,20, 0,255,0,255, "80,20", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 20,30, 0,255,0,255, "20,30", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 80,30, 0,255,0,255, "80,30", "0,255,0,255", 2); + _assertPixelApprox(canvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 2); + _assertPixelApprox(canvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2); + _assertPixelApprox(canvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2); + _assertPixelApprox(canvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2); + _assertPixelApprox(canvas, 20,20, 0,255,0,255, "20,20", "0,255,0,255", 2); + _assertPixelApprox(canvas, 80,20, 0,255,0,255, "80,20", "0,255,0,255", 2); + _assertPixelApprox(canvas, 20,30, 0,255,0,255, "20,30", "0,255,0,255", 2); + _assertPixelApprox(canvas, 80,30, 0,255,0,255, "80,30", "0,255,0,255", 2); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcesize.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcesize.worker.js index 7079998..b1667d6 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcesize.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcesize.worker.js
@@ -14,8 +14,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -34,14 +34,14 @@ ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 51, 26); ctx.fillRect(49, 24, 51, 26); - _assertPixelApprox(offscreenCanvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 20,20, 0,255,0,255, "20,20", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 80,20, 0,255,0,255, "80,20", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 20,30, 0,255,0,255, "20,30", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 80,30, 0,255,0,255, "80,30", "0,255,0,255", 2); + _assertPixelApprox(canvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 2); + _assertPixelApprox(canvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2); + _assertPixelApprox(canvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2); + _assertPixelApprox(canvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2); + _assertPixelApprox(canvas, 20,20, 0,255,0,255, "20,20", "0,255,0,255", 2); + _assertPixelApprox(canvas, 80,20, 0,255,0,255, "80,20", "0,255,0,255", 2); + _assertPixelApprox(canvas, 20,30, 0,255,0,255, "20,30", "0,255,0,255", 2); + _assertPixelApprox(canvas, 80,30, 0,255,0,255, "80,30", "0,255,0,255", 2); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.alpha.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.alpha.html index 9902d3e2..7382452e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.alpha.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.alpha.html
@@ -18,8 +18,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -36,7 +36,7 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.alpha.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.alpha.worker.js index 791665c9..59f48f8c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.alpha.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.alpha.worker.js
@@ -14,8 +14,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -32,7 +32,7 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.animated.poster.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.animated.poster.html index a9668a0d..ee4e17ec 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.animated.poster.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.animated.poster.html
@@ -18,8 +18,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var promise = new Promise(function(resolve, reject) { var xhr = new XMLHttpRequest(); @@ -33,7 +33,7 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.animated.poster.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.animated.poster.worker.js index e92ffd6..ba77be0a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.animated.poster.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.animated.poster.worker.js
@@ -14,8 +14,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var promise = new Promise(function(resolve, reject) { var xhr = new XMLHttpRequest(); @@ -29,7 +29,7 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.broken.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.broken.html index 2f1edb0..ee3f758 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.broken.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.broken.html
@@ -18,8 +18,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var promise = new Promise(function(resolve, reject) { var xhr = new XMLHttpRequest(); @@ -35,7 +35,7 @@ ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); ctx.drawImage(bitmap, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.broken.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.broken.worker.js index ab5f2d6..f43f7eef 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.broken.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.broken.worker.js
@@ -14,8 +14,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var promise = new Promise(function(resolve, reject) { var xhr = new XMLHttpRequest(); @@ -31,7 +31,7 @@ ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); ctx.drawImage(bitmap, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.canvas.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.canvas.html index 74bfaac..99251b5 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.canvas.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.canvas.html
@@ -18,8 +18,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var offscreenCanvas2 = new OffscreenCanvas(100, 50); var ctx2 = offscreenCanvas2.getContext('2d'); @@ -27,10 +27,10 @@ ctx2.fillRect(0, 0, 100, 50); ctx.fillStyle = '#f00'; ctx.drawImage(offscreenCanvas2, 0, 0); -_assertPixelApprox(offscreenCanvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2); +_assertPixelApprox(canvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 2); +_assertPixelApprox(canvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2); +_assertPixelApprox(canvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2); +_assertPixelApprox(canvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.canvas.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.canvas.worker.js index 8ab99fe1..fb979816 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.canvas.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.canvas.worker.js
@@ -14,8 +14,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var offscreenCanvas2 = new OffscreenCanvas(100, 50); var ctx2 = offscreenCanvas2.getContext('2d'); @@ -23,10 +23,10 @@ ctx2.fillRect(0, 0, 100, 50); ctx.fillStyle = '#f00'; ctx.drawImage(offscreenCanvas2, 0, 0); -_assertPixelApprox(offscreenCanvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2); +_assertPixelApprox(canvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 2); +_assertPixelApprox(canvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2); +_assertPixelApprox(canvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2); +_assertPixelApprox(canvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.clip.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.clip.html index e91af25f..2d7b97a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.clip.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.clip.html
@@ -18,8 +18,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -37,7 +37,7 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.clip.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.clip.worker.js index 39e6a924..d6fa618 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.clip.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.clip.worker.js
@@ -14,8 +14,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -33,7 +33,7 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.composite.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.composite.html index d77c363..9d721a5 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.composite.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.composite.html
@@ -18,8 +18,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -36,7 +36,7 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.composite.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.composite.worker.js index cf3b6c7..6a8962b 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.composite.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.composite.worker.js
@@ -14,8 +14,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -32,7 +32,7 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.floatsource.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.floatsource.html index 1831395..a4a82615 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.floatsource.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.floatsource.html
@@ -18,8 +18,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var promise = new Promise(function(resolve, reject) { var xhr = new XMLHttpRequest(); @@ -33,7 +33,7 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 10.1, 10.1, 0.1, 0.1, 0, 0, 100, 50); - _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.floatsource.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.floatsource.worker.js index 28a7479..b2e9112 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.floatsource.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.floatsource.worker.js
@@ -14,8 +14,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var promise = new Promise(function(resolve, reject) { var xhr = new XMLHttpRequest(); @@ -29,7 +29,7 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 10.1, 10.1, 0.1, 0.1, 0, 0, 100, 50); - _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativedest.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativedest.html index 357c7c3..a70da77 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativedest.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativedest.html
@@ -18,8 +18,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -36,16 +36,16 @@ createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 100, 78, 50, 50, 0, 50, 50, -50); ctx.drawImage(bitmap, 100, 128, 50, -50, 100, 50, -50, -50); - _assertPixelApprox(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 51,1, 0,255,0,255, "51,1", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 51,48, 0,255,0,255, "51,48", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 2); + _assertPixelApprox(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 2); + _assertPixelApprox(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 2); + _assertPixelApprox(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 2); + _assertPixelApprox(canvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255", 2); + _assertPixelApprox(canvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255", 2); + _assertPixelApprox(canvas, 51,1, 0,255,0,255, "51,1", "0,255,0,255", 2); + _assertPixelApprox(canvas, 51,48, 0,255,0,255, "51,48", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativedest.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativedest.worker.js index 95749c4..567a126f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativedest.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativedest.worker.js
@@ -14,8 +14,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -32,16 +32,16 @@ createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 100, 78, 50, 50, 0, 50, 50, -50); ctx.drawImage(bitmap, 100, 128, 50, -50, 100, 50, -50, -50); - _assertPixelApprox(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 51,1, 0,255,0,255, "51,1", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 51,48, 0,255,0,255, "51,48", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 2); + _assertPixelApprox(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 2); + _assertPixelApprox(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 2); + _assertPixelApprox(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 2); + _assertPixelApprox(canvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255", 2); + _assertPixelApprox(canvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255", 2); + _assertPixelApprox(canvas, 51,1, 0,255,0,255, "51,1", "0,255,0,255", 2); + _assertPixelApprox(canvas, 51,48, 0,255,0,255, "51,48", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativedir.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativedir.html index 76f7917..caf5ebaa 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativedir.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativedir.html
@@ -18,8 +18,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -36,16 +36,16 @@ createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 0, 178, 50, -100, 0, 0, 50, 100); ctx.drawImage(bitmap, 0, 78, 50, 100, 50, 100, 50, -100); - _assertPixelApprox(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 51,1, 0,255,0,255, "51,1", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 51,48, 0,255,0,255, "51,48", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 2); + _assertPixelApprox(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 2); + _assertPixelApprox(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 2); + _assertPixelApprox(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 2); + _assertPixelApprox(canvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255", 2); + _assertPixelApprox(canvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255", 2); + _assertPixelApprox(canvas, 51,1, 0,255,0,255, "51,1", "0,255,0,255", 2); + _assertPixelApprox(canvas, 51,48, 0,255,0,255, "51,48", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativedir.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativedir.worker.js index 23eb5a2..a52ef82 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativedir.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativedir.worker.js
@@ -14,8 +14,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -32,16 +32,16 @@ createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 0, 178, 50, -100, 0, 0, 50, 100); ctx.drawImage(bitmap, 0, 78, 50, 100, 50, 100, 50, -100); - _assertPixelApprox(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 51,1, 0,255,0,255, "51,1", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 51,48, 0,255,0,255, "51,48", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 2); + _assertPixelApprox(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 2); + _assertPixelApprox(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 2); + _assertPixelApprox(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 2); + _assertPixelApprox(canvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255", 2); + _assertPixelApprox(canvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255", 2); + _assertPixelApprox(canvas, 51,1, 0,255,0,255, "51,1", "0,255,0,255", 2); + _assertPixelApprox(canvas, 51,48, 0,255,0,255, "51,48", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativesource.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativesource.html index eca15508..3c9dffe 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativesource.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativesource.html
@@ -18,8 +18,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -36,16 +36,16 @@ createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 100, 78, -100, 50, 0, 0, 50, 50); ctx.drawImage(bitmap, 100, 128, -100, -50, 50, 0, 50, 50); - _assertPixelApprox(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 51,1, 0,255,0,255, "51,1", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 51,48, 0,255,0,255, "51,48", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 2); + _assertPixelApprox(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 2); + _assertPixelApprox(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 2); + _assertPixelApprox(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 2); + _assertPixelApprox(canvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255", 2); + _assertPixelApprox(canvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255", 2); + _assertPixelApprox(canvas, 51,1, 0,255,0,255, "51,1", "0,255,0,255", 2); + _assertPixelApprox(canvas, 51,48, 0,255,0,255, "51,48", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativesource.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativesource.worker.js index b276385..de832f4a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativesource.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativesource.worker.js
@@ -14,8 +14,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -32,16 +32,16 @@ createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 100, 78, -100, 50, 0, 0, 50, 50); ctx.drawImage(bitmap, 100, 128, -100, -50, 50, 0, 50, 50); - _assertPixelApprox(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 51,1, 0,255,0,255, "51,1", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 51,48, 0,255,0,255, "51,48", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 2); + _assertPixelApprox(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 2); + _assertPixelApprox(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 2); + _assertPixelApprox(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 2); + _assertPixelApprox(canvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255", 2); + _assertPixelApprox(canvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255", 2); + _assertPixelApprox(canvas, 51,1, 0,255,0,255, "51,1", "0,255,0,255", 2); + _assertPixelApprox(canvas, 51,48, 0,255,0,255, "51,48", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.nonfinite.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.nonfinite.html index 4ff27757..a191139 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.nonfinite.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.nonfinite.html
@@ -18,8 +18,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -335,7 +335,7 @@ ctx.drawImage(bitmap, 0, 0, 100, 50, 0, Infinity, Infinity, Infinity); ctx.drawImage(bitmap, 0, 0, 100, 50, 0, Infinity, 100, Infinity); ctx.drawImage(bitmap, 0, 0, 100, 50, 0, 0, Infinity, Infinity); - _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); + _assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.nonfinite.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.nonfinite.worker.js index 0daa4c68..f7484b65 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.nonfinite.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.nonfinite.worker.js
@@ -14,8 +14,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -331,7 +331,7 @@ ctx.drawImage(bitmap, 0, 0, 100, 50, 0, Infinity, Infinity, Infinity); ctx.drawImage(bitmap, 0, 0, 100, 50, 0, Infinity, 100, Infinity); ctx.drawImage(bitmap, 0, 0, 100, 50, 0, 0, Infinity, Infinity); - _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); + _assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.nowrap.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.nowrap.html index c3485b5..aeeaff6 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.nowrap.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.nowrap.html
@@ -18,8 +18,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -35,9 +35,9 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, -1950, 0, 2000, 50); - _assertPixelApprox(offscreenCanvas, 45,25, 0,255,0,255, "45,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 55,25, 0,255,0,255, "55,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 45,25, 0,255,0,255, "45,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 55,25, 0,255,0,255, "55,25", "0,255,0,255", 2); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.nowrap.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.nowrap.worker.js index cd1bc0b..6fc94276 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.nowrap.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.nowrap.worker.js
@@ -14,8 +14,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -31,9 +31,9 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, -1950, 0, 2000, 50); - _assertPixelApprox(offscreenCanvas, 45,25, 0,255,0,255, "45,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 55,25, 0,255,0,255, "55,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 45,25, 0,255,0,255, "45,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 55,25, 0,255,0,255, "55,25", "0,255,0,255", 2); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.null.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.null.html index b1b1d80..b74b93a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.null.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.null.html
@@ -18,8 +18,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); assert_throws_js(TypeError, function() { ctx.drawImage(null, 0, 0); }); t.done();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.null.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.null.worker.js index 0572dd5..6c649ac4 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.null.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.null.worker.js
@@ -14,8 +14,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); assert_throws_js(TypeError, function() { ctx.drawImage(null, 0, 0); }); t.done();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.path.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.path.html index 520106e..df3af5b 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.path.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.path.html
@@ -18,8 +18,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.rect(0, 0, 100, 50); @@ -36,7 +36,7 @@ createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 0, 0); ctx.fill(); - _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.path.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.path.worker.js index 19162385..3f477c0 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.path.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.path.worker.js
@@ -14,8 +14,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.rect(0, 0, 100, 50); @@ -32,7 +32,7 @@ createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 0, 0); ctx.fill(); - _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.self.1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.self.1.html index d57f53b..6ffbd39 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.self.1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.self.1.html
@@ -18,18 +18,18 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 50, 50); ctx.fillStyle = '#f00'; ctx.fillRect(50, 0, 50, 50); -ctx.drawImage(offscreenCanvas, 50, 0); -_assertPixelApprox(offscreenCanvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2); +ctx.drawImage(canvas, 50, 0); +_assertPixelApprox(canvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 2); +_assertPixelApprox(canvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2); +_assertPixelApprox(canvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2); +_assertPixelApprox(canvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.self.1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.self.1.worker.js index 17fcd2a..98706dd 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.self.1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.self.1.worker.js
@@ -14,18 +14,18 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 50, 50); ctx.fillStyle = '#f00'; ctx.fillRect(50, 0, 50, 50); -ctx.drawImage(offscreenCanvas, 50, 0); -_assertPixelApprox(offscreenCanvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2); +ctx.drawImage(canvas, 50, 0); +_assertPixelApprox(canvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 2); +_assertPixelApprox(canvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2); +_assertPixelApprox(canvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2); +_assertPixelApprox(canvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.self.2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.self.2.html index 13c86139..856d572 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.self.2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.self.2.html
@@ -18,20 +18,20 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 1, 100, 49); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 1); -ctx.drawImage(offscreenCanvas, 0, 1); +ctx.drawImage(canvas, 0, 1); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 2); -_assertPixelApprox(offscreenCanvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2); +_assertPixelApprox(canvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 2); +_assertPixelApprox(canvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2); +_assertPixelApprox(canvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2); +_assertPixelApprox(canvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.self.2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.self.2.worker.js index adfeea5d..59e6e9b 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.self.2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.self.2.worker.js
@@ -14,20 +14,20 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 1, 100, 49); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 1); -ctx.drawImage(offscreenCanvas, 0, 1); +ctx.drawImage(canvas, 0, 1); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 2); -_assertPixelApprox(offscreenCanvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2); +_assertPixelApprox(canvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 2); +_assertPixelApprox(canvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2); +_assertPixelApprox(canvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2); +_assertPixelApprox(canvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.svg.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.svg.html index d76c8c4..6f568d7 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.svg.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.svg.html
@@ -18,8 +18,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var promise = new Promise(function(resolve, reject) { var xhr = new XMLHttpRequest(); @@ -33,7 +33,7 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.svg.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.svg.worker.js index 6189edc..7c2c0933 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.svg.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.svg.worker.js
@@ -14,8 +14,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var promise = new Promise(function(resolve, reject) { var xhr = new XMLHttpRequest(); @@ -29,7 +29,7 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.transform.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.transform.html index 67c12c2b..25f1202 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.transform.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.transform.html
@@ -18,8 +18,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -36,7 +36,7 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.transform.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.transform.worker.js index 791c710..8fa51fb 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.transform.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.transform.worker.js
@@ -14,8 +14,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -32,7 +32,7 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 0, 0); - _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.wrongtype.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.wrongtype.html index f6b0686..f66944bf 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.wrongtype.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.wrongtype.html
@@ -18,8 +18,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); assert_throws_js(TypeError, function() { ctx.drawImage(undefined, 0, 0); }); assert_throws_js(TypeError, function() { ctx.drawImage(0, 0, 0); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.wrongtype.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.wrongtype.worker.js index c3b945c..a5d0dfc 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.wrongtype.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.wrongtype.worker.js
@@ -14,8 +14,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); assert_throws_js(TypeError, function() { ctx.drawImage(undefined, 0, 0); }); assert_throws_js(TypeError, function() { ctx.drawImage(0, 0, 0); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerocanvas.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerocanvas.html index 1cc3e5d..9d59ba70 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerocanvas.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerocanvas.html
@@ -18,8 +18,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var offscreenCanvas2 = new OffscreenCanvas(0, 10); assert_throws_dom("INVALID_STATE_ERR", function() { ctx.drawImage(offscreenCanvas2, 0, 0); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerocanvas.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerocanvas.worker.js index 7d6f9767..5f3764b 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerocanvas.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerocanvas.worker.js
@@ -14,8 +14,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var offscreenCanvas2 = new OffscreenCanvas(0, 10); assert_throws_dom("INVALID_STATE_ERR", function() { ctx.drawImage(offscreenCanvas2, 0, 0); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerosource.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerosource.html index d83a935d..77d05e8 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerosource.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerosource.html
@@ -18,8 +18,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -37,7 +37,7 @@ ctx.drawImage(bitmap, 10, 10, 0, 1, 0, 0, 100, 50); ctx.drawImage(bitmap, 10, 10, 1, 0, 0, 0, 100, 50); ctx.drawImage(bitmap, 10, 10, 0, 0, 0, 0, 100, 50); - _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerosource.image.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerosource.image.html index 3a9a1c6..50c49d9 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerosource.image.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerosource.image.html
@@ -18,8 +18,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -37,7 +37,7 @@ ctx.drawImage(bitmap, 0, 0, 100, 50); ctx.drawImage(bitmap, 0, 0, 100, 50); ctx.drawImage(bitmap, 0, 0, 100, 50); - _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); + _assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerosource.image.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerosource.image.worker.js index 8901d72..57985f2 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerosource.image.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerosource.image.worker.js
@@ -14,8 +14,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -33,7 +33,7 @@ ctx.drawImage(bitmap, 0, 0, 100, 50); ctx.drawImage(bitmap, 0, 0, 100, 50); ctx.drawImage(bitmap, 0, 0, 100, 50); - _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); + _assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerosource.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerosource.worker.js index 7d5994ed..1c0c2b15 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerosource.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerosource.worker.js
@@ -14,8 +14,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -33,7 +33,7 @@ ctx.drawImage(bitmap, 10, 10, 0, 1, 0, 0, 100, 50); ctx.drawImage(bitmap, 10, 10, 1, 0, 0, 0, 100, 50); ctx.drawImage(bitmap, 10, 10, 0, 0, 0, 0, 100, 50); - _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.basic.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.basic.html index f3b2920c..7a931c3 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.basic.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.basic.html
@@ -17,13 +17,13 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.clearRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0"); +_assertPixel(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.basic.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.basic.worker.js index e2b5e7e..2a7a70e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.basic.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.basic.worker.js
@@ -13,13 +13,13 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.clearRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0"); +_assertPixel(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.clip.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.clip.html index 8f448bf..6f70f0e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.clip.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.clip.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -28,7 +28,7 @@ ctx.clearRect(0, 0, 100, 50); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 16, 16); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.clip.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.clip.worker.js index 8823aa4..ac9d849 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.clip.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.clip.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -24,7 +24,7 @@ ctx.clearRect(0, 0, 100, 50); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 16, 16); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.globalalpha.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.globalalpha.html index 3515322..3f89f69 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.globalalpha.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.globalalpha.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.globalAlpha = 0.1; ctx.clearRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0"); +_assertPixel(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.globalalpha.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.globalalpha.worker.js index e9742ac..b0d766a9 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.globalalpha.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.globalalpha.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.globalAlpha = 0.1; ctx.clearRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0"); +_assertPixel(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.globalcomposite.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.globalcomposite.html index c8e5331..828ea03 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.globalcomposite.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.globalcomposite.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.globalCompositeOperation = 'destination-atop'; ctx.clearRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0"); +_assertPixel(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.globalcomposite.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.globalcomposite.worker.js index b181b5b..6f31696 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.globalcomposite.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.globalcomposite.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.globalCompositeOperation = 'destination-atop'; ctx.clearRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0"); +_assertPixel(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.negative.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.negative.html index 27424fc9..3c1afcb 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.negative.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.negative.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -26,10 +26,10 @@ ctx.clearRect(100, 0, -50, 25); ctx.clearRect(0, 50, 50, -25); ctx.clearRect(100, 50, -50, -25); -_assertPixel(offscreenCanvas, 25,12, 0,0,0,0, "25,12", "0,0,0,0"); -_assertPixel(offscreenCanvas, 75,12, 0,0,0,0, "75,12", "0,0,0,0"); -_assertPixel(offscreenCanvas, 25,37, 0,0,0,0, "25,37", "0,0,0,0"); -_assertPixel(offscreenCanvas, 75,37, 0,0,0,0, "75,37", "0,0,0,0"); +_assertPixel(canvas, 25,12, 0,0,0,0, "25,12", "0,0,0,0"); +_assertPixel(canvas, 75,12, 0,0,0,0, "75,12", "0,0,0,0"); +_assertPixel(canvas, 25,37, 0,0,0,0, "25,37", "0,0,0,0"); +_assertPixel(canvas, 75,37, 0,0,0,0, "75,37", "0,0,0,0"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.negative.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.negative.worker.js index ae2a247..e07e636 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.negative.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.negative.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -22,10 +22,10 @@ ctx.clearRect(100, 0, -50, 25); ctx.clearRect(0, 50, 50, -25); ctx.clearRect(100, 50, -50, -25); -_assertPixel(offscreenCanvas, 25,12, 0,0,0,0, "25,12", "0,0,0,0"); -_assertPixel(offscreenCanvas, 75,12, 0,0,0,0, "75,12", "0,0,0,0"); -_assertPixel(offscreenCanvas, 25,37, 0,0,0,0, "25,37", "0,0,0,0"); -_assertPixel(offscreenCanvas, 75,37, 0,0,0,0, "75,37", "0,0,0,0"); +_assertPixel(canvas, 25,12, 0,0,0,0, "25,12", "0,0,0,0"); +_assertPixel(canvas, 75,12, 0,0,0,0, "75,12", "0,0,0,0"); +_assertPixel(canvas, 25,37, 0,0,0,0, "25,37", "0,0,0,0"); +_assertPixel(canvas, 75,37, 0,0,0,0, "75,37", "0,0,0,0"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.nonfinite.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.nonfinite.html index 75cb1bd..dc11a5a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.nonfinite.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.nonfinite.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -45,7 +45,7 @@ ctx.clearRect(0, Infinity, Infinity, Infinity); ctx.clearRect(0, Infinity, 100, Infinity); ctx.clearRect(0, 0, Infinity, Infinity); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.nonfinite.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.nonfinite.worker.js index 501700d..0e2427090 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.nonfinite.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.nonfinite.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -41,7 +41,7 @@ ctx.clearRect(0, Infinity, Infinity, Infinity); ctx.clearRect(0, Infinity, 100, Infinity); ctx.clearRect(0, 0, Infinity, Infinity); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.path.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.path.html index b1feea9..435d690 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.path.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.path.html
@@ -17,15 +17,15 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.beginPath(); ctx.rect(0, 0, 100, 50); ctx.clearRect(0, 0, 16, 16); ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.path.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.path.worker.js index 80aa5d1..ab6f498 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.path.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.path.worker.js
@@ -13,15 +13,15 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.beginPath(); ctx.rect(0, 0, 100, 50); ctx.clearRect(0, 0, 16, 16); ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.shadow.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.shadow.html index b7ce2879..d543d732 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.shadow.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.shadow.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -27,7 +27,7 @@ ctx.shadowOffsetX = 0; ctx.shadowOffsetY = 50; ctx.clearRect(0, -50, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.shadow.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.shadow.worker.js index a35463f..02740b8 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.shadow.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.shadow.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -23,7 +23,7 @@ ctx.shadowOffsetX = 0; ctx.shadowOffsetY = 50; ctx.clearRect(0, -50, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.transform.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.transform.html index 0c43eae1..d861e75 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.transform.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.transform.html
@@ -17,15 +17,15 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.scale(10, 10); ctx.translate(0, 5); ctx.clearRect(0, -5, 10, 5); -_assertPixel(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0"); +_assertPixel(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.transform.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.transform.worker.js index fa99b91..bfbaa92f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.transform.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.transform.worker.js
@@ -13,15 +13,15 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.scale(10, 10); ctx.translate(0, 5); ctx.clearRect(0, -5, 10, 5); -_assertPixel(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0"); +_assertPixel(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.zero.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.zero.html index 3d48185..a418fe6 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.zero.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.zero.html
@@ -17,15 +17,15 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); ctx.clearRect(0, 0, 100, 0); ctx.clearRect(0, 0, 0, 50); ctx.clearRect(0, 0, 0, 0); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.zero.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.zero.worker.js index 015f8b0..de87699 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.zero.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.zero.worker.js
@@ -13,15 +13,15 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); ctx.clearRect(0, 0, 100, 0); ctx.clearRect(0, 0, 0, 50); ctx.clearRect(0, 0, 0, 0); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.basic.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.basic.html index dc06ea7..f39d9ddb 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.basic.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.basic.html
@@ -17,12 +17,12 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.basic.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.basic.worker.js index 57ef8bd..7d07bbd 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.basic.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.basic.worker.js
@@ -13,12 +13,12 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.clip.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.clip.html index 244a982..d39bbc96 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.clip.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.clip.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -29,7 +29,7 @@ ctx.fillRect(0, 0, 100, 50); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 16, 16); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.clip.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.clip.worker.js index e69585a..0edab03b0 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.clip.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.clip.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -25,7 +25,7 @@ ctx.fillRect(0, 0, 100, 50); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 16, 16); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.negative.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.negative.html index ae2adf76..1802e96f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.negative.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.negative.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,10 +27,10 @@ ctx.fillRect(100, 0, -50, 25); ctx.fillRect(0, 50, 50, -25); ctx.fillRect(100, 50, -50, -25); -_assertPixel(offscreenCanvas, 25,12, 0,255,0,255, "25,12", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,12, 0,255,0,255, "75,12", "0,255,0,255"); -_assertPixel(offscreenCanvas, 25,37, 0,255,0,255, "25,37", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,37, 0,255,0,255, "75,37", "0,255,0,255"); +_assertPixel(canvas, 25,12, 0,255,0,255, "25,12", "0,255,0,255"); +_assertPixel(canvas, 75,12, 0,255,0,255, "75,12", "0,255,0,255"); +_assertPixel(canvas, 25,37, 0,255,0,255, "25,37", "0,255,0,255"); +_assertPixel(canvas, 75,37, 0,255,0,255, "75,37", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.negative.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.negative.worker.js index 21ab4eb..9acaeb49 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.negative.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.negative.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,10 +23,10 @@ ctx.fillRect(100, 0, -50, 25); ctx.fillRect(0, 50, 50, -25); ctx.fillRect(100, 50, -50, -25); -_assertPixel(offscreenCanvas, 25,12, 0,255,0,255, "25,12", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,12, 0,255,0,255, "75,12", "0,255,0,255"); -_assertPixel(offscreenCanvas, 25,37, 0,255,0,255, "25,37", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,37, 0,255,0,255, "75,37", "0,255,0,255"); +_assertPixel(canvas, 25,12, 0,255,0,255, "25,12", "0,255,0,255"); +_assertPixel(canvas, 75,12, 0,255,0,255, "75,12", "0,255,0,255"); +_assertPixel(canvas, 25,37, 0,255,0,255, "25,37", "0,255,0,255"); +_assertPixel(canvas, 75,37, 0,255,0,255, "75,37", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.nonfinite.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.nonfinite.html index f97432d..70f91e1 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.nonfinite.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.nonfinite.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -46,7 +46,7 @@ ctx.fillRect(0, Infinity, Infinity, Infinity); ctx.fillRect(0, Infinity, 100, Infinity); ctx.fillRect(0, 0, Infinity, Infinity); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.nonfinite.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.nonfinite.worker.js index 0ad3014c..dc42921 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.nonfinite.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.nonfinite.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -42,7 +42,7 @@ ctx.fillRect(0, Infinity, Infinity, Infinity); ctx.fillRect(0, Infinity, 100, Infinity); ctx.fillRect(0, 0, Infinity, Infinity); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.path.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.path.html index c1d1638..8fa577e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.path.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.path.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.beginPath(); ctx.rect(0, 0, 100, 50); @@ -26,7 +26,7 @@ ctx.fillRect(0, 0, 16, 16); ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.path.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.path.worker.js index 5f0e74c..d8a5e00a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.path.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.path.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.beginPath(); ctx.rect(0, 0, 100, 50); @@ -22,7 +22,7 @@ ctx.fillRect(0, 0, 16, 16); ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.shadow.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.shadow.html index f8daecc6..71c677d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.shadow.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.shadow.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,7 +27,7 @@ ctx.shadowOffsetX = 0; ctx.shadowOffsetY = 50; ctx.fillRect(0, -50, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.shadow.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.shadow.worker.js index 94b3088..3da576d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.shadow.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.shadow.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,7 +23,7 @@ ctx.shadowOffsetX = 0; ctx.shadowOffsetY = 50; ctx.fillRect(0, -50, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.transform.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.transform.html index ec96be2..858beb44 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.transform.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.transform.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.scale(10, 10); ctx.translate(0, 5); ctx.fillStyle = '#0f0'; ctx.fillRect(0, -5, 10, 5); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.transform.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.transform.worker.js index 388b7e3..4aed159 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.transform.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.transform.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.scale(10, 10); ctx.translate(0, 5); ctx.fillStyle = '#0f0'; ctx.fillRect(0, -5, 10, 5); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.zero.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.zero.html index 520897f4..f5d1f1d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.zero.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.zero.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -26,7 +26,7 @@ ctx.fillRect(0, 0, 100, 0); ctx.fillRect(0, 0, 0, 50); ctx.fillRect(0, 0, 0, 0); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.zero.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.zero.worker.js index ad5ec015..a034c0c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.zero.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.zero.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -22,7 +22,7 @@ ctx.fillRect(0, 0, 100, 0); ctx.fillRect(0, 0, 0, 50); ctx.fillRect(0, 0, 0, 0); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.basic.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.basic.html index c90167f..489754a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.basic.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.basic.html
@@ -17,13 +17,13 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.strokeStyle = '#0f0'; ctx.lineWidth = 50; ctx.strokeRect(25, 24, 50, 2); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.basic.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.basic.worker.js index 0064b44..39d8ac7 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.basic.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.basic.worker.js
@@ -13,13 +13,13 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.strokeStyle = '#0f0'; ctx.lineWidth = 50; ctx.strokeRect(25, 24, 50, 2); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.clip.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.clip.html index 61493ec..135b685 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.clip.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.clip.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -30,7 +30,7 @@ ctx.strokeRect(0, 0, 100, 50); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 16, 16); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.clip.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.clip.worker.js index 06fe746..0937ac4 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.clip.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.clip.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -26,7 +26,7 @@ ctx.strokeRect(0, 0, 100, 50); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 16, 16); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.globalalpha.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.globalalpha.html index b13e7be..6e4a718 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.globalalpha.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.globalalpha.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.globalAlpha = 0; ctx.strokeStyle = '#f00'; ctx.lineWidth = 50; ctx.strokeRect(25, 24, 50, 2); -_assertPixel(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0"); +_assertPixel(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.globalalpha.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.globalalpha.worker.js index 120ca6c..25538b36 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.globalalpha.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.globalalpha.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.globalAlpha = 0; ctx.strokeStyle = '#f00'; ctx.lineWidth = 50; ctx.strokeRect(25, 24, 50, 2); -_assertPixel(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0"); +_assertPixel(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.globalcomposite.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.globalcomposite.html index ab8cb47..ca2e49cb 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.globalcomposite.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.globalcomposite.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.globalCompositeOperation = 'source-in'; ctx.strokeStyle = '#f00'; ctx.lineWidth = 50; ctx.strokeRect(25, 24, 50, 2); -_assertPixel(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0"); +_assertPixel(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.globalcomposite.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.globalcomposite.worker.js index 08a85419..86e8f32 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.globalcomposite.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.globalcomposite.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.globalCompositeOperation = 'source-in'; ctx.strokeStyle = '#f00'; ctx.lineWidth = 50; ctx.strokeRect(25, 24, 50, 2); -_assertPixel(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0"); +_assertPixel(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.negative.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.negative.html index e6388fd..c2d3f9b50c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.negative.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.negative.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -28,10 +28,10 @@ ctx.strokeRect(88, 12, -26, 1); ctx.strokeRect(12, 38, 26, -1); ctx.strokeRect(88, 38, -26, -1); -_assertPixel(offscreenCanvas, 25,12, 0,255,0,255, "25,12", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,12, 0,255,0,255, "75,12", "0,255,0,255"); -_assertPixel(offscreenCanvas, 25,37, 0,255,0,255, "25,37", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,37, 0,255,0,255, "75,37", "0,255,0,255"); +_assertPixel(canvas, 25,12, 0,255,0,255, "25,12", "0,255,0,255"); +_assertPixel(canvas, 75,12, 0,255,0,255, "75,12", "0,255,0,255"); +_assertPixel(canvas, 25,37, 0,255,0,255, "25,37", "0,255,0,255"); +_assertPixel(canvas, 75,37, 0,255,0,255, "75,37", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.negative.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.negative.worker.js index 476004e..7df75594 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.negative.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.negative.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -24,10 +24,10 @@ ctx.strokeRect(88, 12, -26, 1); ctx.strokeRect(12, 38, 26, -1); ctx.strokeRect(88, 38, -26, -1); -_assertPixel(offscreenCanvas, 25,12, 0,255,0,255, "25,12", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,12, 0,255,0,255, "75,12", "0,255,0,255"); -_assertPixel(offscreenCanvas, 25,37, 0,255,0,255, "25,37", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,37, 0,255,0,255, "75,37", "0,255,0,255"); +_assertPixel(canvas, 25,12, 0,255,0,255, "25,12", "0,255,0,255"); +_assertPixel(canvas, 75,12, 0,255,0,255, "75,12", "0,255,0,255"); +_assertPixel(canvas, 25,37, 0,255,0,255, "25,37", "0,255,0,255"); +_assertPixel(canvas, 75,37, 0,255,0,255, "75,37", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.nonfinite.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.nonfinite.html index 6a07afc..de1617b 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.nonfinite.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.nonfinite.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -47,7 +47,7 @@ ctx.strokeRect(0, Infinity, Infinity, Infinity); ctx.strokeRect(0, Infinity, 100, Infinity); ctx.strokeRect(0, 0, Infinity, Infinity); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.nonfinite.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.nonfinite.worker.js index 8e998c6..11efdf8 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.nonfinite.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.nonfinite.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -43,7 +43,7 @@ ctx.strokeRect(0, Infinity, Infinity, Infinity); ctx.strokeRect(0, Infinity, 100, Infinity); ctx.strokeRect(0, 0, Infinity, Infinity); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.path.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.path.html index a147cb3..42891df 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.path.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.path.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.beginPath(); ctx.rect(0, 0, 100, 50); @@ -27,7 +27,7 @@ ctx.strokeRect(0, 0, 16, 16); ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.path.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.path.worker.js index 493a936..81da4d3 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.path.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.path.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.beginPath(); ctx.rect(0, 0, 100, 50); @@ -23,7 +23,7 @@ ctx.strokeRect(0, 0, 16, 16); ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.shadow.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.shadow.html index 237984c..44c9838 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.shadow.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.shadow.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -30,7 +30,7 @@ ctx.strokeStyle = '#f00'; ctx.lineWidth = 50; ctx.strokeRect(0, -75, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.shadow.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.shadow.worker.js index 466cf303..7b51e5e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.shadow.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.shadow.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -26,7 +26,7 @@ ctx.strokeStyle = '#f00'; ctx.lineWidth = 50; ctx.strokeRect(0, -75, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.transform.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.transform.html index f5191c0..fa667627 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.transform.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.transform.html
@@ -17,15 +17,15 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.scale(10, 10); ctx.translate(0, 5); ctx.strokeStyle = '#0f0'; ctx.lineWidth = 5; ctx.strokeRect(2.5, -2.6, 5, 0.2); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.transform.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.transform.worker.js index 8a2d9ca..c3c2863 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.transform.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.transform.worker.js
@@ -13,15 +13,15 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.scale(10, 10); ctx.translate(0, 5); ctx.strokeStyle = '#0f0'; ctx.lineWidth = 5; ctx.strokeRect(2.5, -2.6, 5, 0.2); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.1.html index 382bcb1..d663833 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.1.html
@@ -17,13 +17,13 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.strokeStyle = '#f00'; ctx.lineWidth = 250; ctx.strokeRect(50, 25, 0, 0); -_assertPixel(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0"); +_assertPixel(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.1.worker.js index d63f509e..10750ec9 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.1.worker.js
@@ -13,13 +13,13 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.strokeStyle = '#f00'; ctx.lineWidth = 250; ctx.strokeRect(50, 25, 0, 0); -_assertPixel(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0"); +_assertPixel(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.2.html index 5b661b2..962502f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.2.html
@@ -17,15 +17,15 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.strokeStyle = '#f00'; ctx.lineWidth = 250; ctx.lineCap = 'round'; ctx.lineJoin = 'round'; ctx.strokeRect(50, 25, 0, 0); -_assertPixel(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0"); +_assertPixel(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.2.worker.js index 4e71ee8f..eabc3883 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.2.worker.js
@@ -13,15 +13,15 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.strokeStyle = '#f00'; ctx.lineWidth = 250; ctx.lineCap = 'round'; ctx.lineJoin = 'round'; ctx.strokeRect(50, 25, 0, 0); -_assertPixel(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0"); +_assertPixel(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.3.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.3.html index 1bb2397..079e84b 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.3.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.3.html
@@ -17,13 +17,13 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.strokeStyle = '#0f0'; ctx.lineWidth = 50; ctx.strokeRect(0, 25, 100, 0); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.3.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.3.worker.js index 20d9749..452fd83 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.3.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.3.worker.js
@@ -13,13 +13,13 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.strokeStyle = '#0f0'; ctx.lineWidth = 50; ctx.strokeRect(0, 25, 100, 0); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.4.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.4.html index 27d64e9..1cc44b7c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.4.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.4.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.strokeStyle = '#f00'; ctx.lineWidth = 250; ctx.lineCap = 'round'; ctx.strokeRect(100, 25, 100, 0); -_assertPixel(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0"); +_assertPixel(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.4.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.4.worker.js index 716fe8fa..94d407293 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.4.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.4.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.strokeStyle = '#f00'; ctx.lineWidth = 250; ctx.lineCap = 'round'; ctx.strokeRect(100, 25, 100, 0); -_assertPixel(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0"); +_assertPixel(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.5.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.5.html index 545e3d9..a3c5a04 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.5.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.5.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.strokeStyle = '#0f0'; ctx.lineWidth = 250; ctx.lineJoin = 'round'; ctx.strokeRect(100, 25, 100, 0); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.5.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.5.worker.js index 423e314..9846ec3 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.5.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.5.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.strokeStyle = '#0f0'; ctx.lineWidth = 250; ctx.lineJoin = 'round'; ctx.strokeRect(100, 25, 100, 0); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.default.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.default.html index 4256de5..3a3b6a97 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.default.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.default.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); _assertSame(ctx.fillStyle, '#000000', "ctx.fillStyle", "'#000000'"); t.done();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.default.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.default.worker.js index 45bc906..95ae259 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.default.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.default.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); _assertSame(ctx.fillStyle, '#000000', "ctx.fillStyle", "'#000000'"); t.done();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.get.semitransparent.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.get.semitransparent.html index 069bd98..9f85668 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.get.semitransparent.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.get.semitransparent.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(255,255,255,0.45)'; assert_regexp_match(ctx.fillStyle, /^rgba\(255, 255, 255, 0\.4\d+\)$/);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.get.semitransparent.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.get.semitransparent.worker.js index 88fc376..3715183 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.get.semitransparent.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.get.semitransparent.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(255,255,255,0.45)'; assert_regexp_match(ctx.fillStyle, /^rgba\(255, 255, 255, 0\.4\d+\)$/);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.get.solid.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.get.solid.html index bfca16c..3eca93e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.get.solid.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.get.solid.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#fa0'; _assertSame(ctx.fillStyle, '#ffaa00', "ctx.fillStyle", "'#ffaa00'");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.get.solid.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.get.solid.worker.js index e3cf3d0..2ada733 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.get.solid.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.get.solid.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#fa0'; _assertSame(ctx.fillStyle, '#ffaa00', "ctx.fillStyle", "'#ffaa00'");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.get.transparent.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.get.transparent.html index 1e42b1f8..caab8e02 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.get.transparent.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.get.transparent.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0,0,0,0)'; _assertSame(ctx.fillStyle, 'rgba(0, 0, 0, 0)', "ctx.fillStyle", "'rgba(0, 0, 0, 0)'");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.get.transparent.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.get.transparent.worker.js index 943b8ed..57f5facf 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.get.transparent.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.get.transparent.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0,0,0,0)'; _assertSame(ctx.fillStyle, 'rgba(0, 0, 0, 0)', "ctx.fillStyle", "'rgba(0, 0, 0, 0)'");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.invalidstring.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.invalidstring.html index 342a49d..a6e86cdf 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.invalidstring.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.invalidstring.html
@@ -17,15 +17,15 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.fillStyle = '#0f0'; ctx.fillStyle = 'invalid'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.invalidstring.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.invalidstring.worker.js index 3c39af7..43ac52e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.invalidstring.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.invalidstring.worker.js
@@ -13,15 +13,15 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.fillStyle = '#0f0'; ctx.fillStyle = 'invalid'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.invalidtype.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.invalidtype.html index 524674ea..a8de993 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.invalidtype.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.invalidtype.html
@@ -17,15 +17,15 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.fillStyle = '#0f0'; ctx.fillStyle = null; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.invalidtype.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.invalidtype.worker.js index 9b6c851..f8b661aa 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.invalidtype.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.invalidtype.worker.js
@@ -13,15 +13,15 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.fillStyle = '#0f0'; ctx.fillStyle = null; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-1.html index 85e9744..7d6e789 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-1.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsl(120 100.0% 50.0%)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-1.worker.js index dd2c9a3..99ccafd4 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-1.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsl(120 100.0% 50.0%)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-2.html index d0703f0..67779b5 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-2.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsl(120 100.0% 50.0% / 0.2)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); +_assertPixel(canvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-2.worker.js index 10223c8..d24a0de 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-2.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsl(120 100.0% 50.0% / 0.2)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); +_assertPixel(canvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-3.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-3.html index 6c53814..0788137 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-3.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-3.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsl(120.0, 100.0%, 50.0%, 0.2)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); +_assertPixel(canvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-3.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-3.worker.js index 4ff6ddd..2e2f034 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-3.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-3.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsl(120.0, 100.0%, 50.0%, 0.2)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); +_assertPixel(canvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-4.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-4.html index 8f2dc396..5989679 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-4.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-4.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsl(120.0, 100.0%, 50.0%, 20%)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); +_assertPixel(canvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-4.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-4.worker.js index c80a927..8cd4d66 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-4.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-4.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsl(120.0, 100.0%, 50.0%, 20%)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); +_assertPixel(canvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-5.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-5.html index 0a25341..f60b97e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-5.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-5.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsl(120deg, 100.0%, 50.0%, 0.2)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); +_assertPixel(canvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-5.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-5.worker.js index 710370bc..932b696 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-5.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-5.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsl(120deg, 100.0%, 50.0%, 0.2)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); +_assertPixel(canvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-6.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-6.html index 23824eb73..39d5a62 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-6.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-6.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsl(120deg, 100.0%, 50.0%)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-6.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-6.worker.js index d9ee11f..572e8cc 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-6.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-6.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsl(120deg, 100.0%, 50.0%)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-7.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-7.html index 73f3e8b..a6c654f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-7.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-7.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsl(133.33333333grad, 100.0%, 50.0%)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-7.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-7.worker.js index fff6cdb..335c260 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-7.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-7.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsl(133.33333333grad, 100.0%, 50.0%)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-8.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-8.html index 1132ceb4..644015f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-8.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-8.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsl(2.0943951024rad, 100.0%, 50.0%)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-8.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-8.worker.js index d71cb14..0f8fb44f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-8.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-8.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsl(2.0943951024rad, 100.0%, 50.0%)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-9.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-9.html index cc9fe2be..506f235 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-9.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-9.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsl(0.3333333333turn, 100.0%, 50.0%)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-9.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-9.worker.js index b4cdcd6..fb2c394 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-9.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-9.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsl(0.3333333333turn, 100.0%, 50.0%)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-1.html index 467a88e..aa24927 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-1.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsl(120 100.0% 50.0%)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-1.worker.js index 7009125..2b0fcc8 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-1.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsl(120 100.0% 50.0%)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-2.html index 25b5d08..6e629d1 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-2.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsl(120 100.0% 50.0% / 0.2)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); +_assertPixel(canvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-2.worker.js index 67f5933..4ea0a25 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-2.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsl(120 100.0% 50.0% / 0.2)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); +_assertPixel(canvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-3.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-3.html index 4581db0..d4ceb4d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-3.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-3.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsl(120.0, 100.0%, 50.0%, 0.2)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); +_assertPixel(canvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-3.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-3.worker.js index 6d992915..8f21b2f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-3.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-3.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsl(120.0, 100.0%, 50.0%, 0.2)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); +_assertPixel(canvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-4.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-4.html index c3dcbdc..5c63ba21 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-4.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-4.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsl(120.0, 100.0%, 50.0%, 20%)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); +_assertPixel(canvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-4.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-4.worker.js index 926df1f..d138da5 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-4.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-4.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsl(120.0, 100.0%, 50.0%, 20%)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); +_assertPixel(canvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-5.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-5.html index aafed3f..9320a1c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-5.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-5.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsl(120deg, 100.0%, 50.0%, 0.2)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); +_assertPixel(canvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-5.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-5.worker.js index 346fe19..80ad13a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-5.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-5.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsl(120deg, 100.0%, 50.0%, 0.2)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); +_assertPixel(canvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-6.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-6.html index 5122767..d4b0499 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-6.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-6.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsl(120deg, 100.0%, 50.0%)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-6.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-6.worker.js index 98046fc..4afd20c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-6.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-6.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsl(120deg, 100.0%, 50.0%)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-7.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-7.html index 791794e..10773ee 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-7.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-7.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsl(133.33333333grad, 100.0%, 50.0%)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-7.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-7.worker.js index d97a7cb2..4fc3e4d5 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-7.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-7.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsl(133.33333333grad, 100.0%, 50.0%)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-8.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-8.html index 10cd9fa..97e5210 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-8.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-8.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsl(2.0943951024rad, 100.0%, 50.0%)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-8.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-8.worker.js index 407d8237..af502b3 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-8.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-8.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsl(2.0943951024rad, 100.0%, 50.0%)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-9.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-9.html index 07332c5..235f586e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-9.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-9.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsl(0.3333333333turn, 100.0%, 50.0%)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-9.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-9.worker.js index df8c26c..f048dda 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-9.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsla-9.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsl(0.3333333333turn, 100.0%, 50.0%)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-1.html index 22f63f3..1c38fce 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-1.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgb(0, 255.0, 0)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-1.worker.js index 8d1895a..b35ee79 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-1.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgb(0, 255.0, 0)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-2.html index 63692d47..5efeb47 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-2.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgb(0, 255, 0, 0.2)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); +_assertPixel(canvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-2.worker.js index afd7969..0f996ec 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-2.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgb(0, 255, 0, 0.2)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); +_assertPixel(canvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-3.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-3.html index 29b42b8a0..34ce23e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-3.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-3.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgb(0, 255, 0, 20%)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); +_assertPixel(canvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-3.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-3.worker.js index 9a310095..f580f7b 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-3.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-3.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgb(0, 255, 0, 20%)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); +_assertPixel(canvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-4.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-4.html index 8898450..c35dd12bd 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-4.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-4.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgb(0 255 0)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-4.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-4.worker.js index ef4d8be..02656cf 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-4.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-4.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgb(0 255 0)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-5.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-5.html index e7436882..865c76d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-5.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-5.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgb(0 255 0 / 0.2)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); +_assertPixel(canvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-5.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-5.worker.js index d06e7281..306850a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-5.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-5.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgb(0 255 0 / 0.2)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); +_assertPixel(canvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-6.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-6.html index 971f262..9b17978 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-6.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-6.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgb(0 255 0 / 20%)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); +_assertPixel(canvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-6.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-6.worker.js index daa68394..38c492c5 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-6.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-6.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgb(0 255 0 / 20%)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); +_assertPixel(canvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-1.html index cd282d4..a3c18c5 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-1.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgba(0, 255.0, 0)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-1.worker.js index 8c29081..2200d1d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-1.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgba(0, 255.0, 0)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-2.html index 7b019ef..20f99598 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-2.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgba(0, 255, 0, 0.2)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); +_assertPixel(canvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-2.worker.js index 20ee3656..8fe773cc 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-2.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgba(0, 255, 0, 0.2)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); +_assertPixel(canvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-3.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-3.html index 74a1b6d..6172eef2 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-3.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-3.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgba(0, 255, 0, 20%)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); +_assertPixel(canvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-3.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-3.worker.js index 80e37e7f..3582e7d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-3.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-3.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgba(0, 255, 0, 20%)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); +_assertPixel(canvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-4.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-4.html index f018c1f..37d02e6 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-4.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-4.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgba(0 255 0)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-4.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-4.worker.js index b8ba49af..15d3c3a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-4.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-4.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgba(0 255 0)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-5.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-5.html index b5d53f4..30a418a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-5.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-5.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgba(0 255 0 / 0.2)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); +_assertPixel(canvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-5.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-5.worker.js index 4a2c139..a01ee82 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-5.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-5.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgba(0 255 0 / 0.2)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); +_assertPixel(canvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-6.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-6.html index cb09da5f..b7f2287 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-6.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-6.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgba(0 255 0 / 20%)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); +_assertPixel(canvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-6.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-6.worker.js index 871dd34..8df045d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-6.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgba-6.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgba(0 255 0 / 20%)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); +_assertPixel(canvas, 50,25, 0,255,0,51, "50,25", "0,255,0,51"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex3.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex3.html index 994b2ebf..ca2fa74 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex3.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex3.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex3.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex3.worker.js index bdd2f3c..32d4bad 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex3.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex3.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex4.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex4.html index 78caa5b..591d19435 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex4.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex4.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = '#0f0f'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex4.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex4.worker.js index d02b781..cd73f709 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex4.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex4.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = '#0f0f'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex6.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex6.html index 0a575281..f6e1c4f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex6.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex6.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = '#00fF00'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex6.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex6.worker.js index 6556478c..55185d4 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex6.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex6.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = '#00fF00'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex8.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex8.html index 4fa8dace..f24f6bcf 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex8.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex8.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = '#00ff00ff'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex8.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex8.worker.js index af13294d..39e5fb5d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex8.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hex8.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = '#00ff00ff'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-1.html index f7bd376..71b3d5670 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-1.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsl(120, 100%, 50%)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-1.worker.js index 2358794..7102833 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-1.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsl(120, 100%, 50%)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-2.html index 0cc255b36..819eebb 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-2.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsl( -240 , 100% , 50% )'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-2.worker.js index 998909a..182c0503 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-2.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsl( -240 , 100% , 50% )'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-3.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-3.html index f18af426..38fb322d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-3.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-3.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsl(360120, 100%, 50%)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-3.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-3.worker.js index 217a717..612a31581 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-3.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-3.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsl(360120, 100%, 50%)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-4.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-4.html index 10007f0b..72d8ce8 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-4.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-4.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsl(-360240, 100%, 50%)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-4.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-4.worker.js index 21fa84a..f9fb8582 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-4.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-4.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsl(-360240, 100%, 50%)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-5.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-5.html index 99138ea..33a373ae 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-5.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-5.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsl(120.0, 100.0%, 50.0%)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-5.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-5.worker.js index f361a6b..ade7bab 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-5.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-5.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsl(120.0, 100.0%, 50.0%)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-6.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-6.html index 5646ae1..dfd80ad 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-6.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-6.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsl(+120, +100%, +50%)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-6.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-6.worker.js index 4f5eb7ed..4669a0c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-6.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-6.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsl(+120, +100%, +50%)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-1.html index 749d9a14..87232ccb 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-1.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsl(120, 200%, 50%)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-1.worker.js index 881e540c..00ccf32 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-1.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsl(120, 200%, 50%)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-2.html index f44224a..2aabf99 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-2.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsl(120, -200%, 49.9%)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 127,127,127,255, "50,25", "127,127,127,255"); +_assertPixel(canvas, 50,25, 127,127,127,255, "50,25", "127,127,127,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-2.worker.js index 71c53f14..4cce2df 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-2.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsl(120, -200%, 49.9%)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 127,127,127,255, "50,25", "127,127,127,255"); +_assertPixel(canvas, 50,25, 127,127,127,255, "50,25", "127,127,127,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-3.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-3.html index 8e27275..8d2d6bc 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-3.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-3.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsl(120, 100%, 200%)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 255,255,255,255, "50,25", "255,255,255,255"); +_assertPixel(canvas, 50,25, 255,255,255,255, "50,25", "255,255,255,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-3.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-3.worker.js index 67bc802..8dc92df 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-3.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-3.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsl(120, 100%, 200%)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 255,255,255,255, "50,25", "255,255,255,255"); +_assertPixel(canvas, 50,25, 255,255,255,255, "50,25", "255,255,255,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-4.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-4.html index c48fb0a9..a2e56df 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-4.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-4.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsl(120, 100%, -200%)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,0,0,255, "50,25", "0,0,0,255"); +_assertPixel(canvas, 50,25, 0,0,0,255, "50,25", "0,0,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-4.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-4.worker.js index 9ddbe1b..89d33da8 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-4.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-4.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsl(120, 100%, -200%)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,0,0,255, "50,25", "0,0,0,255"); +_assertPixel(canvas, 50,25, 0,0,0,255, "50,25", "0,0,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-1.html index 177e4b7..f8e130e0 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-1.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsla(120, 100%, 50%, 0.499)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,127, "50,25", "0,255,0,127"); +_assertPixel(canvas, 50,25, 0,255,0,127, "50,25", "0,255,0,127"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-1.worker.js index 3db7480..69a322e7 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-1.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsla(120, 100%, 50%, 0.499)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,127, "50,25", "0,255,0,127"); +_assertPixel(canvas, 50,25, 0,255,0,127, "50,25", "0,255,0,127"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-2.html index 742e7c49..a38f624 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-2.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsla( 120.0 , 100.0% , 50.0% , 1 )'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-2.worker.js index 2a795a96..34676fc 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-2.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsla( 120.0 , 100.0% , 50.0% , 1 )'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-1.html index e4a5603..5c6a5eea 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-1.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsla(120, 200%, 50%, 1)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-1.worker.js index 048303a..968684a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-1.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsla(120, 200%, 50%, 1)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-2.html index 2eb6582..35cd11fb 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-2.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsla(120, -200%, 49.9%, 1)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 127,127,127,255, "50,25", "127,127,127,255"); +_assertPixel(canvas, 50,25, 127,127,127,255, "50,25", "127,127,127,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-2.worker.js index 17c48614e..ae40bbd61 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-2.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsla(120, -200%, 49.9%, 1)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 127,127,127,255, "50,25", "127,127,127,255"); +_assertPixel(canvas, 50,25, 127,127,127,255, "50,25", "127,127,127,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-3.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-3.html index 7b9f24a..117e58f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-3.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-3.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsla(120, 100%, 200%, 1)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 255,255,255,255, "50,25", "255,255,255,255"); +_assertPixel(canvas, 50,25, 255,255,255,255, "50,25", "255,255,255,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-3.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-3.worker.js index aa1f38f..7e61bec 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-3.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-3.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsla(120, 100%, 200%, 1)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 255,255,255,255, "50,25", "255,255,255,255"); +_assertPixel(canvas, 50,25, 255,255,255,255, "50,25", "255,255,255,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-4.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-4.html index f87f078..31350f24 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-4.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-4.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsla(120, 100%, -200%, 1)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,0,0,255, "50,25", "0,0,0,255"); +_assertPixel(canvas, 50,25, 0,0,0,255, "50,25", "0,0,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-4.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-4.worker.js index 1cf3b95..8a461f16 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-4.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-4.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsla(120, 100%, -200%, 1)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,0,0,255, "50,25", "0,0,0,255"); +_assertPixel(canvas, 50,25, 0,0,0,255, "50,25", "0,0,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-5.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-5.html index 97c356d1..1476c2d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-5.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-5.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsla(120, 100%, 50%, 2)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-5.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-5.worker.js index 8bde530..a759108 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-5.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-5.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsla(120, 100%, 50%, 2)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-6.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-6.html index fc467c8..8514c70 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-6.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-6.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsla(120, 100%, 0%, -2)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0"); +_assertPixel(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-6.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-6.worker.js index 1ab33162..f19520c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-6.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-6.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'hsla(120, 100%, 0%, -2)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0"); +_assertPixel(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.html4.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.html4.html index f0cebb58..e6fc9ba 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.html4.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.html4.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'limE'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.html4.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.html4.worker.js index c08fd77..b4f2e00 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.html4.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.html4.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'limE'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-1.html index 8a5716af..3db32fe 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-1.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'hsl(0, 100%, 50% / 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-1.worker.js index 9f49fca..97b03f7 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-1.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'hsl(0, 100%, 50% / 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-2.html index 0f626a4..8051a63 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-2.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'hsl(0 100% 50%, 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-2.worker.js index c73f1df..c3a8cc50 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-2.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'hsl(0 100% 50%, 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-3.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-3.html index a6f76e3..e0a6514 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-3.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-3.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'hsl(0, 100% 50%)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-3.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-3.worker.js index 767d817..f64aa3e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-3.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-3.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'hsl(0, 100% 50%)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-4.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-4.html index 92238d2..07b5fd8 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-4.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-4.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'hsl(0 100% 50% /)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-4.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-4.worker.js index 1c20ec9..d286c1963 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-4.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-4.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'hsl(0 100% 50% /)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-5.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-5.html index deb3776..ababebd 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-5.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-5.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'hsl(0, 100%, 50% /)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-5.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-5.worker.js index 228dba0..80e19172 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-5.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsl-5.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'hsl(0, 100%, 50% /)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-1.html index 6053455d..64fabf3 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-1.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'hsla(0, 100%, 50% / 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-1.worker.js index 65970ff..cb70865 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-1.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'hsla(0, 100%, 50% / 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-2.html index e6c7441..6c14743 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-2.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'hsla(0 100% 50%, 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-2.worker.js index 6150637..6ba2fbd 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-2.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'hsla(0 100% 50%, 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-3.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-3.html index eb104be..24d347d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-3.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-3.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'hsla(0, 100% 50%)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-3.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-3.worker.js index 196e8b9..139eeb0 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-3.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-hsla-3.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'hsla(0, 100% 50%)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-1.html index a82a2e5e..39801a0 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-1.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'rgb(255, 0, 0 / 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-1.worker.js index 655e001..b87aff8 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-1.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'rgb(255, 0, 0 / 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-2.html index 456c4221c..d86e63af 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-2.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'rgb(255 0 0, 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-2.worker.js index f1d6c58..bf99c93 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-2.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'rgb(255 0 0, 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-3.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-3.html index 119f9ad..0b47dc0 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-3.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-3.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'rgb(255, 0 0)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-3.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-3.worker.js index 78e9c156..dcbdc50 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-3.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-3.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'rgb(255, 0 0)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-4.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-4.html index 36ae9f71..c968208 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-4.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-4.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'rgb(0 0 0 /)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-4.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-4.worker.js index b2ee3d0..3cf1c8d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-4.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-4.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'rgb(0 0 0 /)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-5.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-5.html index d62f59d..75de3cf 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-5.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-5.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'rgb(0, 0, 0 /)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-5.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-5.worker.js index 6e547fd6..a827792 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-5.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-5.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'rgb(0, 0, 0 /)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-1.html index a46646ab3..074c4bca 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-1.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'rgba(255, 0, 0 / 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-1.worker.js index 87bcea2..565395e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-1.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'rgba(255, 0, 0 / 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-2.html index 150a31bd..a943933 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-2.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'rgba(255 0 0, 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-2.worker.js index 06bfbdb..5768745f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-2.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'rgba(255 0 0, 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-3.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-3.html index 1210a9d..d87f0929 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-3.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-3.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'rgba(255, 0 0)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-3.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-3.worker.js index 2ff40b2e..e373b2f6 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-3.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgba-3.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'rgba(255, 0 0)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex1.html index c8654ff..e27c89a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex1.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = '#f'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex1.worker.js index 42927cc5..e957f88 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex1.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = '#f'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex2.html index 3aca101..acd620c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex2.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = '#f0'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex2.worker.js index caee2e5..0863e5fd 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex2.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = '#f0'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex3.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex3.html index 937bc68..14d687b 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex3.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex3.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = '#g00'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex3.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex3.worker.js index 9a62a5a8..faa66420 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex3.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex3.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = '#g00'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex4.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex4.html index c4a425b..98d155b 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex4.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex4.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = '#fg00'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex4.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex4.worker.js index 180c38c..42ebb181 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex4.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex4.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = '#fg00'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex5.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex5.html index ca443e8..72eee71 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex5.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex5.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = '#ff000'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex5.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex5.worker.js index 1655932..d864a88 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex5.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex5.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = '#ff000'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex6.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex6.html index afa0e05..9ffa1ef 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex6.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex6.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = '#fg0000'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex6.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex6.worker.js index aed777de..d0c6098 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex6.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex6.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = '#fg0000'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex7.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex7.html index 5876904..83dab53 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex7.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex7.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = '#ff0000f'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex7.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex7.worker.js index 27d10459..453e72f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex7.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex7.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = '#ff0000f'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex8.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex8.html index e405d3f..9797b81 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex8.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex8.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = '#fg0000ff'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex8.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex8.worker.js index d7473a1..2c9c0d6 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex8.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex8.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = '#fg0000ff'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-1.html index 3e626709..fc8a53e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-1.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'hsl(0%, 100%, 50%)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-1.worker.js index 7230353b..f984cfb 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-1.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'hsl(0%, 100%, 50%)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-2.html index fdd740a8..2375c0d1 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-2.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'hsl(z, 100%, 50%)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-2.worker.js index eb9d2113..19871030 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-2.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'hsl(z, 100%, 50%)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-3.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-3.html index 9469a68..7769b87 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-3.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-3.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'hsl(0, 0, 50%)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-3.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-3.worker.js index f97c5135..cee6352 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-3.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-3.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'hsl(0, 0, 50%)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-4.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-4.html index 7ea4641..fa36f0c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-4.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-4.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'hsl(0, 100%, 0)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-4.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-4.worker.js index 86d5adb..cb96b62 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-4.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-4.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'hsl(0, 100%, 0)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-5.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-5.html index baa80ea..7d17ebf8 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-5.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-5.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'hsl(0, 100.%, 50%)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-5.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-5.worker.js index c78491cb..0617cda 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-5.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-5.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'hsl(0, 100.%, 50%)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-6.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-6.html index 701d159..65d4d2c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-6.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-6.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'hsl(0, 100%, 50%,)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-6.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-6.worker.js index 5ea958f8..656087e0 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-6.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-6.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'hsl(0, 100%, 50%,)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-1.html index 8c8066e..0bb55b8 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-1.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'hsla(0%, 100%, 50%, 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-1.worker.js index d668aaa..152eca1 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-1.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'hsla(0%, 100%, 50%, 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-2.html index 8ee324b..8da3bb7 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-2.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'hsla(0, 0, 50%, 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-2.worker.js index eb90338..3af6805 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-2.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'hsla(0, 0, 50%, 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-3.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-3.html index 041dd6d..a41774f5 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-3.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-3.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'hsla(0, 0, 50%, 1,)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-3.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-3.worker.js index 51666561..d78c3ec 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-3.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-3.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'hsla(0, 0, 50%, 1,)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-1.html index 86052a76..f42c5e00 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-1.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'darkbrown'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-1.worker.js index 7a9305e..8acea69 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-1.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'darkbrown'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-2.html index b4f4198..42fb3fc3 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-2.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'firebrick1'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-2.worker.js index 2f5b683a..7c2bf79d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-2.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'firebrick1'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-3.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-3.html index e1f6475..8d351754 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-3.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-3.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'red blue'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-3.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-3.worker.js index 3cb937a1..3f5a115c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-3.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-3.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'red blue'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-4.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-4.html index e8f861b2..b2f4b4f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-4.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-4.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = '"red"'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-4.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-4.worker.js index ed3c3f3..2299ff85 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-4.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-4.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = '"red"'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-5.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-5.html index 2c50888..4fe8e67 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-5.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-5.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = '"red'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-5.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-5.worker.js index f0bab65..8280800 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-5.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-5.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = '"red'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-1.html index aa33fc9..6e4fb4ed 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-1.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'rgb(255.0, 0, 0,)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-1.worker.js index cb341dba..ae7cb8b1 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-1.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'rgb(255.0, 0, 0,)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-2.html index 629dfe7c..15aedf0 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-2.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'rgb(100%, 0, 0)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-2.worker.js index 863f28c8d..1d09da73 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-2.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'rgb(100%, 0, 0)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-3.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-3.html index edc101a..93c0a824 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-3.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-3.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'rgb(255, - 1, 0)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-3.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-3.worker.js index cfc6fb0..21ed0b9 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-3.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-3.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'rgb(255, - 1, 0)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-1.html index d8b6991..7ffc5613 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-1.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'rgba(100%, 0, 0, 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-1.worker.js index ad64f8c..450ed24 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-1.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'rgba(100%, 0, 0, 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-2.html index 1a1978a1..9771a390 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-2.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'rgba(255, 0, 0, 1. 0)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-2.worker.js index 3f9b6be0..974f09c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-2.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'rgba(255, 0, 0, 1. 0)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-3.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-3.html index 7e0ccf7..052cda3 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-3.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-3.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'rgba(255, 0, 0, 1.)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-3.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-3.worker.js index c6cc915..e97be91 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-3.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-3.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'rgba(255, 0, 0, 1.)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-4.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-4.html index c70fef4..58685cae 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-4.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-4.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'rgba(255, 0, 0, '; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-4.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-4.worker.js index 94533e1..a9a4e97a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-4.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-4.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'rgba(255, 0, 0, '; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-5.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-5.html index e37122df..23c958e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-5.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-5.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'rgba(255, 0, 0, 1,)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-5.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-5.worker.js index 82c6b1b..e354cc1 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-5.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-5.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; try { ctx.fillStyle = 'rgba(255, 0, 0, 1,)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-1.html index bb1ff4e..bc53f85 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-1.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgb(-1000, 1000, -1000)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-1.worker.js index 635146d..2ee2b75f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-1.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgb(-1000, 1000, -1000)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-2.html index 6c25a41..8e677fd 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-2.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgb(-200%, 200%, -200%)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-2.worker.js index 351e2e06..e3a24cff 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-2.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgb(-200%, 200%, -200%)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-3.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-3.html index c69500e..4ab5895 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-3.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-3.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgb(-2147483649, 4294967298, -18446744073709551619)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-3.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-3.worker.js index 758a2b1..a0faea1b 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-3.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-3.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgb(-2147483649, 4294967298, -18446744073709551619)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-4.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-4.html index 8eb79d8..5a33ce8 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-4.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-4.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgb(-1000000000000000000000000000000000000000, 1000000000000000000000000000000000000000, -1000000000000000000000000000000000000000)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-4.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-4.worker.js index 4fa383b7..28942a9 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-4.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-4.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgb(-1000000000000000000000000000000000000000, 1000000000000000000000000000000000000000, -1000000000000000000000000000000000000000)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-5.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-5.html index fcdfa66..8335fb0 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-5.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-5.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgb(-10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000, 10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000, -10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-5.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-5.worker.js index b6b392b..6c869dd3 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-5.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-5.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgb(-10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000, 10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000, -10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-eof.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-eof.html index 5cd064c..14a932e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-eof.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-eof.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgb(0, 255, 0'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-eof.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-eof.worker.js index 96db10a2..2f37fc8e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-eof.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-eof.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgb(0, 255, 0'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-num.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-num.html index 3c5aaba..0847040 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-num.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-num.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgb(0,255,0)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-num.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-num.worker.js index a562ea1..839139a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-num.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-num.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgb(0,255,0)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-percent.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-percent.html index 727e574..7b9b300 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-percent.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-percent.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgb(0% ,100% ,0%)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-percent.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-percent.worker.js index 35aba06..b3f5c61 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-percent.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgb-percent.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgb(0% ,100% ,0%)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-1.html index 424e4215..9752ef1b2 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-1.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgba(0, 255, 0, -2)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0"); +_assertPixel(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-1.worker.js index f277e4d..37fe065 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-1.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgba(0, 255, 0, -2)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0"); +_assertPixel(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-2.html index 3be1fbb..119589e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-2.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgba(0, 255, 0, 2)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-2.worker.js index f7d5fe0..684aa34 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-2.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgba(0, 255, 0, 2)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-eof.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-eof.html index f886a6c0..d233eab 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-eof.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-eof.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgba(0, 255, 0, 1'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-eof.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-eof.worker.js index eb902c50..0a6e570 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-eof.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-eof.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgba(0, 255, 0, 1'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-1.html index 456bd0b4..6946f78 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-1.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgba( 0 , 255 , 0 , .499 )'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,127, "50,25", "0,255,0,127"); +_assertPixel(canvas, 50,25, 0,255,0,127, "50,25", "0,255,0,127"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-1.worker.js index dfcfa71..a2b1eec 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-1.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgba( 0 , 255 , 0 , .499 )'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,127, "50,25", "0,255,0,127"); +_assertPixel(canvas, 50,25, 0,255,0,127, "50,25", "0,255,0,127"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-2.html index 46933b3..6e0c04f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-2.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgba( 0 , 255 , 0 , 0.499 )'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,127, "50,25", "0,255,0,127"); +_assertPixel(canvas, 50,25, 0,255,0,127, "50,25", "0,255,0,127"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-2.worker.js index b77e50a..1b9aede4 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-2.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgba( 0 , 255 , 0 , 0.499 )'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,127, "50,25", "0,255,0,127"); +_assertPixel(canvas, 50,25, 0,255,0,127, "50,25", "0,255,0,127"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-percent.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-percent.html index 5a45918..ecfb527 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-percent.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-percent.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgba(0%,100%,0%,0.499)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,127, "50,25", "0,255,0,127"); +_assertPixel(canvas, 50,25, 0,255,0,127, "50,25", "0,255,0,127"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-percent.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-percent.worker.js index bdb28a5..39054cd3 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-percent.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-percent.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgba(0%,100%,0%,0.499)'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,127, "50,25", "0,255,0,127"); +_assertPixel(canvas, 50,25, 0,255,0,127, "50,25", "0,255,0,127"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-1.html index 8da515e..c0740571 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-1.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgba( 0 , 255 , 0 , 1 )'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-1.worker.js index 5d190fd..a9a753d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-1.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgba( 0 , 255 , 0 , 1 )'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-2.html index 5d8e531..64b87be 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-2.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgba( 0 , 255 , 0 , 1.0 )'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-2.worker.js index 758da37..fc81f0f3 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-2.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgba( 0 , 255 , 0 , 1.0 )'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-3.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-3.html index 062cf18..2b1b897 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-3.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-3.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgba( 0 , 255 , 0 , +1 )'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-3.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-3.worker.js index 310235a..c85dfb3 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-3.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-3.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgba( 0 , 255 , 0 , +1 )'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-4.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-4.html index e7d9353..be05e23d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-4.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-4.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgba( -0 , 255 , +0 , 1 )'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-4.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-4.worker.js index 71c91aa..141669a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-4.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-4.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'rgba( -0 , 255 , +0 , 1 )'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.svg-1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.svg-1.html index bcc8d382..1736db07 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.svg-1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.svg-1.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'gray'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 128,128,128,255, "50,25", "128,128,128,255"); +_assertPixel(canvas, 50,25, 128,128,128,255, "50,25", "128,128,128,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.svg-1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.svg-1.worker.js index 00c0e4f..bee57cc 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.svg-1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.svg-1.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'gray'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 128,128,128,255, "50,25", "128,128,128,255"); +_assertPixel(canvas, 50,25, 128,128,128,255, "50,25", "128,128,128,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.svg-2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.svg-2.html index bcf9b793..c5641e1 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.svg-2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.svg-2.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'grey'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 128,128,128,255, "50,25", "128,128,128,255"); +_assertPixel(canvas, 50,25, 128,128,128,255, "50,25", "128,128,128,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.svg-2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.svg-2.worker.js index fe77548d..dee217f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.svg-2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.svg-2.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'grey'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 128,128,128,255, "50,25", "128,128,128,255"); +_assertPixel(canvas, 50,25, 128,128,128,255, "50,25", "128,128,128,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.system.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.system.html index 3e466ec..65a84a78 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.system.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.system.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00';
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.system.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.system.worker.js index 7fafc99..8e21145 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.system.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.system.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00';
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.transparent-1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.transparent-1.html index 832757e..fb2fa0e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.transparent-1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.transparent-1.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'transparent'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0"); +_assertPixel(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.transparent-1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.transparent-1.worker.js index 9135c1a8b..0c838f6 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.transparent-1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.transparent-1.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'transparent'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0"); +_assertPixel(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.transparent-2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.transparent-2.html index 70b391d..cf54ac7 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.transparent-2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.transparent-2.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'TrAnSpArEnT'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0"); +_assertPixel(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.transparent-2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.transparent-2.worker.js index 6d418d7..e243816 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.transparent-2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.transparent-2.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillStyle = 'TrAnSpArEnT'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0"); +_assertPixel(canvas, 50,25, 0,0,0,0, "50,25", "0,0,0,0"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.toStringFunctionCallback.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.toStringFunctionCallback.html index f3b1498..70eb6b1a2 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.toStringFunctionCallback.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.toStringFunctionCallback.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = { toString: function() { return "#008000"; } }; _assertSame(ctx.fillStyle, "#008000", "ctx.fillStyle", "\"#008000\"");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.toStringFunctionCallback.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.toStringFunctionCallback.worker.js index 3b01851..68ae0a5 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.toStringFunctionCallback.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.toStringFunctionCallback.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = { toString: function() { return "#008000"; } }; _assertSame(ctx.fillStyle, "#008000", "ctx.fillStyle", "\"#008000\"");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.conic.invalid.inputs.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.conic.invalid.inputs.html index 5e3c826..3d1f21e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.conic.invalid.inputs.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.conic.invalid.inputs.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); assert_throws_js(TypeError, function() { ctx.createConicGradient(Infinity, 0, 1); }); assert_throws_js(TypeError, function() { ctx.createConicGradient(-Infinity, 0, 1); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.conic.invalid.inputs.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.conic.invalid.inputs.worker.js index 6b3bd627..b6bd62c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.conic.invalid.inputs.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.conic.invalid.inputs.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); assert_throws_js(TypeError, function() { ctx.createConicGradient(Infinity, 0, 1); }); assert_throws_js(TypeError, function() { ctx.createConicGradient(-Infinity, 0, 1); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.conic.negative.rotation.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.conic.negative.rotation.html index 6b648a2..bc69ead 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.conic.negative.rotation.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.conic.negative.rotation.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); const g = ctx.createConicGradient(-Math.PI/2, 50, 25); // It's red in the upper right region and green on the lower left region @@ -28,8 +28,8 @@ g.addColorStop(0.75, "#f00"); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 25,15, 255,0,0,255, "25,15", "255,0,0,255"); -_assertPixel(offscreenCanvas, 75,40, 0,255,0,255, "75,40", "0,255,0,255"); +_assertPixel(canvas, 25,15, 255,0,0,255, "25,15", "255,0,0,255"); +_assertPixel(canvas, 75,40, 0,255,0,255, "75,40", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.conic.negative.rotation.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.conic.negative.rotation.worker.js index b356a5e..de26598 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.conic.negative.rotation.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.conic.negative.rotation.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); const g = ctx.createConicGradient(-Math.PI/2, 50, 25); // It's red in the upper right region and green on the lower left region @@ -24,8 +24,8 @@ g.addColorStop(0.75, "#f00"); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 25,15, 255,0,0,255, "25,15", "255,0,0,255"); -_assertPixel(offscreenCanvas, 75,40, 0,255,0,255, "75,40", "0,255,0,255"); +_assertPixel(canvas, 25,15, 255,0,0,255, "25,15", "255,0,0,255"); +_assertPixel(canvas, 75,40, 0,255,0,255, "75,40", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.conic.positive.rotation.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.conic.positive.rotation.html index dd9f05e..137d4b9a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.conic.positive.rotation.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.conic.positive.rotation.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); const g = ctx.createConicGradient(3*Math.PI/2, 50, 25); // It's red in the upper right region and green on the lower left region @@ -28,8 +28,8 @@ g.addColorStop(0.75, "#f00"); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 25,15, 255,0,0,255, "25,15", "255,0,0,255"); -_assertPixel(offscreenCanvas, 75,40, 0,255,0,255, "75,40", "0,255,0,255"); +_assertPixel(canvas, 25,15, 255,0,0,255, "25,15", "255,0,0,255"); +_assertPixel(canvas, 75,40, 0,255,0,255, "75,40", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.conic.positive.rotation.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.conic.positive.rotation.worker.js index a574b07..57e8b79 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.conic.positive.rotation.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.conic.positive.rotation.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); const g = ctx.createConicGradient(3*Math.PI/2, 50, 25); // It's red in the upper right region and green on the lower left region @@ -24,8 +24,8 @@ g.addColorStop(0.75, "#f00"); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 25,15, 255,0,0,255, "25,15", "255,0,0,255"); -_assertPixel(offscreenCanvas, 75,40, 0,255,0,255, "75,40", "0,255,0,255"); +_assertPixel(canvas, 25,15, 255,0,0,255, "25,15", "255,0,0,255"); +_assertPixel(canvas, 75,40, 0,255,0,255, "75,40", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.empty.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.empty.html index 927c580..154a888 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.empty.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.empty.html
@@ -17,15 +17,15 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); var g = ctx.createLinearGradient(0, 0, 0, 50); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.empty.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.empty.worker.js index 5fa014d..0db82ee 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.empty.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.empty.worker.js
@@ -13,15 +13,15 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); var g = ctx.createLinearGradient(0, 0, 0, 50); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.alpha.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.alpha.html index 6c622b4..4507adf 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.alpha.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.alpha.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#ff0'; ctx.fillRect(0, 0, 100, 50); @@ -27,9 +27,9 @@ g.addColorStop(1, 'rgba(0,0,255, 1)'); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 25,25, 191,191,63,255, "25,25", "191,191,63,255", 3); -_assertPixelApprox(offscreenCanvas, 50,25, 127,127,127,255, "50,25", "127,127,127,255", 3); -_assertPixelApprox(offscreenCanvas, 75,25, 63,63,191,255, "75,25", "63,63,191,255", 3); +_assertPixelApprox(canvas, 25,25, 191,191,63,255, "25,25", "191,191,63,255", 3); +_assertPixelApprox(canvas, 50,25, 127,127,127,255, "50,25", "127,127,127,255", 3); +_assertPixelApprox(canvas, 75,25, 63,63,191,255, "75,25", "63,63,191,255", 3); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.alpha.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.alpha.worker.js index 1e4553d..119de34 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.alpha.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.alpha.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#ff0'; ctx.fillRect(0, 0, 100, 50); @@ -23,9 +23,9 @@ g.addColorStop(1, 'rgba(0,0,255, 1)'); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 25,25, 191,191,63,255, "25,25", "191,191,63,255", 3); -_assertPixelApprox(offscreenCanvas, 50,25, 127,127,127,255, "50,25", "127,127,127,255", 3); -_assertPixelApprox(offscreenCanvas, 75,25, 63,63,191,255, "75,25", "63,63,191,255", 3); +_assertPixelApprox(canvas, 25,25, 191,191,63,255, "25,25", "191,191,63,255", 3); +_assertPixelApprox(canvas, 50,25, 127,127,127,255, "50,25", "127,127,127,255", 3); +_assertPixelApprox(canvas, 75,25, 63,63,191,255, "75,25", "63,63,191,255", 3); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.colour.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.colour.html index 8a36fd4..6b35d34 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.colour.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.colour.html
@@ -17,17 +17,17 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var g = ctx.createLinearGradient(0, 0, 100, 0); g.addColorStop(0, '#ff0'); g.addColorStop(1, '#00f'); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 25,25, 191,191,63,255, "25,25", "191,191,63,255", 3); -_assertPixelApprox(offscreenCanvas, 50,25, 127,127,127,255, "50,25", "127,127,127,255", 3); -_assertPixelApprox(offscreenCanvas, 75,25, 63,63,191,255, "75,25", "63,63,191,255", 3); +_assertPixelApprox(canvas, 25,25, 191,191,63,255, "25,25", "191,191,63,255", 3); +_assertPixelApprox(canvas, 50,25, 127,127,127,255, "50,25", "127,127,127,255", 3); +_assertPixelApprox(canvas, 75,25, 63,63,191,255, "75,25", "63,63,191,255", 3); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.colour.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.colour.worker.js index 249544149..f25f7cfa 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.colour.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.colour.worker.js
@@ -13,17 +13,17 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var g = ctx.createLinearGradient(0, 0, 100, 0); g.addColorStop(0, '#ff0'); g.addColorStop(1, '#00f'); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 25,25, 191,191,63,255, "25,25", "191,191,63,255", 3); -_assertPixelApprox(offscreenCanvas, 50,25, 127,127,127,255, "50,25", "127,127,127,255", 3); -_assertPixelApprox(offscreenCanvas, 75,25, 63,63,191,255, "75,25", "63,63,191,255", 3); +_assertPixelApprox(canvas, 25,25, 191,191,63,255, "25,25", "191,191,63,255", 3); +_assertPixelApprox(canvas, 50,25, 127,127,127,255, "50,25", "127,127,127,255", 3); +_assertPixelApprox(canvas, 75,25, 63,63,191,255, "75,25", "63,63,191,255", 3); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.colouralpha.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.colouralpha.html index 6d0b0d7..0bf8070 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.colouralpha.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.colouralpha.html
@@ -17,17 +17,17 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var g = ctx.createLinearGradient(0, 0, 100, 0); g.addColorStop(0, 'rgba(255,255,0, 0)'); g.addColorStop(1, 'rgba(0,0,255, 1)'); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 25,25, 190,190,65,65, "25,25", "190,190,65,65", 3); -_assertPixelApprox(offscreenCanvas, 50,25, 126,126,128,128, "50,25", "126,126,128,128", 3); -_assertPixelApprox(offscreenCanvas, 75,25, 62,62,192,192, "75,25", "62,62,192,192", 3); +_assertPixelApprox(canvas, 25,25, 190,190,65,65, "25,25", "190,190,65,65", 3); +_assertPixelApprox(canvas, 50,25, 126,126,128,128, "50,25", "126,126,128,128", 3); +_assertPixelApprox(canvas, 75,25, 62,62,192,192, "75,25", "62,62,192,192", 3); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.colouralpha.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.colouralpha.worker.js index 6ef3d306..f5abf5d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.colouralpha.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.colouralpha.worker.js
@@ -13,17 +13,17 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var g = ctx.createLinearGradient(0, 0, 100, 0); g.addColorStop(0, 'rgba(255,255,0, 0)'); g.addColorStop(1, 'rgba(0,0,255, 1)'); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 25,25, 190,190,65,65, "25,25", "190,190,65,65", 3); -_assertPixelApprox(offscreenCanvas, 50,25, 126,126,128,128, "50,25", "126,126,128,128", 3); -_assertPixelApprox(offscreenCanvas, 75,25, 62,62,192,192, "75,25", "62,62,192,192", 3); +_assertPixelApprox(canvas, 25,25, 190,190,65,65, "25,25", "190,190,65,65", 3); +_assertPixelApprox(canvas, 50,25, 126,126,128,128, "50,25", "126,126,128,128", 3); +_assertPixelApprox(canvas, 75,25, 62,62,192,192, "75,25", "62,62,192,192", 3); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.multiple.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.multiple.html index 76de5600..2abbd65 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.multiple.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.multiple.html
@@ -17,19 +17,19 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -offscreenCanvas.width = 200; +canvas.width = 200; var g = ctx.createLinearGradient(0, 0, 200, 0); g.addColorStop(0, '#ff0'); g.addColorStop(0.5, '#0ff'); g.addColorStop(1, '#f0f'); ctx.fillStyle = g; ctx.fillRect(0, 0, 200, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 127,255,127,255, "50,25", "127,255,127,255", 3); -_assertPixelApprox(offscreenCanvas, 100,25, 0,255,255,255, "100,25", "0,255,255,255", 3); -_assertPixelApprox(offscreenCanvas, 150,25, 127,127,255,255, "150,25", "127,127,255,255", 3); +_assertPixelApprox(canvas, 50,25, 127,255,127,255, "50,25", "127,255,127,255", 3); +_assertPixelApprox(canvas, 100,25, 0,255,255,255, "100,25", "0,255,255,255", 3); +_assertPixelApprox(canvas, 150,25, 127,127,255,255, "150,25", "127,127,255,255", 3); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.multiple.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.multiple.worker.js index 5336e0d..f732b0db 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.multiple.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.multiple.worker.js
@@ -13,19 +13,19 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -offscreenCanvas.width = 200; +canvas.width = 200; var g = ctx.createLinearGradient(0, 0, 200, 0); g.addColorStop(0, '#ff0'); g.addColorStop(0.5, '#0ff'); g.addColorStop(1, '#f0f'); ctx.fillStyle = g; ctx.fillRect(0, 0, 200, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 127,255,127,255, "50,25", "127,255,127,255", 3); -_assertPixelApprox(offscreenCanvas, 100,25, 0,255,255,255, "100,25", "0,255,255,255", 3); -_assertPixelApprox(offscreenCanvas, 150,25, 127,127,255,255, "150,25", "127,127,255,255", 3); +_assertPixelApprox(canvas, 50,25, 127,255,127,255, "50,25", "127,255,127,255", 3); +_assertPixelApprox(canvas, 100,25, 0,255,255,255, "100,25", "0,255,255,255", 3); +_assertPixelApprox(canvas, 150,25, 127,127,255,255, "150,25", "127,127,255,255", 3); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.outside.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.outside.html index 5541139..ce53d95 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.outside.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.outside.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,9 +27,9 @@ g.addColorStop(0.6, '#0f0'); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 20,25, 0,255,0,255, "20,25", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 80,25, 0,255,0,255, "80,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 20,25, 0,255,0,255, "20,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 80,25, 0,255,0,255, "80,25", "0,255,0,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.outside.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.outside.worker.js index 500787c6..9a9949f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.outside.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.outside.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,9 +23,9 @@ g.addColorStop(0.6, '#0f0'); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 20,25, 0,255,0,255, "20,25", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 80,25, 0,255,0,255, "80,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 20,25, 0,255,0,255, "20,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 80,25, 0,255,0,255, "80,25", "0,255,0,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.overlap.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.overlap.html index 70e6eec2..a63eb36 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.overlap.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.overlap.html
@@ -17,10 +17,10 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -offscreenCanvas.width = 200; +canvas.width = 200; var g = ctx.createLinearGradient(0, 0, 200, 0); g.addColorStop(0, '#f00'); g.addColorStop(0, '#ff0'); @@ -40,12 +40,12 @@ g.addColorStop(1, '#00f'); ctx.fillStyle = g; ctx.fillRect(0, 0, 200, 50); -_assertPixelApprox(offscreenCanvas, 49,25, 0,0,255,255, "49,25", "0,0,255,255", 16); -_assertPixelApprox(offscreenCanvas, 51,25, 255,255,0,255, "51,25", "255,255,0,255", 16); -_assertPixelApprox(offscreenCanvas, 99,25, 0,0,255,255, "99,25", "0,0,255,255", 16); -_assertPixelApprox(offscreenCanvas, 101,25, 255,255,0,255, "101,25", "255,255,0,255", 16); -_assertPixelApprox(offscreenCanvas, 149,25, 0,0,255,255, "149,25", "0,0,255,255", 16); -_assertPixelApprox(offscreenCanvas, 151,25, 255,255,0,255, "151,25", "255,255,0,255", 16); +_assertPixelApprox(canvas, 49,25, 0,0,255,255, "49,25", "0,0,255,255", 16); +_assertPixelApprox(canvas, 51,25, 255,255,0,255, "51,25", "255,255,0,255", 16); +_assertPixelApprox(canvas, 99,25, 0,0,255,255, "99,25", "0,0,255,255", 16); +_assertPixelApprox(canvas, 101,25, 255,255,0,255, "101,25", "255,255,0,255", 16); +_assertPixelApprox(canvas, 149,25, 0,0,255,255, "149,25", "0,0,255,255", 16); +_assertPixelApprox(canvas, 151,25, 255,255,0,255, "151,25", "255,255,0,255", 16); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.overlap.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.overlap.worker.js index 86c99ca..8fc2fd5 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.overlap.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.overlap.worker.js
@@ -13,10 +13,10 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -offscreenCanvas.width = 200; +canvas.width = 200; var g = ctx.createLinearGradient(0, 0, 200, 0); g.addColorStop(0, '#f00'); g.addColorStop(0, '#ff0'); @@ -36,12 +36,12 @@ g.addColorStop(1, '#00f'); ctx.fillStyle = g; ctx.fillRect(0, 0, 200, 50); -_assertPixelApprox(offscreenCanvas, 49,25, 0,0,255,255, "49,25", "0,0,255,255", 16); -_assertPixelApprox(offscreenCanvas, 51,25, 255,255,0,255, "51,25", "255,255,0,255", 16); -_assertPixelApprox(offscreenCanvas, 99,25, 0,0,255,255, "99,25", "0,0,255,255", 16); -_assertPixelApprox(offscreenCanvas, 101,25, 255,255,0,255, "101,25", "255,255,0,255", 16); -_assertPixelApprox(offscreenCanvas, 149,25, 0,0,255,255, "149,25", "0,0,255,255", 16); -_assertPixelApprox(offscreenCanvas, 151,25, 255,255,0,255, "151,25", "255,255,0,255", 16); +_assertPixelApprox(canvas, 49,25, 0,0,255,255, "49,25", "0,0,255,255", 16); +_assertPixelApprox(canvas, 51,25, 255,255,0,255, "51,25", "255,255,0,255", 16); +_assertPixelApprox(canvas, 99,25, 0,0,255,255, "99,25", "0,0,255,255", 16); +_assertPixelApprox(canvas, 101,25, 255,255,0,255, "101,25", "255,255,0,255", 16); +_assertPixelApprox(canvas, 149,25, 0,0,255,255, "149,25", "0,0,255,255", 16); +_assertPixelApprox(canvas, 151,25, 255,255,0,255, "151,25", "255,255,0,255", 16); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.overlap2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.overlap2.html index fddaf17..25ef30ed 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.overlap2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.overlap2.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var g = ctx.createLinearGradient(0, 0, 100, 0); var ps = [ 0, 1/10, 1/4, 1/3, 1/2, 3/4, 1 ]; @@ -31,11 +31,11 @@ } ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 30,25, 0,255,0,255, "30,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 40,25, 0,255,0,255, "40,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 60,25, 0,255,0,255, "60,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 80,25, 0,255,0,255, "80,25", "0,255,0,255"); +_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); +_assertPixel(canvas, 30,25, 0,255,0,255, "30,25", "0,255,0,255"); +_assertPixel(canvas, 40,25, 0,255,0,255, "40,25", "0,255,0,255"); +_assertPixel(canvas, 60,25, 0,255,0,255, "60,25", "0,255,0,255"); +_assertPixel(canvas, 80,25, 0,255,0,255, "80,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.overlap2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.overlap2.worker.js index 7c6081e4..8b47778 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.overlap2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.overlap2.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var g = ctx.createLinearGradient(0, 0, 100, 0); var ps = [ 0, 1/10, 1/4, 1/3, 1/2, 3/4, 1 ]; @@ -27,11 +27,11 @@ } ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 30,25, 0,255,0,255, "30,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 40,25, 0,255,0,255, "40,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 60,25, 0,255,0,255, "60,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 80,25, 0,255,0,255, "80,25", "0,255,0,255"); +_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); +_assertPixel(canvas, 30,25, 0,255,0,255, "30,25", "0,255,0,255"); +_assertPixel(canvas, 40,25, 0,255,0,255, "40,25", "0,255,0,255"); +_assertPixel(canvas, 60,25, 0,255,0,255, "60,25", "0,255,0,255"); +_assertPixel(canvas, 80,25, 0,255,0,255, "80,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.solid.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.solid.html index 82619845..98514add 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.solid.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.solid.html
@@ -17,15 +17,15 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var g = ctx.createLinearGradient(0, 0, 100, 0); g.addColorStop(0, '#0f0'); g.addColorStop(1, '#0f0'); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.solid.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.solid.worker.js index 01a509a..c296f48 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.solid.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.solid.worker.js
@@ -13,15 +13,15 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var g = ctx.createLinearGradient(0, 0, 100, 0); g.addColorStop(0, '#0f0'); g.addColorStop(1, '#0f0'); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.vertical.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.vertical.html index b8ff412..3ca5a76 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.vertical.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.vertical.html
@@ -17,17 +17,17 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var g = ctx.createLinearGradient(0, 0, 0, 50); g.addColorStop(0, '#ff0'); g.addColorStop(1, '#00f'); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,12, 191,191,63,255, "50,12", "191,191,63,255", 10); -_assertPixelApprox(offscreenCanvas, 50,25, 127,127,127,255, "50,25", "127,127,127,255", 5); -_assertPixelApprox(offscreenCanvas, 50,37, 63,63,191,255, "50,37", "63,63,191,255", 10); +_assertPixelApprox(canvas, 50,12, 191,191,63,255, "50,12", "191,191,63,255", 10); +_assertPixelApprox(canvas, 50,25, 127,127,127,255, "50,25", "127,127,127,255", 5); +_assertPixelApprox(canvas, 50,37, 63,63,191,255, "50,37", "63,63,191,255", 10); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.vertical.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.vertical.worker.js index 04b3586..319d03c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.vertical.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.vertical.worker.js
@@ -13,17 +13,17 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var g = ctx.createLinearGradient(0, 0, 0, 50); g.addColorStop(0, '#ff0'); g.addColorStop(1, '#00f'); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,12, 191,191,63,255, "50,12", "191,191,63,255", 10); -_assertPixelApprox(offscreenCanvas, 50,25, 127,127,127,255, "50,25", "127,127,127,255", 5); -_assertPixelApprox(offscreenCanvas, 50,37, 63,63,191,255, "50,37", "63,63,191,255", 10); +_assertPixelApprox(canvas, 50,12, 191,191,63,255, "50,12", "191,191,63,255", 10); +_assertPixelApprox(canvas, 50,25, 127,127,127,255, "50,25", "127,127,127,255", 5); +_assertPixelApprox(canvas, 50,37, 63,63,191,255, "50,37", "63,63,191,255", 10); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fill.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fill.html index a72b6201..b0f7be68 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fill.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fill.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -28,7 +28,7 @@ ctx.fillStyle = g; ctx.rect(0, 0, 100, 50); ctx.fill(); -_assertPixel(offscreenCanvas, 40,20, 0,255,0,255, "40,20", "0,255,0,255"); +_assertPixel(canvas, 40,20, 0,255,0,255, "40,20", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fill.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fill.worker.js index 02e7dc0..4fbb8582 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fill.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fill.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -24,7 +24,7 @@ ctx.fillStyle = g; ctx.rect(0, 0, 100, 50); ctx.fill(); -_assertPixel(offscreenCanvas, 40,20, 0,255,0,255, "40,20", "0,255,0,255"); +_assertPixel(canvas, 40,20, 0,255,0,255, "40,20", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fillRect.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fillRect.html index fc4cf5b1..cec97f0 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fillRect.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fillRect.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -27,7 +27,7 @@ g.addColorStop(1, '#f00'); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 40,20, 0,255,0,255, "40,20", "0,255,0,255"); +_assertPixel(canvas, 40,20, 0,255,0,255, "40,20", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fillRect.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fillRect.worker.js index 02d32624..ef3f42a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fillRect.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fillRect.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -23,7 +23,7 @@ g.addColorStop(1, '#f00'); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 40,20, 0,255,0,255, "40,20", "0,255,0,255"); +_assertPixel(canvas, 40,20, 0,255,0,255, "40,20", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.stroke.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.stroke.html index 04b3f9b..ff1eac4 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.stroke.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.stroke.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -28,15 +28,15 @@ ctx.strokeStyle = g; ctx.rect(20, 20, 60, 10); ctx.stroke(); -_assertPixel(offscreenCanvas, 19,19, 0,255,0,255, "19,19", "0,255,0,255"); -_assertPixel(offscreenCanvas, 20,19, 0,255,0,255, "20,19", "0,255,0,255"); -_assertPixel(offscreenCanvas, 21,19, 0,255,0,255, "21,19", "0,255,0,255"); -_assertPixel(offscreenCanvas, 19,20, 0,255,0,255, "19,20", "0,255,0,255"); -_assertPixel(offscreenCanvas, 20,20, 0,255,0,255, "20,20", "0,255,0,255"); -_assertPixel(offscreenCanvas, 21,20, 0,255,0,255, "21,20", "0,255,0,255"); -_assertPixel(offscreenCanvas, 19,21, 0,255,0,255, "19,21", "0,255,0,255"); -_assertPixel(offscreenCanvas, 20,21, 0,255,0,255, "20,21", "0,255,0,255"); -_assertPixel(offscreenCanvas, 21,21, 0,255,0,255, "21,21", "0,255,0,255"); +_assertPixel(canvas, 19,19, 0,255,0,255, "19,19", "0,255,0,255"); +_assertPixel(canvas, 20,19, 0,255,0,255, "20,19", "0,255,0,255"); +_assertPixel(canvas, 21,19, 0,255,0,255, "21,19", "0,255,0,255"); +_assertPixel(canvas, 19,20, 0,255,0,255, "19,20", "0,255,0,255"); +_assertPixel(canvas, 20,20, 0,255,0,255, "20,20", "0,255,0,255"); +_assertPixel(canvas, 21,20, 0,255,0,255, "21,20", "0,255,0,255"); +_assertPixel(canvas, 19,21, 0,255,0,255, "19,21", "0,255,0,255"); +_assertPixel(canvas, 20,21, 0,255,0,255, "20,21", "0,255,0,255"); +_assertPixel(canvas, 21,21, 0,255,0,255, "21,21", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.stroke.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.stroke.worker.js index 73ba6a4..8fc30d6 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.stroke.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.stroke.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -24,15 +24,15 @@ ctx.strokeStyle = g; ctx.rect(20, 20, 60, 10); ctx.stroke(); -_assertPixel(offscreenCanvas, 19,19, 0,255,0,255, "19,19", "0,255,0,255"); -_assertPixel(offscreenCanvas, 20,19, 0,255,0,255, "20,19", "0,255,0,255"); -_assertPixel(offscreenCanvas, 21,19, 0,255,0,255, "21,19", "0,255,0,255"); -_assertPixel(offscreenCanvas, 19,20, 0,255,0,255, "19,20", "0,255,0,255"); -_assertPixel(offscreenCanvas, 20,20, 0,255,0,255, "20,20", "0,255,0,255"); -_assertPixel(offscreenCanvas, 21,20, 0,255,0,255, "21,20", "0,255,0,255"); -_assertPixel(offscreenCanvas, 19,21, 0,255,0,255, "19,21", "0,255,0,255"); -_assertPixel(offscreenCanvas, 20,21, 0,255,0,255, "20,21", "0,255,0,255"); -_assertPixel(offscreenCanvas, 21,21, 0,255,0,255, "21,21", "0,255,0,255"); +_assertPixel(canvas, 19,19, 0,255,0,255, "19,19", "0,255,0,255"); +_assertPixel(canvas, 20,19, 0,255,0,255, "20,19", "0,255,0,255"); +_assertPixel(canvas, 21,19, 0,255,0,255, "21,19", "0,255,0,255"); +_assertPixel(canvas, 19,20, 0,255,0,255, "19,20", "0,255,0,255"); +_assertPixel(canvas, 20,20, 0,255,0,255, "20,20", "0,255,0,255"); +_assertPixel(canvas, 21,20, 0,255,0,255, "21,20", "0,255,0,255"); +_assertPixel(canvas, 19,21, 0,255,0,255, "19,21", "0,255,0,255"); +_assertPixel(canvas, 20,21, 0,255,0,255, "20,21", "0,255,0,255"); +_assertPixel(canvas, 21,21, 0,255,0,255, "21,21", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.strokeRect.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.strokeRect.html index 5d094c8..76273ab1 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.strokeRect.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.strokeRect.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -27,15 +27,15 @@ g.addColorStop(1, '#f00'); ctx.strokeStyle = g; ctx.strokeRect(20, 20, 60, 10); -_assertPixel(offscreenCanvas, 19,19, 0,255,0,255, "19,19", "0,255,0,255"); -_assertPixel(offscreenCanvas, 20,19, 0,255,0,255, "20,19", "0,255,0,255"); -_assertPixel(offscreenCanvas, 21,19, 0,255,0,255, "21,19", "0,255,0,255"); -_assertPixel(offscreenCanvas, 19,20, 0,255,0,255, "19,20", "0,255,0,255"); -_assertPixel(offscreenCanvas, 20,20, 0,255,0,255, "20,20", "0,255,0,255"); -_assertPixel(offscreenCanvas, 21,20, 0,255,0,255, "21,20", "0,255,0,255"); -_assertPixel(offscreenCanvas, 19,21, 0,255,0,255, "19,21", "0,255,0,255"); -_assertPixel(offscreenCanvas, 20,21, 0,255,0,255, "20,21", "0,255,0,255"); -_assertPixel(offscreenCanvas, 21,21, 0,255,0,255, "21,21", "0,255,0,255"); +_assertPixel(canvas, 19,19, 0,255,0,255, "19,19", "0,255,0,255"); +_assertPixel(canvas, 20,19, 0,255,0,255, "20,19", "0,255,0,255"); +_assertPixel(canvas, 21,19, 0,255,0,255, "21,19", "0,255,0,255"); +_assertPixel(canvas, 19,20, 0,255,0,255, "19,20", "0,255,0,255"); +_assertPixel(canvas, 20,20, 0,255,0,255, "20,20", "0,255,0,255"); +_assertPixel(canvas, 21,20, 0,255,0,255, "21,20", "0,255,0,255"); +_assertPixel(canvas, 19,21, 0,255,0,255, "19,21", "0,255,0,255"); +_assertPixel(canvas, 20,21, 0,255,0,255, "20,21", "0,255,0,255"); +_assertPixel(canvas, 21,21, 0,255,0,255, "21,21", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.strokeRect.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.strokeRect.worker.js index 84d786a..03e91be6 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.strokeRect.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.strokeRect.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -23,15 +23,15 @@ g.addColorStop(1, '#f00'); ctx.strokeStyle = g; ctx.strokeRect(20, 20, 60, 10); -_assertPixel(offscreenCanvas, 19,19, 0,255,0,255, "19,19", "0,255,0,255"); -_assertPixel(offscreenCanvas, 20,19, 0,255,0,255, "20,19", "0,255,0,255"); -_assertPixel(offscreenCanvas, 21,19, 0,255,0,255, "21,19", "0,255,0,255"); -_assertPixel(offscreenCanvas, 19,20, 0,255,0,255, "19,20", "0,255,0,255"); -_assertPixel(offscreenCanvas, 20,20, 0,255,0,255, "20,20", "0,255,0,255"); -_assertPixel(offscreenCanvas, 21,20, 0,255,0,255, "21,20", "0,255,0,255"); -_assertPixel(offscreenCanvas, 19,21, 0,255,0,255, "19,21", "0,255,0,255"); -_assertPixel(offscreenCanvas, 20,21, 0,255,0,255, "20,21", "0,255,0,255"); -_assertPixel(offscreenCanvas, 21,21, 0,255,0,255, "21,21", "0,255,0,255"); +_assertPixel(canvas, 19,19, 0,255,0,255, "19,19", "0,255,0,255"); +_assertPixel(canvas, 20,19, 0,255,0,255, "20,19", "0,255,0,255"); +_assertPixel(canvas, 21,19, 0,255,0,255, "21,19", "0,255,0,255"); +_assertPixel(canvas, 19,20, 0,255,0,255, "19,20", "0,255,0,255"); +_assertPixel(canvas, 20,20, 0,255,0,255, "20,20", "0,255,0,255"); +_assertPixel(canvas, 21,20, 0,255,0,255, "21,20", "0,255,0,255"); +_assertPixel(canvas, 19,21, 0,255,0,255, "19,21", "0,255,0,255"); +_assertPixel(canvas, 20,21, 0,255,0,255, "20,21", "0,255,0,255"); +_assertPixel(canvas, 21,21, 0,255,0,255, "21,21", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.nonfinite.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.nonfinite.html index cff00693..f3c4209b 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.nonfinite.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.nonfinite.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); assert_throws_js(TypeError, function() { ctx.createLinearGradient(Infinity, 0, 1, 0); }); assert_throws_js(TypeError, function() { ctx.createLinearGradient(-Infinity, 0, 1, 0); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.nonfinite.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.nonfinite.worker.js index 9cd7bcb..9fefcc3 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.nonfinite.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.nonfinite.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); assert_throws_js(TypeError, function() { ctx.createLinearGradient(Infinity, 0, 1, 0); }); assert_throws_js(TypeError, function() { ctx.createLinearGradient(-Infinity, 0, 1, 0); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.transform.1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.transform.1.html index bd5dc54..0dd162a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.transform.1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.transform.1.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var g = ctx.createLinearGradient(0, 0, 200, 0); g.addColorStop(0, '#f00'); @@ -28,9 +28,9 @@ ctx.fillStyle = g; ctx.translate(-50, 0); ctx.fillRect(50, 0, 100, 50); -_assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.transform.1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.transform.1.worker.js index af97b46..57f23ff 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.transform.1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.transform.1.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var g = ctx.createLinearGradient(0, 0, 200, 0); g.addColorStop(0, '#f00'); @@ -24,9 +24,9 @@ ctx.fillStyle = g; ctx.translate(-50, 0); ctx.fillRect(50, 0, 100, 50); -_assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.transform.2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.transform.2.html index d397702..5856c39 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.transform.2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.transform.2.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.translate(100, 0); var g = ctx.createLinearGradient(0, 0, 200, 0); @@ -29,9 +29,9 @@ ctx.fillStyle = g; ctx.translate(-150, 0); ctx.fillRect(50, 0, 100, 50); -_assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.transform.2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.transform.2.worker.js index 4ba59d32..326a028 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.transform.2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.transform.2.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.translate(100, 0); var g = ctx.createLinearGradient(0, 0, 200, 0); @@ -25,9 +25,9 @@ ctx.fillStyle = g; ctx.translate(-150, 0); ctx.fillRect(50, 0, 100, 50); -_assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.transform.3.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.transform.3.html index 9dd67de..3d0359c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.transform.3.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.transform.3.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var g = ctx.createLinearGradient(0, 0, 200, 0); g.addColorStop(0, '#f00'); @@ -29,9 +29,9 @@ ctx.fillRect(0, 0, 100, 50); ctx.translate(-50, 0); ctx.fillRect(50, 0, 100, 50); -_assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.transform.3.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.transform.3.worker.js index ad956c50..8a3f502 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.transform.3.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.linear.transform.3.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var g = ctx.createLinearGradient(0, 0, 200, 0); g.addColorStop(0, '#f00'); @@ -25,9 +25,9 @@ ctx.fillRect(0, 0, 100, 50); ctx.translate(-50, 0); ctx.fillRect(50, 0, 100, 50); -_assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.compare.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.compare.html index 813901f..a091c32 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.compare.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.compare.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var g1 = ctx.createLinearGradient(0, 0, 100, 0); var g2 = ctx.createLinearGradient(0, 0, 100, 0);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.compare.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.compare.worker.js index 7c59295..6c69e1a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.compare.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.compare.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var g1 = ctx.createLinearGradient(0, 0, 100, 0); var g2 = ctx.createLinearGradient(0, 0, 100, 0);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.crosscanvas.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.crosscanvas.html index 8fa1720..82b6bc1 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.crosscanvas.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.crosscanvas.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -28,7 +28,7 @@ g.addColorStop(1, '#0f0'); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.crosscanvas.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.crosscanvas.worker.js index f9449e7..6639cc75 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.crosscanvas.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.crosscanvas.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -24,7 +24,7 @@ g.addColorStop(1, '#0f0'); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.invalidcolour.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.invalidcolour.html index 8969fdd..a5841df6 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.invalidcolour.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.invalidcolour.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var g = ctx.createLinearGradient(0, 0, 100, 0); assert_throws_dom("SYNTAX_ERR", function() { g.addColorStop(0, ""); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.invalidcolour.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.invalidcolour.worker.js index b93c4a1e..7643645b 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.invalidcolour.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.invalidcolour.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var g = ctx.createLinearGradient(0, 0, 100, 0); assert_throws_dom("SYNTAX_ERR", function() { g.addColorStop(0, ""); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.invalidoffset.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.invalidoffset.html index e505978..bba4050 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.invalidoffset.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.invalidoffset.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var g = ctx.createLinearGradient(0, 0, 100, 0); assert_throws_dom("INDEX_SIZE_ERR", function() { g.addColorStop(-1, '#000'); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.invalidoffset.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.invalidoffset.worker.js index f3c72744..f71c840 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.invalidoffset.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.invalidoffset.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var g = ctx.createLinearGradient(0, 0, 100, 0); assert_throws_dom("INDEX_SIZE_ERR", function() { g.addColorStop(-1, '#000'); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.update.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.update.html index d91784f..fa48b02f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.update.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.update.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var g = ctx.createLinearGradient(-100, 0, 200, 0); g.addColorStop(0, '#f00'); @@ -27,7 +27,7 @@ g.addColorStop(0.1, '#0f0'); g.addColorStop(0.9, '#0f0'); ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.update.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.update.worker.js index c3074ba..7589342 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.update.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.object.update.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var g = ctx.createLinearGradient(-100, 0, 200, 0); g.addColorStop(0, '#f00'); @@ -23,7 +23,7 @@ g.addColorStop(0.1, '#0f0'); g.addColorStop(0.9, '#0f0'); ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.behind.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.behind.html index d2a7633..80c71480 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.behind.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.behind.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -27,15 +27,15 @@ g.addColorStop(1, '#f00'); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.behind.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.behind.worker.js index 1c76c6d..373896c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.behind.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.behind.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -23,15 +23,15 @@ g.addColorStop(1, '#f00'); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.beside.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.beside.html index c8f5c447..283a5fa 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.beside.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.beside.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -27,15 +27,15 @@ g.addColorStop(1, '#f00'); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.beside.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.beside.worker.js index 73fbcc2..77a4eb8 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.beside.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.beside.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -23,15 +23,15 @@ g.addColorStop(1, '#f00'); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.bottom.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.bottom.html index 1c822563..8dae29c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.bottom.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.bottom.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,15 +27,15 @@ g.addColorStop(1, '#f00'); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.bottom.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.bottom.worker.js index d1e6d973..d0aede16 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.bottom.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.bottom.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,15 +23,15 @@ g.addColorStop(1, '#f00'); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.cylinder.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.cylinder.html index 98a6c97a..9eb0840c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.cylinder.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.cylinder.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,15 +27,15 @@ g.addColorStop(1, '#f00'); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.cylinder.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.cylinder.worker.js index e101472..606a4d5 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.cylinder.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.cylinder.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,15 +23,15 @@ g.addColorStop(1, '#f00'); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.front.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.front.html index 346fc89..2cabc1f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.front.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.front.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,15 +27,15 @@ g.addColorStop(1, '#0f0'); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.front.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.front.worker.js index a4efd82..4fa20456 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.front.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.front.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,15 +23,15 @@ g.addColorStop(1, '#0f0'); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.shape1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.shape1.html index 56af192..424c08c0 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.shape1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.shape1.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var tol = 1; // tolerance to avoid antialiasing artifacts ctx.fillStyle = '#0f0'; @@ -34,15 +34,15 @@ g.addColorStop(1, '#0f0'); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.shape1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.shape1.worker.js index 67340565..562570d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.shape1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.shape1.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var tol = 1; // tolerance to avoid antialiasing artifacts ctx.fillStyle = '#0f0'; @@ -30,15 +30,15 @@ g.addColorStop(1, '#0f0'); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.shape2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.shape2.html index 3e45e00..7b338dc7 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.shape2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.shape2.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var tol = 1; // tolerance to avoid antialiasing artifacts ctx.fillStyle = '#0f0'; @@ -34,15 +34,15 @@ ctx.lineTo(110, -20-tol); ctx.lineTo(110, 100+tol); ctx.fill(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.shape2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.shape2.worker.js index 5856e8b..1a138da 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.shape2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.shape2.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var tol = 1; // tolerance to avoid antialiasing artifacts ctx.fillStyle = '#0f0'; @@ -30,15 +30,15 @@ ctx.lineTo(110, -20-tol); ctx.lineTo(110, 100+tol); ctx.fill(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.top.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.top.html index 159b76cf..ce021f4 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.top.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.top.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,15 +27,15 @@ g.addColorStop(1, '#0f0'); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.top.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.top.worker.js index 337e89c9..f16460b5 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.top.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.cone.top.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,15 +23,15 @@ g.addColorStop(1, '#0f0'); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.equal.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.equal.html index 3453081ec..a63587e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.equal.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.equal.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -27,15 +27,15 @@ g.addColorStop(1, '#f00'); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.equal.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.equal.worker.js index 81716cf..c436c6e7 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.equal.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.equal.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -23,15 +23,15 @@ g.addColorStop(1, '#f00'); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside1.html index 81453df..63a3804 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside1.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,15 +27,15 @@ g.addColorStop(1, '#f00'); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside1.worker.js index f169529..6db3ac8 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside1.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,15 +23,15 @@ g.addColorStop(1, '#f00'); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside2.html index 0a30313..e3e4ac2 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside2.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,15 +27,15 @@ g.addColorStop(1, '#0f0'); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside2.worker.js index 5d71fb1..5c30737 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside2.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,15 +23,15 @@ g.addColorStop(1, '#0f0'); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside3.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside3.html index f377f156..994e0b68 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside3.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside3.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -28,15 +28,15 @@ g.addColorStop(1, '#0f0'); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside3.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside3.worker.js index 0550a66..2a8eda9d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside3.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.inside3.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -24,15 +24,15 @@ g.addColorStop(1, '#0f0'); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.negative.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.negative.html index a7b3ff02..1fb6af522 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.negative.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.negative.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); assert_throws_dom("INDEX_SIZE_ERR", function() { ctx.createRadialGradient(0, 0, -0.1, 0, 0, 1); }); assert_throws_dom("INDEX_SIZE_ERR", function() { ctx.createRadialGradient(0, 0, 1, 0, 0, -0.1); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.negative.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.negative.worker.js index c015aa2c..e0d2c7c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.negative.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.negative.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); assert_throws_dom("INDEX_SIZE_ERR", function() { ctx.createRadialGradient(0, 0, -0.1, 0, 0, 1); }); assert_throws_dom("INDEX_SIZE_ERR", function() { ctx.createRadialGradient(0, 0, 1, 0, 0, -0.1); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.nonfinite.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.nonfinite.html index 3383256..75ab5740 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.nonfinite.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.nonfinite.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); assert_throws_js(TypeError, function() { ctx.createRadialGradient(Infinity, 0, 1, 0, 0, 1); }); assert_throws_js(TypeError, function() { ctx.createRadialGradient(-Infinity, 0, 1, 0, 0, 1); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.nonfinite.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.nonfinite.worker.js index 310e085..f0994694 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.nonfinite.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.nonfinite.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); assert_throws_js(TypeError, function() { ctx.createRadialGradient(Infinity, 0, 1, 0, 0, 1); }); assert_throws_js(TypeError, function() { ctx.createRadialGradient(-Infinity, 0, 1, 0, 0, 1); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside1.html index 6be4d932..e35b67d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside1.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,15 +27,15 @@ g.addColorStop(1, '#0f0'); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside1.worker.js index 1101acc..39720705 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside1.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,15 +23,15 @@ g.addColorStop(1, '#0f0'); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside2.html index 8debd4a..ab26b36b 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside2.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,15 +27,15 @@ g.addColorStop(1, '#f00'); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside2.worker.js index 6d519eb..63b4cb0 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside2.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,15 +23,15 @@ g.addColorStop(1, '#f00'); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside3.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside3.html index 91b9813..f51f652 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside3.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside3.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -28,15 +28,15 @@ g.addColorStop(1, '#f00'); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside3.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside3.worker.js index 45e3c3e..d369c2a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside3.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.outside3.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -24,15 +24,15 @@ g.addColorStop(1, '#f00'); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch1.html index 712b591..b1a1bdd 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch1.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -27,15 +27,15 @@ g.addColorStop(1, '#f00'); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch1.worker.js index 71150fd..3bfab86 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch1.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -23,15 +23,15 @@ g.addColorStop(1, '#f00'); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch2.html index 28b5cba..6ee9794 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch2.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -29,15 +29,15 @@ g.addColorStop(1, '#f00'); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch2.worker.js index 0f92de1..74e9662e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch2.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -25,15 +25,15 @@ g.addColorStop(1, '#f00'); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch3.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch3.html index 7e6ef90..a21416f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch3.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch3.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -27,15 +27,15 @@ g.addColorStop(1, '#f00'); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch3.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch3.worker.js index 3291d3b..9e476c2 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch3.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.touch3.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -23,15 +23,15 @@ g.addColorStop(1, '#f00'); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.transform.1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.transform.1.html index e5e0934..875c8e6 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.transform.1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.transform.1.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var g = ctx.createRadialGradient(0, 0, 0, 0, 0, 11.2); g.addColorStop(0, '#0f0'); @@ -29,9 +29,9 @@ ctx.translate(50, 25); ctx.scale(10, 10); ctx.fillRect(-5, -2.5, 10, 5); -_assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.transform.1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.transform.1.worker.js index d8d9a450..8daebf7 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.transform.1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.transform.1.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var g = ctx.createRadialGradient(0, 0, 0, 0, 0, 11.2); g.addColorStop(0, '#0f0'); @@ -25,9 +25,9 @@ ctx.translate(50, 25); ctx.scale(10, 10); ctx.fillRect(-5, -2.5, 10, 5); -_assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.transform.2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.transform.2.html index 0346c07..e2c221e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.transform.2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.transform.2.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.translate(100, 0); var g = ctx.createRadialGradient(0, 0, 0, 0, 0, 11.2); @@ -30,9 +30,9 @@ ctx.translate(-50, 25); ctx.scale(10, 10); ctx.fillRect(-5, -2.5, 10, 5); -_assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.transform.2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.transform.2.worker.js index 4bc326e..8373417 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.transform.2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.transform.2.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.translate(100, 0); var g = ctx.createRadialGradient(0, 0, 0, 0, 0, 11.2); @@ -26,9 +26,9 @@ ctx.translate(-50, 25); ctx.scale(10, 10); ctx.fillRect(-5, -2.5, 10, 5); -_assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.transform.3.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.transform.3.html index ada08e5..ef6a880 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.transform.3.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.transform.3.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var g = ctx.createRadialGradient(0, 0, 0, 0, 0, 11.2); g.addColorStop(0, '#0f0'); @@ -30,9 +30,9 @@ ctx.translate(50, 25); ctx.scale(10, 10); ctx.fillRect(-5, -2.5, 10, 5); -_assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.transform.3.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.transform.3.worker.js index ae88d2ee..a0790f0 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.transform.3.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.gradient.radial.transform.3.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var g = ctx.createRadialGradient(0, 0, 0, 0, 0, 11.2); g.addColorStop(0, '#0f0'); @@ -26,9 +26,9 @@ ctx.translate(50, 25); ctx.scale(10, 10); ctx.fillRect(-5, -2.5, 10, 5); -_assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.canvas.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.canvas.html index adb8fdd..7b437e3 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.canvas.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.canvas.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -29,15 +29,15 @@ var pattern = ctx.createPattern(offscreenCanvas2, 'no-repeat'); ctx.fillStyle = pattern; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.canvas.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.canvas.worker.js index fc3a529..f76f25ac 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.canvas.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.canvas.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -25,15 +25,15 @@ var pattern = ctx.createPattern(offscreenCanvas2, 'no-repeat'); ctx.fillStyle = pattern; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.image.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.image.html index 850949bc..f99eda3 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.image.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.image.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -36,10 +36,10 @@ var pattern = ctx.createPattern(bitmap, 'no-repeat'); ctx.fillStyle = pattern; ctx.fillRect(0, 0, 100, 50); - _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); + _assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); + _assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); + _assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); + _assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.image.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.image.worker.js index 328d77ef..aca360c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.image.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.image.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -32,10 +32,10 @@ var pattern = ctx.createPattern(bitmap, 'no-repeat'); ctx.fillStyle = pattern; ctx.fillRect(0, 0, 100, 50); - _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); + _assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); + _assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); + _assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); + _assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.nocontext.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.nocontext.html index 0595601..be6c5a12 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.nocontext.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.nocontext.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var offscreenCanvas2 = new OffscreenCanvas(100, 50); var pattern = ctx.createPattern(offscreenCanvas2, 'no-repeat'); @@ -27,10 +27,10 @@ ctx.fillStyle = '#f00'; ctx.fillStyle = pattern; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.nocontext.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.nocontext.worker.js index 968f0ba..e710b2a6 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.nocontext.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.nocontext.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var offscreenCanvas2 = new OffscreenCanvas(100, 50); var pattern = ctx.createPattern(offscreenCanvas2, 'no-repeat'); @@ -23,10 +23,10 @@ ctx.fillStyle = '#f00'; ctx.fillStyle = pattern; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.zerocanvas.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.zerocanvas.html index d55ec37..5c395ab 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.zerocanvas.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.zerocanvas.html
@@ -17,24 +17,24 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -offscreenCanvas.width = 0; -offscreenCanvas.height = 10; -_assertSame(offscreenCanvas.width, 0, "offscreenCanvas.width", "0"); -_assertSame(offscreenCanvas.height, 10, "offscreenCanvas.height", "10"); -assert_throws_dom("INVALID_STATE_ERR", function() { ctx.createPattern(offscreenCanvas, 'repeat'); }); -offscreenCanvas.width = 10; -offscreenCanvas.height = 0; -_assertSame(offscreenCanvas.width, 10, "offscreenCanvas.width", "10"); -_assertSame(offscreenCanvas.height, 0, "offscreenCanvas.height", "0"); -assert_throws_dom("INVALID_STATE_ERR", function() { ctx.createPattern(offscreenCanvas, 'repeat'); }); -offscreenCanvas.width = 0; -offscreenCanvas.height = 0; -_assertSame(offscreenCanvas.width, 0, "offscreenCanvas.width", "0"); -_assertSame(offscreenCanvas.height, 0, "offscreenCanvas.height", "0"); -assert_throws_dom("INVALID_STATE_ERR", function() { ctx.createPattern(offscreenCanvas, 'repeat'); }); +canvas.width = 0; +canvas.height = 10; +_assertSame(canvas.width, 0, "canvas.width", "0"); +_assertSame(canvas.height, 10, "canvas.height", "10"); +assert_throws_dom("INVALID_STATE_ERR", function() { ctx.createPattern(canvas, 'repeat'); }); +canvas.width = 10; +canvas.height = 0; +_assertSame(canvas.width, 10, "canvas.width", "10"); +_assertSame(canvas.height, 0, "canvas.height", "0"); +assert_throws_dom("INVALID_STATE_ERR", function() { ctx.createPattern(canvas, 'repeat'); }); +canvas.width = 0; +canvas.height = 0; +_assertSame(canvas.width, 0, "canvas.width", "0"); +_assertSame(canvas.height, 0, "canvas.height", "0"); +assert_throws_dom("INVALID_STATE_ERR", function() { ctx.createPattern(canvas, 'repeat'); }); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.zerocanvas.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.zerocanvas.worker.js index a8de8e1d..b02e3cc 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.zerocanvas.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.basic.zerocanvas.worker.js
@@ -13,24 +13,24 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -offscreenCanvas.width = 0; -offscreenCanvas.height = 10; -_assertSame(offscreenCanvas.width, 0, "offscreenCanvas.width", "0"); -_assertSame(offscreenCanvas.height, 10, "offscreenCanvas.height", "10"); -assert_throws_dom("INVALID_STATE_ERR", function() { ctx.createPattern(offscreenCanvas, 'repeat'); }); -offscreenCanvas.width = 10; -offscreenCanvas.height = 0; -_assertSame(offscreenCanvas.width, 10, "offscreenCanvas.width", "10"); -_assertSame(offscreenCanvas.height, 0, "offscreenCanvas.height", "0"); -assert_throws_dom("INVALID_STATE_ERR", function() { ctx.createPattern(offscreenCanvas, 'repeat'); }); -offscreenCanvas.width = 0; -offscreenCanvas.height = 0; -_assertSame(offscreenCanvas.width, 0, "offscreenCanvas.width", "0"); -_assertSame(offscreenCanvas.height, 0, "offscreenCanvas.height", "0"); -assert_throws_dom("INVALID_STATE_ERR", function() { ctx.createPattern(offscreenCanvas, 'repeat'); }); +canvas.width = 0; +canvas.height = 10; +_assertSame(canvas.width, 0, "canvas.width", "0"); +_assertSame(canvas.height, 10, "canvas.height", "10"); +assert_throws_dom("INVALID_STATE_ERR", function() { ctx.createPattern(canvas, 'repeat'); }); +canvas.width = 10; +canvas.height = 0; +_assertSame(canvas.width, 10, "canvas.width", "10"); +_assertSame(canvas.height, 0, "canvas.height", "0"); +assert_throws_dom("INVALID_STATE_ERR", function() { ctx.createPattern(canvas, 'repeat'); }); +canvas.width = 0; +canvas.height = 0; +_assertSame(canvas.width, 0, "canvas.width", "0"); +_assertSame(canvas.height, 0, "canvas.height", "0"); +assert_throws_dom("INVALID_STATE_ERR", function() { ctx.createPattern(canvas, 'repeat'); }); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.crosscanvas.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.crosscanvas.html index 2f45d01..b20ce96 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.crosscanvas.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.crosscanvas.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var promise = new Promise(function(resolve, reject) { var xhr = new XMLHttpRequest(); @@ -37,7 +37,7 @@ ctx.fillRect(0, 0, 100, 50); ctx.fillStyle = pattern; ctx.fillRect(0, 0, 100, 50); - _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); + _assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.crosscanvas.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.crosscanvas.worker.js index 96186253..6958906 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.crosscanvas.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.crosscanvas.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var promise = new Promise(function(resolve, reject) { var xhr = new XMLHttpRequest(); @@ -33,7 +33,7 @@ ctx.fillRect(0, 0, 100, 50); ctx.fillStyle = pattern; ctx.fillRect(0, 0, 100, 50); - _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); + _assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.image.null.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.image.null.html index f6a607d..e3ad031 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.image.null.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.image.null.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); assert_throws_js(TypeError, function() { ctx.createPattern(null, 'repeat'); }); t.done();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.image.null.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.image.null.worker.js index 4406eca..63dcb8f9 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.image.null.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.image.null.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); assert_throws_js(TypeError, function() { ctx.createPattern(null, 'repeat'); }); t.done();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.image.string.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.image.string.html index 1aff9c4..ac202ee 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.image.string.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.image.string.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); assert_throws_js(TypeError, function() { ctx.createPattern('../images/red.png', 'repeat'); }); t.done();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.image.string.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.image.string.worker.js index 2d64dcd1..c07e7d51 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.image.string.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.image.string.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); assert_throws_js(TypeError, function() { ctx.createPattern('../images/red.png', 'repeat'); }); t.done();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.image.undefined.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.image.undefined.html index 4bad0bc..0593d415 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.image.undefined.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.image.undefined.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); assert_throws_js(TypeError, function() { ctx.createPattern(undefined, 'repeat'); }); t.done();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.image.undefined.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.image.undefined.worker.js index d1a7eea..1e94f39 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.image.undefined.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.image.undefined.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); assert_throws_js(TypeError, function() { ctx.createPattern(undefined, 'repeat'); }); t.done();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.modify.canvas1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.modify.canvas1.html index b29ffe7c..9ae28ac6 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.modify.canvas1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.modify.canvas1.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var offscreenCanvas2 = new OffscreenCanvas(100, 50); var ctx2 = offscreenCanvas2.getContext('2d'); @@ -29,10 +29,10 @@ ctx2.fillRect(0, 0, 100, 50); ctx.fillStyle = pattern; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.modify.canvas1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.modify.canvas1.worker.js index 1b56cceb..84d4c81 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.modify.canvas1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.modify.canvas1.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var offscreenCanvas2 = new OffscreenCanvas(100, 50); var ctx2 = offscreenCanvas2.getContext('2d'); @@ -25,10 +25,10 @@ ctx2.fillRect(0, 0, 100, 50); ctx.fillStyle = pattern; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.modify.canvas2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.modify.canvas2.html index bd41e78..9e65676 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.modify.canvas2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.modify.canvas2.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var offscreenCanvas2 = new OffscreenCanvas(100, 50); var ctx2 = offscreenCanvas2.getContext('2d'); @@ -33,10 +33,10 @@ ctx2.fillRect(0, 0, 100, 50); ctx.fillStyle = pattern; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.modify.canvas2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.modify.canvas2.worker.js index 4e8d43f..9ffa109 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.modify.canvas2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.modify.canvas2.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var offscreenCanvas2 = new OffscreenCanvas(100, 50); var ctx2 = offscreenCanvas2.getContext('2d'); @@ -29,10 +29,10 @@ ctx2.fillRect(0, 0, 100, 50); ctx.fillStyle = pattern; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.basic.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.basic.html index 0fb88cf..7e95b5e6 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.basic.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.basic.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -36,10 +36,10 @@ var pattern = ctx.createPattern(bitmap, 'no-repeat'); ctx.fillStyle = pattern; ctx.fillRect(0, 0, 100, 50); - _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); + _assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); + _assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); + _assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); + _assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.basic.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.basic.worker.js index 7f4a56c..2c822d0 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.basic.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.basic.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -32,10 +32,10 @@ var pattern = ctx.createPattern(bitmap, 'no-repeat'); ctx.fillStyle = pattern; ctx.fillRect(0, 0, 100, 50); - _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); + _assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); + _assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); + _assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); + _assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord1.html index 065110d..00c3d6a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord1.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 50, 50); @@ -39,10 +39,10 @@ ctx.fillStyle = pattern; ctx.translate(50, 0); ctx.fillRect(-50, 0, 100, 50); - _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); + _assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); + _assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); + _assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); + _assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord1.worker.js index a70617f..59d3d7d9 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord1.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 50, 50); @@ -35,10 +35,10 @@ ctx.fillStyle = pattern; ctx.translate(50, 0); ctx.fillRect(-50, 0, 100, 50); - _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); + _assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); + _assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); + _assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); + _assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord2.html index 2abce6f..193f2b4 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord2.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var promise = new Promise(function(resolve, reject) { var xhr = new XMLHttpRequest(); @@ -39,10 +39,10 @@ ctx.fillStyle = pattern; ctx.translate(50, 0); ctx.fillRect(-50, 0, 100, 50); - _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); + _assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); + _assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); + _assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); + _assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord2.worker.js index 71c06f3c..e310447 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord2.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var promise = new Promise(function(resolve, reject) { var xhr = new XMLHttpRequest(); @@ -35,10 +35,10 @@ ctx.fillStyle = pattern; ctx.translate(50, 0); ctx.fillRect(-50, 0, 100, 50); - _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); + _assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); + _assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); + _assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); + _assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord3.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord3.html index b503d3a4..ff010a0e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord3.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord3.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -39,10 +39,10 @@ ctx.fillRect(-50, -25, 100, 50); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 50, 25); - _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); + _assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); + _assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); + _assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); + _assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord3.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord3.worker.js index 25dd054..80fa05e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord3.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord3.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -35,10 +35,10 @@ ctx.fillRect(-50, -25, 100, 50); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 50, 25); - _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); + _assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); + _assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); + _assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); + _assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.outside.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.outside.html index 93d2b19..4b2dd93 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.outside.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.outside.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -41,10 +41,10 @@ ctx.fillRect(-100, 0, 100, 50); ctx.fillRect(0, 50, 100, 50); ctx.fillRect(100, 0, 100, 50); - _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); + _assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); + _assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); + _assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); + _assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.outside.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.outside.worker.js index 281f9b5b..e0eab96 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.outside.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.norepeat.outside.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -37,10 +37,10 @@ ctx.fillRect(-100, 0, 100, 50); ctx.fillRect(0, 50, 100, 50); ctx.fillRect(100, 0, 100, 50); - _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); + _assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); + _assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); + _assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); + _assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.orientation.canvas.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.orientation.canvas.html index 023662f3..fb0da46 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.orientation.canvas.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.orientation.canvas.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -33,10 +33,10 @@ ctx.fillRect(0, 0, 100, 50); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 25); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.orientation.canvas.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.orientation.canvas.worker.js index 3dd7a22c..088985b 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.orientation.canvas.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.orientation.canvas.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -29,10 +29,10 @@ ctx.fillRect(0, 0, 100, 50); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 25); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.orientation.image.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.orientation.image.html index 96e121b..79061dd 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.orientation.image.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.orientation.image.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -41,10 +41,10 @@ ctx.restore(); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 25); - _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); + _assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); + _assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); + _assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); + _assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.orientation.image.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.orientation.image.worker.js index b7f68e4..453c5a73 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.orientation.image.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.orientation.image.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -37,10 +37,10 @@ ctx.restore(); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 25); - _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); + _assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); + _assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); + _assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); + _assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.basic.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.basic.html index a132b34..a2a3aa7 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.basic.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.basic.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -36,10 +36,10 @@ var pattern = ctx.createPattern(bitmap, 'no-repeat'); ctx.fillStyle = pattern; ctx.fillRect(0, 0, 100, 50); - _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); + _assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); + _assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); + _assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); + _assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.basic.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.basic.worker.js index 65ccafd..50a9883d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.basic.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.basic.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -32,10 +32,10 @@ var pattern = ctx.createPattern(bitmap, 'no-repeat'); ctx.fillStyle = pattern; ctx.fillRect(0, 0, 100, 50); - _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); + _assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); + _assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); + _assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); + _assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.coord1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.coord1.html index 0d0b302..b11e802f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.coord1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.coord1.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -37,10 +37,10 @@ ctx.fillStyle = pattern; ctx.translate(-128, -78); ctx.fillRect(128, 78, 100, 50); - _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); + _assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); + _assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); + _assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); + _assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.coord1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.coord1.worker.js index b3208d1..f81a902 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.coord1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.coord1.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -33,10 +33,10 @@ ctx.fillStyle = pattern; ctx.translate(-128, -78); ctx.fillRect(128, 78, 100, 50); - _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); + _assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); + _assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); + _assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); + _assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.coord2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.coord2.html index f01a952..bbffa5d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.coord2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.coord2.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var promise = new Promise(function(resolve, reject) { var xhr = new XMLHttpRequest(); @@ -34,10 +34,10 @@ var pattern = ctx.createPattern(bitmap, 'no-repeat'); ctx.fillStyle = pattern; ctx.fillRect(0, 0, 100, 50); - _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); + _assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); + _assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); + _assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); + _assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.coord2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.coord2.worker.js index f0a0f3f..469c2a36 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.coord2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.coord2.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var promise = new Promise(function(resolve, reject) { var xhr = new XMLHttpRequest(); @@ -30,10 +30,10 @@ var pattern = ctx.createPattern(bitmap, 'no-repeat'); ctx.fillStyle = pattern; ctx.fillRect(0, 0, 100, 50); - _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); + _assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); + _assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); + _assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); + _assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.coord3.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.coord3.html index 1e936bb..a0688ba 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.coord3.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.coord3.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var promise = new Promise(function(resolve, reject) { var xhr = new XMLHttpRequest(); @@ -36,10 +36,10 @@ ctx.fillRect(0, 0, 100, 50); ctx.translate(-128, -78); ctx.fillRect(128, 78, 100, 50); - _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); + _assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); + _assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); + _assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); + _assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.coord3.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.coord3.worker.js index d0fb653..abda4b7 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.coord3.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.coord3.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var promise = new Promise(function(resolve, reject) { var xhr = new XMLHttpRequest(); @@ -32,10 +32,10 @@ ctx.fillRect(0, 0, 100, 50); ctx.translate(-128, -78); ctx.fillRect(128, 78, 100, 50); - _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); + _assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); + _assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); + _assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); + _assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.outside.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.outside.html index 745ef62..7b0b40d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.outside.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.outside.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -37,10 +37,10 @@ ctx.fillStyle = pattern; ctx.translate(50, 25); ctx.fillRect(-50, -25, 100, 50); - _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); + _assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); + _assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); + _assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); + _assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.outside.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.outside.worker.js index 086eaf2..a4f70bd 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.outside.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.outside.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -33,10 +33,10 @@ ctx.fillStyle = pattern; ctx.translate(50, 25); ctx.fillRect(-50, -25, 100, 50); - _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); + _assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); + _assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); + _assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); + _assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeatx.basic.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeatx.basic.html index 3bccba2d..36bc353 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeatx.basic.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeatx.basic.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -38,10 +38,10 @@ var pattern = ctx.createPattern(bitmap, 'repeat-x'); ctx.fillStyle = pattern; ctx.fillRect(0, 0, 100, 50); - _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); + _assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); + _assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); + _assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); + _assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeatx.basic.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeatx.basic.worker.js index 56c18447..408a5cc9 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeatx.basic.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeatx.basic.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -34,10 +34,10 @@ var pattern = ctx.createPattern(bitmap, 'repeat-x'); ctx.fillStyle = pattern; ctx.fillRect(0, 0, 100, 50); - _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); + _assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); + _assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); + _assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); + _assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeatx.coord1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeatx.coord1.html index c716c14..ee04dee 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeatx.coord1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeatx.coord1.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -39,12 +39,12 @@ ctx.fillRect(0, -16, 100, 50); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 16); - _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); - _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); + _assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); + _assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); + _assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); + _assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); + _assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); + _assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeatx.coord1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeatx.coord1.worker.js index 11625b4..2e51b446 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeatx.coord1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeatx.coord1.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -35,12 +35,12 @@ ctx.fillRect(0, -16, 100, 50); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 16); - _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); - _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); + _assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); + _assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); + _assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); + _assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); + _assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); + _assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeatx.outside.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeatx.outside.html index 71bcecb..ebdafe1 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeatx.outside.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeatx.outside.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -38,10 +38,10 @@ ctx.fillRect(0, 0, 100, 50); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 16); - _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); + _assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); + _assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); + _assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); + _assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeatx.outside.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeatx.outside.worker.js index e4a74f9..4a2c1c4b 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeatx.outside.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeatx.outside.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -34,10 +34,10 @@ ctx.fillRect(0, 0, 100, 50); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 16); - _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); + _assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); + _assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); + _assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); + _assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeaty.basic.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeaty.basic.html index 9e08561..43b68e2fd 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeaty.basic.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeaty.basic.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -38,10 +38,10 @@ var pattern = ctx.createPattern(bitmap, 'repeat-y'); ctx.fillStyle = pattern; ctx.fillRect(0, 0, 100, 50); - _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); + _assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); + _assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); + _assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); + _assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeaty.basic.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeaty.basic.worker.js index a480645..1d6b338c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeaty.basic.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeaty.basic.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -34,10 +34,10 @@ var pattern = ctx.createPattern(bitmap, 'repeat-y'); ctx.fillStyle = pattern; ctx.fillRect(0, 0, 100, 50); - _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); + _assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); + _assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); + _assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); + _assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeaty.coord1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeaty.coord1.html index 25b2f27..fd79559 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeaty.coord1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeaty.coord1.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -39,12 +39,12 @@ ctx.fillRect(-48, 0, 100, 50); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 16, 50); - _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); - _assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); + _assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); + _assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); + _assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); + _assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); + _assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); + _assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeaty.coord1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeaty.coord1.worker.js index 0ffc3c3..f91d005 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeaty.coord1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeaty.coord1.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -35,12 +35,12 @@ ctx.fillRect(-48, 0, 100, 50); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 16, 50); - _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); - _assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); + _assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); + _assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); + _assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); + _assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); + _assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); + _assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeaty.outside.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeaty.outside.html index 4a54f75..44caa80 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeaty.outside.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeaty.outside.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -38,10 +38,10 @@ ctx.fillRect(0, 0, 100, 50); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 16, 50); - _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); + _assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); + _assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); + _assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); + _assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeaty.outside.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeaty.outside.worker.js index 8c816e2e..e7b12c9 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeaty.outside.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeaty.outside.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -34,10 +34,10 @@ ctx.fillRect(0, 0, 100, 50); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 16, 50); - _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); + _assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); + _assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); + _assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); + _assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.case.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.case.html index b533ba3..5251f93 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.case.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.case.html
@@ -17,10 +17,10 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -assert_throws_dom("SYNTAX_ERR", function() { ctx.createPattern(offscreenCanvas, "Repeat"); }); +assert_throws_dom("SYNTAX_ERR", function() { ctx.createPattern(canvas, "Repeat"); }); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.case.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.case.worker.js index 28e349ad..6a7dd8d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.case.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.case.worker.js
@@ -13,10 +13,10 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -assert_throws_dom("SYNTAX_ERR", function() { ctx.createPattern(offscreenCanvas, "Repeat"); }); +assert_throws_dom("SYNTAX_ERR", function() { ctx.createPattern(canvas, "Repeat"); }); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.empty.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.empty.html index 82a769f3..11c38581 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.empty.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.empty.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -36,10 +36,10 @@ var pattern = ctx.createPattern(bitmap, ""); ctx.fillStyle = pattern; ctx.fillRect(0, 0, 200, 50); - _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); + _assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); + _assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); + _assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); + _assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.empty.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.empty.worker.js index 654aea6..9cf75403 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.empty.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.empty.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -32,10 +32,10 @@ var pattern = ctx.createPattern(bitmap, ""); ctx.fillStyle = pattern; ctx.fillRect(0, 0, 200, 50); - _assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); - _assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); - _assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); + _assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); + _assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); + _assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); + _assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.null.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.null.html index 8b96871f..0e97c7a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.null.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.null.html
@@ -17,10 +17,10 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -_assert(ctx.createPattern(offscreenCanvas, null) != null, "ctx.createPattern(offscreenCanvas, null) != null"); +_assert(ctx.createPattern(canvas, null) != null, "ctx.createPattern(canvas, null) != null"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.null.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.null.worker.js index cfec03b..57353f3 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.null.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.null.worker.js
@@ -13,10 +13,10 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -_assert(ctx.createPattern(offscreenCanvas, null) != null, "ctx.createPattern(offscreenCanvas, null) != null"); +_assert(ctx.createPattern(canvas, null) != null, "ctx.createPattern(canvas, null) != null"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.nullsuffix.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.nullsuffix.html index 7b63d77..d5166d7 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.nullsuffix.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.nullsuffix.html
@@ -17,10 +17,10 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -assert_throws_dom("SYNTAX_ERR", function() { ctx.createPattern(offscreenCanvas, "repeat\0"); }); +assert_throws_dom("SYNTAX_ERR", function() { ctx.createPattern(canvas, "repeat\0"); }); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.nullsuffix.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.nullsuffix.worker.js index c4c3966..baafd4b 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.nullsuffix.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.nullsuffix.worker.js
@@ -13,10 +13,10 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -assert_throws_dom("SYNTAX_ERR", function() { ctx.createPattern(offscreenCanvas, "repeat\0"); }); +assert_throws_dom("SYNTAX_ERR", function() { ctx.createPattern(canvas, "repeat\0"); }); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.undefined.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.undefined.html index 0148af4..731ef86 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.undefined.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.undefined.html
@@ -17,10 +17,10 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -assert_throws_dom("SYNTAX_ERR", function() { ctx.createPattern(offscreenCanvas, undefined); }); +assert_throws_dom("SYNTAX_ERR", function() { ctx.createPattern(canvas, undefined); }); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.undefined.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.undefined.worker.js index b6a87ef..1474ac4 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.undefined.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.undefined.worker.js
@@ -13,10 +13,10 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -assert_throws_dom("SYNTAX_ERR", function() { ctx.createPattern(offscreenCanvas, undefined); }); +assert_throws_dom("SYNTAX_ERR", function() { ctx.createPattern(canvas, undefined); }); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.unrecognised.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.unrecognised.html index 6ecbe82c..793ed67a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.unrecognised.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.unrecognised.html
@@ -17,10 +17,10 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -assert_throws_dom("SYNTAX_ERR", function() { ctx.createPattern(offscreenCanvas, "invalid"); }); +assert_throws_dom("SYNTAX_ERR", function() { ctx.createPattern(canvas, "invalid"); }); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.unrecognised.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.unrecognised.worker.js index 5abc229..076cba5 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.unrecognised.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.unrecognised.worker.js
@@ -13,10 +13,10 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -assert_throws_dom("SYNTAX_ERR", function() { ctx.createPattern(offscreenCanvas, "invalid"); }); +assert_throws_dom("SYNTAX_ERR", function() { ctx.createPattern(canvas, "invalid"); }); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.unrecognisednull.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.unrecognisednull.html index 3206b268..59a0be42 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.unrecognisednull.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.unrecognisednull.html
@@ -17,10 +17,10 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -assert_throws_dom("SYNTAX_ERR", function() { ctx.createPattern(offscreenCanvas, "null"); }); +assert_throws_dom("SYNTAX_ERR", function() { ctx.createPattern(canvas, "null"); }); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.unrecognisednull.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.unrecognisednull.worker.js index 08f0707..0adfe9bf 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.unrecognisednull.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.repeat.unrecognisednull.worker.js
@@ -13,10 +13,10 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -assert_throws_dom("SYNTAX_ERR", function() { ctx.createPattern(offscreenCanvas, "null"); }); +assert_throws_dom("SYNTAX_ERR", function() { ctx.createPattern(canvas, "null"); }); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.strokeStyle.default.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.strokeStyle.default.html index 383f2b22..70524cb6d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.strokeStyle.default.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.strokeStyle.default.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); _assertSame(ctx.strokeStyle, '#000000', "ctx.strokeStyle", "'#000000'"); t.done();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.strokeStyle.default.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.strokeStyle.default.worker.js index a4ae55e..0d72f352 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.strokeStyle.default.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/fill-and-stroke-styles/2d.strokeStyle.default.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); _assertSame(ctx.strokeStyle, '#000000', "ctx.strokeStyle", "'#000000'"); t.done();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.blur.exceptions.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.blur.exceptions.html index d3a03dc..f36184ed 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.blur.exceptions.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.blur.exceptions.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); assert_throws_js(TypeError, function() { ctx.filter = new CanvasFilter({filter: "gaussianBlur"}); }); assert_throws_js(TypeError, function() { ctx.filter = new CanvasFilter({filter: "gaussianBlur", stdDeviation: undefined}); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.blur.exceptions.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.blur.exceptions.worker.js index 29f743dd..88d774c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.blur.exceptions.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.blur.exceptions.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); assert_throws_js(TypeError, function() { ctx.filter = new CanvasFilter({filter: "gaussianBlur"}); }); assert_throws_js(TypeError, function() { ctx.filter = new CanvasFilter({filter: "gaussianBlur", stdDeviation: undefined}); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.colorMatrix.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.colorMatrix.html index ed02c4d..cf6ea35 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.colorMatrix.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.colorMatrix.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); assert_throws_js(TypeError, function() { new CanvasFilter({filter: "colorMatrix", values: undefined}); }); assert_throws_js(TypeError, function() { new CanvasFilter({filter: "colorMatrix", values: "foo"}); }); @@ -29,23 +29,23 @@ ctx.fillStyle = "#f00"; ctx.filter = new CanvasFilter({filter: "colorMatrix", type: "hueRotate", values: 0}); ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 10,10, 255,0,0,255, "10,10", "255,0,0,255", 2); +_assertPixelApprox(canvas, 10,10, 255,0,0,255, "10,10", "255,0,0,255", 2); ctx.filter = new CanvasFilter({filter: "colorMatrix", type: "hueRotate", values: 90}); ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 10,10, 0,91,0,255, "10,10", "0,91,0,255", 2); +_assertPixelApprox(canvas, 10,10, 0,91,0,255, "10,10", "0,91,0,255", 2); ctx.filter = new CanvasFilter({filter: "colorMatrix", type: "hueRotate", values: 180}); ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 10,10, 0,109,109,255, "10,10", "0,109,109,255", 2); +_assertPixelApprox(canvas, 10,10, 0,109,109,255, "10,10", "0,109,109,255", 2); ctx.filter = new CanvasFilter({filter: "colorMatrix", type: "hueRotate", values: 270}); ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 10,10, 109,18,255,255, "10,10", "109,18,255,255", 2); +_assertPixelApprox(canvas, 10,10, 109,18,255,255, "10,10", "109,18,255,255", 2); ctx.filter = new CanvasFilter({filter: "colorMatrix", type: "saturate", values: 0.5}); ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 10,10, 155,27,27,255, "10,10", "155,27,27,255", 2); +_assertPixelApprox(canvas, 10,10, 155,27,27,255, "10,10", "155,27,27,255", 2); ctx.clearRect(0, 0, 100, 50); ctx.filter = new CanvasFilter({filter: "colorMatrix", type: "luminanceToAlpha"}); ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 10,10, 0,0,0,54, "10,10", "0,0,0,54", 2); +_assertPixelApprox(canvas, 10,10, 0,0,0,54, "10,10", "0,0,0,54", 2); ctx.filter = new CanvasFilter({filter: "colorMatrix", values: [ 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, @@ -59,10 +59,10 @@ ctx.fillRect(0, 25, 50, 25); ctx.fillStyle = "#fff"; ctx.fillRect(50, 25, 50, 25); -_assertPixelApprox(offscreenCanvas, 10,10, 0,255,0,255, "10,10", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 60,10, 0,255,0,255, "60,10", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 10,30, 0,255,0,255, "10,30", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 60,30, 0,255,0,255, "60,30", "0,255,0,255", 2); +_assertPixelApprox(canvas, 10,10, 0,255,0,255, "10,10", "0,255,0,255", 2); +_assertPixelApprox(canvas, 60,10, 0,255,0,255, "60,10", "0,255,0,255", 2); +_assertPixelApprox(canvas, 10,30, 0,255,0,255, "10,30", "0,255,0,255", 2); +_assertPixelApprox(canvas, 60,30, 0,255,0,255, "60,30", "0,255,0,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.colorMatrix.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.colorMatrix.worker.js index 4e839f9..a7b29d4 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.colorMatrix.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.colorMatrix.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); assert_throws_js(TypeError, function() { new CanvasFilter({filter: "colorMatrix", values: undefined}); }); assert_throws_js(TypeError, function() { new CanvasFilter({filter: "colorMatrix", values: "foo"}); }); @@ -25,23 +25,23 @@ ctx.fillStyle = "#f00"; ctx.filter = new CanvasFilter({filter: "colorMatrix", type: "hueRotate", values: 0}); ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 10,10, 255,0,0,255, "10,10", "255,0,0,255", 2); +_assertPixelApprox(canvas, 10,10, 255,0,0,255, "10,10", "255,0,0,255", 2); ctx.filter = new CanvasFilter({filter: "colorMatrix", type: "hueRotate", values: 90}); ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 10,10, 0,91,0,255, "10,10", "0,91,0,255", 2); +_assertPixelApprox(canvas, 10,10, 0,91,0,255, "10,10", "0,91,0,255", 2); ctx.filter = new CanvasFilter({filter: "colorMatrix", type: "hueRotate", values: 180}); ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 10,10, 0,109,109,255, "10,10", "0,109,109,255", 2); +_assertPixelApprox(canvas, 10,10, 0,109,109,255, "10,10", "0,109,109,255", 2); ctx.filter = new CanvasFilter({filter: "colorMatrix", type: "hueRotate", values: 270}); ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 10,10, 109,18,255,255, "10,10", "109,18,255,255", 2); +_assertPixelApprox(canvas, 10,10, 109,18,255,255, "10,10", "109,18,255,255", 2); ctx.filter = new CanvasFilter({filter: "colorMatrix", type: "saturate", values: 0.5}); ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 10,10, 155,27,27,255, "10,10", "155,27,27,255", 2); +_assertPixelApprox(canvas, 10,10, 155,27,27,255, "10,10", "155,27,27,255", 2); ctx.clearRect(0, 0, 100, 50); ctx.filter = new CanvasFilter({filter: "colorMatrix", type: "luminanceToAlpha"}); ctx.fillRect(0, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 10,10, 0,0,0,54, "10,10", "0,0,0,54", 2); +_assertPixelApprox(canvas, 10,10, 0,0,0,54, "10,10", "0,0,0,54", 2); ctx.filter = new CanvasFilter({filter: "colorMatrix", values: [ 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, @@ -55,10 +55,10 @@ ctx.fillRect(0, 25, 50, 25); ctx.fillStyle = "#fff"; ctx.fillRect(50, 25, 50, 25); -_assertPixelApprox(offscreenCanvas, 10,10, 0,255,0,255, "10,10", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 60,10, 0,255,0,255, "60,10", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 10,30, 0,255,0,255, "10,30", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 60,30, 0,255,0,255, "60,30", "0,255,0,255", 2); +_assertPixelApprox(canvas, 10,10, 0,255,0,255, "10,10", "0,255,0,255", 2); +_assertPixelApprox(canvas, 60,10, 0,255,0,255, "60,10", "0,255,0,255", 2); +_assertPixelApprox(canvas, 10,30, 0,255,0,255, "10,30", "0,255,0,255", 2); +_assertPixelApprox(canvas, 60,30, 0,255,0,255, "60,30", "0,255,0,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.discrete.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.discrete.html index d77d49c5..2254e68 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.discrete.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.discrete.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); // From https://www.w3.org/TR/SVG11/filters.html#feComponentTransferElement function getTransformedValue(C, V) { @@ -59,7 +59,7 @@ let outputColor = getColor(color, [tableValuesR, tableValuesG, tableValuesB]); ctx.fillStyle = `rgb(${color[0]}, ${color[1]}, ${color[2]})`; ctx.fillRect(0, 0, 10, 10); - _assertPixelApprox(offscreenCanvas, 5, 5, outputColor[0],outputColor[1],outputColor[2],255, "5,5", `${outputColor[0]},${outputColor[1]},${outputColor[2]}`, 2); + _assertPixelApprox(canvas, 5, 5, outputColor[0],outputColor[1],outputColor[2],255, "5,5", `${outputColor[0]},${outputColor[1]},${outputColor[2]}`, 2); } t.done();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.discrete.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.discrete.worker.js index 335dd48..3f5aafe 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.discrete.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.discrete.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); // From https://www.w3.org/TR/SVG11/filters.html#feComponentTransferElement function getTransformedValue(C, V) { @@ -55,7 +55,7 @@ let outputColor = getColor(color, [tableValuesR, tableValuesG, tableValuesB]); ctx.fillStyle = `rgb(${color[0]}, ${color[1]}, ${color[2]})`; ctx.fillRect(0, 0, 10, 10); - _assertPixelApprox(offscreenCanvas, 5, 5, outputColor[0],outputColor[1],outputColor[2],255, "5,5", `${outputColor[0]},${outputColor[1]},${outputColor[2]}`, 2); + _assertPixelApprox(canvas, 5, 5, outputColor[0],outputColor[1],outputColor[2],255, "5,5", `${outputColor[0]},${outputColor[1]},${outputColor[2]}`, 2); } t.done();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.gamma.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.gamma.html index ec7c184b..fbc49079 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.gamma.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.gamma.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); // From https://www.w3.org/TR/SVG11/filters.html#feComponentTransferElement function getColor(inputColor, amplitude, exponent, offset) { @@ -50,7 +50,7 @@ let outputColor = getColor(color, amplitudes, exponents, offsets); ctx.fillStyle = `rgb(${color[0]}, ${color[1]}, ${color[2]})`; ctx.fillRect(0, 0, 10, 10); - _assertPixelApprox(offscreenCanvas, 5, 5, outputColor[0],outputColor[1],outputColor[2],255, "5,5", `${outputColor[0]},${outputColor[1]},${outputColor[2]}`, 2); + _assertPixelApprox(canvas, 5, 5, outputColor[0],outputColor[1],outputColor[2],255, "5,5", `${outputColor[0]},${outputColor[1]},${outputColor[2]}`, 2); } t.done();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.gamma.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.gamma.worker.js index ae9df24..89d04df6 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.gamma.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.gamma.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); // From https://www.w3.org/TR/SVG11/filters.html#feComponentTransferElement function getColor(inputColor, amplitude, exponent, offset) { @@ -46,7 +46,7 @@ let outputColor = getColor(color, amplitudes, exponents, offsets); ctx.fillStyle = `rgb(${color[0]}, ${color[1]}, ${color[2]})`; ctx.fillRect(0, 0, 10, 10); - _assertPixelApprox(offscreenCanvas, 5, 5, outputColor[0],outputColor[1],outputColor[2],255, "5,5", `${outputColor[0]},${outputColor[1]},${outputColor[2]}`, 2); + _assertPixelApprox(canvas, 5, 5, outputColor[0],outputColor[1],outputColor[2],255, "5,5", `${outputColor[0]},${outputColor[1]},${outputColor[2]}`, 2); } t.done();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.identity.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.identity.html index dd60a37..d698b8a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.identity.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.identity.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.filter = new CanvasFilter({filter: "componentTransfer", funcR: {type: "identity"}, @@ -37,7 +37,7 @@ for (const color of inputColors) { ctx.fillStyle = `rgba(${color[0]}, ${color[1]}, ${color[2]}, 1)`, ctx.fillRect(0, 0, 10, 10); - _assertPixel(offscreenCanvas, 5, 5, color[0],color[1],color[2],255, "5,5", `${color[0]},${color[1]},${color[2]}`); + _assertPixel(canvas, 5, 5, color[0],color[1],color[2],255, "5,5", `${color[0]},${color[1]},${color[2]}`); } t.done();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.identity.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.identity.worker.js index 2997cf3..18dfef0 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.identity.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.identity.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.filter = new CanvasFilter({filter: "componentTransfer", funcR: {type: "identity"}, @@ -33,7 +33,7 @@ for (const color of inputColors) { ctx.fillStyle = `rgba(${color[0]}, ${color[1]}, ${color[2]}, 1)`, ctx.fillRect(0, 0, 10, 10); - _assertPixel(offscreenCanvas, 5, 5, color[0],color[1],color[2],255, "5,5", `${color[0]},${color[1]},${color[2]}`); + _assertPixel(canvas, 5, 5, color[0],color[1],color[2],255, "5,5", `${color[0]},${color[1]},${color[2]}`); } t.done();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.linear.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.linear.html index a42819e..96b0960a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.linear.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.linear.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); // From https://www.w3.org/TR/SVG11/filters.html#feComponentTransferElement function getColor(inputColor, slopes, intercepts) { @@ -49,7 +49,7 @@ let outputColor = getColor(color, slopes, intercepts); ctx.fillStyle = `rgb(${color[0]}, ${color[1]}, ${color[2]})`; ctx.fillRect(0, 0, 10, 10); - _assertPixelApprox(offscreenCanvas, 5, 5, outputColor[0],outputColor[1],outputColor[2],255, "5,5", `${outputColor[0]},${outputColor[1]},${outputColor[2]}`, 2); + _assertPixelApprox(canvas, 5, 5, outputColor[0],outputColor[1],outputColor[2],255, "5,5", `${outputColor[0]},${outputColor[1]},${outputColor[2]}`, 2); } t.done();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.linear.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.linear.worker.js index f1caad3d..1f3f9d8 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.linear.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.linear.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); // From https://www.w3.org/TR/SVG11/filters.html#feComponentTransferElement function getColor(inputColor, slopes, intercepts) { @@ -45,7 +45,7 @@ let outputColor = getColor(color, slopes, intercepts); ctx.fillStyle = `rgb(${color[0]}, ${color[1]}, ${color[2]})`; ctx.fillRect(0, 0, 10, 10); - _assertPixelApprox(offscreenCanvas, 5, 5, outputColor[0],outputColor[1],outputColor[2],255, "5,5", `${outputColor[0]},${outputColor[1]},${outputColor[2]}`, 2); + _assertPixelApprox(canvas, 5, 5, outputColor[0],outputColor[1],outputColor[2],255, "5,5", `${outputColor[0]},${outputColor[1]},${outputColor[2]}`, 2); } t.done();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.table.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.table.html index 4c35520..6b9a797 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.table.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.table.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); // From https://www.w3.org/TR/SVG11/filters.html#feComponentTransferElement function getTransformedValue(C, V) { @@ -59,7 +59,7 @@ let outputColor = getColor(color, [tableValuesR, tableValuesG, tableValuesB]); ctx.fillStyle = `rgb(${color[0]}, ${color[1]}, ${color[2]})`; ctx.fillRect(0, 0, 10, 10); - _assertPixelApprox(offscreenCanvas, 5, 5, outputColor[0],outputColor[1],outputColor[2],255, "5,5", `${outputColor[0]},${outputColor[1]},${outputColor[2]}`, 2); + _assertPixelApprox(canvas, 5, 5, outputColor[0],outputColor[1],outputColor[2],255, "5,5", `${outputColor[0]},${outputColor[1]},${outputColor[2]}`, 2); } t.done()
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.table.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.table.worker.js index cb8d2141..95a0e29 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.table.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.table.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); // From https://www.w3.org/TR/SVG11/filters.html#feComponentTransferElement function getTransformedValue(C, V) { @@ -55,7 +55,7 @@ let outputColor = getColor(color, [tableValuesR, tableValuesG, tableValuesB]); ctx.fillStyle = `rgb(${color[0]}, ${color[1]}, ${color[2]})`; ctx.fillRect(0, 0, 10, 10); - _assertPixelApprox(offscreenCanvas, 5, 5, outputColor[0],outputColor[1],outputColor[2],255, "5,5", `${outputColor[0]},${outputColor[1]},${outputColor[2]}`, 2); + _assertPixelApprox(canvas, 5, 5, outputColor[0],outputColor[1],outputColor[2],255, "5,5", `${outputColor[0]},${outputColor[1]},${outputColor[2]}`, 2); } t.done()
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.convolveMatrix.exceptions.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.convolveMatrix.exceptions.html index c70fd8a3a..949b6d7 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.convolveMatrix.exceptions.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.convolveMatrix.exceptions.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); assert_throws_js(TypeError, function() { new CanvasFilter({filter: "convolveMatrix"}); }); assert_throws_js(TypeError, function() { new CanvasFilter({filter: "convolveMatrix", divisor: 2}); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.convolveMatrix.exceptions.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.convolveMatrix.exceptions.worker.js index 54cf13b..169a26c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.convolveMatrix.exceptions.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.convolveMatrix.exceptions.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); assert_throws_js(TypeError, function() { new CanvasFilter({filter: "convolveMatrix"}); }); assert_throws_js(TypeError, function() { new CanvasFilter({filter: "convolveMatrix", divisor: 2}); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.html index 1536cca..93b046d5 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); _assert(ctx.filter == 'none', "ctx.filter == 'none'"); ctx.filter = 'blur(5px)';
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.worker.js index 94f82ba..3a38f8f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); _assert(ctx.filter == 'none', "ctx.filter == 'none'"); ctx.filter = 'blur(5px)';
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cap.butt.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cap.butt.html index 10c98ce0..86fedde 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cap.butt.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cap.butt.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -38,18 +38,18 @@ ctx.lineTo(75, 35); ctx.stroke(); ctx.fillRect(65, 15, 20, 20); -_assertPixel(offscreenCanvas, 25,14, 0,255,0,255, "25,14", "0,255,0,255"); -_assertPixel(offscreenCanvas, 25,15, 0,255,0,255, "25,15", "0,255,0,255"); -_assertPixel(offscreenCanvas, 25,16, 0,255,0,255, "25,16", "0,255,0,255"); -_assertPixel(offscreenCanvas, 25,34, 0,255,0,255, "25,34", "0,255,0,255"); -_assertPixel(offscreenCanvas, 25,35, 0,255,0,255, "25,35", "0,255,0,255"); -_assertPixel(offscreenCanvas, 25,36, 0,255,0,255, "25,36", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,14, 0,255,0,255, "75,14", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,15, 0,255,0,255, "75,15", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,16, 0,255,0,255, "75,16", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,34, 0,255,0,255, "75,34", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,35, 0,255,0,255, "75,35", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,36, 0,255,0,255, "75,36", "0,255,0,255"); +_assertPixel(canvas, 25,14, 0,255,0,255, "25,14", "0,255,0,255"); +_assertPixel(canvas, 25,15, 0,255,0,255, "25,15", "0,255,0,255"); +_assertPixel(canvas, 25,16, 0,255,0,255, "25,16", "0,255,0,255"); +_assertPixel(canvas, 25,34, 0,255,0,255, "25,34", "0,255,0,255"); +_assertPixel(canvas, 25,35, 0,255,0,255, "25,35", "0,255,0,255"); +_assertPixel(canvas, 25,36, 0,255,0,255, "25,36", "0,255,0,255"); +_assertPixel(canvas, 75,14, 0,255,0,255, "75,14", "0,255,0,255"); +_assertPixel(canvas, 75,15, 0,255,0,255, "75,15", "0,255,0,255"); +_assertPixel(canvas, 75,16, 0,255,0,255, "75,16", "0,255,0,255"); +_assertPixel(canvas, 75,34, 0,255,0,255, "75,34", "0,255,0,255"); +_assertPixel(canvas, 75,35, 0,255,0,255, "75,35", "0,255,0,255"); +_assertPixel(canvas, 75,36, 0,255,0,255, "75,36", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cap.butt.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cap.butt.worker.js index 8a6294d..d31be79 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cap.butt.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cap.butt.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -34,18 +34,18 @@ ctx.lineTo(75, 35); ctx.stroke(); ctx.fillRect(65, 15, 20, 20); -_assertPixel(offscreenCanvas, 25,14, 0,255,0,255, "25,14", "0,255,0,255"); -_assertPixel(offscreenCanvas, 25,15, 0,255,0,255, "25,15", "0,255,0,255"); -_assertPixel(offscreenCanvas, 25,16, 0,255,0,255, "25,16", "0,255,0,255"); -_assertPixel(offscreenCanvas, 25,34, 0,255,0,255, "25,34", "0,255,0,255"); -_assertPixel(offscreenCanvas, 25,35, 0,255,0,255, "25,35", "0,255,0,255"); -_assertPixel(offscreenCanvas, 25,36, 0,255,0,255, "25,36", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,14, 0,255,0,255, "75,14", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,15, 0,255,0,255, "75,15", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,16, 0,255,0,255, "75,16", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,34, 0,255,0,255, "75,34", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,35, 0,255,0,255, "75,35", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,36, 0,255,0,255, "75,36", "0,255,0,255"); +_assertPixel(canvas, 25,14, 0,255,0,255, "25,14", "0,255,0,255"); +_assertPixel(canvas, 25,15, 0,255,0,255, "25,15", "0,255,0,255"); +_assertPixel(canvas, 25,16, 0,255,0,255, "25,16", "0,255,0,255"); +_assertPixel(canvas, 25,34, 0,255,0,255, "25,34", "0,255,0,255"); +_assertPixel(canvas, 25,35, 0,255,0,255, "25,35", "0,255,0,255"); +_assertPixel(canvas, 25,36, 0,255,0,255, "25,36", "0,255,0,255"); +_assertPixel(canvas, 75,14, 0,255,0,255, "75,14", "0,255,0,255"); +_assertPixel(canvas, 75,15, 0,255,0,255, "75,15", "0,255,0,255"); +_assertPixel(canvas, 75,16, 0,255,0,255, "75,16", "0,255,0,255"); +_assertPixel(canvas, 75,34, 0,255,0,255, "75,34", "0,255,0,255"); +_assertPixel(canvas, 75,35, 0,255,0,255, "75,35", "0,255,0,255"); +_assertPixel(canvas, 75,36, 0,255,0,255, "75,36", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cap.closed.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cap.closed.html index 6854876..6a44954 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cap.closed.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cap.closed.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.strokeStyle = '#f00'; @@ -33,10 +33,10 @@ ctx.lineTo(1000, 200); ctx.closePath(); ctx.stroke(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255"); +_assertPixel(canvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cap.closed.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cap.closed.worker.js index 5ca3f48..2787396 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cap.closed.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cap.closed.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.strokeStyle = '#f00'; @@ -29,10 +29,10 @@ ctx.lineTo(1000, 200); ctx.closePath(); ctx.stroke(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255"); +_assertPixel(canvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cap.invalid.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cap.invalid.html index 67535957..f02cfcc7 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cap.invalid.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cap.invalid.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.lineCap = 'butt' _assertSame(ctx.lineCap, 'butt', "ctx.lineCap", "'butt'");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cap.invalid.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cap.invalid.worker.js index b8ada8f..4ef69f3 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cap.invalid.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cap.invalid.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.lineCap = 'butt' _assertSame(ctx.lineCap, 'butt', "ctx.lineCap", "'butt'");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cap.open.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cap.open.html index cbbf51e2..9eab060 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cap.open.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cap.open.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.strokeStyle = '#0f0'; @@ -33,10 +33,10 @@ ctx.lineTo(1000, 200); ctx.lineTo(200, 200); ctx.stroke(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255"); +_assertPixel(canvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cap.open.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cap.open.worker.js index d3a5ed10..94e70b1 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cap.open.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cap.open.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.strokeStyle = '#0f0'; @@ -29,10 +29,10 @@ ctx.lineTo(1000, 200); ctx.lineTo(200, 200); ctx.stroke(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255"); +_assertPixel(canvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cap.round.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cap.round.html index 22379bf..ddf6a4d1 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cap.round.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cap.round.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -47,18 +47,18 @@ ctx.arc(75, 15, 10+tol, 0, Math.PI, true); ctx.arc(75, 35, 10+tol, Math.PI, 0, true); ctx.fill(); -_assertPixel(offscreenCanvas, 17,6, 0,255,0,255, "17,6", "0,255,0,255"); -_assertPixel(offscreenCanvas, 25,6, 0,255,0,255, "25,6", "0,255,0,255"); -_assertPixel(offscreenCanvas, 32,6, 0,255,0,255, "32,6", "0,255,0,255"); -_assertPixel(offscreenCanvas, 17,43, 0,255,0,255, "17,43", "0,255,0,255"); -_assertPixel(offscreenCanvas, 25,43, 0,255,0,255, "25,43", "0,255,0,255"); -_assertPixel(offscreenCanvas, 32,43, 0,255,0,255, "32,43", "0,255,0,255"); -_assertPixel(offscreenCanvas, 67,6, 0,255,0,255, "67,6", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,6, 0,255,0,255, "75,6", "0,255,0,255"); -_assertPixel(offscreenCanvas, 82,6, 0,255,0,255, "82,6", "0,255,0,255"); -_assertPixel(offscreenCanvas, 67,43, 0,255,0,255, "67,43", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,43, 0,255,0,255, "75,43", "0,255,0,255"); -_assertPixel(offscreenCanvas, 82,43, 0,255,0,255, "82,43", "0,255,0,255"); +_assertPixel(canvas, 17,6, 0,255,0,255, "17,6", "0,255,0,255"); +_assertPixel(canvas, 25,6, 0,255,0,255, "25,6", "0,255,0,255"); +_assertPixel(canvas, 32,6, 0,255,0,255, "32,6", "0,255,0,255"); +_assertPixel(canvas, 17,43, 0,255,0,255, "17,43", "0,255,0,255"); +_assertPixel(canvas, 25,43, 0,255,0,255, "25,43", "0,255,0,255"); +_assertPixel(canvas, 32,43, 0,255,0,255, "32,43", "0,255,0,255"); +_assertPixel(canvas, 67,6, 0,255,0,255, "67,6", "0,255,0,255"); +_assertPixel(canvas, 75,6, 0,255,0,255, "75,6", "0,255,0,255"); +_assertPixel(canvas, 82,6, 0,255,0,255, "82,6", "0,255,0,255"); +_assertPixel(canvas, 67,43, 0,255,0,255, "67,43", "0,255,0,255"); +_assertPixel(canvas, 75,43, 0,255,0,255, "75,43", "0,255,0,255"); +_assertPixel(canvas, 82,43, 0,255,0,255, "82,43", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cap.round.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cap.round.worker.js index 81a62eaf..37fffce 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cap.round.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cap.round.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -43,18 +43,18 @@ ctx.arc(75, 15, 10+tol, 0, Math.PI, true); ctx.arc(75, 35, 10+tol, Math.PI, 0, true); ctx.fill(); -_assertPixel(offscreenCanvas, 17,6, 0,255,0,255, "17,6", "0,255,0,255"); -_assertPixel(offscreenCanvas, 25,6, 0,255,0,255, "25,6", "0,255,0,255"); -_assertPixel(offscreenCanvas, 32,6, 0,255,0,255, "32,6", "0,255,0,255"); -_assertPixel(offscreenCanvas, 17,43, 0,255,0,255, "17,43", "0,255,0,255"); -_assertPixel(offscreenCanvas, 25,43, 0,255,0,255, "25,43", "0,255,0,255"); -_assertPixel(offscreenCanvas, 32,43, 0,255,0,255, "32,43", "0,255,0,255"); -_assertPixel(offscreenCanvas, 67,6, 0,255,0,255, "67,6", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,6, 0,255,0,255, "75,6", "0,255,0,255"); -_assertPixel(offscreenCanvas, 82,6, 0,255,0,255, "82,6", "0,255,0,255"); -_assertPixel(offscreenCanvas, 67,43, 0,255,0,255, "67,43", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,43, 0,255,0,255, "75,43", "0,255,0,255"); -_assertPixel(offscreenCanvas, 82,43, 0,255,0,255, "82,43", "0,255,0,255"); +_assertPixel(canvas, 17,6, 0,255,0,255, "17,6", "0,255,0,255"); +_assertPixel(canvas, 25,6, 0,255,0,255, "25,6", "0,255,0,255"); +_assertPixel(canvas, 32,6, 0,255,0,255, "32,6", "0,255,0,255"); +_assertPixel(canvas, 17,43, 0,255,0,255, "17,43", "0,255,0,255"); +_assertPixel(canvas, 25,43, 0,255,0,255, "25,43", "0,255,0,255"); +_assertPixel(canvas, 32,43, 0,255,0,255, "32,43", "0,255,0,255"); +_assertPixel(canvas, 67,6, 0,255,0,255, "67,6", "0,255,0,255"); +_assertPixel(canvas, 75,6, 0,255,0,255, "75,6", "0,255,0,255"); +_assertPixel(canvas, 82,6, 0,255,0,255, "82,6", "0,255,0,255"); +_assertPixel(canvas, 67,43, 0,255,0,255, "67,43", "0,255,0,255"); +_assertPixel(canvas, 75,43, 0,255,0,255, "75,43", "0,255,0,255"); +_assertPixel(canvas, 82,43, 0,255,0,255, "82,43", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cap.square.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cap.square.html index b1a4b05..68f6d241 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cap.square.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cap.square.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -38,18 +38,18 @@ ctx.lineTo(75, 35); ctx.stroke(); ctx.fillRect(65, 5, 20, 40); -_assertPixel(offscreenCanvas, 25,4, 0,255,0,255, "25,4", "0,255,0,255"); -_assertPixel(offscreenCanvas, 25,5, 0,255,0,255, "25,5", "0,255,0,255"); -_assertPixel(offscreenCanvas, 25,6, 0,255,0,255, "25,6", "0,255,0,255"); -_assertPixel(offscreenCanvas, 25,44, 0,255,0,255, "25,44", "0,255,0,255"); -_assertPixel(offscreenCanvas, 25,45, 0,255,0,255, "25,45", "0,255,0,255"); -_assertPixel(offscreenCanvas, 25,46, 0,255,0,255, "25,46", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,4, 0,255,0,255, "75,4", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,5, 0,255,0,255, "75,5", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,6, 0,255,0,255, "75,6", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,44, 0,255,0,255, "75,44", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,45, 0,255,0,255, "75,45", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,46, 0,255,0,255, "75,46", "0,255,0,255"); +_assertPixel(canvas, 25,4, 0,255,0,255, "25,4", "0,255,0,255"); +_assertPixel(canvas, 25,5, 0,255,0,255, "25,5", "0,255,0,255"); +_assertPixel(canvas, 25,6, 0,255,0,255, "25,6", "0,255,0,255"); +_assertPixel(canvas, 25,44, 0,255,0,255, "25,44", "0,255,0,255"); +_assertPixel(canvas, 25,45, 0,255,0,255, "25,45", "0,255,0,255"); +_assertPixel(canvas, 25,46, 0,255,0,255, "25,46", "0,255,0,255"); +_assertPixel(canvas, 75,4, 0,255,0,255, "75,4", "0,255,0,255"); +_assertPixel(canvas, 75,5, 0,255,0,255, "75,5", "0,255,0,255"); +_assertPixel(canvas, 75,6, 0,255,0,255, "75,6", "0,255,0,255"); +_assertPixel(canvas, 75,44, 0,255,0,255, "75,44", "0,255,0,255"); +_assertPixel(canvas, 75,45, 0,255,0,255, "75,45", "0,255,0,255"); +_assertPixel(canvas, 75,46, 0,255,0,255, "75,46", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cap.square.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cap.square.worker.js index 1faf4bac..5f687a0 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cap.square.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cap.square.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -34,18 +34,18 @@ ctx.lineTo(75, 35); ctx.stroke(); ctx.fillRect(65, 5, 20, 40); -_assertPixel(offscreenCanvas, 25,4, 0,255,0,255, "25,4", "0,255,0,255"); -_assertPixel(offscreenCanvas, 25,5, 0,255,0,255, "25,5", "0,255,0,255"); -_assertPixel(offscreenCanvas, 25,6, 0,255,0,255, "25,6", "0,255,0,255"); -_assertPixel(offscreenCanvas, 25,44, 0,255,0,255, "25,44", "0,255,0,255"); -_assertPixel(offscreenCanvas, 25,45, 0,255,0,255, "25,45", "0,255,0,255"); -_assertPixel(offscreenCanvas, 25,46, 0,255,0,255, "25,46", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,4, 0,255,0,255, "75,4", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,5, 0,255,0,255, "75,5", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,6, 0,255,0,255, "75,6", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,44, 0,255,0,255, "75,44", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,45, 0,255,0,255, "75,45", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,46, 0,255,0,255, "75,46", "0,255,0,255"); +_assertPixel(canvas, 25,4, 0,255,0,255, "25,4", "0,255,0,255"); +_assertPixel(canvas, 25,5, 0,255,0,255, "25,5", "0,255,0,255"); +_assertPixel(canvas, 25,6, 0,255,0,255, "25,6", "0,255,0,255"); +_assertPixel(canvas, 25,44, 0,255,0,255, "25,44", "0,255,0,255"); +_assertPixel(canvas, 25,45, 0,255,0,255, "25,45", "0,255,0,255"); +_assertPixel(canvas, 25,46, 0,255,0,255, "25,46", "0,255,0,255"); +_assertPixel(canvas, 75,4, 0,255,0,255, "75,4", "0,255,0,255"); +_assertPixel(canvas, 75,5, 0,255,0,255, "75,5", "0,255,0,255"); +_assertPixel(canvas, 75,6, 0,255,0,255, "75,6", "0,255,0,255"); +_assertPixel(canvas, 75,44, 0,255,0,255, "75,44", "0,255,0,255"); +_assertPixel(canvas, 75,45, 0,255,0,255, "75,45", "0,255,0,255"); +_assertPixel(canvas, 75,46, 0,255,0,255, "75,46", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cap.valid.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cap.valid.html index 90d2c05..ce7b4c8 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cap.valid.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cap.valid.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.lineCap = 'butt' _assertSame(ctx.lineCap, 'butt', "ctx.lineCap", "'butt'");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cap.valid.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cap.valid.worker.js index a6c3493..7fa84f4 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cap.valid.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cap.valid.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.lineCap = 'butt' _assertSame(ctx.lineCap, 'butt', "ctx.lineCap", "'butt'");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cross.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cross.html index 442ee16..9569b1c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cross.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cross.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -30,10 +30,10 @@ ctx.lineTo(110, 60); ctx.lineTo(100, 60); ctx.stroke(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255"); +_assertPixel(canvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cross.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cross.worker.js index 68f39fc4..4f961fb 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cross.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.cross.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -26,10 +26,10 @@ ctx.lineTo(110, 60); ctx.lineTo(100, 60); ctx.stroke(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255"); +_assertPixel(canvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.defaults.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.defaults.html index 4ced621..64c21c56 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.defaults.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.defaults.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); _assertSame(ctx.lineWidth, 1, "ctx.lineWidth", "1"); _assertSame(ctx.lineCap, 'butt', "ctx.lineCap", "'butt'");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.defaults.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.defaults.worker.js index d4226e9..77116b4 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.defaults.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.defaults.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); _assertSame(ctx.lineWidth, 1, "ctx.lineWidth", "1"); _assertSame(ctx.lineCap, 'butt', "ctx.lineCap", "'butt'");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.bevel.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.bevel.html index 6e97717..32c365ff 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.bevel.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.bevel.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -53,16 +53,16 @@ ctx.lineTo(90+tol, 20); ctx.lineTo(80, 10-tol); ctx.fill(); -_assertPixel(offscreenCanvas, 34,16, 0,255,0,255, "34,16", "0,255,0,255"); -_assertPixel(offscreenCanvas, 34,15, 0,255,0,255, "34,15", "0,255,0,255"); -_assertPixel(offscreenCanvas, 35,15, 0,255,0,255, "35,15", "0,255,0,255"); -_assertPixel(offscreenCanvas, 36,15, 0,255,0,255, "36,15", "0,255,0,255"); -_assertPixel(offscreenCanvas, 36,14, 0,255,0,255, "36,14", "0,255,0,255"); -_assertPixel(offscreenCanvas, 84,16, 0,255,0,255, "84,16", "0,255,0,255"); -_assertPixel(offscreenCanvas, 84,15, 0,255,0,255, "84,15", "0,255,0,255"); -_assertPixel(offscreenCanvas, 85,15, 0,255,0,255, "85,15", "0,255,0,255"); -_assertPixel(offscreenCanvas, 86,15, 0,255,0,255, "86,15", "0,255,0,255"); -_assertPixel(offscreenCanvas, 86,14, 0,255,0,255, "86,14", "0,255,0,255"); +_assertPixel(canvas, 34,16, 0,255,0,255, "34,16", "0,255,0,255"); +_assertPixel(canvas, 34,15, 0,255,0,255, "34,15", "0,255,0,255"); +_assertPixel(canvas, 35,15, 0,255,0,255, "35,15", "0,255,0,255"); +_assertPixel(canvas, 36,15, 0,255,0,255, "36,15", "0,255,0,255"); +_assertPixel(canvas, 36,14, 0,255,0,255, "36,14", "0,255,0,255"); +_assertPixel(canvas, 84,16, 0,255,0,255, "84,16", "0,255,0,255"); +_assertPixel(canvas, 84,15, 0,255,0,255, "84,15", "0,255,0,255"); +_assertPixel(canvas, 85,15, 0,255,0,255, "85,15", "0,255,0,255"); +_assertPixel(canvas, 86,15, 0,255,0,255, "86,15", "0,255,0,255"); +_assertPixel(canvas, 86,14, 0,255,0,255, "86,14", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.bevel.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.bevel.worker.js index cf82f3b..6917daa 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.bevel.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.bevel.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -49,16 +49,16 @@ ctx.lineTo(90+tol, 20); ctx.lineTo(80, 10-tol); ctx.fill(); -_assertPixel(offscreenCanvas, 34,16, 0,255,0,255, "34,16", "0,255,0,255"); -_assertPixel(offscreenCanvas, 34,15, 0,255,0,255, "34,15", "0,255,0,255"); -_assertPixel(offscreenCanvas, 35,15, 0,255,0,255, "35,15", "0,255,0,255"); -_assertPixel(offscreenCanvas, 36,15, 0,255,0,255, "36,15", "0,255,0,255"); -_assertPixel(offscreenCanvas, 36,14, 0,255,0,255, "36,14", "0,255,0,255"); -_assertPixel(offscreenCanvas, 84,16, 0,255,0,255, "84,16", "0,255,0,255"); -_assertPixel(offscreenCanvas, 84,15, 0,255,0,255, "84,15", "0,255,0,255"); -_assertPixel(offscreenCanvas, 85,15, 0,255,0,255, "85,15", "0,255,0,255"); -_assertPixel(offscreenCanvas, 86,15, 0,255,0,255, "86,15", "0,255,0,255"); -_assertPixel(offscreenCanvas, 86,14, 0,255,0,255, "86,14", "0,255,0,255"); +_assertPixel(canvas, 34,16, 0,255,0,255, "34,16", "0,255,0,255"); +_assertPixel(canvas, 34,15, 0,255,0,255, "34,15", "0,255,0,255"); +_assertPixel(canvas, 35,15, 0,255,0,255, "35,15", "0,255,0,255"); +_assertPixel(canvas, 36,15, 0,255,0,255, "36,15", "0,255,0,255"); +_assertPixel(canvas, 36,14, 0,255,0,255, "36,14", "0,255,0,255"); +_assertPixel(canvas, 84,16, 0,255,0,255, "84,16", "0,255,0,255"); +_assertPixel(canvas, 84,15, 0,255,0,255, "84,15", "0,255,0,255"); +_assertPixel(canvas, 85,15, 0,255,0,255, "85,15", "0,255,0,255"); +_assertPixel(canvas, 86,15, 0,255,0,255, "86,15", "0,255,0,255"); +_assertPixel(canvas, 86,14, 0,255,0,255, "86,14", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.closed.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.closed.html index 6469153..63a06536 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.closed.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.closed.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.strokeStyle = '#0f0'; @@ -32,10 +32,10 @@ ctx.lineTo(1000, 50); ctx.closePath(); ctx.stroke(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255"); +_assertPixel(canvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.closed.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.closed.worker.js index 03685740..72c6038 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.closed.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.closed.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.strokeStyle = '#0f0'; @@ -28,10 +28,10 @@ ctx.lineTo(1000, 50); ctx.closePath(); ctx.stroke(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255"); +_assertPixel(canvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.invalid.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.invalid.html index 6b85c7b..a5486120 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.invalid.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.invalid.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.lineJoin = 'bevel' _assertSame(ctx.lineJoin, 'bevel', "ctx.lineJoin", "'bevel'");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.invalid.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.invalid.worker.js index e7a77ba1..23dfe67 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.invalid.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.invalid.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.lineJoin = 'bevel' _assertSame(ctx.lineJoin, 'bevel', "ctx.lineJoin", "'bevel'");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.miter.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.miter.html index 6a2d93f..4be38c0 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.miter.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.miter.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -44,16 +44,16 @@ ctx.stroke(); ctx.fillRect(60, 10, 30, 20); ctx.fillRect(70, 10, 20, 30); -_assertPixel(offscreenCanvas, 38,12, 0,255,0,255, "38,12", "0,255,0,255"); -_assertPixel(offscreenCanvas, 39,11, 0,255,0,255, "39,11", "0,255,0,255"); -_assertPixel(offscreenCanvas, 40,10, 0,255,0,255, "40,10", "0,255,0,255"); -_assertPixel(offscreenCanvas, 41,9, 0,255,0,255, "41,9", "0,255,0,255"); -_assertPixel(offscreenCanvas, 42,8, 0,255,0,255, "42,8", "0,255,0,255"); -_assertPixel(offscreenCanvas, 88,12, 0,255,0,255, "88,12", "0,255,0,255"); -_assertPixel(offscreenCanvas, 89,11, 0,255,0,255, "89,11", "0,255,0,255"); -_assertPixel(offscreenCanvas, 90,10, 0,255,0,255, "90,10", "0,255,0,255"); -_assertPixel(offscreenCanvas, 91,9, 0,255,0,255, "91,9", "0,255,0,255"); -_assertPixel(offscreenCanvas, 92,8, 0,255,0,255, "92,8", "0,255,0,255"); +_assertPixel(canvas, 38,12, 0,255,0,255, "38,12", "0,255,0,255"); +_assertPixel(canvas, 39,11, 0,255,0,255, "39,11", "0,255,0,255"); +_assertPixel(canvas, 40,10, 0,255,0,255, "40,10", "0,255,0,255"); +_assertPixel(canvas, 41,9, 0,255,0,255, "41,9", "0,255,0,255"); +_assertPixel(canvas, 42,8, 0,255,0,255, "42,8", "0,255,0,255"); +_assertPixel(canvas, 88,12, 0,255,0,255, "88,12", "0,255,0,255"); +_assertPixel(canvas, 89,11, 0,255,0,255, "89,11", "0,255,0,255"); +_assertPixel(canvas, 90,10, 0,255,0,255, "90,10", "0,255,0,255"); +_assertPixel(canvas, 91,9, 0,255,0,255, "91,9", "0,255,0,255"); +_assertPixel(canvas, 92,8, 0,255,0,255, "92,8", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.miter.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.miter.worker.js index 5ce7c0e..603b3266 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.miter.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.miter.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -40,16 +40,16 @@ ctx.stroke(); ctx.fillRect(60, 10, 30, 20); ctx.fillRect(70, 10, 20, 30); -_assertPixel(offscreenCanvas, 38,12, 0,255,0,255, "38,12", "0,255,0,255"); -_assertPixel(offscreenCanvas, 39,11, 0,255,0,255, "39,11", "0,255,0,255"); -_assertPixel(offscreenCanvas, 40,10, 0,255,0,255, "40,10", "0,255,0,255"); -_assertPixel(offscreenCanvas, 41,9, 0,255,0,255, "41,9", "0,255,0,255"); -_assertPixel(offscreenCanvas, 42,8, 0,255,0,255, "42,8", "0,255,0,255"); -_assertPixel(offscreenCanvas, 88,12, 0,255,0,255, "88,12", "0,255,0,255"); -_assertPixel(offscreenCanvas, 89,11, 0,255,0,255, "89,11", "0,255,0,255"); -_assertPixel(offscreenCanvas, 90,10, 0,255,0,255, "90,10", "0,255,0,255"); -_assertPixel(offscreenCanvas, 91,9, 0,255,0,255, "91,9", "0,255,0,255"); -_assertPixel(offscreenCanvas, 92,8, 0,255,0,255, "92,8", "0,255,0,255"); +_assertPixel(canvas, 38,12, 0,255,0,255, "38,12", "0,255,0,255"); +_assertPixel(canvas, 39,11, 0,255,0,255, "39,11", "0,255,0,255"); +_assertPixel(canvas, 40,10, 0,255,0,255, "40,10", "0,255,0,255"); +_assertPixel(canvas, 41,9, 0,255,0,255, "41,9", "0,255,0,255"); +_assertPixel(canvas, 42,8, 0,255,0,255, "42,8", "0,255,0,255"); +_assertPixel(canvas, 88,12, 0,255,0,255, "88,12", "0,255,0,255"); +_assertPixel(canvas, 89,11, 0,255,0,255, "89,11", "0,255,0,255"); +_assertPixel(canvas, 90,10, 0,255,0,255, "90,10", "0,255,0,255"); +_assertPixel(canvas, 91,9, 0,255,0,255, "91,9", "0,255,0,255"); +_assertPixel(canvas, 92,8, 0,255,0,255, "92,8", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.open.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.open.html index 3753ae55..5520601 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.open.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.open.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.strokeStyle = '#f00'; @@ -32,10 +32,10 @@ ctx.lineTo(1000, 50); ctx.lineTo(100, 50); ctx.stroke(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255"); +_assertPixel(canvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.open.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.open.worker.js index 0ac1bd78..d946fc1 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.open.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.open.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.strokeStyle = '#f00'; @@ -28,10 +28,10 @@ ctx.lineTo(1000, 50); ctx.lineTo(100, 50); ctx.stroke(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255"); +_assertPixel(canvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.parallel.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.parallel.html index 44be17e..fbd2437 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.parallel.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.parallel.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -30,10 +30,10 @@ ctx.lineTo(0, 25); ctx.lineTo(-100, 25); ctx.stroke(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255"); +_assertPixel(canvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.parallel.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.parallel.worker.js index e829ef1..a625bca1 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.parallel.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.parallel.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -26,10 +26,10 @@ ctx.lineTo(0, 25); ctx.lineTo(-100, 25); ctx.stroke(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255"); +_assertPixel(canvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.round.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.round.html index 5f8689e..79f01ed 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.round.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.round.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -51,16 +51,16 @@ ctx.moveTo(80, 20); ctx.arc(80, 20, 10+tol, 0, 2*Math.PI, true); ctx.fill(); -_assertPixel(offscreenCanvas, 36,14, 0,255,0,255, "36,14", "0,255,0,255"); -_assertPixel(offscreenCanvas, 36,13, 0,255,0,255, "36,13", "0,255,0,255"); -_assertPixel(offscreenCanvas, 37,13, 0,255,0,255, "37,13", "0,255,0,255"); -_assertPixel(offscreenCanvas, 38,13, 0,255,0,255, "38,13", "0,255,0,255"); -_assertPixel(offscreenCanvas, 38,12, 0,255,0,255, "38,12", "0,255,0,255"); -_assertPixel(offscreenCanvas, 86,14, 0,255,0,255, "86,14", "0,255,0,255"); -_assertPixel(offscreenCanvas, 86,13, 0,255,0,255, "86,13", "0,255,0,255"); -_assertPixel(offscreenCanvas, 87,13, 0,255,0,255, "87,13", "0,255,0,255"); -_assertPixel(offscreenCanvas, 88,13, 0,255,0,255, "88,13", "0,255,0,255"); -_assertPixel(offscreenCanvas, 88,12, 0,255,0,255, "88,12", "0,255,0,255"); +_assertPixel(canvas, 36,14, 0,255,0,255, "36,14", "0,255,0,255"); +_assertPixel(canvas, 36,13, 0,255,0,255, "36,13", "0,255,0,255"); +_assertPixel(canvas, 37,13, 0,255,0,255, "37,13", "0,255,0,255"); +_assertPixel(canvas, 38,13, 0,255,0,255, "38,13", "0,255,0,255"); +_assertPixel(canvas, 38,12, 0,255,0,255, "38,12", "0,255,0,255"); +_assertPixel(canvas, 86,14, 0,255,0,255, "86,14", "0,255,0,255"); +_assertPixel(canvas, 86,13, 0,255,0,255, "86,13", "0,255,0,255"); +_assertPixel(canvas, 87,13, 0,255,0,255, "87,13", "0,255,0,255"); +_assertPixel(canvas, 88,13, 0,255,0,255, "88,13", "0,255,0,255"); +_assertPixel(canvas, 88,12, 0,255,0,255, "88,12", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.round.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.round.worker.js index 12178e1..475070b 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.round.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.round.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -47,16 +47,16 @@ ctx.moveTo(80, 20); ctx.arc(80, 20, 10+tol, 0, 2*Math.PI, true); ctx.fill(); -_assertPixel(offscreenCanvas, 36,14, 0,255,0,255, "36,14", "0,255,0,255"); -_assertPixel(offscreenCanvas, 36,13, 0,255,0,255, "36,13", "0,255,0,255"); -_assertPixel(offscreenCanvas, 37,13, 0,255,0,255, "37,13", "0,255,0,255"); -_assertPixel(offscreenCanvas, 38,13, 0,255,0,255, "38,13", "0,255,0,255"); -_assertPixel(offscreenCanvas, 38,12, 0,255,0,255, "38,12", "0,255,0,255"); -_assertPixel(offscreenCanvas, 86,14, 0,255,0,255, "86,14", "0,255,0,255"); -_assertPixel(offscreenCanvas, 86,13, 0,255,0,255, "86,13", "0,255,0,255"); -_assertPixel(offscreenCanvas, 87,13, 0,255,0,255, "87,13", "0,255,0,255"); -_assertPixel(offscreenCanvas, 88,13, 0,255,0,255, "88,13", "0,255,0,255"); -_assertPixel(offscreenCanvas, 88,12, 0,255,0,255, "88,12", "0,255,0,255"); +_assertPixel(canvas, 36,14, 0,255,0,255, "36,14", "0,255,0,255"); +_assertPixel(canvas, 36,13, 0,255,0,255, "36,13", "0,255,0,255"); +_assertPixel(canvas, 37,13, 0,255,0,255, "37,13", "0,255,0,255"); +_assertPixel(canvas, 38,13, 0,255,0,255, "38,13", "0,255,0,255"); +_assertPixel(canvas, 38,12, 0,255,0,255, "38,12", "0,255,0,255"); +_assertPixel(canvas, 86,14, 0,255,0,255, "86,14", "0,255,0,255"); +_assertPixel(canvas, 86,13, 0,255,0,255, "86,13", "0,255,0,255"); +_assertPixel(canvas, 87,13, 0,255,0,255, "87,13", "0,255,0,255"); +_assertPixel(canvas, 88,13, 0,255,0,255, "88,13", "0,255,0,255"); +_assertPixel(canvas, 88,12, 0,255,0,255, "88,12", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.valid.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.valid.html index 4336b91..eaa7c24 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.valid.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.valid.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.lineJoin = 'bevel' _assertSame(ctx.lineJoin, 'bevel', "ctx.lineJoin", "'bevel'");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.valid.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.valid.worker.js index 50acb78..4e71543 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.valid.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.join.valid.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.lineJoin = 'bevel' _assertSame(ctx.lineJoin, 'bevel', "ctx.lineJoin", "'bevel'");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.acute.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.acute.html index 75409401..4620e17 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.acute.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.acute.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -38,10 +38,10 @@ ctx.lineTo(100, 100); ctx.lineTo(1000, 1000); ctx.stroke(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255"); +_assertPixel(canvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.acute.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.acute.worker.js index 890f8b8..abb96397 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.acute.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.acute.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -34,10 +34,10 @@ ctx.lineTo(100, 100); ctx.lineTo(1000, 1000); ctx.stroke(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255"); +_assertPixel(canvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.exceeded.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.exceeded.html index 4ba46a01..3e8b444d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.exceeded.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.exceeded.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -31,10 +31,10 @@ ctx.lineTo(200, 200); ctx.lineTo(1000, 201); // slightly non-right-angle to avoid being a special case ctx.stroke(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255"); +_assertPixel(canvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.exceeded.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.exceeded.worker.js index 03088e2..cccdbc5 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.exceeded.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.exceeded.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -27,10 +27,10 @@ ctx.lineTo(200, 200); ctx.lineTo(1000, 201); // slightly non-right-angle to avoid being a special case ctx.stroke(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255"); +_assertPixel(canvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.invalid.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.invalid.html index f60dc898..35bda1a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.invalid.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.invalid.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.miterLimit = 1.5; _assertSame(ctx.miterLimit, 1.5, "ctx.miterLimit", "1.5");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.invalid.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.invalid.worker.js index 6906fc54..ef4c17e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.invalid.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.invalid.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.miterLimit = 1.5; _assertSame(ctx.miterLimit, 1.5, "ctx.miterLimit", "1.5");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.lineedge.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.lineedge.html index 0be1c8d..e641877 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.lineedge.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.lineedge.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -28,10 +28,10 @@ ctx.miterLimit = 1.414; ctx.beginPath(); ctx.strokeRect(100, 25, 200, 0); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255"); +_assertPixel(canvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.lineedge.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.lineedge.worker.js index a289256..fca0924d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.lineedge.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.lineedge.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -24,10 +24,10 @@ ctx.miterLimit = 1.414; ctx.beginPath(); ctx.strokeRect(100, 25, 200, 0); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255"); +_assertPixel(canvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.obtuse.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.obtuse.html index 70ad57f..c956dcf 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.obtuse.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.obtuse.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -38,10 +38,10 @@ ctx.lineTo(800, 300); ctx.lineTo(10000, -8900); ctx.stroke(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255"); +_assertPixel(canvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.obtuse.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.obtuse.worker.js index 36b5b579..8b369aa 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.obtuse.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.obtuse.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -34,10 +34,10 @@ ctx.lineTo(800, 300); ctx.lineTo(10000, -8900); ctx.stroke(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255"); +_assertPixel(canvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.rightangle.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.rightangle.html index 81ef9eb..331dbb4 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.rightangle.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.rightangle.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -31,10 +31,10 @@ ctx.lineTo(200, 200); ctx.lineTo(1000, 200); ctx.stroke(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255"); +_assertPixel(canvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.rightangle.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.rightangle.worker.js index 8988c01..15bca3b5 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.rightangle.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.rightangle.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -27,10 +27,10 @@ ctx.lineTo(200, 200); ctx.lineTo(1000, 200); ctx.stroke(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255"); +_assertPixel(canvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.valid.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.valid.html index 82d7209..1d034052a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.valid.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.valid.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.miterLimit = 1.5; _assertSame(ctx.miterLimit, 1.5, "ctx.miterLimit", "1.5");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.valid.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.valid.worker.js index d81abb8..b345614 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.valid.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.valid.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.miterLimit = 1.5; _assertSame(ctx.miterLimit, 1.5, "ctx.miterLimit", "1.5");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.within.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.within.html index 86c5eca4..ccda7aa 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.within.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.within.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -31,10 +31,10 @@ ctx.lineTo(200, 200); ctx.lineTo(1000, 201); ctx.stroke(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255"); +_assertPixel(canvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.within.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.within.worker.js index 5289a25..0a5c16a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.within.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.miter.within.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,10 +27,10 @@ ctx.lineTo(200, 200); ctx.lineTo(1000, 201); ctx.stroke(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255"); +_assertPixel(canvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.union.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.union.html index e8d7a8c..e3f85ea2 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.union.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.union.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -31,12 +31,12 @@ ctx.lineTo(0, 26); ctx.closePath(); ctx.stroke(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 25,1, 0,255,0,255, "25,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 25,1, 0,255,0,255, "25,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 25,1, 0,255,0,255, "25,1", "0,255,0,255"); +_assertPixel(canvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 25,1, 0,255,0,255, "25,1", "0,255,0,255"); +_assertPixel(canvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.union.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.union.worker.js index be79cd01..9770fc7 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.union.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.union.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,12 +27,12 @@ ctx.lineTo(0, 26); ctx.closePath(); ctx.stroke(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 25,1, 0,255,0,255, "25,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 25,1, 0,255,0,255, "25,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 25,1, 0,255,0,255, "25,1", "0,255,0,255"); +_assertPixel(canvas, 48,1, 0,255,0,255, "48,1", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 25,1, 0,255,0,255, "25,1", "0,255,0,255"); +_assertPixel(canvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.width.basic.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.width.basic.html index 686dfc4a..1f8513d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.width.basic.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.width.basic.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -39,20 +39,20 @@ ctx.lineTo(75, 35); ctx.stroke(); ctx.fillRect(65, 15, 20, 20); -_assertPixel(offscreenCanvas, 14,25, 0,255,0,255, "14,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 15,25, 0,255,0,255, "15,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 16,25, 0,255,0,255, "16,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 34,25, 0,255,0,255, "34,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 35,25, 0,255,0,255, "35,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 36,25, 0,255,0,255, "36,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 64,25, 0,255,0,255, "64,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 65,25, 0,255,0,255, "65,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 66,25, 0,255,0,255, "66,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 84,25, 0,255,0,255, "84,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 85,25, 0,255,0,255, "85,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 86,25, 0,255,0,255, "86,25", "0,255,0,255"); +_assertPixel(canvas, 14,25, 0,255,0,255, "14,25", "0,255,0,255"); +_assertPixel(canvas, 15,25, 0,255,0,255, "15,25", "0,255,0,255"); +_assertPixel(canvas, 16,25, 0,255,0,255, "16,25", "0,255,0,255"); +_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); +_assertPixel(canvas, 34,25, 0,255,0,255, "34,25", "0,255,0,255"); +_assertPixel(canvas, 35,25, 0,255,0,255, "35,25", "0,255,0,255"); +_assertPixel(canvas, 36,25, 0,255,0,255, "36,25", "0,255,0,255"); +_assertPixel(canvas, 64,25, 0,255,0,255, "64,25", "0,255,0,255"); +_assertPixel(canvas, 65,25, 0,255,0,255, "65,25", "0,255,0,255"); +_assertPixel(canvas, 66,25, 0,255,0,255, "66,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 84,25, 0,255,0,255, "84,25", "0,255,0,255"); +_assertPixel(canvas, 85,25, 0,255,0,255, "85,25", "0,255,0,255"); +_assertPixel(canvas, 86,25, 0,255,0,255, "86,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.width.basic.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.width.basic.worker.js index 791228f..d1b6a35 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.width.basic.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.width.basic.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -35,20 +35,20 @@ ctx.lineTo(75, 35); ctx.stroke(); ctx.fillRect(65, 15, 20, 20); -_assertPixel(offscreenCanvas, 14,25, 0,255,0,255, "14,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 15,25, 0,255,0,255, "15,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 16,25, 0,255,0,255, "16,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 34,25, 0,255,0,255, "34,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 35,25, 0,255,0,255, "35,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 36,25, 0,255,0,255, "36,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 64,25, 0,255,0,255, "64,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 65,25, 0,255,0,255, "65,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 66,25, 0,255,0,255, "66,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 84,25, 0,255,0,255, "84,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 85,25, 0,255,0,255, "85,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 86,25, 0,255,0,255, "86,25", "0,255,0,255"); +_assertPixel(canvas, 14,25, 0,255,0,255, "14,25", "0,255,0,255"); +_assertPixel(canvas, 15,25, 0,255,0,255, "15,25", "0,255,0,255"); +_assertPixel(canvas, 16,25, 0,255,0,255, "16,25", "0,255,0,255"); +_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); +_assertPixel(canvas, 34,25, 0,255,0,255, "34,25", "0,255,0,255"); +_assertPixel(canvas, 35,25, 0,255,0,255, "35,25", "0,255,0,255"); +_assertPixel(canvas, 36,25, 0,255,0,255, "36,25", "0,255,0,255"); +_assertPixel(canvas, 64,25, 0,255,0,255, "64,25", "0,255,0,255"); +_assertPixel(canvas, 65,25, 0,255,0,255, "65,25", "0,255,0,255"); +_assertPixel(canvas, 66,25, 0,255,0,255, "66,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 84,25, 0,255,0,255, "84,25", "0,255,0,255"); +_assertPixel(canvas, 85,25, 0,255,0,255, "85,25", "0,255,0,255"); +_assertPixel(canvas, 86,25, 0,255,0,255, "86,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.width.invalid.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.width.invalid.html index 8a83131..439af5ec 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.width.invalid.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.width.invalid.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.lineWidth = 1.5; _assertSame(ctx.lineWidth, 1.5, "ctx.lineWidth", "1.5");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.width.invalid.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.width.invalid.worker.js index 0eea24e..d87b87e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.width.invalid.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.width.invalid.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.lineWidth = 1.5; _assertSame(ctx.lineWidth, 1.5, "ctx.lineWidth", "1.5");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.width.scaledefault.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.width.scaledefault.html index 748c750..09ae212 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.width.scaledefault.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.width.scaledefault.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,11 +27,11 @@ ctx.moveTo(0, 0.5); ctx.lineTo(2, 0.5); ctx.stroke(); -_assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,5, 0,255,0,255, "50,5", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,45, 0,255,0,255, "50,45", "0,255,0,255"); +_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 50,5, 0,255,0,255, "50,5", "0,255,0,255"); +_assertPixel(canvas, 50,45, 0,255,0,255, "50,45", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.width.scaledefault.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.width.scaledefault.worker.js index d0ca0f5..d625146 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.width.scaledefault.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.width.scaledefault.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,11 +23,11 @@ ctx.moveTo(0, 0.5); ctx.lineTo(2, 0.5); ctx.stroke(); -_assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,5, 0,255,0,255, "50,5", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,45, 0,255,0,255, "50,45", "0,255,0,255"); +_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 50,5, 0,255,0,255, "50,5", "0,255,0,255"); +_assertPixel(canvas, 50,45, 0,255,0,255, "50,45", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.width.transformed.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.width.transformed.html index e02118d..c990785 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.width.transformed.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.width.transformed.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -45,20 +45,20 @@ ctx.stroke(); ctx.restore(); ctx.fillRect(65, 15, 20, 20); -_assertPixel(offscreenCanvas, 14,25, 0,255,0,255, "14,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 15,25, 0,255,0,255, "15,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 16,25, 0,255,0,255, "16,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 34,25, 0,255,0,255, "34,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 35,25, 0,255,0,255, "35,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 36,25, 0,255,0,255, "36,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 64,25, 0,255,0,255, "64,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 65,25, 0,255,0,255, "65,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 66,25, 0,255,0,255, "66,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 84,25, 0,255,0,255, "84,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 85,25, 0,255,0,255, "85,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 86,25, 0,255,0,255, "86,25", "0,255,0,255"); +_assertPixel(canvas, 14,25, 0,255,0,255, "14,25", "0,255,0,255"); +_assertPixel(canvas, 15,25, 0,255,0,255, "15,25", "0,255,0,255"); +_assertPixel(canvas, 16,25, 0,255,0,255, "16,25", "0,255,0,255"); +_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); +_assertPixel(canvas, 34,25, 0,255,0,255, "34,25", "0,255,0,255"); +_assertPixel(canvas, 35,25, 0,255,0,255, "35,25", "0,255,0,255"); +_assertPixel(canvas, 36,25, 0,255,0,255, "36,25", "0,255,0,255"); +_assertPixel(canvas, 64,25, 0,255,0,255, "64,25", "0,255,0,255"); +_assertPixel(canvas, 65,25, 0,255,0,255, "65,25", "0,255,0,255"); +_assertPixel(canvas, 66,25, 0,255,0,255, "66,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 84,25, 0,255,0,255, "84,25", "0,255,0,255"); +_assertPixel(canvas, 85,25, 0,255,0,255, "85,25", "0,255,0,255"); +_assertPixel(canvas, 86,25, 0,255,0,255, "86,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.width.transformed.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.width.transformed.worker.js index d3474977..2ed23fb6 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.width.transformed.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.width.transformed.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -41,20 +41,20 @@ ctx.stroke(); ctx.restore(); ctx.fillRect(65, 15, 20, 20); -_assertPixel(offscreenCanvas, 14,25, 0,255,0,255, "14,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 15,25, 0,255,0,255, "15,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 16,25, 0,255,0,255, "16,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 34,25, 0,255,0,255, "34,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 35,25, 0,255,0,255, "35,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 36,25, 0,255,0,255, "36,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 64,25, 0,255,0,255, "64,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 65,25, 0,255,0,255, "65,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 66,25, 0,255,0,255, "66,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 84,25, 0,255,0,255, "84,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 85,25, 0,255,0,255, "85,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 86,25, 0,255,0,255, "86,25", "0,255,0,255"); +_assertPixel(canvas, 14,25, 0,255,0,255, "14,25", "0,255,0,255"); +_assertPixel(canvas, 15,25, 0,255,0,255, "15,25", "0,255,0,255"); +_assertPixel(canvas, 16,25, 0,255,0,255, "16,25", "0,255,0,255"); +_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); +_assertPixel(canvas, 34,25, 0,255,0,255, "34,25", "0,255,0,255"); +_assertPixel(canvas, 35,25, 0,255,0,255, "35,25", "0,255,0,255"); +_assertPixel(canvas, 36,25, 0,255,0,255, "36,25", "0,255,0,255"); +_assertPixel(canvas, 64,25, 0,255,0,255, "64,25", "0,255,0,255"); +_assertPixel(canvas, 65,25, 0,255,0,255, "65,25", "0,255,0,255"); +_assertPixel(canvas, 66,25, 0,255,0,255, "66,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 84,25, 0,255,0,255, "84,25", "0,255,0,255"); +_assertPixel(canvas, 85,25, 0,255,0,255, "85,25", "0,255,0,255"); +_assertPixel(canvas, 86,25, 0,255,0,255, "86,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.width.valid.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.width.valid.html index 4a8660b..adaabcc 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.width.valid.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.width.valid.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.lineWidth = 1.5; _assertSame(ctx.lineWidth, 1.5, "ctx.lineWidth", "1.5");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.width.valid.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.width.valid.worker.js index a92ec072..f409e1f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.width.valid.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/line-styles/2d.line.width.valid.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.lineWidth = 1.5; _assertSame(ctx.lineWidth, 1.5, "ctx.lineWidth", "1.5");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.angle.1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.angle.1.html index 811d6861..3f4e85d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.angle.1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.angle.1.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -27,7 +27,7 @@ ctx.moveTo(100, 0); ctx.arc(100, 0, 150, Math.PI/2, -Math.PI, true); ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.angle.1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.angle.1.worker.js index b91b5b6d..b8dfd990 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.angle.1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.angle.1.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -23,7 +23,7 @@ ctx.moveTo(100, 0); ctx.arc(100, 0, 150, Math.PI/2, -Math.PI, true); ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.angle.2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.angle.2.html index 32f15a2..389db76 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.angle.2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.angle.2.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -27,7 +27,7 @@ ctx.moveTo(100, 0); ctx.arc(100, 0, 150, -3*Math.PI/2, -Math.PI, true); ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.angle.2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.angle.2.worker.js index bc1b637..9d84eee 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.angle.2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.angle.2.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -23,7 +23,7 @@ ctx.moveTo(100, 0); ctx.arc(100, 0, 150, -3*Math.PI/2, -Math.PI, true); ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.angle.3.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.angle.3.html index 6cd0978..e89cdc57 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.angle.3.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.angle.3.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -27,7 +27,7 @@ ctx.moveTo(100, 0); ctx.arc(100, 0, 150, (512+1/2)*Math.PI, (1024-1)*Math.PI, true); ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.angle.3.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.angle.3.worker.js index e85362f6..4ebd45b1 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.angle.3.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.angle.3.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -23,7 +23,7 @@ ctx.moveTo(100, 0); ctx.arc(100, 0, 150, (512+1/2)*Math.PI, (1024-1)*Math.PI, true); ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.angle.4.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.angle.4.html index 4e94305..e40a05e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.angle.4.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.angle.4.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,10 +27,10 @@ ctx.moveTo(50, 25); ctx.arc(50, 25, 60, (512+1/2)*Math.PI, (1024-1)*Math.PI, false); ctx.fill(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.angle.4.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.angle.4.worker.js index 3b5b9d0..93ad272 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.angle.4.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.angle.4.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,10 +23,10 @@ ctx.moveTo(50, 25); ctx.arc(50, 25, 60, (512+1/2)*Math.PI, (1024-1)*Math.PI, false); ctx.fill(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.angle.5.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.angle.5.html index 4091d9d..5ab209b 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.angle.5.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.angle.5.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -27,7 +27,7 @@ ctx.moveTo(100, 0); ctx.arc(100, 0, 150, (1024-1)*Math.PI, (512+1/2)*Math.PI, false); ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.angle.5.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.angle.5.worker.js index f437404..651ec5a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.angle.5.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.angle.5.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -23,7 +23,7 @@ ctx.moveTo(100, 0); ctx.arc(100, 0, 150, (1024-1)*Math.PI, (512+1/2)*Math.PI, false); ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.angle.6.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.angle.6.html index 8ddf72e..3c8e2a6 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.angle.6.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.angle.6.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,10 +27,10 @@ ctx.moveTo(50, 25); ctx.arc(50, 25, 60, (1024-1)*Math.PI, (512+1/2)*Math.PI, true); ctx.fill(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.angle.6.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.angle.6.worker.js index 5846333..2702415 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.angle.6.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.angle.6.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,10 +23,10 @@ ctx.moveTo(50, 25); ctx.arc(50, 25, 60, (1024-1)*Math.PI, (512+1/2)*Math.PI, true); ctx.fill(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.default.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.default.html index 2657a76c..58aa1f9 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.default.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.default.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -27,7 +27,7 @@ ctx.moveTo(100, 0); ctx.arc(100, 0, 150, -Math.PI, Math.PI/2); ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.default.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.default.worker.js index 336151b..8ad1a6f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.default.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.default.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -23,7 +23,7 @@ ctx.moveTo(100, 0); ctx.arc(100, 0, 150, -Math.PI, Math.PI/2); ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.empty.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.empty.html index e6a928b..16889781c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.empty.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.empty.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -27,7 +27,7 @@ ctx.beginPath(); ctx.arc(200, 25, 5, 0, 2*Math.PI, true); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.empty.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.empty.worker.js index b86c44c..916e6b8 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.empty.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.empty.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -23,7 +23,7 @@ ctx.beginPath(); ctx.arc(200, 25, 5, 0, 2*Math.PI, true); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.end.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.end.html index 8f43a5d..65fa0731 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.end.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.end.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -29,7 +29,7 @@ ctx.arc(-100, 0, 25, -Math.PI/2, Math.PI/2, true); ctx.lineTo(100, 25); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.end.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.end.worker.js index 0f9f55a..a2653ef 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.end.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.end.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -25,7 +25,7 @@ ctx.arc(-100, 0, 25, -Math.PI/2, Math.PI/2, true); ctx.lineTo(100, 25); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.negative.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.negative.html index d7b02c2..77f1b07bf 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.negative.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.negative.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); assert_throws_dom("INDEX_SIZE_ERR", function() { ctx.arc(0, 0, -1, 0, 0, true); }); t.done();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.negative.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.negative.worker.js index 24455db9..c1abffa8 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.negative.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.negative.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); assert_throws_dom("INDEX_SIZE_ERR", function() { ctx.arc(0, 0, -1, 0, 0, true); }); t.done();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.nonempty.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.nonempty.html index abb7087..b888121 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.nonempty.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.nonempty.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -28,7 +28,7 @@ ctx.moveTo(0, 25); ctx.arc(200, 25, 5, 0, 2*Math.PI, true); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.nonempty.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.nonempty.worker.js index 226cf104..8e30f56 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.nonempty.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.nonempty.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -24,7 +24,7 @@ ctx.moveTo(0, 25); ctx.arc(200, 25, 5, 0, 2*Math.PI, true); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.nonfinite.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.nonfinite.html index 61fc6af2..c37dec2 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.nonfinite.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.nonfinite.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -69,8 +69,8 @@ ctx.lineTo(0, 50); ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 90,45, 0,255,0,255, "90,45", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 90,45, 0,255,0,255, "90,45", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.nonfinite.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.nonfinite.worker.js index be57286..d027f5d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.nonfinite.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.nonfinite.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -65,8 +65,8 @@ ctx.lineTo(0, 50); ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 90,45, 0,255,0,255, "90,45", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 90,45, 0,255,0,255, "90,45", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.scale.1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.scale.1.html index e08e22a..52d03ed 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.scale.1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.scale.1.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -38,15 +38,15 @@ ctx.moveTo(25, 125); ctx.arc(25, 125, 24, 0, 2*Math.PI, false); ctx.fill(); -_assertPixel(offscreenCanvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,0, 0,255,0,255, "50,0", "0,255,0,255"); -_assertPixel(offscreenCanvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255"); -_assertPixel(offscreenCanvas, 0,25, 0,255,0,255, "0,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 99,25, 0,255,0,255, "99,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,49, 0,255,0,255, "50,49", "0,255,0,255"); -_assertPixel(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255"); +_assertPixel(canvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255"); +_assertPixel(canvas, 50,0, 0,255,0,255, "50,0", "0,255,0,255"); +_assertPixel(canvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255"); +_assertPixel(canvas, 0,25, 0,255,0,255, "0,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 99,25, 0,255,0,255, "99,25", "0,255,0,255"); +_assertPixel(canvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255"); +_assertPixel(canvas, 50,49, 0,255,0,255, "50,49", "0,255,0,255"); +_assertPixel(canvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.scale.1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.scale.1.worker.js index d930fe52..04372c2 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.scale.1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.scale.1.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -34,15 +34,15 @@ ctx.moveTo(25, 125); ctx.arc(25, 125, 24, 0, 2*Math.PI, false); ctx.fill(); -_assertPixel(offscreenCanvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,0, 0,255,0,255, "50,0", "0,255,0,255"); -_assertPixel(offscreenCanvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255"); -_assertPixel(offscreenCanvas, 0,25, 0,255,0,255, "0,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 99,25, 0,255,0,255, "99,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,49, 0,255,0,255, "50,49", "0,255,0,255"); -_assertPixel(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255"); +_assertPixel(canvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255"); +_assertPixel(canvas, 50,0, 0,255,0,255, "50,0", "0,255,0,255"); +_assertPixel(canvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255"); +_assertPixel(canvas, 0,25, 0,255,0,255, "0,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 99,25, 0,255,0,255, "99,25", "0,255,0,255"); +_assertPixel(canvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255"); +_assertPixel(canvas, 50,49, 0,255,0,255, "50,49", "0,255,0,255"); +_assertPixel(canvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.scale.2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.scale.2.html index cfb19c46..cd38bdfc 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.scale.2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.scale.2.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -28,15 +28,15 @@ ctx.beginPath(); ctx.arc(0, 0, 0.6, 0, Math.PI/2, false); ctx.stroke(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.scale.2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.scale.2.worker.js index cc69efcd..e419c7c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.scale.2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.scale.2.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -24,15 +24,15 @@ ctx.beginPath(); ctx.arc(0, 0, 0.6, 0, Math.PI/2, false); ctx.stroke(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.selfintersect.1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.selfintersect.1.html index 869d4749..c8fe461 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.selfintersect.1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.selfintersect.1.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -30,8 +30,8 @@ ctx.beginPath(); ctx.arc(0, 0, 25, 0, -Math.PI/2, true); ctx.stroke(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.selfintersect.1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.selfintersect.1.worker.js index 6576178e..75e366e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.selfintersect.1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.selfintersect.1.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -26,8 +26,8 @@ ctx.beginPath(); ctx.arc(0, 0, 25, 0, -Math.PI/2, true); ctx.stroke(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.selfintersect.2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.selfintersect.2.html index 1811862c..c5cb5cd 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.selfintersect.2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.selfintersect.2.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -30,12 +30,12 @@ ctx.beginPath(); ctx.arc(100, 0, 25, 0, -Math.PI/2, true); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 90,10, 0,255,0,255, "90,10", "0,255,0,255"); -_assertPixel(offscreenCanvas, 97,1, 0,255,0,255, "97,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 97,2, 0,255,0,255, "97,2", "0,255,0,255"); -_assertPixel(offscreenCanvas, 97,3, 0,255,0,255, "97,3", "0,255,0,255"); -_assertPixel(offscreenCanvas, 2,48, 0,255,0,255, "2,48", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 90,10, 0,255,0,255, "90,10", "0,255,0,255"); +_assertPixel(canvas, 97,1, 0,255,0,255, "97,1", "0,255,0,255"); +_assertPixel(canvas, 97,2, 0,255,0,255, "97,2", "0,255,0,255"); +_assertPixel(canvas, 97,3, 0,255,0,255, "97,3", "0,255,0,255"); +_assertPixel(canvas, 2,48, 0,255,0,255, "2,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.selfintersect.2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.selfintersect.2.worker.js index 303c149..769d5fa 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.selfintersect.2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.selfintersect.2.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -26,12 +26,12 @@ ctx.beginPath(); ctx.arc(100, 0, 25, 0, -Math.PI/2, true); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 90,10, 0,255,0,255, "90,10", "0,255,0,255"); -_assertPixel(offscreenCanvas, 97,1, 0,255,0,255, "97,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 97,2, 0,255,0,255, "97,2", "0,255,0,255"); -_assertPixel(offscreenCanvas, 97,3, 0,255,0,255, "97,3", "0,255,0,255"); -_assertPixel(offscreenCanvas, 2,48, 0,255,0,255, "2,48", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 90,10, 0,255,0,255, "90,10", "0,255,0,255"); +_assertPixel(canvas, 97,1, 0,255,0,255, "97,1", "0,255,0,255"); +_assertPixel(canvas, 97,2, 0,255,0,255, "97,2", "0,255,0,255"); +_assertPixel(canvas, 97,3, 0,255,0,255, "97,3", "0,255,0,255"); +_assertPixel(canvas, 2,48, 0,255,0,255, "2,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.shape.1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.shape.1.html index 7c21883b..301cd05 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.shape.1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.shape.1.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -27,12 +27,12 @@ ctx.beginPath(); ctx.arc(50, 50, 50, 0, Math.PI, false); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 20,48, 0,255,0,255, "20,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 20,48, 0,255,0,255, "20,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.shape.1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.shape.1.worker.js index 838f2216..ed5a7ff 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.shape.1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.shape.1.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -23,12 +23,12 @@ ctx.beginPath(); ctx.arc(50, 50, 50, 0, Math.PI, false); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 20,48, 0,255,0,255, "20,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 20,48, 0,255,0,255, "20,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.shape.2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.shape.2.html index ad88b97..cb60d66 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.shape.2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.shape.2.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,12 +27,12 @@ ctx.beginPath(); ctx.arc(50, 50, 50, 0, Math.PI, true); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 20,48, 0,255,0,255, "20,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 20,48, 0,255,0,255, "20,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.shape.2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.shape.2.worker.js index 6b71e5e..b470bb6 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.shape.2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.shape.2.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,12 +23,12 @@ ctx.beginPath(); ctx.arc(50, 50, 50, 0, Math.PI, true); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 20,48, 0,255,0,255, "20,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 20,48, 0,255,0,255, "20,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.shape.3.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.shape.3.html index 3cb53efa..14cd7fe 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.shape.3.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.shape.3.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -27,11 +27,11 @@ ctx.beginPath(); ctx.arc(0, 50, 50, 0, -Math.PI/2, false); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.shape.3.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.shape.3.worker.js index 77f699a..1e4843e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.shape.3.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.shape.3.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -23,11 +23,11 @@ ctx.beginPath(); ctx.arc(0, 50, 50, 0, -Math.PI/2, false); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.shape.4.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.shape.4.html index 723d628e..81a533a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.shape.4.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.shape.4.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,11 +27,11 @@ ctx.beginPath(); ctx.arc(-50, 50, 100, 0, -Math.PI/2, true); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.shape.4.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.shape.4.worker.js index 1272181..0de7e2d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.shape.4.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.shape.4.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,11 +23,11 @@ ctx.beginPath(); ctx.arc(-50, 50, 100, 0, -Math.PI/2, true); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.shape.5.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.shape.5.html index 7a02a29..b9621da 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.shape.5.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.shape.5.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -27,11 +27,11 @@ ctx.beginPath(); ctx.arc(300, 0, 100, 0, 5*Math.PI, false); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.shape.5.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.shape.5.worker.js index c952780..212de17 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.shape.5.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.shape.5.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -23,11 +23,11 @@ ctx.beginPath(); ctx.arc(300, 0, 100, 0, 5*Math.PI, false); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.twopie.1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.twopie.1.html index ff6fa9e4..01a930e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.twopie.1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.twopie.1.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -27,7 +27,7 @@ ctx.beginPath(); ctx.arc(50, 25, 50, 0, 2*Math.PI - 1e-4, true); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,20, 0,255,0,255, "50,20", "0,255,0,255"); +_assertPixel(canvas, 50,20, 0,255,0,255, "50,20", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.twopie.1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.twopie.1.worker.js index e55006b4..94b38b4 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.twopie.1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.twopie.1.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -23,7 +23,7 @@ ctx.beginPath(); ctx.arc(50, 25, 50, 0, 2*Math.PI - 1e-4, true); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,20, 0,255,0,255, "50,20", "0,255,0,255"); +_assertPixel(canvas, 50,20, 0,255,0,255, "50,20", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.twopie.2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.twopie.2.html index 962a70b1..26344fe 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.twopie.2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.twopie.2.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,7 +27,7 @@ ctx.beginPath(); ctx.arc(50, 25, 50, 0, 2*Math.PI - 1e-4, false); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,20, 0,255,0,255, "50,20", "0,255,0,255"); +_assertPixel(canvas, 50,20, 0,255,0,255, "50,20", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.twopie.2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.twopie.2.worker.js index 43af374..50525023 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.twopie.2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.twopie.2.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,7 +23,7 @@ ctx.beginPath(); ctx.arc(50, 25, 50, 0, 2*Math.PI - 1e-4, false); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,20, 0,255,0,255, "50,20", "0,255,0,255"); +_assertPixel(canvas, 50,20, 0,255,0,255, "50,20", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.twopie.3.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.twopie.3.html index 1775817..1c2112eb 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.twopie.3.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.twopie.3.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,7 +27,7 @@ ctx.beginPath(); ctx.arc(50, 25, 50, 0, 2*Math.PI + 1e-4, true); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,20, 0,255,0,255, "50,20", "0,255,0,255"); +_assertPixel(canvas, 50,20, 0,255,0,255, "50,20", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.twopie.3.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.twopie.3.worker.js index 818948c..4382003e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.twopie.3.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.twopie.3.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,7 +23,7 @@ ctx.beginPath(); ctx.arc(50, 25, 50, 0, 2*Math.PI + 1e-4, true); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,20, 0,255,0,255, "50,20", "0,255,0,255"); +_assertPixel(canvas, 50,20, 0,255,0,255, "50,20", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.twopie.4.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.twopie.4.html index 992f8b2..6809cb44 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.twopie.4.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.twopie.4.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,7 +27,7 @@ ctx.beginPath(); ctx.arc(50, 25, 50, 0, 2*Math.PI + 1e-4, false); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,20, 0,255,0,255, "50,20", "0,255,0,255"); +_assertPixel(canvas, 50,20, 0,255,0,255, "50,20", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.twopie.4.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.twopie.4.worker.js index aa53f4c..ecc65e4a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.twopie.4.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.twopie.4.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,7 +23,7 @@ ctx.beginPath(); ctx.arc(50, 25, 50, 0, 2*Math.PI + 1e-4, false); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,20, 0,255,0,255, "50,20", "0,255,0,255"); +_assertPixel(canvas, 50,20, 0,255,0,255, "50,20", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.zero.1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.zero.1.html index a6b78ec8..530a4304f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.zero.1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.zero.1.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -27,7 +27,7 @@ ctx.beginPath(); ctx.arc(50, 25, 50, 0, 0, true); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,20, 0,255,0,255, "50,20", "0,255,0,255"); +_assertPixel(canvas, 50,20, 0,255,0,255, "50,20", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.zero.1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.zero.1.worker.js index 7edc657..4fb264a5 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.zero.1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.zero.1.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -23,7 +23,7 @@ ctx.beginPath(); ctx.arc(50, 25, 50, 0, 0, true); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,20, 0,255,0,255, "50,20", "0,255,0,255"); +_assertPixel(canvas, 50,20, 0,255,0,255, "50,20", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.zero.2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.zero.2.html index 57ab399c..60b860ce 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.zero.2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.zero.2.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -27,7 +27,7 @@ ctx.beginPath(); ctx.arc(50, 25, 50, 0, 0, false); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,20, 0,255,0,255, "50,20", "0,255,0,255"); +_assertPixel(canvas, 50,20, 0,255,0,255, "50,20", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.zero.2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.zero.2.worker.js index a887aa4..f7cca0b 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.zero.2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.zero.2.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -23,7 +23,7 @@ ctx.beginPath(); ctx.arc(50, 25, 50, 0, 0, false); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,20, 0,255,0,255, "50,20", "0,255,0,255"); +_assertPixel(canvas, 50,20, 0,255,0,255, "50,20", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.zeroradius.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.zeroradius.html index 6eb1b49..4f779180 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.zeroradius.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.zeroradius.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00' ctx.fillRect(0, 0, 100, 50); @@ -28,7 +28,7 @@ ctx.moveTo(0, 25); ctx.arc(200, 25, 0, 0, Math.PI, true); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.zeroradius.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.zeroradius.worker.js index 8175e9f..cd228d49 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.zeroradius.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arc.zeroradius.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00' ctx.fillRect(0, 0, 100, 50); @@ -24,7 +24,7 @@ ctx.moveTo(0, 25); ctx.arc(200, 25, 0, 0, Math.PI, true); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.coincide.1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.coincide.1.html index 15c1813..233dda5 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.coincide.1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.coincide.1.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -34,9 +34,9 @@ ctx.moveTo(50, 25); ctx.arcTo(50, 25, 100, 25, 1); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); +_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.coincide.1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.coincide.1.worker.js index f424d95..57e5766 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.coincide.1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.coincide.1.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -30,9 +30,9 @@ ctx.moveTo(50, 25); ctx.arcTo(50, 25, 100, 25, 1); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); +_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.coincide.2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.coincide.2.html index 1de618a..46a7c52 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.coincide.2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.coincide.2.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -28,7 +28,7 @@ ctx.moveTo(0, 25); ctx.arcTo(100, 25, 100, 25, 1); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.coincide.2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.coincide.2.worker.js index 92d8db9..eced5ad 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.coincide.2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.coincide.2.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -24,7 +24,7 @@ ctx.moveTo(0, 25); ctx.arcTo(100, 25, 100, 25, 1); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.collinear.1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.collinear.1.html index 2e6e806e..471ac41b 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.collinear.1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.collinear.1.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -33,7 +33,7 @@ ctx.moveTo(-100, 25); ctx.arcTo(0, 25, 100, 25, 1); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.collinear.1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.collinear.1.worker.js index c737e4b..f765cff 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.collinear.1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.collinear.1.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -29,7 +29,7 @@ ctx.moveTo(-100, 25); ctx.arcTo(0, 25, 100, 25, 1); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.collinear.2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.collinear.2.html index 4a42c0bd..5a8fc62 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.collinear.2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.collinear.2.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -33,7 +33,7 @@ ctx.moveTo(100, 25); ctx.arcTo(200, 25, 110, 25, 1); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.collinear.2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.collinear.2.worker.js index 1e134f9..9b08169 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.collinear.2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.collinear.2.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -29,7 +29,7 @@ ctx.moveTo(100, 25); ctx.arcTo(200, 25, 110, 25, 1); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.collinear.3.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.collinear.3.html index daa04cd5..b042e11 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.collinear.3.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.collinear.3.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -37,7 +37,7 @@ ctx.moveTo(-100, 25); ctx.arcTo(0, 25, -200, 25, 1); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.collinear.3.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.collinear.3.worker.js index 03caf77..d6eef695 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.collinear.3.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.collinear.3.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -33,7 +33,7 @@ ctx.moveTo(-100, 25); ctx.arcTo(0, 25, -200, 25, 1); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.ensuresubpath.1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.ensuresubpath.1.html index b23b580..aee1d50b 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.ensuresubpath.1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.ensuresubpath.1.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -27,7 +27,7 @@ ctx.beginPath(); ctx.arcTo(100, 50, 200, 50, 0.1); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.ensuresubpath.1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.ensuresubpath.1.worker.js index 4599ba9..8481a3710 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.ensuresubpath.1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.ensuresubpath.1.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -23,7 +23,7 @@ ctx.beginPath(); ctx.arcTo(100, 50, 200, 50, 0.1); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.ensuresubpath.2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.ensuresubpath.2.html index 6e02421..36b143cd 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.ensuresubpath.2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.ensuresubpath.2.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -28,7 +28,7 @@ ctx.arcTo(0, 25, 50, 250, 0.1); // adds (x1,y1), draws nothing ctx.lineTo(100, 25); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.ensuresubpath.2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.ensuresubpath.2.worker.js index 2a5432a..e27280f5 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.ensuresubpath.2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.ensuresubpath.2.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -24,7 +24,7 @@ ctx.arcTo(0, 25, 50, 250, 0.1); // adds (x1,y1), draws nothing ctx.lineTo(100, 25); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.negative.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.negative.html index 0535cfb..59cf973 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.negative.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.negative.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); assert_throws_dom("INDEX_SIZE_ERR", function() { ctx.arcTo(0, 0, 0, 0, -1); }); t.done();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.negative.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.negative.worker.js index 1a53e2d5..60813e8 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.negative.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.negative.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); assert_throws_dom("INDEX_SIZE_ERR", function() { ctx.arcTo(0, 0, 0, 0, -1); }); t.done();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.nonfinite.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.nonfinite.html index fd4e236..be6fcff 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.nonfinite.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.nonfinite.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.moveTo(0, 0); ctx.lineTo(100, 0); @@ -67,8 +67,8 @@ ctx.lineTo(0, 50); ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 90,45, 0,255,0,255, "90,45", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 90,45, 0,255,0,255, "90,45", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.nonfinite.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.nonfinite.worker.js index 81be1705..6ad8e601 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.nonfinite.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.nonfinite.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.moveTo(0, 0); ctx.lineTo(100, 0); @@ -63,8 +63,8 @@ ctx.lineTo(0, 50); ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 90,45, 0,255,0,255, "90,45", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 90,45, 0,255,0,255, "90,45", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.scale.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.scale.html index f65ddec..1abbf953 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.scale.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.scale.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -30,15 +30,15 @@ ctx.arcTo(50, 50, 50, 0, 50); ctx.lineTo(-1000, 0); ctx.fill(); -_assertPixel(offscreenCanvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,0, 0,255,0,255, "50,0", "0,255,0,255"); -_assertPixel(offscreenCanvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255"); -_assertPixel(offscreenCanvas, 0,25, 0,255,0,255, "0,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 99,25, 0,255,0,255, "99,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,49, 0,255,0,255, "50,49", "0,255,0,255"); -_assertPixel(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255"); +_assertPixel(canvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255"); +_assertPixel(canvas, 50,0, 0,255,0,255, "50,0", "0,255,0,255"); +_assertPixel(canvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255"); +_assertPixel(canvas, 0,25, 0,255,0,255, "0,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 99,25, 0,255,0,255, "99,25", "0,255,0,255"); +_assertPixel(canvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255"); +_assertPixel(canvas, 50,49, 0,255,0,255, "50,49", "0,255,0,255"); +_assertPixel(canvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.scale.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.scale.worker.js index fc15d7c..998265d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.scale.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.scale.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -26,15 +26,15 @@ ctx.arcTo(50, 50, 50, 0, 50); ctx.lineTo(-1000, 0); ctx.fill(); -_assertPixel(offscreenCanvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,0, 0,255,0,255, "50,0", "0,255,0,255"); -_assertPixel(offscreenCanvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255"); -_assertPixel(offscreenCanvas, 0,25, 0,255,0,255, "0,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 99,25, 0,255,0,255, "99,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,49, 0,255,0,255, "50,49", "0,255,0,255"); -_assertPixel(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255"); +_assertPixel(canvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255"); +_assertPixel(canvas, 50,0, 0,255,0,255, "50,0", "0,255,0,255"); +_assertPixel(canvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255"); +_assertPixel(canvas, 0,25, 0,255,0,255, "0,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 99,25, 0,255,0,255, "99,25", "0,255,0,255"); +_assertPixel(canvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255"); +_assertPixel(canvas, 50,49, 0,255,0,255, "50,49", "0,255,0,255"); +_assertPixel(canvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.curve1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.curve1.html index 594381a..7ba352f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.curve1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.curve1.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var tol = 1.5; // tolerance to avoid antialiasing artifacts ctx.fillStyle = '#0f0'; @@ -36,20 +36,20 @@ ctx.arc(55, 45, 25+tol, 0, -Math.PI/2, true); ctx.arc(55, 45, 15-tol, -Math.PI/2, 0, false); ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 55,19, 0,255,0,255, "55,19", "0,255,0,255"); -_assertPixel(offscreenCanvas, 55,20, 0,255,0,255, "55,20", "0,255,0,255"); -_assertPixel(offscreenCanvas, 55,21, 0,255,0,255, "55,21", "0,255,0,255"); -_assertPixel(offscreenCanvas, 64,22, 0,255,0,255, "64,22", "0,255,0,255"); -_assertPixel(offscreenCanvas, 65,21, 0,255,0,255, "65,21", "0,255,0,255"); -_assertPixel(offscreenCanvas, 72,28, 0,255,0,255, "72,28", "0,255,0,255"); -_assertPixel(offscreenCanvas, 73,27, 0,255,0,255, "73,27", "0,255,0,255"); -_assertPixel(offscreenCanvas, 78,36, 0,255,0,255, "78,36", "0,255,0,255"); -_assertPixel(offscreenCanvas, 79,35, 0,255,0,255, "79,35", "0,255,0,255"); -_assertPixel(offscreenCanvas, 80,44, 0,255,0,255, "80,44", "0,255,0,255"); -_assertPixel(offscreenCanvas, 80,45, 0,255,0,255, "80,45", "0,255,0,255"); -_assertPixel(offscreenCanvas, 80,46, 0,255,0,255, "80,46", "0,255,0,255"); -_assertPixel(offscreenCanvas, 65,45, 0,255,0,255, "65,45", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 55,19, 0,255,0,255, "55,19", "0,255,0,255"); +_assertPixel(canvas, 55,20, 0,255,0,255, "55,20", "0,255,0,255"); +_assertPixel(canvas, 55,21, 0,255,0,255, "55,21", "0,255,0,255"); +_assertPixel(canvas, 64,22, 0,255,0,255, "64,22", "0,255,0,255"); +_assertPixel(canvas, 65,21, 0,255,0,255, "65,21", "0,255,0,255"); +_assertPixel(canvas, 72,28, 0,255,0,255, "72,28", "0,255,0,255"); +_assertPixel(canvas, 73,27, 0,255,0,255, "73,27", "0,255,0,255"); +_assertPixel(canvas, 78,36, 0,255,0,255, "78,36", "0,255,0,255"); +_assertPixel(canvas, 79,35, 0,255,0,255, "79,35", "0,255,0,255"); +_assertPixel(canvas, 80,44, 0,255,0,255, "80,44", "0,255,0,255"); +_assertPixel(canvas, 80,45, 0,255,0,255, "80,45", "0,255,0,255"); +_assertPixel(canvas, 80,46, 0,255,0,255, "80,46", "0,255,0,255"); +_assertPixel(canvas, 65,45, 0,255,0,255, "65,45", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.curve1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.curve1.worker.js index f918395..ff04a00e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.curve1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.curve1.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var tol = 1.5; // tolerance to avoid antialiasing artifacts ctx.fillStyle = '#0f0'; @@ -32,20 +32,20 @@ ctx.arc(55, 45, 25+tol, 0, -Math.PI/2, true); ctx.arc(55, 45, 15-tol, -Math.PI/2, 0, false); ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 55,19, 0,255,0,255, "55,19", "0,255,0,255"); -_assertPixel(offscreenCanvas, 55,20, 0,255,0,255, "55,20", "0,255,0,255"); -_assertPixel(offscreenCanvas, 55,21, 0,255,0,255, "55,21", "0,255,0,255"); -_assertPixel(offscreenCanvas, 64,22, 0,255,0,255, "64,22", "0,255,0,255"); -_assertPixel(offscreenCanvas, 65,21, 0,255,0,255, "65,21", "0,255,0,255"); -_assertPixel(offscreenCanvas, 72,28, 0,255,0,255, "72,28", "0,255,0,255"); -_assertPixel(offscreenCanvas, 73,27, 0,255,0,255, "73,27", "0,255,0,255"); -_assertPixel(offscreenCanvas, 78,36, 0,255,0,255, "78,36", "0,255,0,255"); -_assertPixel(offscreenCanvas, 79,35, 0,255,0,255, "79,35", "0,255,0,255"); -_assertPixel(offscreenCanvas, 80,44, 0,255,0,255, "80,44", "0,255,0,255"); -_assertPixel(offscreenCanvas, 80,45, 0,255,0,255, "80,45", "0,255,0,255"); -_assertPixel(offscreenCanvas, 80,46, 0,255,0,255, "80,46", "0,255,0,255"); -_assertPixel(offscreenCanvas, 65,45, 0,255,0,255, "65,45", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 55,19, 0,255,0,255, "55,19", "0,255,0,255"); +_assertPixel(canvas, 55,20, 0,255,0,255, "55,20", "0,255,0,255"); +_assertPixel(canvas, 55,21, 0,255,0,255, "55,21", "0,255,0,255"); +_assertPixel(canvas, 64,22, 0,255,0,255, "64,22", "0,255,0,255"); +_assertPixel(canvas, 65,21, 0,255,0,255, "65,21", "0,255,0,255"); +_assertPixel(canvas, 72,28, 0,255,0,255, "72,28", "0,255,0,255"); +_assertPixel(canvas, 73,27, 0,255,0,255, "73,27", "0,255,0,255"); +_assertPixel(canvas, 78,36, 0,255,0,255, "78,36", "0,255,0,255"); +_assertPixel(canvas, 79,35, 0,255,0,255, "79,35", "0,255,0,255"); +_assertPixel(canvas, 80,44, 0,255,0,255, "80,44", "0,255,0,255"); +_assertPixel(canvas, 80,45, 0,255,0,255, "80,45", "0,255,0,255"); +_assertPixel(canvas, 80,46, 0,255,0,255, "80,46", "0,255,0,255"); +_assertPixel(canvas, 65,45, 0,255,0,255, "65,45", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.curve2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.curve2.html index 1b9d84e..8d1f4953 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.curve2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.curve2.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var tol = 1.5; // tolerance to avoid antialiasing artifacts ctx.fillStyle = '#0f0'; @@ -36,19 +36,19 @@ ctx.moveTo(10, 25); ctx.arcTo(75, 25, 75, 60, 20); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 55,19, 0,255,0,255, "55,19", "0,255,0,255"); -_assertPixel(offscreenCanvas, 55,20, 0,255,0,255, "55,20", "0,255,0,255"); -_assertPixel(offscreenCanvas, 55,21, 0,255,0,255, "55,21", "0,255,0,255"); -_assertPixel(offscreenCanvas, 64,22, 0,255,0,255, "64,22", "0,255,0,255"); -_assertPixel(offscreenCanvas, 65,21, 0,255,0,255, "65,21", "0,255,0,255"); -_assertPixel(offscreenCanvas, 72,28, 0,255,0,255, "72,28", "0,255,0,255"); -_assertPixel(offscreenCanvas, 73,27, 0,255,0,255, "73,27", "0,255,0,255"); -_assertPixel(offscreenCanvas, 78,36, 0,255,0,255, "78,36", "0,255,0,255"); -_assertPixel(offscreenCanvas, 79,35, 0,255,0,255, "79,35", "0,255,0,255"); -_assertPixel(offscreenCanvas, 80,44, 0,255,0,255, "80,44", "0,255,0,255"); -_assertPixel(offscreenCanvas, 80,45, 0,255,0,255, "80,45", "0,255,0,255"); -_assertPixel(offscreenCanvas, 80,46, 0,255,0,255, "80,46", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 55,19, 0,255,0,255, "55,19", "0,255,0,255"); +_assertPixel(canvas, 55,20, 0,255,0,255, "55,20", "0,255,0,255"); +_assertPixel(canvas, 55,21, 0,255,0,255, "55,21", "0,255,0,255"); +_assertPixel(canvas, 64,22, 0,255,0,255, "64,22", "0,255,0,255"); +_assertPixel(canvas, 65,21, 0,255,0,255, "65,21", "0,255,0,255"); +_assertPixel(canvas, 72,28, 0,255,0,255, "72,28", "0,255,0,255"); +_assertPixel(canvas, 73,27, 0,255,0,255, "73,27", "0,255,0,255"); +_assertPixel(canvas, 78,36, 0,255,0,255, "78,36", "0,255,0,255"); +_assertPixel(canvas, 79,35, 0,255,0,255, "79,35", "0,255,0,255"); +_assertPixel(canvas, 80,44, 0,255,0,255, "80,44", "0,255,0,255"); +_assertPixel(canvas, 80,45, 0,255,0,255, "80,45", "0,255,0,255"); +_assertPixel(canvas, 80,46, 0,255,0,255, "80,46", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.curve2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.curve2.worker.js index 66ad77c..b83dff1 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.curve2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.curve2.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var tol = 1.5; // tolerance to avoid antialiasing artifacts ctx.fillStyle = '#0f0'; @@ -32,19 +32,19 @@ ctx.moveTo(10, 25); ctx.arcTo(75, 25, 75, 60, 20); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 55,19, 0,255,0,255, "55,19", "0,255,0,255"); -_assertPixel(offscreenCanvas, 55,20, 0,255,0,255, "55,20", "0,255,0,255"); -_assertPixel(offscreenCanvas, 55,21, 0,255,0,255, "55,21", "0,255,0,255"); -_assertPixel(offscreenCanvas, 64,22, 0,255,0,255, "64,22", "0,255,0,255"); -_assertPixel(offscreenCanvas, 65,21, 0,255,0,255, "65,21", "0,255,0,255"); -_assertPixel(offscreenCanvas, 72,28, 0,255,0,255, "72,28", "0,255,0,255"); -_assertPixel(offscreenCanvas, 73,27, 0,255,0,255, "73,27", "0,255,0,255"); -_assertPixel(offscreenCanvas, 78,36, 0,255,0,255, "78,36", "0,255,0,255"); -_assertPixel(offscreenCanvas, 79,35, 0,255,0,255, "79,35", "0,255,0,255"); -_assertPixel(offscreenCanvas, 80,44, 0,255,0,255, "80,44", "0,255,0,255"); -_assertPixel(offscreenCanvas, 80,45, 0,255,0,255, "80,45", "0,255,0,255"); -_assertPixel(offscreenCanvas, 80,46, 0,255,0,255, "80,46", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 55,19, 0,255,0,255, "55,19", "0,255,0,255"); +_assertPixel(canvas, 55,20, 0,255,0,255, "55,20", "0,255,0,255"); +_assertPixel(canvas, 55,21, 0,255,0,255, "55,21", "0,255,0,255"); +_assertPixel(canvas, 64,22, 0,255,0,255, "64,22", "0,255,0,255"); +_assertPixel(canvas, 65,21, 0,255,0,255, "65,21", "0,255,0,255"); +_assertPixel(canvas, 72,28, 0,255,0,255, "72,28", "0,255,0,255"); +_assertPixel(canvas, 73,27, 0,255,0,255, "73,27", "0,255,0,255"); +_assertPixel(canvas, 78,36, 0,255,0,255, "78,36", "0,255,0,255"); +_assertPixel(canvas, 79,35, 0,255,0,255, "79,35", "0,255,0,255"); +_assertPixel(canvas, 80,44, 0,255,0,255, "80,44", "0,255,0,255"); +_assertPixel(canvas, 80,45, 0,255,0,255, "80,45", "0,255,0,255"); +_assertPixel(canvas, 80,46, 0,255,0,255, "80,46", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.end.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.end.html index 98f72b6..28066843 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.end.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.end.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -28,11 +28,11 @@ ctx.moveTo(-100, -100); ctx.arcTo(-100, 25, 200, 25, 10); ctx.stroke(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.end.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.end.worker.js index 5670bdcc..4f12e45 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.end.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.end.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -24,11 +24,11 @@ ctx.moveTo(-100, -100); ctx.arcTo(-100, 25, 200, 25, 10); ctx.stroke(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.start.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.start.html index 8162682..5db369a5 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.start.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.start.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -28,11 +28,11 @@ ctx.moveTo(0, 25); ctx.arcTo(200, 25, 200, 50, 10); ctx.stroke(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.start.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.start.worker.js index b7dee007..d0a6e34 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.start.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.shape.start.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -24,11 +24,11 @@ ctx.moveTo(0, 25); ctx.arcTo(200, 25, 200, 50, 10); ctx.stroke(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.transformation.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.transformation.html index dcf84f76..4f47002 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.transformation.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.transformation.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -29,15 +29,15 @@ ctx.arcTo(50, 50, 50, 0, 50); ctx.lineTo(-100, 0); ctx.fill(); -_assertPixel(offscreenCanvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,0, 0,255,0,255, "50,0", "0,255,0,255"); -_assertPixel(offscreenCanvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255"); -_assertPixel(offscreenCanvas, 0,25, 0,255,0,255, "0,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 99,25, 0,255,0,255, "99,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,49, 0,255,0,255, "50,49", "0,255,0,255"); -_assertPixel(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255"); +_assertPixel(canvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255"); +_assertPixel(canvas, 50,0, 0,255,0,255, "50,0", "0,255,0,255"); +_assertPixel(canvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255"); +_assertPixel(canvas, 0,25, 0,255,0,255, "0,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 99,25, 0,255,0,255, "99,25", "0,255,0,255"); +_assertPixel(canvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255"); +_assertPixel(canvas, 50,49, 0,255,0,255, "50,49", "0,255,0,255"); +_assertPixel(canvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.transformation.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.transformation.worker.js index cce07f4..46bb461 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.transformation.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.transformation.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -25,15 +25,15 @@ ctx.arcTo(50, 50, 50, 0, 50); ctx.lineTo(-100, 0); ctx.fill(); -_assertPixel(offscreenCanvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,0, 0,255,0,255, "50,0", "0,255,0,255"); -_assertPixel(offscreenCanvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255"); -_assertPixel(offscreenCanvas, 0,25, 0,255,0,255, "0,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 99,25, 0,255,0,255, "99,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,49, 0,255,0,255, "50,49", "0,255,0,255"); -_assertPixel(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255"); +_assertPixel(canvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255"); +_assertPixel(canvas, 50,0, 0,255,0,255, "50,0", "0,255,0,255"); +_assertPixel(canvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255"); +_assertPixel(canvas, 0,25, 0,255,0,255, "0,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 99,25, 0,255,0,255, "99,25", "0,255,0,255"); +_assertPixel(canvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255"); +_assertPixel(canvas, 50,49, 0,255,0,255, "50,49", "0,255,0,255"); +_assertPixel(canvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.zero.1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.zero.1.html index c31d328..e01f15b 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.zero.1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.zero.1.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -33,7 +33,7 @@ ctx.moveTo(0, -25); ctx.arcTo(50, -25, 50, 50, 0); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.zero.1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.zero.1.worker.js index c63e08d..9768431 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.zero.1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.zero.1.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -29,7 +29,7 @@ ctx.moveTo(0, -25); ctx.arcTo(50, -25, 50, 50, 0); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.zero.2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.zero.2.html index d7301c24..94158ca 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.zero.2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.zero.2.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -33,7 +33,7 @@ ctx.moveTo(100, 25); ctx.arcTo(200, 25, 50, 25, 0); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.zero.2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.zero.2.worker.js index b7845f21..63843ec 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.zero.2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.arcTo.zero.2.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -29,7 +29,7 @@ ctx.moveTo(100, 25); ctx.arcTo(200, 25, 50, 25, 0); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.beginPath.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.beginPath.html index c5132bc..c3c826d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.beginPath.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.beginPath.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -26,7 +26,7 @@ ctx.beginPath(); ctx.fillStyle = '#f00'; ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.beginPath.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.beginPath.worker.js index 3cc0c65..e13b8bf0 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.beginPath.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.beginPath.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -22,7 +22,7 @@ ctx.beginPath(); ctx.fillStyle = '#f00'; ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.basic.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.basic.html index 82bccea..9b595ab 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.basic.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.basic.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -28,7 +28,7 @@ ctx.moveTo(0, 25); ctx.bezierCurveTo(100, 25, 100, 25, 100, 25); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.basic.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.basic.worker.js index acdbcf8..d22fdaa 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.basic.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.basic.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -24,7 +24,7 @@ ctx.moveTo(0, 25); ctx.bezierCurveTo(100, 25, 100, 25, 100, 25); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.ensuresubpath.1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.ensuresubpath.1.html index 704b2407..064d12e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.ensuresubpath.1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.ensuresubpath.1.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -27,8 +27,8 @@ ctx.beginPath(); ctx.bezierCurveTo(100, 50, 200, 50, 200, 50); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.ensuresubpath.1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.ensuresubpath.1.worker.js index ec05c90..32927ff 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.ensuresubpath.1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.ensuresubpath.1.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -23,8 +23,8 @@ ctx.beginPath(); ctx.bezierCurveTo(100, 50, 200, 50, 200, 50); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.ensuresubpath.2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.ensuresubpath.2.html index adece7b..55a05d3 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.ensuresubpath.2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.ensuresubpath.2.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,8 +27,8 @@ ctx.beginPath(); ctx.bezierCurveTo(0, 25, 100, 25, 100, 25); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.ensuresubpath.2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.ensuresubpath.2.worker.js index b1b95353..a053b5d4 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.ensuresubpath.2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.ensuresubpath.2.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,8 +23,8 @@ ctx.beginPath(); ctx.bezierCurveTo(0, 25, 100, 25, 100, 25); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.nonfinite.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.nonfinite.html index 065074b..c396f92a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.nonfinite.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.nonfinite.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.moveTo(0, 0); ctx.lineTo(100, 0); @@ -101,8 +101,8 @@ ctx.lineTo(0, 50); ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 90,45, 0,255,0,255, "90,45", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 90,45, 0,255,0,255, "90,45", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.nonfinite.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.nonfinite.worker.js index a0a6881..fba6b76c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.nonfinite.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.nonfinite.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.moveTo(0, 0); ctx.lineTo(100, 0); @@ -97,8 +97,8 @@ ctx.lineTo(0, 50); ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 90,45, 0,255,0,255, "90,45", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 90,45, 0,255,0,255, "90,45", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.scaled.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.scaled.html index 1c14d85a..7bdcb0ee 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.scaled.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.scaled.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -29,11 +29,11 @@ ctx.moveTo(-2, 3.1); ctx.bezierCurveTo(-2, -1, 2.1, -1, 2.1, 3.1); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.scaled.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.scaled.worker.js index 3d16b7b..bca64bd6 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.scaled.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.scaled.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -25,11 +25,11 @@ ctx.moveTo(-2, 3.1); ctx.bezierCurveTo(-2, -1, 2.1, -1, 2.1, 3.1); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.shape.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.shape.html index f0e94812..a270bf7f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.shape.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.shape.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -28,11 +28,11 @@ ctx.moveTo(-2000, 3100); ctx.bezierCurveTo(-2000, -1000, 2100, -1000, 2100, 3100); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.shape.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.shape.worker.js index de0063c..7095114 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.shape.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.bezierCurveTo.shape.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -24,11 +24,11 @@ ctx.moveTo(-2000, 3100); ctx.bezierCurveTo(-2000, -1000, 2100, -1000, 2100, 3100); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.clip.basic.1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.clip.basic.1.html index 11ace382..dde6f8b 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.clip.basic.1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.clip.basic.1.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,7 +27,7 @@ ctx.clip(); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.clip.basic.1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.clip.basic.1.worker.js index 603f307..b0f42b9 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.clip.basic.1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.clip.basic.1.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,7 +23,7 @@ ctx.clip(); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.clip.basic.2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.clip.basic.2.html index 67daf78..4aa1659 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.clip.basic.2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.clip.basic.2.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -27,7 +27,7 @@ ctx.clip(); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.clip.basic.2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.clip.basic.2.worker.js index 6de4f5802..dfc5c18e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.clip.basic.2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.clip.basic.2.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -23,7 +23,7 @@ ctx.clip(); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.clip.empty.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.clip.empty.html index 4e89e1b..475c046 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.clip.empty.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.clip.empty.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -26,7 +26,7 @@ ctx.clip(); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.clip.empty.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.clip.empty.worker.js index e46b75d..fc15dbb 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.clip.empty.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.clip.empty.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -22,7 +22,7 @@ ctx.clip(); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.clip.intersect.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.clip.intersect.html index 2614c9e..18b8baa 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.clip.intersect.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.clip.intersect.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -30,7 +30,7 @@ ctx.clip(); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.clip.intersect.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.clip.intersect.worker.js index 8207622..85b8e0f2 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.clip.intersect.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.clip.intersect.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -26,7 +26,7 @@ ctx.clip(); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.clip.unaffected.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.clip.unaffected.html index 602181b..739f5d378 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.clip.unaffected.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.clip.unaffected.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -31,7 +31,7 @@ ctx.clip(); ctx.lineTo(0, 0); ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.clip.unaffected.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.clip.unaffected.worker.js index 670d59c..3c83b091 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.clip.unaffected.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.clip.unaffected.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,7 +27,7 @@ ctx.clip(); ctx.lineTo(0, 0); ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.clip.winding.1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.clip.winding.1.html index e8380750c..ef1649f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.clip.winding.1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.clip.winding.1.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -35,7 +35,7 @@ ctx.clip(); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.clip.winding.1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.clip.winding.1.worker.js index ce3508c..8a7bdb7f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.clip.winding.1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.clip.winding.1.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -31,7 +31,7 @@ ctx.clip(); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.clip.winding.2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.clip.winding.2.html index a691de4..f5acfb2 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.clip.winding.2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.clip.winding.2.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -38,7 +38,7 @@ ctx.clip(); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.clip.winding.2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.clip.winding.2.worker.js index c8405143..d97e45c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.clip.winding.2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.clip.winding.2.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -34,7 +34,7 @@ ctx.clip(); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.closePath.empty.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.closePath.empty.html index 799a623..c4a2262 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.closePath.empty.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.closePath.empty.html
@@ -17,15 +17,15 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); ctx.closePath(); ctx.fillStyle = '#f00'; ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.closePath.empty.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.closePath.empty.worker.js index 7b675f4d..f5eb503 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.closePath.empty.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.closePath.empty.worker.js
@@ -13,15 +13,15 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); ctx.closePath(); ctx.fillStyle = '#f00'; ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.closePath.newline.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.closePath.newline.html index 66c19e9f..11339fa 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.closePath.newline.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.closePath.newline.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -30,7 +30,7 @@ ctx.lineTo(200, 25); ctx.closePath(); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.closePath.newline.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.closePath.newline.worker.js index 4c8bc194..13a9f48 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.closePath.newline.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.closePath.newline.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -26,7 +26,7 @@ ctx.lineTo(200, 25); ctx.closePath(); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.closePath.nextpoint.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.closePath.nextpoint.html index 9c8c646f..e39f21f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.closePath.nextpoint.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.closePath.nextpoint.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -29,7 +29,7 @@ ctx.closePath(); ctx.lineTo(1000, 25); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.closePath.nextpoint.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.closePath.nextpoint.worker.js index e11751e..9618918 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.closePath.nextpoint.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.closePath.nextpoint.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -25,7 +25,7 @@ ctx.closePath(); ctx.lineTo(1000, 25); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.fill.closed.basic.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.fill.closed.basic.html index f735574..9d0c235 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.fill.closed.basic.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.fill.closed.basic.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -28,7 +28,7 @@ ctx.lineTo(100, 50); ctx.lineTo(0, 50); ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.fill.closed.basic.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.fill.closed.basic.worker.js index 61f5488..e7650bf 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.fill.closed.basic.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.fill.closed.basic.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -24,7 +24,7 @@ ctx.lineTo(100, 50); ctx.lineTo(0, 50); ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.fill.closed.unaffected.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.fill.closed.unaffected.html index 6018300..fb3a715a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.fill.closed.unaffected.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.fill.closed.unaffected.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#00f'; ctx.fillRect(0, 0, 100, 50); @@ -30,8 +30,8 @@ ctx.lineTo(0, 50); ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixel(offscreenCanvas, 90,10, 0,255,0,255, "90,10", "0,255,0,255"); -_assertPixel(offscreenCanvas, 10,40, 0,255,0,255, "10,40", "0,255,0,255"); +_assertPixel(canvas, 90,10, 0,255,0,255, "90,10", "0,255,0,255"); +_assertPixel(canvas, 10,40, 0,255,0,255, "10,40", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.fill.closed.unaffected.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.fill.closed.unaffected.worker.js index 1f85431a..3f44708 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.fill.closed.unaffected.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.fill.closed.unaffected.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#00f'; ctx.fillRect(0, 0, 100, 50); @@ -26,8 +26,8 @@ ctx.lineTo(0, 50); ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixel(offscreenCanvas, 90,10, 0,255,0,255, "90,10", "0,255,0,255"); -_assertPixel(offscreenCanvas, 10,40, 0,255,0,255, "10,40", "0,255,0,255"); +_assertPixel(canvas, 90,10, 0,255,0,255, "90,10", "0,255,0,255"); +_assertPixel(canvas, 10,40, 0,255,0,255, "10,40", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.fill.overlap.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.fill.overlap.html index 780cae43..f933a67 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.fill.overlap.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.fill.overlap.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#000'; ctx.fillRect(0, 0, 100, 50); @@ -27,7 +27,7 @@ ctx.closePath(); ctx.rect(10, 10, 80, 30); ctx.fill(); -_assertPixelApprox(offscreenCanvas, 50,25, 0,127,0,255, "50,25", "0,127,0,255", 1); +_assertPixelApprox(canvas, 50,25, 0,127,0,255, "50,25", "0,127,0,255", 1); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.fill.overlap.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.fill.overlap.worker.js index a023f117..907c949 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.fill.overlap.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.fill.overlap.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#000'; ctx.fillRect(0, 0, 100, 50); @@ -23,7 +23,7 @@ ctx.closePath(); ctx.rect(10, 10, 80, 30); ctx.fill(); -_assertPixelApprox(offscreenCanvas, 50,25, 0,127,0,255, "50,25", "0,127,0,255", 1); +_assertPixelApprox(canvas, 50,25, 0,127,0,255, "50,25", "0,127,0,255", 1); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.fill.winding.add.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.fill.winding.add.html index c043e9bc..87ff125 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.fill.winding.add.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.fill.winding.add.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -33,7 +33,7 @@ ctx.lineTo(100, 50); ctx.lineTo(0, 50); ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.fill.winding.add.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.fill.winding.add.worker.js index ca872d1..8963be3c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.fill.winding.add.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.fill.winding.add.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -29,7 +29,7 @@ ctx.lineTo(100, 50); ctx.lineTo(0, 50); ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.fill.winding.subtract.1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.fill.winding.subtract.1.html index fef9c0a..31b9d4f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.fill.winding.subtract.1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.fill.winding.subtract.1.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -33,7 +33,7 @@ ctx.lineTo(100, 50); ctx.lineTo(100, 0); ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.fill.winding.subtract.1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.fill.winding.subtract.1.worker.js index ae4580da..4fb6a542 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.fill.winding.subtract.1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.fill.winding.subtract.1.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -29,7 +29,7 @@ ctx.lineTo(100, 50); ctx.lineTo(100, 0); ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.fill.winding.subtract.2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.fill.winding.subtract.2.html index 39e7e53..3f7502d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.fill.winding.subtract.2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.fill.winding.subtract.2.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -32,7 +32,7 @@ ctx.lineTo(100, 50); ctx.lineTo(100, 0); ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.fill.winding.subtract.2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.fill.winding.subtract.2.worker.js index 0d73e523..532f89c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.fill.winding.subtract.2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.fill.winding.subtract.2.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -28,7 +28,7 @@ ctx.lineTo(100, 50); ctx.lineTo(100, 0); ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.fill.winding.subtract.3.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.fill.winding.subtract.3.html index 5d590c89..2e0e0c6 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.fill.winding.subtract.3.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.fill.winding.subtract.3.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -38,7 +38,7 @@ ctx.lineTo(100, 50); ctx.lineTo(100, 0); ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.fill.winding.subtract.3.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.fill.winding.subtract.3.worker.js index e12b580..cf54bfb 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.fill.winding.subtract.3.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.fill.winding.subtract.3.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -34,7 +34,7 @@ ctx.lineTo(100, 50); ctx.lineTo(100, 0); ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.initial.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.initial.html index 51f76449..851deac 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.initial.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.initial.html
@@ -17,15 +17,15 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); ctx.closePath(); ctx.fillStyle = '#f00'; ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.initial.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.initial.worker.js index 3467eaeb..4bdc8eb 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.initial.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.initial.worker.js
@@ -13,15 +13,15 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); ctx.closePath(); ctx.fillStyle = '#f00'; ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.arc.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.arc.html index b82f233..fe12f94 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.arc.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.arc.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.arc(50, 25, 10, 0, Math.PI, false); _assertSame(ctx.isPointInPath(50, 10), false, "ctx.isPointInPath(50, 10)", "false");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.arc.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.arc.worker.js index 6a1ca24..2803e39 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.arc.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.arc.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.arc(50, 25, 10, 0, Math.PI, false); _assertSame(ctx.isPointInPath(50, 10), false, "ctx.isPointInPath(50, 10)", "false");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.basic.1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.basic.1.html index c28d8681..3cd24f54 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.basic.1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.basic.1.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.rect(0, 0, 20, 20); _assertSame(ctx.isPointInPath(10, 10), true, "ctx.isPointInPath(10, 10)", "true");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.basic.1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.basic.1.worker.js index 19fbf213..93dd86a5 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.basic.1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.basic.1.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.rect(0, 0, 20, 20); _assertSame(ctx.isPointInPath(10, 10), true, "ctx.isPointInPath(10, 10)", "true");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.basic.2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.basic.2.html index 291b002..42381d3 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.basic.2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.basic.2.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.rect(20, 0, 20, 20); _assertSame(ctx.isPointInPath(10, 10), false, "ctx.isPointInPath(10, 10)", "false");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.basic.2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.basic.2.worker.js index 4b41c389f..7dbc5fc 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.basic.2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.basic.2.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.rect(20, 0, 20, 20); _assertSame(ctx.isPointInPath(10, 10), false, "ctx.isPointInPath(10, 10)", "false");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.bezier.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.bezier.html index faa7042..f336fe4 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.bezier.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.bezier.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.moveTo(25, 25); ctx.bezierCurveTo(50, -50, 50, 100, 75, 25);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.bezier.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.bezier.worker.js index 3aed9ef..6017efc2 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.bezier.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.bezier.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.moveTo(25, 25); ctx.bezierCurveTo(50, -50, 50, 100, 75, 25);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.bigarc.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.bigarc.html index ee317f3..2e6e78f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.bigarc.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.bigarc.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.arc(50, 25, 10, 0, 7, false); _assertSame(ctx.isPointInPath(50, 10), false, "ctx.isPointInPath(50, 10)", "false");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.bigarc.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.bigarc.worker.js index 30b4b6fa..1ee0010 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.bigarc.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.bigarc.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.arc(50, 25, 10, 0, 7, false); _assertSame(ctx.isPointInPath(50, 10), false, "ctx.isPointInPath(50, 10)", "false");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.edge.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.edge.html index ff9ae84..bcd4eae 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.edge.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.edge.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.rect(0, 0, 20, 20); _assertSame(ctx.isPointInPath(0, 0), true, "ctx.isPointInPath(0, 0)", "true");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.edge.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.edge.worker.js index fbd1b906..21222eb 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.edge.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.edge.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.rect(0, 0, 20, 20); _assertSame(ctx.isPointInPath(0, 0), true, "ctx.isPointInPath(0, 0)", "true");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.empty.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.empty.html index eae13e6..9a87509 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.empty.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.empty.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); _assertSame(ctx.isPointInPath(0, 0), false, "ctx.isPointInPath(0, 0)", "false"); t.done();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.empty.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.empty.worker.js index 5f8ab2a..e449ee2e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.empty.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.empty.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); _assertSame(ctx.isPointInPath(0, 0), false, "ctx.isPointInPath(0, 0)", "false"); t.done();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.nonfinite.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.nonfinite.html index 738b6980..8dc4c1df 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.nonfinite.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.nonfinite.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.rect(-100, -50, 200, 100); _assertSame(ctx.isPointInPath(Infinity, 0), false, "ctx.isPointInPath(Infinity, 0)", "false");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.nonfinite.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.nonfinite.worker.js index 1fe8daa3..70a4ece 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.nonfinite.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.nonfinite.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.rect(-100, -50, 200, 100); _assertSame(ctx.isPointInPath(Infinity, 0), false, "ctx.isPointInPath(Infinity, 0)", "false");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.outside.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.outside.html index 966d664..d1a1d86 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.outside.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.outside.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.rect(0, -100, 20, 20); ctx.rect(20, -10, 20, 20);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.outside.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.outside.worker.js index 51898c4..6d071050 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.outside.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.outside.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.rect(0, -100, 20, 20); ctx.rect(20, -10, 20, 20);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.subpath.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.subpath.html index 0161302..b0ea1f9 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.subpath.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.subpath.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.rect(0, 0, 20, 20); ctx.beginPath();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.subpath.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.subpath.worker.js index d0e1d614..4a82fcc 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.subpath.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.subpath.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.rect(0, 0, 20, 20); ctx.beginPath();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.1.html index dd32f57..9b7b2e5 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.1.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.translate(50, 0); ctx.rect(0, 0, 20, 20);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.1.worker.js index 90d163b..2fafbe9 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.1.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.translate(50, 0); ctx.rect(0, 0, 20, 20);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.2.html index 213104d..45b884f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.2.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.rect(50, 0, 20, 20); ctx.translate(50, 0);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.2.worker.js index 00fb6a0..3f37e62 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.2.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.rect(50, 0, 20, 20); ctx.translate(50, 0);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.3.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.3.html index 6b57fc7..923da48 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.3.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.3.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.scale(-1, 1); ctx.rect(-70, 0, 20, 20);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.3.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.3.worker.js index ee15d4f7..172d0a7 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.3.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.3.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.scale(-1, 1); ctx.rect(-70, 0, 20, 20);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.4.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.4.html index a0fdc790..0f87cc2 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.4.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.4.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.translate(50, 0); ctx.rect(50, 0, 20, 20);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.4.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.4.worker.js index 2733526..9931481 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.4.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.transform.4.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.translate(50, 0); ctx.rect(50, 0, 20, 20);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.unclosed.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.unclosed.html index 912199f..098370f0 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.unclosed.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.unclosed.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.moveTo(0, 0); ctx.lineTo(20, 0);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.unclosed.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.unclosed.worker.js index 9921a470..ad4ac878 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.unclosed.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.unclosed.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.moveTo(0, 0); ctx.lineTo(20, 0);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.winding.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.winding.html index c1b821c..9698017e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.winding.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.winding.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); // Create a square ring, using opposite windings to make a hole in the centre ctx.moveTo(0, 0);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.winding.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.winding.worker.js index d2cf365..6ef758114 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.winding.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInPath.winding.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); // Create a square ring, using opposite windings to make a hole in the centre ctx.moveTo(0, 0);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInStroke.basic.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInStroke.basic.html index f91c6f1..95f7fd7 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInStroke.basic.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInStroke.basic.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.strokeStyle = '#0f0'; ctx.beginPath();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInStroke.basic.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInStroke.basic.worker.js index 7228ce6..844f0ef1 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInStroke.basic.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.isPointInStroke.basic.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.strokeStyle = '#0f0'; ctx.beginPath();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.lineTo.basic.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.lineTo.basic.html index d41b3bf..ab309f4 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.lineTo.basic.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.lineTo.basic.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -28,7 +28,7 @@ ctx.moveTo(0, 25); ctx.lineTo(100, 25); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.lineTo.basic.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.lineTo.basic.worker.js index 7beb8da..f00439ef 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.lineTo.basic.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.lineTo.basic.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -24,7 +24,7 @@ ctx.moveTo(0, 25); ctx.lineTo(100, 25); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.lineTo.ensuresubpath.1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.lineTo.ensuresubpath.1.html index e68e02a..f6b85bc 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.lineTo.ensuresubpath.1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.lineTo.ensuresubpath.1.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -27,7 +27,7 @@ ctx.beginPath(); ctx.lineTo(100, 50); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.lineTo.ensuresubpath.1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.lineTo.ensuresubpath.1.worker.js index d14bda90..908fe2d9 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.lineTo.ensuresubpath.1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.lineTo.ensuresubpath.1.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -23,7 +23,7 @@ ctx.beginPath(); ctx.lineTo(100, 50); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.lineTo.ensuresubpath.2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.lineTo.ensuresubpath.2.html index 9b87e81..8659965 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.lineTo.ensuresubpath.2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.lineTo.ensuresubpath.2.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -28,7 +28,7 @@ ctx.lineTo(0, 25); ctx.lineTo(100, 25); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.lineTo.ensuresubpath.2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.lineTo.ensuresubpath.2.worker.js index fe2b848..878b86d6 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.lineTo.ensuresubpath.2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.lineTo.ensuresubpath.2.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -24,7 +24,7 @@ ctx.lineTo(0, 25); ctx.lineTo(100, 25); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.lineTo.nextpoint.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.lineTo.nextpoint.html index f4da631..7d42c0d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.lineTo.nextpoint.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.lineTo.nextpoint.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -29,7 +29,7 @@ ctx.lineTo(0, 25); ctx.lineTo(100, 25); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.lineTo.nextpoint.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.lineTo.nextpoint.worker.js index 6c80637..258c0fef 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.lineTo.nextpoint.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.lineTo.nextpoint.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -25,7 +25,7 @@ ctx.lineTo(0, 25); ctx.lineTo(100, 25); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.lineTo.nonfinite.details.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.lineTo.nonfinite.details.html index 7562d437..82270be 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.lineTo.nonfinite.details.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.lineTo.nonfinite.details.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); for (var arg1 of [Infinity, -Infinity, NaN]) { var converted = false;
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.lineTo.nonfinite.details.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.lineTo.nonfinite.details.worker.js index 3698e3fe..bf74ee5 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.lineTo.nonfinite.details.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.lineTo.nonfinite.details.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); for (var arg1 of [Infinity, -Infinity, NaN]) { var converted = false;
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.lineTo.nonfinite.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.lineTo.nonfinite.html index 10b89e6f..ff8bda7 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.lineTo.nonfinite.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.lineTo.nonfinite.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.moveTo(0, 0); ctx.lineTo(100, 0); @@ -33,8 +33,8 @@ ctx.lineTo(0, 50); ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 90,45, 0,255,0,255, "90,45", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 90,45, 0,255,0,255, "90,45", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.lineTo.nonfinite.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.lineTo.nonfinite.worker.js index 1a33740..5eaa4f0 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.lineTo.nonfinite.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.lineTo.nonfinite.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.moveTo(0, 0); ctx.lineTo(100, 0); @@ -29,8 +29,8 @@ ctx.lineTo(0, 50); ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 90,45, 0,255,0,255, "90,45", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 90,45, 0,255,0,255, "90,45", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.moveTo.basic.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.moveTo.basic.html index 6a9b74d..7e2a583 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.moveTo.basic.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.moveTo.basic.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -29,7 +29,7 @@ ctx.lineTo(100, 50); ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixel(offscreenCanvas, 90,25, 0,255,0,255, "90,25", "0,255,0,255"); +_assertPixel(canvas, 90,25, 0,255,0,255, "90,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.moveTo.basic.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.moveTo.basic.worker.js index 0e9130c..9cf101f5 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.moveTo.basic.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.moveTo.basic.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -25,7 +25,7 @@ ctx.lineTo(100, 50); ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixel(offscreenCanvas, 90,25, 0,255,0,255, "90,25", "0,255,0,255"); +_assertPixel(canvas, 90,25, 0,255,0,255, "90,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.moveTo.multiple.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.moveTo.multiple.html index c124fc8..cb2c4a4 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.moveTo.multiple.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.moveTo.multiple.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -29,7 +29,7 @@ ctx.strokeStyle = '#0f0'; ctx.lineWidth = 50; ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.moveTo.multiple.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.moveTo.multiple.worker.js index 45dfeb00..2001b2a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.moveTo.multiple.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.moveTo.multiple.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -25,7 +25,7 @@ ctx.strokeStyle = '#0f0'; ctx.lineWidth = 50; ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.moveTo.newsubpath.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.moveTo.newsubpath.html index 019f2a9..c0b170a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.moveTo.newsubpath.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.moveTo.newsubpath.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -29,7 +29,7 @@ ctx.moveTo(0, 50); ctx.fillStyle = '#f00'; ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.moveTo.newsubpath.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.moveTo.newsubpath.worker.js index 743ac51..721cb1a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.moveTo.newsubpath.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.moveTo.newsubpath.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -25,7 +25,7 @@ ctx.moveTo(0, 50); ctx.fillStyle = '#f00'; ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.moveTo.nonfinite.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.moveTo.nonfinite.html index 03c1918..a2dda9e5 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.moveTo.nonfinite.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.moveTo.nonfinite.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.moveTo(0, 0); ctx.lineTo(100, 0); @@ -33,7 +33,7 @@ ctx.lineTo(0, 50); ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.moveTo.nonfinite.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.moveTo.nonfinite.worker.js index 00ed9246..d574e2c1 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.moveTo.nonfinite.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.moveTo.nonfinite.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.moveTo(0, 0); ctx.lineTo(100, 0); @@ -29,7 +29,7 @@ ctx.lineTo(0, 50); ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.basic.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.basic.html index 7ea49b8..777b24ad 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.basic.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.basic.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -28,7 +28,7 @@ ctx.moveTo(0, 25); ctx.quadraticCurveTo(100, 25, 100, 25); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.basic.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.basic.worker.js index f3d147b..d19af37 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.basic.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.basic.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -24,7 +24,7 @@ ctx.moveTo(0, 25); ctx.quadraticCurveTo(100, 25, 100, 25); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.ensuresubpath.1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.ensuresubpath.1.html index a95c670..9cc6adfe 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.ensuresubpath.1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.ensuresubpath.1.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -27,8 +27,8 @@ ctx.beginPath(); ctx.quadraticCurveTo(100, 50, 200, 50); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.ensuresubpath.1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.ensuresubpath.1.worker.js index f7d35b3..6b11985 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.ensuresubpath.1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.ensuresubpath.1.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -23,8 +23,8 @@ ctx.beginPath(); ctx.quadraticCurveTo(100, 50, 200, 50); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.ensuresubpath.2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.ensuresubpath.2.html index 908517a..4ceadbd 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.ensuresubpath.2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.ensuresubpath.2.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,8 +27,8 @@ ctx.beginPath(); ctx.quadraticCurveTo(0, 25, 100, 25); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.ensuresubpath.2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.ensuresubpath.2.worker.js index 4fae7c84..1d31617 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.ensuresubpath.2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.ensuresubpath.2.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,8 +23,8 @@ ctx.beginPath(); ctx.quadraticCurveTo(0, 25, 100, 25); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.nonfinite.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.nonfinite.html index 8802b818..4f32efb4 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.nonfinite.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.nonfinite.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.moveTo(0, 0); ctx.lineTo(100, 0); @@ -49,8 +49,8 @@ ctx.lineTo(0, 50); ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 90,45, 0,255,0,255, "90,45", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 90,45, 0,255,0,255, "90,45", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.nonfinite.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.nonfinite.worker.js index 0a19538..738b735 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.nonfinite.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.nonfinite.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.moveTo(0, 0); ctx.lineTo(100, 0); @@ -45,8 +45,8 @@ ctx.lineTo(0, 50); ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 90,45, 0,255,0,255, "90,45", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 90,45, 0,255,0,255, "90,45", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.scaled.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.scaled.html index 9615f9f..14bff6a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.scaled.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.scaled.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -29,11 +29,11 @@ ctx.moveTo(-1, 1.05); ctx.quadraticCurveTo(0, -1, 1.2, 1.05); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.scaled.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.scaled.worker.js index e28d3d14..48fadcdf 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.scaled.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.scaled.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -25,11 +25,11 @@ ctx.moveTo(-1, 1.05); ctx.quadraticCurveTo(0, -1, 1.2, 1.05); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.shape.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.shape.html index 897f21c..5090ea2 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.shape.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.shape.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -28,11 +28,11 @@ ctx.moveTo(-1000, 1050); ctx.quadraticCurveTo(0, -1000, 1200, 1050); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.shape.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.shape.worker.js index 8270c36..2c22a23 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.shape.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.quadraticCurveTo.shape.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -24,11 +24,11 @@ ctx.moveTo(-1000, 1050); ctx.quadraticCurveTo(0, -1000, 1200, 1050); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.basic.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.basic.html index f0e7b09b..16fb299 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.basic.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.basic.html
@@ -17,15 +17,15 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.fillStyle = '#0f0'; ctx.rect(0, 0, 100, 50); ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.basic.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.basic.worker.js index 5a77b18cd..e547f6d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.basic.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.basic.worker.js
@@ -13,15 +13,15 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.fillStyle = '#0f0'; ctx.rect(0, 0, 100, 50); ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.closed.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.closed.html index d62ecd1..8dd8f181 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.closed.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.closed.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,7 +27,7 @@ ctx.lineJoin = 'miter'; ctx.rect(100, 50, 100, 100); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.closed.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.closed.worker.js index 1590648c..9c6ca9d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.closed.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.closed.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,7 +23,7 @@ ctx.lineJoin = 'miter'; ctx.rect(100, 50, 100, 100); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.end.1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.end.1.html index 905c065e..b3e59bc 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.end.1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.end.1.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,7 +27,7 @@ ctx.rect(200, 100, 400, 1000); ctx.lineTo(-2000, -1000); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.end.1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.end.1.worker.js index c6cc51e..33f5a722 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.end.1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.end.1.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,7 +23,7 @@ ctx.rect(200, 100, 400, 1000); ctx.lineTo(-2000, -1000); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.end.2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.end.2.html index bbe61ee..d58763b 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.end.2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.end.2.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -29,10 +29,10 @@ ctx.rect(150, 150, 2000, 2000); ctx.lineTo(160, 160); ctx.stroke(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.end.2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.end.2.worker.js index 7c80411..7bbe9fed 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.end.2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.end.2.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -25,10 +25,10 @@ ctx.rect(150, 150, 2000, 2000); ctx.lineTo(160, 160); ctx.stroke(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.negative.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.negative.html index bd6f4ea..c707698 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.negative.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.negative.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -29,10 +29,10 @@ ctx.rect(0, 50, 50, -25); ctx.rect(100, 50, -50, -25); ctx.fill(); -_assertPixel(offscreenCanvas, 25,12, 0,255,0,255, "25,12", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,12, 0,255,0,255, "75,12", "0,255,0,255"); -_assertPixel(offscreenCanvas, 25,37, 0,255,0,255, "25,37", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,37, 0,255,0,255, "75,37", "0,255,0,255"); +_assertPixel(canvas, 25,12, 0,255,0,255, "25,12", "0,255,0,255"); +_assertPixel(canvas, 75,12, 0,255,0,255, "75,12", "0,255,0,255"); +_assertPixel(canvas, 25,37, 0,255,0,255, "25,37", "0,255,0,255"); +_assertPixel(canvas, 75,37, 0,255,0,255, "75,37", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.negative.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.negative.worker.js index fda6d7e9..f844c97 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.negative.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.negative.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -25,10 +25,10 @@ ctx.rect(0, 50, 50, -25); ctx.rect(100, 50, -50, -25); ctx.fill(); -_assertPixel(offscreenCanvas, 25,12, 0,255,0,255, "25,12", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,12, 0,255,0,255, "75,12", "0,255,0,255"); -_assertPixel(offscreenCanvas, 25,37, 0,255,0,255, "25,37", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,37, 0,255,0,255, "75,37", "0,255,0,255"); +_assertPixel(canvas, 25,12, 0,255,0,255, "25,12", "0,255,0,255"); +_assertPixel(canvas, 75,12, 0,255,0,255, "75,12", "0,255,0,255"); +_assertPixel(canvas, 25,37, 0,255,0,255, "25,37", "0,255,0,255"); +_assertPixel(canvas, 75,37, 0,255,0,255, "75,37", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.newsubpath.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.newsubpath.html index a4c3752..cbd9c58 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.newsubpath.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.newsubpath.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -29,7 +29,7 @@ ctx.lineTo(-50, 25); ctx.rect(200, 25, 1, 1); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.newsubpath.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.newsubpath.worker.js index cf56bf2..d5ad0d1f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.newsubpath.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.newsubpath.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -25,7 +25,7 @@ ctx.lineTo(-50, 25); ctx.rect(200, 25, 1, 1); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.nonfinite.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.nonfinite.html index 320da07da..68931af37 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.nonfinite.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.nonfinite.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.moveTo(0, 0); ctx.lineTo(100, 0); @@ -49,8 +49,8 @@ ctx.lineTo(0, 50); ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 90,45, 0,255,0,255, "90,45", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 90,45, 0,255,0,255, "90,45", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.nonfinite.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.nonfinite.worker.js index 14a8e34d..9095b9e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.nonfinite.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.nonfinite.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.moveTo(0, 0); ctx.lineTo(100, 0); @@ -45,8 +45,8 @@ ctx.lineTo(0, 50); ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 90,45, 0,255,0,255, "90,45", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 90,45, 0,255,0,255, "90,45", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.selfintersect.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.selfintersect.html index e8cc646..6e4fb68 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.selfintersect.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.selfintersect.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,7 +27,7 @@ ctx.beginPath(); ctx.rect(45, 20, 10, 10); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.selfintersect.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.selfintersect.worker.js index efe54a0..85ec849 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.selfintersect.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.selfintersect.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,7 +23,7 @@ ctx.beginPath(); ctx.rect(45, 20, 10, 10); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.winding.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.winding.html index 3126699..15500294 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.winding.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.winding.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -29,10 +29,10 @@ ctx.rect(0, 25, 100, -25); ctx.rect(100, 25, -100, 25); ctx.fill(); -_assertPixel(offscreenCanvas, 25,12, 0,255,0,255, "25,12", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,12, 0,255,0,255, "75,12", "0,255,0,255"); -_assertPixel(offscreenCanvas, 25,37, 0,255,0,255, "25,37", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,37, 0,255,0,255, "75,37", "0,255,0,255"); +_assertPixel(canvas, 25,12, 0,255,0,255, "25,12", "0,255,0,255"); +_assertPixel(canvas, 75,12, 0,255,0,255, "75,12", "0,255,0,255"); +_assertPixel(canvas, 25,37, 0,255,0,255, "25,37", "0,255,0,255"); +_assertPixel(canvas, 75,37, 0,255,0,255, "75,37", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.winding.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.winding.worker.js index e4ae725..d406db9 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.winding.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.winding.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -25,10 +25,10 @@ ctx.rect(0, 25, 100, -25); ctx.rect(100, 25, -100, 25); ctx.fill(); -_assertPixel(offscreenCanvas, 25,12, 0,255,0,255, "25,12", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,12, 0,255,0,255, "75,12", "0,255,0,255"); -_assertPixel(offscreenCanvas, 25,37, 0,255,0,255, "25,37", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,37, 0,255,0,255, "75,37", "0,255,0,255"); +_assertPixel(canvas, 25,12, 0,255,0,255, "25,12", "0,255,0,255"); +_assertPixel(canvas, 75,12, 0,255,0,255, "75,12", "0,255,0,255"); +_assertPixel(canvas, 25,37, 0,255,0,255, "25,37", "0,255,0,255"); +_assertPixel(canvas, 75,37, 0,255,0,255, "75,37", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.zero.1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.zero.1.html index 61d71cb..f2772ccd 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.zero.1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.zero.1.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,7 +27,7 @@ ctx.beginPath(); ctx.rect(0, 50, 100, 0); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.zero.1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.zero.1.worker.js index 90a33a4d..33d2be8 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.zero.1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.zero.1.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,7 +23,7 @@ ctx.beginPath(); ctx.rect(0, 50, 100, 0); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.zero.2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.zero.2.html index d180462..8abca94 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.zero.2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.zero.2.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,7 +27,7 @@ ctx.beginPath(); ctx.rect(50, -100, 0, 250); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.zero.2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.zero.2.worker.js index d3644ad..7c580da 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.zero.2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.zero.2.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,7 +23,7 @@ ctx.beginPath(); ctx.rect(50, -100, 0, 250); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.zero.3.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.zero.3.html index 67692821..c0af2d3 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.zero.3.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.zero.3.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -27,7 +27,7 @@ ctx.beginPath(); ctx.rect(50, 25, 0, 0); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.zero.3.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.zero.3.worker.js index c711407..e6b7da7 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.zero.3.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.zero.3.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -23,7 +23,7 @@ ctx.beginPath(); ctx.rect(50, 25, 0, 0); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.zero.4.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.zero.4.html index bab1b87..fd40e788 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.zero.4.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.zero.4.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,7 +27,7 @@ ctx.rect(100, 25, 0, 0); ctx.lineTo(0, 25); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.zero.4.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.zero.4.worker.js index d73300f..c8cb1e2 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.zero.4.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.zero.4.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,7 +23,7 @@ ctx.rect(100, 25, 0, 0); ctx.lineTo(0, 25); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.zero.5.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.zero.5.html index 0027d8f..d58b09dc 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.zero.5.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.zero.5.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -27,7 +27,7 @@ ctx.moveTo(0, 0); ctx.rect(100, 25, 0, 0); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.zero.5.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.zero.5.worker.js index 9b3e394..77bd33c1 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.zero.5.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.zero.5.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -23,7 +23,7 @@ ctx.moveTo(0, 0); ctx.rect(100, 25, 0, 0); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.zero.6.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.zero.6.html index c54d7d9..7828d138 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.zero.6.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.zero.6.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -29,7 +29,7 @@ ctx.beginPath(); ctx.rect(100, 25, 1000, 0); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.zero.6.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.zero.6.worker.js index 66c29c0..93e41f58 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.zero.6.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.rect.zero.6.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -25,7 +25,7 @@ ctx.beginPath(); ctx.rect(100, 25, 1000, 0); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.dompoint.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.dompoint.html index d403898..d6b2aff 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.dompoint.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.dompoint.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,28 +27,28 @@ ctx.fill(); // top-left corner -_assertPixel(offscreenCanvas, 20,1, 255,0,0,255, "20,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 41,1, 0,255,0,255, "41,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,10, 255,0,0,255, "1,10", "255,0,0,255"); -_assertPixel(offscreenCanvas, 1,21, 0,255,0,255, "1,21", "0,255,0,255"); +_assertPixel(canvas, 20,1, 255,0,0,255, "20,1", "255,0,0,255"); +_assertPixel(canvas, 41,1, 0,255,0,255, "41,1", "0,255,0,255"); +_assertPixel(canvas, 1,10, 255,0,0,255, "1,10", "255,0,0,255"); +_assertPixel(canvas, 1,21, 0,255,0,255, "1,21", "0,255,0,255"); // top-right corner -_assertPixel(offscreenCanvas, 79,1, 255,0,0,255, "79,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 58,1, 0,255,0,255, "58,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,10, 255,0,0,255, "98,10", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,21, 0,255,0,255, "98,21", "0,255,0,255"); +_assertPixel(canvas, 79,1, 255,0,0,255, "79,1", "255,0,0,255"); +_assertPixel(canvas, 58,1, 0,255,0,255, "58,1", "0,255,0,255"); +_assertPixel(canvas, 98,10, 255,0,0,255, "98,10", "255,0,0,255"); +_assertPixel(canvas, 98,21, 0,255,0,255, "98,21", "0,255,0,255"); // bottom-right corner -_assertPixel(offscreenCanvas, 79,48, 255,0,0,255, "79,48", "255,0,0,255"); -_assertPixel(offscreenCanvas, 58,48, 0,255,0,255, "58,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,39, 255,0,0,255, "98,39", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,28, 0,255,0,255, "98,28", "0,255,0,255"); +_assertPixel(canvas, 79,48, 255,0,0,255, "79,48", "255,0,0,255"); +_assertPixel(canvas, 58,48, 0,255,0,255, "58,48", "0,255,0,255"); +_assertPixel(canvas, 98,39, 255,0,0,255, "98,39", "255,0,0,255"); +_assertPixel(canvas, 98,28, 0,255,0,255, "98,28", "0,255,0,255"); // bottom-left corner -_assertPixel(offscreenCanvas, 20,48, 255,0,0,255, "20,48", "255,0,0,255"); -_assertPixel(offscreenCanvas, 41,48, 0,255,0,255, "41,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,39, 255,0,0,255, "1,39", "255,0,0,255"); -_assertPixel(offscreenCanvas, 1,28, 0,255,0,255, "1,28", "0,255,0,255"); +_assertPixel(canvas, 20,48, 255,0,0,255, "20,48", "255,0,0,255"); +_assertPixel(canvas, 41,48, 0,255,0,255, "41,48", "0,255,0,255"); +_assertPixel(canvas, 1,39, 255,0,0,255, "1,39", "255,0,0,255"); +_assertPixel(canvas, 1,28, 0,255,0,255, "1,28", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.dompoint.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.dompoint.worker.js index eec2dfd..224f4d6 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.dompoint.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.dompoint.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,28 +23,28 @@ ctx.fill(); // top-left corner -_assertPixel(offscreenCanvas, 20,1, 255,0,0,255, "20,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 41,1, 0,255,0,255, "41,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,10, 255,0,0,255, "1,10", "255,0,0,255"); -_assertPixel(offscreenCanvas, 1,21, 0,255,0,255, "1,21", "0,255,0,255"); +_assertPixel(canvas, 20,1, 255,0,0,255, "20,1", "255,0,0,255"); +_assertPixel(canvas, 41,1, 0,255,0,255, "41,1", "0,255,0,255"); +_assertPixel(canvas, 1,10, 255,0,0,255, "1,10", "255,0,0,255"); +_assertPixel(canvas, 1,21, 0,255,0,255, "1,21", "0,255,0,255"); // top-right corner -_assertPixel(offscreenCanvas, 79,1, 255,0,0,255, "79,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 58,1, 0,255,0,255, "58,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,10, 255,0,0,255, "98,10", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,21, 0,255,0,255, "98,21", "0,255,0,255"); +_assertPixel(canvas, 79,1, 255,0,0,255, "79,1", "255,0,0,255"); +_assertPixel(canvas, 58,1, 0,255,0,255, "58,1", "0,255,0,255"); +_assertPixel(canvas, 98,10, 255,0,0,255, "98,10", "255,0,0,255"); +_assertPixel(canvas, 98,21, 0,255,0,255, "98,21", "0,255,0,255"); // bottom-right corner -_assertPixel(offscreenCanvas, 79,48, 255,0,0,255, "79,48", "255,0,0,255"); -_assertPixel(offscreenCanvas, 58,48, 0,255,0,255, "58,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,39, 255,0,0,255, "98,39", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,28, 0,255,0,255, "98,28", "0,255,0,255"); +_assertPixel(canvas, 79,48, 255,0,0,255, "79,48", "255,0,0,255"); +_assertPixel(canvas, 58,48, 0,255,0,255, "58,48", "0,255,0,255"); +_assertPixel(canvas, 98,39, 255,0,0,255, "98,39", "255,0,0,255"); +_assertPixel(canvas, 98,28, 0,255,0,255, "98,28", "0,255,0,255"); // bottom-left corner -_assertPixel(offscreenCanvas, 20,48, 255,0,0,255, "20,48", "255,0,0,255"); -_assertPixel(offscreenCanvas, 41,48, 0,255,0,255, "41,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,39, 255,0,0,255, "1,39", "255,0,0,255"); -_assertPixel(offscreenCanvas, 1,28, 0,255,0,255, "1,28", "0,255,0,255"); +_assertPixel(canvas, 20,48, 255,0,0,255, "20,48", "255,0,0,255"); +_assertPixel(canvas, 41,48, 0,255,0,255, "41,48", "0,255,0,255"); +_assertPixel(canvas, 1,39, 255,0,0,255, "1,39", "255,0,0,255"); +_assertPixel(canvas, 1,28, 0,255,0,255, "1,28", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.dompointinit.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.dompointinit.html index 0bf3370..f13e6dd4 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.dompointinit.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.dompointinit.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,28 +27,28 @@ ctx.fill(); // top-left corner -_assertPixel(offscreenCanvas, 20,1, 255,0,0,255, "20,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 41,1, 0,255,0,255, "41,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,10, 255,0,0,255, "1,10", "255,0,0,255"); -_assertPixel(offscreenCanvas, 1,21, 0,255,0,255, "1,21", "0,255,0,255"); +_assertPixel(canvas, 20,1, 255,0,0,255, "20,1", "255,0,0,255"); +_assertPixel(canvas, 41,1, 0,255,0,255, "41,1", "0,255,0,255"); +_assertPixel(canvas, 1,10, 255,0,0,255, "1,10", "255,0,0,255"); +_assertPixel(canvas, 1,21, 0,255,0,255, "1,21", "0,255,0,255"); // top-right corner -_assertPixel(offscreenCanvas, 79,1, 255,0,0,255, "79,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 58,1, 0,255,0,255, "58,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,10, 255,0,0,255, "98,10", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,21, 0,255,0,255, "98,21", "0,255,0,255"); +_assertPixel(canvas, 79,1, 255,0,0,255, "79,1", "255,0,0,255"); +_assertPixel(canvas, 58,1, 0,255,0,255, "58,1", "0,255,0,255"); +_assertPixel(canvas, 98,10, 255,0,0,255, "98,10", "255,0,0,255"); +_assertPixel(canvas, 98,21, 0,255,0,255, "98,21", "0,255,0,255"); // bottom-right corner -_assertPixel(offscreenCanvas, 79,48, 255,0,0,255, "79,48", "255,0,0,255"); -_assertPixel(offscreenCanvas, 58,48, 0,255,0,255, "58,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,39, 255,0,0,255, "98,39", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,28, 0,255,0,255, "98,28", "0,255,0,255"); +_assertPixel(canvas, 79,48, 255,0,0,255, "79,48", "255,0,0,255"); +_assertPixel(canvas, 58,48, 0,255,0,255, "58,48", "0,255,0,255"); +_assertPixel(canvas, 98,39, 255,0,0,255, "98,39", "255,0,0,255"); +_assertPixel(canvas, 98,28, 0,255,0,255, "98,28", "0,255,0,255"); // bottom-left corner -_assertPixel(offscreenCanvas, 20,48, 255,0,0,255, "20,48", "255,0,0,255"); -_assertPixel(offscreenCanvas, 41,48, 0,255,0,255, "41,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,39, 255,0,0,255, "1,39", "255,0,0,255"); -_assertPixel(offscreenCanvas, 1,28, 0,255,0,255, "1,28", "0,255,0,255"); +_assertPixel(canvas, 20,48, 255,0,0,255, "20,48", "255,0,0,255"); +_assertPixel(canvas, 41,48, 0,255,0,255, "41,48", "0,255,0,255"); +_assertPixel(canvas, 1,39, 255,0,0,255, "1,39", "255,0,0,255"); +_assertPixel(canvas, 1,28, 0,255,0,255, "1,28", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.dompointinit.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.dompointinit.worker.js index ec0580b..7b3d4cb 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.dompointinit.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.dompointinit.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,28 +23,28 @@ ctx.fill(); // top-left corner -_assertPixel(offscreenCanvas, 20,1, 255,0,0,255, "20,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 41,1, 0,255,0,255, "41,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,10, 255,0,0,255, "1,10", "255,0,0,255"); -_assertPixel(offscreenCanvas, 1,21, 0,255,0,255, "1,21", "0,255,0,255"); +_assertPixel(canvas, 20,1, 255,0,0,255, "20,1", "255,0,0,255"); +_assertPixel(canvas, 41,1, 0,255,0,255, "41,1", "0,255,0,255"); +_assertPixel(canvas, 1,10, 255,0,0,255, "1,10", "255,0,0,255"); +_assertPixel(canvas, 1,21, 0,255,0,255, "1,21", "0,255,0,255"); // top-right corner -_assertPixel(offscreenCanvas, 79,1, 255,0,0,255, "79,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 58,1, 0,255,0,255, "58,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,10, 255,0,0,255, "98,10", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,21, 0,255,0,255, "98,21", "0,255,0,255"); +_assertPixel(canvas, 79,1, 255,0,0,255, "79,1", "255,0,0,255"); +_assertPixel(canvas, 58,1, 0,255,0,255, "58,1", "0,255,0,255"); +_assertPixel(canvas, 98,10, 255,0,0,255, "98,10", "255,0,0,255"); +_assertPixel(canvas, 98,21, 0,255,0,255, "98,21", "0,255,0,255"); // bottom-right corner -_assertPixel(offscreenCanvas, 79,48, 255,0,0,255, "79,48", "255,0,0,255"); -_assertPixel(offscreenCanvas, 58,48, 0,255,0,255, "58,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,39, 255,0,0,255, "98,39", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,28, 0,255,0,255, "98,28", "0,255,0,255"); +_assertPixel(canvas, 79,48, 255,0,0,255, "79,48", "255,0,0,255"); +_assertPixel(canvas, 58,48, 0,255,0,255, "58,48", "0,255,0,255"); +_assertPixel(canvas, 98,39, 255,0,0,255, "98,39", "255,0,0,255"); +_assertPixel(canvas, 98,28, 0,255,0,255, "98,28", "0,255,0,255"); // bottom-left corner -_assertPixel(offscreenCanvas, 20,48, 255,0,0,255, "20,48", "255,0,0,255"); -_assertPixel(offscreenCanvas, 41,48, 0,255,0,255, "41,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,39, 255,0,0,255, "1,39", "255,0,0,255"); -_assertPixel(offscreenCanvas, 1,28, 0,255,0,255, "1,28", "0,255,0,255"); +_assertPixel(canvas, 20,48, 255,0,0,255, "20,48", "255,0,0,255"); +_assertPixel(canvas, 41,48, 0,255,0,255, "41,48", "0,255,0,255"); +_assertPixel(canvas, 1,39, 255,0,0,255, "1,39", "255,0,0,255"); +_assertPixel(canvas, 1,28, 0,255,0,255, "1,28", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.double.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.double.html index bfc15e7a..4eef53ca 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.double.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.double.html
@@ -17,18 +17,18 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.roundRect(0, 0, 100, 50, [20]); ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixel(offscreenCanvas, 1,1, 255,0,0,255, "1,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,1, 255,0,0,255, "98,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,48, 255,0,0,255, "98,48", "255,0,0,255"); -_assertPixel(offscreenCanvas, 1,48, 255,0,0,255, "1,48", "255,0,0,255"); +_assertPixel(canvas, 1,1, 255,0,0,255, "1,1", "255,0,0,255"); +_assertPixel(canvas, 98,1, 255,0,0,255, "98,1", "255,0,0,255"); +_assertPixel(canvas, 98,48, 255,0,0,255, "98,48", "255,0,0,255"); +_assertPixel(canvas, 1,48, 255,0,0,255, "1,48", "255,0,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.double.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.double.worker.js index 573e4c75f..f637778d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.double.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.1.radius.double.worker.js
@@ -13,18 +13,18 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.roundRect(0, 0, 100, 50, [20]); ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixel(offscreenCanvas, 1,1, 255,0,0,255, "1,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,1, 255,0,0,255, "98,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,48, 255,0,0,255, "98,48", "255,0,0,255"); -_assertPixel(offscreenCanvas, 1,48, 255,0,0,255, "1,48", "255,0,0,255"); +_assertPixel(canvas, 1,1, 255,0,0,255, "1,1", "255,0,0,255"); +_assertPixel(canvas, 98,1, 255,0,0,255, "98,1", "255,0,0,255"); +_assertPixel(canvas, 98,48, 255,0,0,255, "98,48", "255,0,0,255"); +_assertPixel(canvas, 1,48, 255,0,0,255, "1,48", "255,0,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.1.dompoint.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.1.dompoint.html index ea3028d8..722d1120 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.1.dompoint.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.1.dompoint.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,20 +27,20 @@ ctx.fill(); // top-left corner -_assertPixel(offscreenCanvas, 20,1, 255,0,0,255, "20,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 41,1, 0,255,0,255, "41,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,10, 255,0,0,255, "1,10", "255,0,0,255"); -_assertPixel(offscreenCanvas, 1,21, 0,255,0,255, "1,21", "0,255,0,255"); +_assertPixel(canvas, 20,1, 255,0,0,255, "20,1", "255,0,0,255"); +_assertPixel(canvas, 41,1, 0,255,0,255, "41,1", "0,255,0,255"); +_assertPixel(canvas, 1,10, 255,0,0,255, "1,10", "255,0,0,255"); +_assertPixel(canvas, 1,21, 0,255,0,255, "1,21", "0,255,0,255"); // bottom-right corner -_assertPixel(offscreenCanvas, 79,48, 255,0,0,255, "79,48", "255,0,0,255"); -_assertPixel(offscreenCanvas, 58,48, 0,255,0,255, "58,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,39, 255,0,0,255, "98,39", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,28, 0,255,0,255, "98,28", "0,255,0,255"); +_assertPixel(canvas, 79,48, 255,0,0,255, "79,48", "255,0,0,255"); +_assertPixel(canvas, 58,48, 0,255,0,255, "58,48", "0,255,0,255"); +_assertPixel(canvas, 98,39, 255,0,0,255, "98,39", "255,0,0,255"); +_assertPixel(canvas, 98,28, 0,255,0,255, "98,28", "0,255,0,255"); // other corners -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.1.dompoint.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.1.dompoint.worker.js index 64d7c4ab..1324fd1a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.1.dompoint.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.1.dompoint.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,20 +23,20 @@ ctx.fill(); // top-left corner -_assertPixel(offscreenCanvas, 20,1, 255,0,0,255, "20,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 41,1, 0,255,0,255, "41,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,10, 255,0,0,255, "1,10", "255,0,0,255"); -_assertPixel(offscreenCanvas, 1,21, 0,255,0,255, "1,21", "0,255,0,255"); +_assertPixel(canvas, 20,1, 255,0,0,255, "20,1", "255,0,0,255"); +_assertPixel(canvas, 41,1, 0,255,0,255, "41,1", "0,255,0,255"); +_assertPixel(canvas, 1,10, 255,0,0,255, "1,10", "255,0,0,255"); +_assertPixel(canvas, 1,21, 0,255,0,255, "1,21", "0,255,0,255"); // bottom-right corner -_assertPixel(offscreenCanvas, 79,48, 255,0,0,255, "79,48", "255,0,0,255"); -_assertPixel(offscreenCanvas, 58,48, 0,255,0,255, "58,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,39, 255,0,0,255, "98,39", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,28, 0,255,0,255, "98,28", "0,255,0,255"); +_assertPixel(canvas, 79,48, 255,0,0,255, "79,48", "255,0,0,255"); +_assertPixel(canvas, 58,48, 0,255,0,255, "58,48", "0,255,0,255"); +_assertPixel(canvas, 98,39, 255,0,0,255, "98,39", "255,0,0,255"); +_assertPixel(canvas, 98,28, 0,255,0,255, "98,28", "0,255,0,255"); // other corners -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.1.dompointinit.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.1.dompointinit.html index dbaac00..8338c9a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.1.dompointinit.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.1.dompointinit.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,20 +27,20 @@ ctx.fill(); // top-left corner -_assertPixel(offscreenCanvas, 20,1, 255,0,0,255, "20,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 41,1, 0,255,0,255, "41,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,10, 255,0,0,255, "1,10", "255,0,0,255"); -_assertPixel(offscreenCanvas, 1,21, 0,255,0,255, "1,21", "0,255,0,255"); +_assertPixel(canvas, 20,1, 255,0,0,255, "20,1", "255,0,0,255"); +_assertPixel(canvas, 41,1, 0,255,0,255, "41,1", "0,255,0,255"); +_assertPixel(canvas, 1,10, 255,0,0,255, "1,10", "255,0,0,255"); +_assertPixel(canvas, 1,21, 0,255,0,255, "1,21", "0,255,0,255"); // bottom-right corner -_assertPixel(offscreenCanvas, 79,48, 255,0,0,255, "79,48", "255,0,0,255"); -_assertPixel(offscreenCanvas, 58,48, 0,255,0,255, "58,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,39, 255,0,0,255, "98,39", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,28, 0,255,0,255, "98,28", "0,255,0,255"); +_assertPixel(canvas, 79,48, 255,0,0,255, "79,48", "255,0,0,255"); +_assertPixel(canvas, 58,48, 0,255,0,255, "58,48", "0,255,0,255"); +_assertPixel(canvas, 98,39, 255,0,0,255, "98,39", "255,0,0,255"); +_assertPixel(canvas, 98,28, 0,255,0,255, "98,28", "0,255,0,255"); // other corners -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.1.dompointinit.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.1.dompointinit.worker.js index f9d11df..4e91ac09 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.1.dompointinit.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.1.dompointinit.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,20 +23,20 @@ ctx.fill(); // top-left corner -_assertPixel(offscreenCanvas, 20,1, 255,0,0,255, "20,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 41,1, 0,255,0,255, "41,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,10, 255,0,0,255, "1,10", "255,0,0,255"); -_assertPixel(offscreenCanvas, 1,21, 0,255,0,255, "1,21", "0,255,0,255"); +_assertPixel(canvas, 20,1, 255,0,0,255, "20,1", "255,0,0,255"); +_assertPixel(canvas, 41,1, 0,255,0,255, "41,1", "0,255,0,255"); +_assertPixel(canvas, 1,10, 255,0,0,255, "1,10", "255,0,0,255"); +_assertPixel(canvas, 1,21, 0,255,0,255, "1,21", "0,255,0,255"); // bottom-right corner -_assertPixel(offscreenCanvas, 79,48, 255,0,0,255, "79,48", "255,0,0,255"); -_assertPixel(offscreenCanvas, 58,48, 0,255,0,255, "58,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,39, 255,0,0,255, "98,39", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,28, 0,255,0,255, "98,28", "0,255,0,255"); +_assertPixel(canvas, 79,48, 255,0,0,255, "79,48", "255,0,0,255"); +_assertPixel(canvas, 58,48, 0,255,0,255, "58,48", "0,255,0,255"); +_assertPixel(canvas, 98,39, 255,0,0,255, "98,39", "255,0,0,255"); +_assertPixel(canvas, 98,28, 0,255,0,255, "98,28", "0,255,0,255"); // other corners -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.1.double.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.1.double.html index f359b3d..a864fbd1 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.1.double.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.1.double.html
@@ -17,18 +17,18 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.roundRect(0, 0, 100, 50, [20, 0]); ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixel(offscreenCanvas, 1,1, 255,0,0,255, "1,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 255,0,0,255, "98,48", "255,0,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 255,0,0,255, "1,1", "255,0,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 98,48, 255,0,0,255, "98,48", "255,0,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.1.double.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.1.double.worker.js index ba999f8..553c107 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.1.double.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.1.double.worker.js
@@ -13,18 +13,18 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.roundRect(0, 0, 100, 50, [20, 0]); ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixel(offscreenCanvas, 1,1, 255,0,0,255, "1,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 255,0,0,255, "98,48", "255,0,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 255,0,0,255, "1,1", "255,0,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 98,48, 255,0,0,255, "98,48", "255,0,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.2.dompoint.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.2.dompoint.html index 2a9175ae..b815596 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.2.dompoint.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.2.dompoint.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,20 +27,20 @@ ctx.fill(); // top-right corner -_assertPixel(offscreenCanvas, 79,1, 255,0,0,255, "79,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 58,1, 0,255,0,255, "58,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,10, 255,0,0,255, "98,10", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,21, 0,255,0,255, "98,21", "0,255,0,255"); +_assertPixel(canvas, 79,1, 255,0,0,255, "79,1", "255,0,0,255"); +_assertPixel(canvas, 58,1, 0,255,0,255, "58,1", "0,255,0,255"); +_assertPixel(canvas, 98,10, 255,0,0,255, "98,10", "255,0,0,255"); +_assertPixel(canvas, 98,21, 0,255,0,255, "98,21", "0,255,0,255"); // bottom-left corner -_assertPixel(offscreenCanvas, 20,48, 255,0,0,255, "20,48", "255,0,0,255"); -_assertPixel(offscreenCanvas, 41,48, 0,255,0,255, "41,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,39, 255,0,0,255, "1,39", "255,0,0,255"); -_assertPixel(offscreenCanvas, 1,28, 0,255,0,255, "1,28", "0,255,0,255"); +_assertPixel(canvas, 20,48, 255,0,0,255, "20,48", "255,0,0,255"); +_assertPixel(canvas, 41,48, 0,255,0,255, "41,48", "0,255,0,255"); +_assertPixel(canvas, 1,39, 255,0,0,255, "1,39", "255,0,0,255"); +_assertPixel(canvas, 1,28, 0,255,0,255, "1,28", "0,255,0,255"); // other corners -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.2.dompoint.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.2.dompoint.worker.js index 05e91c7..d753a2b 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.2.dompoint.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.2.dompoint.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,20 +23,20 @@ ctx.fill(); // top-right corner -_assertPixel(offscreenCanvas, 79,1, 255,0,0,255, "79,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 58,1, 0,255,0,255, "58,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,10, 255,0,0,255, "98,10", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,21, 0,255,0,255, "98,21", "0,255,0,255"); +_assertPixel(canvas, 79,1, 255,0,0,255, "79,1", "255,0,0,255"); +_assertPixel(canvas, 58,1, 0,255,0,255, "58,1", "0,255,0,255"); +_assertPixel(canvas, 98,10, 255,0,0,255, "98,10", "255,0,0,255"); +_assertPixel(canvas, 98,21, 0,255,0,255, "98,21", "0,255,0,255"); // bottom-left corner -_assertPixel(offscreenCanvas, 20,48, 255,0,0,255, "20,48", "255,0,0,255"); -_assertPixel(offscreenCanvas, 41,48, 0,255,0,255, "41,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,39, 255,0,0,255, "1,39", "255,0,0,255"); -_assertPixel(offscreenCanvas, 1,28, 0,255,0,255, "1,28", "0,255,0,255"); +_assertPixel(canvas, 20,48, 255,0,0,255, "20,48", "255,0,0,255"); +_assertPixel(canvas, 41,48, 0,255,0,255, "41,48", "0,255,0,255"); +_assertPixel(canvas, 1,39, 255,0,0,255, "1,39", "255,0,0,255"); +_assertPixel(canvas, 1,28, 0,255,0,255, "1,28", "0,255,0,255"); // other corners -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.2.dompointinit.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.2.dompointinit.html index eb782c13..9e2e268 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.2.dompointinit.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.2.dompointinit.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,20 +27,20 @@ ctx.fill(); // top-right corner -_assertPixel(offscreenCanvas, 79,1, 255,0,0,255, "79,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 58,1, 0,255,0,255, "58,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,10, 255,0,0,255, "98,10", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,21, 0,255,0,255, "98,21", "0,255,0,255"); +_assertPixel(canvas, 79,1, 255,0,0,255, "79,1", "255,0,0,255"); +_assertPixel(canvas, 58,1, 0,255,0,255, "58,1", "0,255,0,255"); +_assertPixel(canvas, 98,10, 255,0,0,255, "98,10", "255,0,0,255"); +_assertPixel(canvas, 98,21, 0,255,0,255, "98,21", "0,255,0,255"); // bottom-left corner -_assertPixel(offscreenCanvas, 20,48, 255,0,0,255, "20,48", "255,0,0,255"); -_assertPixel(offscreenCanvas, 41,48, 0,255,0,255, "41,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,39, 255,0,0,255, "1,39", "255,0,0,255"); -_assertPixel(offscreenCanvas, 1,28, 0,255,0,255, "1,28", "0,255,0,255"); +_assertPixel(canvas, 20,48, 255,0,0,255, "20,48", "255,0,0,255"); +_assertPixel(canvas, 41,48, 0,255,0,255, "41,48", "0,255,0,255"); +_assertPixel(canvas, 1,39, 255,0,0,255, "1,39", "255,0,0,255"); +_assertPixel(canvas, 1,28, 0,255,0,255, "1,28", "0,255,0,255"); // other corners -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.2.dompointinit.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.2.dompointinit.worker.js index 5285968..824d6d4 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.2.dompointinit.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.2.dompointinit.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,20 +23,20 @@ ctx.fill(); // top-right corner -_assertPixel(offscreenCanvas, 79,1, 255,0,0,255, "79,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 58,1, 0,255,0,255, "58,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,10, 255,0,0,255, "98,10", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,21, 0,255,0,255, "98,21", "0,255,0,255"); +_assertPixel(canvas, 79,1, 255,0,0,255, "79,1", "255,0,0,255"); +_assertPixel(canvas, 58,1, 0,255,0,255, "58,1", "0,255,0,255"); +_assertPixel(canvas, 98,10, 255,0,0,255, "98,10", "255,0,0,255"); +_assertPixel(canvas, 98,21, 0,255,0,255, "98,21", "0,255,0,255"); // bottom-left corner -_assertPixel(offscreenCanvas, 20,48, 255,0,0,255, "20,48", "255,0,0,255"); -_assertPixel(offscreenCanvas, 41,48, 0,255,0,255, "41,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,39, 255,0,0,255, "1,39", "255,0,0,255"); -_assertPixel(offscreenCanvas, 1,28, 0,255,0,255, "1,28", "0,255,0,255"); +_assertPixel(canvas, 20,48, 255,0,0,255, "20,48", "255,0,0,255"); +_assertPixel(canvas, 41,48, 0,255,0,255, "41,48", "0,255,0,255"); +_assertPixel(canvas, 1,39, 255,0,0,255, "1,39", "255,0,0,255"); +_assertPixel(canvas, 1,28, 0,255,0,255, "1,28", "0,255,0,255"); // other corners -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.2.double.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.2.double.html index 50cf0c6..481833b 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.2.double.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.2.double.html
@@ -17,18 +17,18 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.roundRect(0, 0, 100, 50, [0, 20]); ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 255,0,0,255, "98,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 255,0,0,255, "1,48", "255,0,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 255,0,0,255, "98,1", "255,0,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,48, 255,0,0,255, "1,48", "255,0,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.2.double.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.2.double.worker.js index d41ac26..ab65f619f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.2.double.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.2.radii.2.double.worker.js
@@ -13,18 +13,18 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.roundRect(0, 0, 100, 50, [0, 20]); ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 255,0,0,255, "98,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 255,0,0,255, "1,48", "255,0,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 255,0,0,255, "98,1", "255,0,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,48, 255,0,0,255, "1,48", "255,0,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.1.dompoint.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.1.dompoint.html index 0351500..0f1b60f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.1.dompoint.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.1.dompoint.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,15 +27,15 @@ ctx.fill(); // top-left corner -_assertPixel(offscreenCanvas, 20,1, 255,0,0,255, "20,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 41,1, 0,255,0,255, "41,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,10, 255,0,0,255, "1,10", "255,0,0,255"); -_assertPixel(offscreenCanvas, 1,21, 0,255,0,255, "1,21", "0,255,0,255"); +_assertPixel(canvas, 20,1, 255,0,0,255, "20,1", "255,0,0,255"); +_assertPixel(canvas, 41,1, 0,255,0,255, "41,1", "0,255,0,255"); +_assertPixel(canvas, 1,10, 255,0,0,255, "1,10", "255,0,0,255"); +_assertPixel(canvas, 1,21, 0,255,0,255, "1,21", "0,255,0,255"); // other corners -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.1.dompoint.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.1.dompoint.worker.js index a8d4a6c0..c16a781 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.1.dompoint.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.1.dompoint.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,15 +23,15 @@ ctx.fill(); // top-left corner -_assertPixel(offscreenCanvas, 20,1, 255,0,0,255, "20,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 41,1, 0,255,0,255, "41,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,10, 255,0,0,255, "1,10", "255,0,0,255"); -_assertPixel(offscreenCanvas, 1,21, 0,255,0,255, "1,21", "0,255,0,255"); +_assertPixel(canvas, 20,1, 255,0,0,255, "20,1", "255,0,0,255"); +_assertPixel(canvas, 41,1, 0,255,0,255, "41,1", "0,255,0,255"); +_assertPixel(canvas, 1,10, 255,0,0,255, "1,10", "255,0,0,255"); +_assertPixel(canvas, 1,21, 0,255,0,255, "1,21", "0,255,0,255"); // other corners -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.1.dompointinit.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.1.dompointinit.html index a419679..08dde93 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.1.dompointinit.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.1.dompointinit.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,15 +27,15 @@ ctx.fill(); // top-left corner -_assertPixel(offscreenCanvas, 20,1, 255,0,0,255, "20,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 41,1, 0,255,0,255, "41,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,10, 255,0,0,255, "1,10", "255,0,0,255"); -_assertPixel(offscreenCanvas, 1,21, 0,255,0,255, "1,21", "0,255,0,255"); +_assertPixel(canvas, 20,1, 255,0,0,255, "20,1", "255,0,0,255"); +_assertPixel(canvas, 41,1, 0,255,0,255, "41,1", "0,255,0,255"); +_assertPixel(canvas, 1,10, 255,0,0,255, "1,10", "255,0,0,255"); +_assertPixel(canvas, 1,21, 0,255,0,255, "1,21", "0,255,0,255"); // other corners -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.1.dompointinit.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.1.dompointinit.worker.js index 8ef16a44..53c33a33 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.1.dompointinit.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.1.dompointinit.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,15 +23,15 @@ ctx.fill(); // top-left corner -_assertPixel(offscreenCanvas, 20,1, 255,0,0,255, "20,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 41,1, 0,255,0,255, "41,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,10, 255,0,0,255, "1,10", "255,0,0,255"); -_assertPixel(offscreenCanvas, 1,21, 0,255,0,255, "1,21", "0,255,0,255"); +_assertPixel(canvas, 20,1, 255,0,0,255, "20,1", "255,0,0,255"); +_assertPixel(canvas, 41,1, 0,255,0,255, "41,1", "0,255,0,255"); +_assertPixel(canvas, 1,10, 255,0,0,255, "1,10", "255,0,0,255"); +_assertPixel(canvas, 1,21, 0,255,0,255, "1,21", "0,255,0,255"); // other corners -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.1.double.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.1.double.html index 324eb8c..cf9ee86 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.1.double.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.1.double.html
@@ -17,18 +17,18 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.roundRect(0, 0, 100, 50, [20, 0, 0]); ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixel(offscreenCanvas, 1,1, 255,0,0,255, "1,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 255,0,0,255, "1,1", "255,0,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.1.double.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.1.double.worker.js index e6843b7..dd64668 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.1.double.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.1.double.worker.js
@@ -13,18 +13,18 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.roundRect(0, 0, 100, 50, [20, 0, 0]); ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixel(offscreenCanvas, 1,1, 255,0,0,255, "1,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 255,0,0,255, "1,1", "255,0,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.2.dompoint.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.2.dompoint.html index 0ab615d..918133e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.2.dompoint.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.2.dompoint.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,20 +27,20 @@ ctx.fill(); // top-right corner -_assertPixel(offscreenCanvas, 79,1, 255,0,0,255, "79,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 58,1, 0,255,0,255, "58,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,10, 255,0,0,255, "98,10", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,21, 0,255,0,255, "98,21", "0,255,0,255"); +_assertPixel(canvas, 79,1, 255,0,0,255, "79,1", "255,0,0,255"); +_assertPixel(canvas, 58,1, 0,255,0,255, "58,1", "0,255,0,255"); +_assertPixel(canvas, 98,10, 255,0,0,255, "98,10", "255,0,0,255"); +_assertPixel(canvas, 98,21, 0,255,0,255, "98,21", "0,255,0,255"); // bottom-left corner -_assertPixel(offscreenCanvas, 20,48, 255,0,0,255, "20,48", "255,0,0,255"); -_assertPixel(offscreenCanvas, 41,48, 0,255,0,255, "41,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,39, 255,0,0,255, "1,39", "255,0,0,255"); -_assertPixel(offscreenCanvas, 1,28, 0,255,0,255, "1,28", "0,255,0,255"); +_assertPixel(canvas, 20,48, 255,0,0,255, "20,48", "255,0,0,255"); +_assertPixel(canvas, 41,48, 0,255,0,255, "41,48", "0,255,0,255"); +_assertPixel(canvas, 1,39, 255,0,0,255, "1,39", "255,0,0,255"); +_assertPixel(canvas, 1,28, 0,255,0,255, "1,28", "0,255,0,255"); // other corners -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.2.dompoint.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.2.dompoint.worker.js index 66d895b3c..f0bd34ee 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.2.dompoint.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.2.dompoint.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,20 +23,20 @@ ctx.fill(); // top-right corner -_assertPixel(offscreenCanvas, 79,1, 255,0,0,255, "79,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 58,1, 0,255,0,255, "58,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,10, 255,0,0,255, "98,10", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,21, 0,255,0,255, "98,21", "0,255,0,255"); +_assertPixel(canvas, 79,1, 255,0,0,255, "79,1", "255,0,0,255"); +_assertPixel(canvas, 58,1, 0,255,0,255, "58,1", "0,255,0,255"); +_assertPixel(canvas, 98,10, 255,0,0,255, "98,10", "255,0,0,255"); +_assertPixel(canvas, 98,21, 0,255,0,255, "98,21", "0,255,0,255"); // bottom-left corner -_assertPixel(offscreenCanvas, 20,48, 255,0,0,255, "20,48", "255,0,0,255"); -_assertPixel(offscreenCanvas, 41,48, 0,255,0,255, "41,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,39, 255,0,0,255, "1,39", "255,0,0,255"); -_assertPixel(offscreenCanvas, 1,28, 0,255,0,255, "1,28", "0,255,0,255"); +_assertPixel(canvas, 20,48, 255,0,0,255, "20,48", "255,0,0,255"); +_assertPixel(canvas, 41,48, 0,255,0,255, "41,48", "0,255,0,255"); +_assertPixel(canvas, 1,39, 255,0,0,255, "1,39", "255,0,0,255"); +_assertPixel(canvas, 1,28, 0,255,0,255, "1,28", "0,255,0,255"); // other corners -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.2.dompointinit.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.2.dompointinit.html index 07c4eec..6f7ecac 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.2.dompointinit.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.2.dompointinit.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,20 +27,20 @@ ctx.fill(); // top-right corner -_assertPixel(offscreenCanvas, 79,1, 255,0,0,255, "79,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 58,1, 0,255,0,255, "58,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,10, 255,0,0,255, "98,10", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,21, 0,255,0,255, "98,21", "0,255,0,255"); +_assertPixel(canvas, 79,1, 255,0,0,255, "79,1", "255,0,0,255"); +_assertPixel(canvas, 58,1, 0,255,0,255, "58,1", "0,255,0,255"); +_assertPixel(canvas, 98,10, 255,0,0,255, "98,10", "255,0,0,255"); +_assertPixel(canvas, 98,21, 0,255,0,255, "98,21", "0,255,0,255"); // bottom-left corner -_assertPixel(offscreenCanvas, 20,48, 255,0,0,255, "20,48", "255,0,0,255"); -_assertPixel(offscreenCanvas, 41,48, 0,255,0,255, "41,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,39, 255,0,0,255, "1,39", "255,0,0,255"); -_assertPixel(offscreenCanvas, 1,28, 0,255,0,255, "1,28", "0,255,0,255"); +_assertPixel(canvas, 20,48, 255,0,0,255, "20,48", "255,0,0,255"); +_assertPixel(canvas, 41,48, 0,255,0,255, "41,48", "0,255,0,255"); +_assertPixel(canvas, 1,39, 255,0,0,255, "1,39", "255,0,0,255"); +_assertPixel(canvas, 1,28, 0,255,0,255, "1,28", "0,255,0,255"); // other corners -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.2.dompointinit.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.2.dompointinit.worker.js index 557762505..dd5d170 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.2.dompointinit.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.2.dompointinit.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,20 +23,20 @@ ctx.fill(); // top-right corner -_assertPixel(offscreenCanvas, 79,1, 255,0,0,255, "79,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 58,1, 0,255,0,255, "58,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,10, 255,0,0,255, "98,10", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,21, 0,255,0,255, "98,21", "0,255,0,255"); +_assertPixel(canvas, 79,1, 255,0,0,255, "79,1", "255,0,0,255"); +_assertPixel(canvas, 58,1, 0,255,0,255, "58,1", "0,255,0,255"); +_assertPixel(canvas, 98,10, 255,0,0,255, "98,10", "255,0,0,255"); +_assertPixel(canvas, 98,21, 0,255,0,255, "98,21", "0,255,0,255"); // bottom-left corner -_assertPixel(offscreenCanvas, 20,48, 255,0,0,255, "20,48", "255,0,0,255"); -_assertPixel(offscreenCanvas, 41,48, 0,255,0,255, "41,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,39, 255,0,0,255, "1,39", "255,0,0,255"); -_assertPixel(offscreenCanvas, 1,28, 0,255,0,255, "1,28", "0,255,0,255"); +_assertPixel(canvas, 20,48, 255,0,0,255, "20,48", "255,0,0,255"); +_assertPixel(canvas, 41,48, 0,255,0,255, "41,48", "0,255,0,255"); +_assertPixel(canvas, 1,39, 255,0,0,255, "1,39", "255,0,0,255"); +_assertPixel(canvas, 1,28, 0,255,0,255, "1,28", "0,255,0,255"); // other corners -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.2.double.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.2.double.html index 7da57484..380d316 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.2.double.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.2.double.html
@@ -17,18 +17,18 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.roundRect(0, 0, 100, 50, [0, 20, 0]); ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 255,0,0,255, "98,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 255,0,0,255, "1,48", "255,0,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 255,0,0,255, "98,1", "255,0,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,48, 255,0,0,255, "1,48", "255,0,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.2.double.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.2.double.worker.js index 72e2c35..1fd9fca 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.2.double.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.2.double.worker.js
@@ -13,18 +13,18 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.roundRect(0, 0, 100, 50, [0, 20, 0]); ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 255,0,0,255, "98,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 255,0,0,255, "1,48", "255,0,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 255,0,0,255, "98,1", "255,0,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,48, 255,0,0,255, "1,48", "255,0,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.3.dompoint.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.3.dompoint.html index 75dd829..fcde6b9 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.3.dompoint.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.3.dompoint.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,15 +27,15 @@ ctx.fill(); // bottom-right corner -_assertPixel(offscreenCanvas, 79,48, 255,0,0,255, "79,48", "255,0,0,255"); -_assertPixel(offscreenCanvas, 58,48, 0,255,0,255, "58,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,39, 255,0,0,255, "98,39", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,28, 0,255,0,255, "98,28", "0,255,0,255"); +_assertPixel(canvas, 79,48, 255,0,0,255, "79,48", "255,0,0,255"); +_assertPixel(canvas, 58,48, 0,255,0,255, "58,48", "0,255,0,255"); +_assertPixel(canvas, 98,39, 255,0,0,255, "98,39", "255,0,0,255"); +_assertPixel(canvas, 98,28, 0,255,0,255, "98,28", "0,255,0,255"); // other corners -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.3.dompoint.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.3.dompoint.worker.js index 1cd6506..7d798980 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.3.dompoint.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.3.dompoint.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,15 +23,15 @@ ctx.fill(); // bottom-right corner -_assertPixel(offscreenCanvas, 79,48, 255,0,0,255, "79,48", "255,0,0,255"); -_assertPixel(offscreenCanvas, 58,48, 0,255,0,255, "58,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,39, 255,0,0,255, "98,39", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,28, 0,255,0,255, "98,28", "0,255,0,255"); +_assertPixel(canvas, 79,48, 255,0,0,255, "79,48", "255,0,0,255"); +_assertPixel(canvas, 58,48, 0,255,0,255, "58,48", "0,255,0,255"); +_assertPixel(canvas, 98,39, 255,0,0,255, "98,39", "255,0,0,255"); +_assertPixel(canvas, 98,28, 0,255,0,255, "98,28", "0,255,0,255"); // other corners -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.3.dompointinit.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.3.dompointinit.html index 9e46776..3d4b1b1 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.3.dompointinit.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.3.dompointinit.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,15 +27,15 @@ ctx.fill(); // bottom-right corner -_assertPixel(offscreenCanvas, 79,48, 255,0,0,255, "79,48", "255,0,0,255"); -_assertPixel(offscreenCanvas, 58,48, 0,255,0,255, "58,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,39, 255,0,0,255, "98,39", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,28, 0,255,0,255, "98,28", "0,255,0,255"); +_assertPixel(canvas, 79,48, 255,0,0,255, "79,48", "255,0,0,255"); +_assertPixel(canvas, 58,48, 0,255,0,255, "58,48", "0,255,0,255"); +_assertPixel(canvas, 98,39, 255,0,0,255, "98,39", "255,0,0,255"); +_assertPixel(canvas, 98,28, 0,255,0,255, "98,28", "0,255,0,255"); // other corners -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.3.dompointinit.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.3.dompointinit.worker.js index 5bc8e6f..c54c88a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.3.dompointinit.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.3.dompointinit.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,15 +23,15 @@ ctx.fill(); // bottom-right corner -_assertPixel(offscreenCanvas, 79,48, 255,0,0,255, "79,48", "255,0,0,255"); -_assertPixel(offscreenCanvas, 58,48, 0,255,0,255, "58,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,39, 255,0,0,255, "98,39", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,28, 0,255,0,255, "98,28", "0,255,0,255"); +_assertPixel(canvas, 79,48, 255,0,0,255, "79,48", "255,0,0,255"); +_assertPixel(canvas, 58,48, 0,255,0,255, "58,48", "0,255,0,255"); +_assertPixel(canvas, 98,39, 255,0,0,255, "98,39", "255,0,0,255"); +_assertPixel(canvas, 98,28, 0,255,0,255, "98,28", "0,255,0,255"); // other corners -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.3.double.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.3.double.html index d2f7a03..fc4e640 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.3.double.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.3.double.html
@@ -17,18 +17,18 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.roundRect(0, 0, 100, 50, [0, 0, 20]); ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 255,0,0,255, "98,48", "255,0,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 98,48, 255,0,0,255, "98,48", "255,0,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.3.double.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.3.double.worker.js index d18a2c0..8662862 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.3.double.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.3.radii.3.double.worker.js
@@ -13,18 +13,18 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.roundRect(0, 0, 100, 50, [0, 0, 20]); ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 255,0,0,255, "98,48", "255,0,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 98,48, 255,0,0,255, "98,48", "255,0,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.1.dompoint.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.1.dompoint.html index 2d4a651c..3d22bb9 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.1.dompoint.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.1.dompoint.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,15 +27,15 @@ ctx.fill(); // top-left corner -_assertPixel(offscreenCanvas, 20,1, 255,0,0,255, "20,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 41,1, 0,255,0,255, "41,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,10, 255,0,0,255, "1,10", "255,0,0,255"); -_assertPixel(offscreenCanvas, 1,21, 0,255,0,255, "1,21", "0,255,0,255"); +_assertPixel(canvas, 20,1, 255,0,0,255, "20,1", "255,0,0,255"); +_assertPixel(canvas, 41,1, 0,255,0,255, "41,1", "0,255,0,255"); +_assertPixel(canvas, 1,10, 255,0,0,255, "1,10", "255,0,0,255"); +_assertPixel(canvas, 1,21, 0,255,0,255, "1,21", "0,255,0,255"); // other corners -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.1.dompoint.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.1.dompoint.worker.js index 712884dd..623ebe4 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.1.dompoint.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.1.dompoint.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,15 +23,15 @@ ctx.fill(); // top-left corner -_assertPixel(offscreenCanvas, 20,1, 255,0,0,255, "20,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 41,1, 0,255,0,255, "41,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,10, 255,0,0,255, "1,10", "255,0,0,255"); -_assertPixel(offscreenCanvas, 1,21, 0,255,0,255, "1,21", "0,255,0,255"); +_assertPixel(canvas, 20,1, 255,0,0,255, "20,1", "255,0,0,255"); +_assertPixel(canvas, 41,1, 0,255,0,255, "41,1", "0,255,0,255"); +_assertPixel(canvas, 1,10, 255,0,0,255, "1,10", "255,0,0,255"); +_assertPixel(canvas, 1,21, 0,255,0,255, "1,21", "0,255,0,255"); // other corners -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.1.dompointinit.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.1.dompointinit.html index 81900a2..aaffcd2 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.1.dompointinit.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.1.dompointinit.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,15 +27,15 @@ ctx.fill(); // top-left corner -_assertPixel(offscreenCanvas, 20,1, 255,0,0,255, "20,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 41,1, 0,255,0,255, "41,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,10, 255,0,0,255, "1,10", "255,0,0,255"); -_assertPixel(offscreenCanvas, 1,21, 0,255,0,255, "1,21", "0,255,0,255"); +_assertPixel(canvas, 20,1, 255,0,0,255, "20,1", "255,0,0,255"); +_assertPixel(canvas, 41,1, 0,255,0,255, "41,1", "0,255,0,255"); +_assertPixel(canvas, 1,10, 255,0,0,255, "1,10", "255,0,0,255"); +_assertPixel(canvas, 1,21, 0,255,0,255, "1,21", "0,255,0,255"); // other corners -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.1.dompointinit.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.1.dompointinit.worker.js index dad5edf..f9fb961af 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.1.dompointinit.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.1.dompointinit.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,15 +23,15 @@ ctx.fill(); // top-left corner -_assertPixel(offscreenCanvas, 20,1, 255,0,0,255, "20,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 41,1, 0,255,0,255, "41,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,10, 255,0,0,255, "1,10", "255,0,0,255"); -_assertPixel(offscreenCanvas, 1,21, 0,255,0,255, "1,21", "0,255,0,255"); +_assertPixel(canvas, 20,1, 255,0,0,255, "20,1", "255,0,0,255"); +_assertPixel(canvas, 41,1, 0,255,0,255, "41,1", "0,255,0,255"); +_assertPixel(canvas, 1,10, 255,0,0,255, "1,10", "255,0,0,255"); +_assertPixel(canvas, 1,21, 0,255,0,255, "1,21", "0,255,0,255"); // other corners -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.1.double.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.1.double.html index 24160a1..1819c73 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.1.double.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.1.double.html
@@ -17,18 +17,18 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.roundRect(0, 0, 100, 50, [20, 0, 0, 0]); ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixel(offscreenCanvas, 1,1, 255,0,0,255, "1,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 255,0,0,255, "1,1", "255,0,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.1.double.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.1.double.worker.js index 061a8c4f..2515f70 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.1.double.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.1.double.worker.js
@@ -13,18 +13,18 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.roundRect(0, 0, 100, 50, [20, 0, 0, 0]); ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixel(offscreenCanvas, 1,1, 255,0,0,255, "1,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 255,0,0,255, "1,1", "255,0,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.2.dompoint.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.2.dompoint.html index f69865a..1518d55 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.2.dompoint.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.2.dompoint.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,15 +27,15 @@ ctx.fill(); // top-right corner -_assertPixel(offscreenCanvas, 79,1, 255,0,0,255, "79,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 58,1, 0,255,0,255, "58,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,10, 255,0,0,255, "98,10", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,21, 0,255,0,255, "98,21", "0,255,0,255"); +_assertPixel(canvas, 79,1, 255,0,0,255, "79,1", "255,0,0,255"); +_assertPixel(canvas, 58,1, 0,255,0,255, "58,1", "0,255,0,255"); +_assertPixel(canvas, 98,10, 255,0,0,255, "98,10", "255,0,0,255"); +_assertPixel(canvas, 98,21, 0,255,0,255, "98,21", "0,255,0,255"); // other corners -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.2.dompoint.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.2.dompoint.worker.js index 7c6c36d..556a1171 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.2.dompoint.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.2.dompoint.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,15 +23,15 @@ ctx.fill(); // top-right corner -_assertPixel(offscreenCanvas, 79,1, 255,0,0,255, "79,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 58,1, 0,255,0,255, "58,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,10, 255,0,0,255, "98,10", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,21, 0,255,0,255, "98,21", "0,255,0,255"); +_assertPixel(canvas, 79,1, 255,0,0,255, "79,1", "255,0,0,255"); +_assertPixel(canvas, 58,1, 0,255,0,255, "58,1", "0,255,0,255"); +_assertPixel(canvas, 98,10, 255,0,0,255, "98,10", "255,0,0,255"); +_assertPixel(canvas, 98,21, 0,255,0,255, "98,21", "0,255,0,255"); // other corners -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.2.dompointinit.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.2.dompointinit.html index 1386928..78fe981 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.2.dompointinit.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.2.dompointinit.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,15 +27,15 @@ ctx.fill(); // top-right corner -_assertPixel(offscreenCanvas, 79,1, 255,0,0,255, "79,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 58,1, 0,255,0,255, "58,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,10, 255,0,0,255, "98,10", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,21, 0,255,0,255, "98,21", "0,255,0,255"); +_assertPixel(canvas, 79,1, 255,0,0,255, "79,1", "255,0,0,255"); +_assertPixel(canvas, 58,1, 0,255,0,255, "58,1", "0,255,0,255"); +_assertPixel(canvas, 98,10, 255,0,0,255, "98,10", "255,0,0,255"); +_assertPixel(canvas, 98,21, 0,255,0,255, "98,21", "0,255,0,255"); // other corners -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.2.dompointinit.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.2.dompointinit.worker.js index d0dd9bab..81e115d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.2.dompointinit.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.2.dompointinit.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,15 +23,15 @@ ctx.fill(); // top-right corner -_assertPixel(offscreenCanvas, 79,1, 255,0,0,255, "79,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 58,1, 0,255,0,255, "58,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,10, 255,0,0,255, "98,10", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,21, 0,255,0,255, "98,21", "0,255,0,255"); +_assertPixel(canvas, 79,1, 255,0,0,255, "79,1", "255,0,0,255"); +_assertPixel(canvas, 58,1, 0,255,0,255, "58,1", "0,255,0,255"); +_assertPixel(canvas, 98,10, 255,0,0,255, "98,10", "255,0,0,255"); +_assertPixel(canvas, 98,21, 0,255,0,255, "98,21", "0,255,0,255"); // other corners -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.2.double.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.2.double.html index 97ecb39..0a6e140f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.2.double.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.2.double.html
@@ -17,18 +17,18 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.roundRect(0, 0, 100, 50, [0, 20, 0, 0]); ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 255,0,0,255, "98,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 255,0,0,255, "98,1", "255,0,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.2.double.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.2.double.worker.js index 641acc9..57914f6 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.2.double.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.2.double.worker.js
@@ -13,18 +13,18 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.roundRect(0, 0, 100, 50, [0, 20, 0, 0]); ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 255,0,0,255, "98,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 255,0,0,255, "98,1", "255,0,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.3.dompoint.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.3.dompoint.html index 4441250..d9aceaa6 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.3.dompoint.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.3.dompoint.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,15 +27,15 @@ ctx.fill(); // bottom-right corner -_assertPixel(offscreenCanvas, 79,48, 255,0,0,255, "79,48", "255,0,0,255"); -_assertPixel(offscreenCanvas, 58,48, 0,255,0,255, "58,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,39, 255,0,0,255, "98,39", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,28, 0,255,0,255, "98,28", "0,255,0,255"); +_assertPixel(canvas, 79,48, 255,0,0,255, "79,48", "255,0,0,255"); +_assertPixel(canvas, 58,48, 0,255,0,255, "58,48", "0,255,0,255"); +_assertPixel(canvas, 98,39, 255,0,0,255, "98,39", "255,0,0,255"); +_assertPixel(canvas, 98,28, 0,255,0,255, "98,28", "0,255,0,255"); // other corners -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.3.dompoint.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.3.dompoint.worker.js index 838246a1..6280aa51 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.3.dompoint.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.3.dompoint.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,15 +23,15 @@ ctx.fill(); // bottom-right corner -_assertPixel(offscreenCanvas, 79,48, 255,0,0,255, "79,48", "255,0,0,255"); -_assertPixel(offscreenCanvas, 58,48, 0,255,0,255, "58,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,39, 255,0,0,255, "98,39", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,28, 0,255,0,255, "98,28", "0,255,0,255"); +_assertPixel(canvas, 79,48, 255,0,0,255, "79,48", "255,0,0,255"); +_assertPixel(canvas, 58,48, 0,255,0,255, "58,48", "0,255,0,255"); +_assertPixel(canvas, 98,39, 255,0,0,255, "98,39", "255,0,0,255"); +_assertPixel(canvas, 98,28, 0,255,0,255, "98,28", "0,255,0,255"); // other corners -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.3.dompointinit.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.3.dompointinit.html index 66e2b7e..cc0ad6d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.3.dompointinit.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.3.dompointinit.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,15 +27,15 @@ ctx.fill(); // bottom-right corner -_assertPixel(offscreenCanvas, 79,48, 255,0,0,255, "79,48", "255,0,0,255"); -_assertPixel(offscreenCanvas, 58,48, 0,255,0,255, "58,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,39, 255,0,0,255, "98,39", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,28, 0,255,0,255, "98,28", "0,255,0,255"); +_assertPixel(canvas, 79,48, 255,0,0,255, "79,48", "255,0,0,255"); +_assertPixel(canvas, 58,48, 0,255,0,255, "58,48", "0,255,0,255"); +_assertPixel(canvas, 98,39, 255,0,0,255, "98,39", "255,0,0,255"); +_assertPixel(canvas, 98,28, 0,255,0,255, "98,28", "0,255,0,255"); // other corners -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.3.dompointinit.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.3.dompointinit.worker.js index 5242cbb..0f54b1e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.3.dompointinit.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.3.dompointinit.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,15 +23,15 @@ ctx.fill(); // bottom-right corner -_assertPixel(offscreenCanvas, 79,48, 255,0,0,255, "79,48", "255,0,0,255"); -_assertPixel(offscreenCanvas, 58,48, 0,255,0,255, "58,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,39, 255,0,0,255, "98,39", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,28, 0,255,0,255, "98,28", "0,255,0,255"); +_assertPixel(canvas, 79,48, 255,0,0,255, "79,48", "255,0,0,255"); +_assertPixel(canvas, 58,48, 0,255,0,255, "58,48", "0,255,0,255"); +_assertPixel(canvas, 98,39, 255,0,0,255, "98,39", "255,0,0,255"); +_assertPixel(canvas, 98,28, 0,255,0,255, "98,28", "0,255,0,255"); // other corners -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.3.double.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.3.double.html index 08554c0..93f41a5c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.3.double.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.3.double.html
@@ -17,18 +17,18 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.roundRect(0, 0, 100, 50, [0, 0, 20, 0]); ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 255,0,0,255, "98,48", "255,0,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 98,48, 255,0,0,255, "98,48", "255,0,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.3.double.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.3.double.worker.js index 67c8c37..08f2a21 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.3.double.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.3.double.worker.js
@@ -13,18 +13,18 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.roundRect(0, 0, 100, 50, [0, 0, 20, 0]); ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 255,0,0,255, "98,48", "255,0,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 98,48, 255,0,0,255, "98,48", "255,0,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.4.dompoint.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.4.dompoint.html index 9f19e99..110e684 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.4.dompoint.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.4.dompoint.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,15 +27,15 @@ ctx.fill(); // bottom-left corner -_assertPixel(offscreenCanvas, 20,48, 255,0,0,255, "20,48", "255,0,0,255"); -_assertPixel(offscreenCanvas, 41,48, 0,255,0,255, "41,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,39, 255,0,0,255, "1,39", "255,0,0,255"); -_assertPixel(offscreenCanvas, 1,28, 0,255,0,255, "1,28", "0,255,0,255"); +_assertPixel(canvas, 20,48, 255,0,0,255, "20,48", "255,0,0,255"); +_assertPixel(canvas, 41,48, 0,255,0,255, "41,48", "0,255,0,255"); +_assertPixel(canvas, 1,39, 255,0,0,255, "1,39", "255,0,0,255"); +_assertPixel(canvas, 1,28, 0,255,0,255, "1,28", "0,255,0,255"); // other corners -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.4.dompoint.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.4.dompoint.worker.js index 7c867e2..0240541 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.4.dompoint.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.4.dompoint.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,15 +23,15 @@ ctx.fill(); // bottom-left corner -_assertPixel(offscreenCanvas, 20,48, 255,0,0,255, "20,48", "255,0,0,255"); -_assertPixel(offscreenCanvas, 41,48, 0,255,0,255, "41,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,39, 255,0,0,255, "1,39", "255,0,0,255"); -_assertPixel(offscreenCanvas, 1,28, 0,255,0,255, "1,28", "0,255,0,255"); +_assertPixel(canvas, 20,48, 255,0,0,255, "20,48", "255,0,0,255"); +_assertPixel(canvas, 41,48, 0,255,0,255, "41,48", "0,255,0,255"); +_assertPixel(canvas, 1,39, 255,0,0,255, "1,39", "255,0,0,255"); +_assertPixel(canvas, 1,28, 0,255,0,255, "1,28", "0,255,0,255"); // other corners -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.4.dompointinit.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.4.dompointinit.html index 2cd3930..a063eb19b 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.4.dompointinit.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.4.dompointinit.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,15 +27,15 @@ ctx.fill(); // bottom-left corner -_assertPixel(offscreenCanvas, 20,48, 255,0,0,255, "20,48", "255,0,0,255"); -_assertPixel(offscreenCanvas, 41,48, 0,255,0,255, "41,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,39, 255,0,0,255, "1,39", "255,0,0,255"); -_assertPixel(offscreenCanvas, 1,28, 0,255,0,255, "1,28", "0,255,0,255"); +_assertPixel(canvas, 20,48, 255,0,0,255, "20,48", "255,0,0,255"); +_assertPixel(canvas, 41,48, 0,255,0,255, "41,48", "0,255,0,255"); +_assertPixel(canvas, 1,39, 255,0,0,255, "1,39", "255,0,0,255"); +_assertPixel(canvas, 1,28, 0,255,0,255, "1,28", "0,255,0,255"); // other corners -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.4.dompointinit.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.4.dompointinit.worker.js index 50cd0ed..94d1561 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.4.dompointinit.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.4.dompointinit.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,15 +23,15 @@ ctx.fill(); // bottom-left corner -_assertPixel(offscreenCanvas, 20,48, 255,0,0,255, "20,48", "255,0,0,255"); -_assertPixel(offscreenCanvas, 41,48, 0,255,0,255, "41,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,39, 255,0,0,255, "1,39", "255,0,0,255"); -_assertPixel(offscreenCanvas, 1,28, 0,255,0,255, "1,28", "0,255,0,255"); +_assertPixel(canvas, 20,48, 255,0,0,255, "20,48", "255,0,0,255"); +_assertPixel(canvas, 41,48, 0,255,0,255, "41,48", "0,255,0,255"); +_assertPixel(canvas, 1,39, 255,0,0,255, "1,39", "255,0,0,255"); +_assertPixel(canvas, 1,28, 0,255,0,255, "1,28", "0,255,0,255"); // other corners -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.4.double.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.4.double.html index 32959f7..efa52ca 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.4.double.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.4.double.html
@@ -17,18 +17,18 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.roundRect(0, 0, 100, 50, [0, 0, 0, 20]); ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 255,0,0,255, "1,48", "255,0,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,48, 255,0,0,255, "1,48", "255,0,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.4.double.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.4.double.worker.js index 78004cb..058758d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.4.double.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.4.radii.4.double.worker.js
@@ -13,18 +13,18 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.roundRect(0, 0, 100, 50, [0, 0, 0, 20]); ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 255,0,0,255, "1,48", "255,0,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,48, 255,0,0,255, "1,48", "255,0,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.closed.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.closed.html index d070e0f4..5cac59f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.closed.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.closed.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,7 +27,7 @@ ctx.lineJoin = 'miter'; ctx.roundRect(100, 50, 100, 100, [0]); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.closed.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.closed.worker.js index 906eb6e..5aebb5f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.closed.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.closed.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,7 +23,7 @@ ctx.lineJoin = 'miter'; ctx.roundRect(100, 50, 100, 100, [0]); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.end.1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.end.1.html index f79ee17..c3217852 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.end.1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.end.1.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,7 +27,7 @@ ctx.roundRect(200, 100, 400, 1000, [0]); ctx.lineTo(-2000, -1000); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.end.1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.end.1.worker.js index ef50fe5..0999797 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.end.1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.end.1.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,7 +23,7 @@ ctx.roundRect(200, 100, 400, 1000, [0]); ctx.lineTo(-2000, -1000); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.end.2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.end.2.html index 6303f24..7f5927f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.end.2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.end.2.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -29,10 +29,10 @@ ctx.roundRect(150, 150, 2000, 2000, [0]); ctx.lineTo(160, 160); ctx.stroke(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.end.2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.end.2.worker.js index e2a51c6..95d111d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.end.2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.end.2.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -25,10 +25,10 @@ ctx.roundRect(150, 150, 2000, 2000, [0]); ctx.lineTo(160, 160); ctx.stroke(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.end.3.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.end.3.html index 4216bf1..f42768d73 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.end.3.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.end.3.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,10 +27,10 @@ ctx.roundRect(101, 51, 2000, 2000, [500, 500, 500, 500]); ctx.lineTo(-1, -1); ctx.stroke(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.end.3.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.end.3.worker.js index 46c82dc..85d51f70 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.end.3.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.end.3.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,10 +23,10 @@ ctx.roundRect(101, 51, 2000, 2000, [500, 500, 500, 500]); ctx.lineTo(-1, -1); ctx.stroke(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.end.4.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.end.4.html index 39915312..197955b 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.end.4.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.end.4.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -27,10 +27,10 @@ ctx.roundRect(-1, -1, 2000, 2000, [1000, 1000, 1000, 1000]); ctx.lineTo(-150, -150); ctx.stroke(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.end.4.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.end.4.worker.js index 05ef9d4..65febe57 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.end.4.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.end.4.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -23,10 +23,10 @@ ctx.roundRect(-1, -1, 2000, 2000, [1000, 1000, 1000, 1000]); ctx.lineTo(-150, -150); ctx.stroke(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255"); +_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.negative.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.negative.html index 5558a99b..644ebdf 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.negative.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.negative.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -30,15 +30,15 @@ ctx.roundRect(100, 50, -50, -25, [10, 0, 0, 0]); ctx.fill(); // All rects drawn -_assertPixel(offscreenCanvas, 25,12, 0,255,0,255, "25,12", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,12, 0,255,0,255, "75,12", "0,255,0,255"); -_assertPixel(offscreenCanvas, 25,37, 0,255,0,255, "25,37", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,37, 0,255,0,255, "75,37", "0,255,0,255"); +_assertPixel(canvas, 25,12, 0,255,0,255, "25,12", "0,255,0,255"); +_assertPixel(canvas, 75,12, 0,255,0,255, "75,12", "0,255,0,255"); +_assertPixel(canvas, 25,37, 0,255,0,255, "25,37", "0,255,0,255"); +_assertPixel(canvas, 75,37, 0,255,0,255, "75,37", "0,255,0,255"); // Correct corners are rounded. -_assertPixel(offscreenCanvas, 1,1, 255,0,0,255, "1,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,1, 255,0,0,255, "98,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 1,48, 255,0,0,255, "1,48", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,48, 255,0,0,255, "98,48", "255,0,0,255"); +_assertPixel(canvas, 1,1, 255,0,0,255, "1,1", "255,0,0,255"); +_assertPixel(canvas, 98,1, 255,0,0,255, "98,1", "255,0,0,255"); +_assertPixel(canvas, 1,48, 255,0,0,255, "1,48", "255,0,0,255"); +_assertPixel(canvas, 98,48, 255,0,0,255, "98,48", "255,0,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.negative.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.negative.worker.js index 96df71a5..1191eb4 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.negative.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.negative.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -26,15 +26,15 @@ ctx.roundRect(100, 50, -50, -25, [10, 0, 0, 0]); ctx.fill(); // All rects drawn -_assertPixel(offscreenCanvas, 25,12, 0,255,0,255, "25,12", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,12, 0,255,0,255, "75,12", "0,255,0,255"); -_assertPixel(offscreenCanvas, 25,37, 0,255,0,255, "25,37", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,37, 0,255,0,255, "75,37", "0,255,0,255"); +_assertPixel(canvas, 25,12, 0,255,0,255, "25,12", "0,255,0,255"); +_assertPixel(canvas, 75,12, 0,255,0,255, "75,12", "0,255,0,255"); +_assertPixel(canvas, 25,37, 0,255,0,255, "25,37", "0,255,0,255"); +_assertPixel(canvas, 75,37, 0,255,0,255, "75,37", "0,255,0,255"); // Correct corners are rounded. -_assertPixel(offscreenCanvas, 1,1, 255,0,0,255, "1,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,1, 255,0,0,255, "98,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 1,48, 255,0,0,255, "1,48", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,48, 255,0,0,255, "98,48", "255,0,0,255"); +_assertPixel(canvas, 1,1, 255,0,0,255, "1,1", "255,0,0,255"); +_assertPixel(canvas, 98,1, 255,0,0,255, "98,1", "255,0,0,255"); +_assertPixel(canvas, 1,48, 255,0,0,255, "1,48", "255,0,0,255"); +_assertPixel(canvas, 98,48, 255,0,0,255, "98,48", "255,0,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.newsubpath.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.newsubpath.html index 676e0be..4c1c27e1 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.newsubpath.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.newsubpath.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -29,7 +29,7 @@ ctx.lineTo(-50, 25); ctx.roundRect(200, 25, 1, 1, [0]); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.newsubpath.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.newsubpath.worker.js index 66e35f9..8274f6d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.newsubpath.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.newsubpath.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -25,7 +25,7 @@ ctx.lineTo(-50, 25); ctx.roundRect(200, 25, 1, 1, [0]); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.nonfinite.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.nonfinite.html index 6d41959..a5436e5 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.nonfinite.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.nonfinite.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50) @@ -108,8 +108,8 @@ ctx.lineTo(0, 50); ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 90,45, 0,255,0,255, "90,45", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 90,45, 0,255,0,255, "90,45", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.nonfinite.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.nonfinite.worker.js index 64c770d..cc60f0f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.nonfinite.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.nonfinite.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50) @@ -104,8 +104,8 @@ ctx.lineTo(0, 50); ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 90,45, 0,255,0,255, "90,45", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 90,45, 0,255,0,255, "90,45", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.intersecting.1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.intersecting.1.html index 68b16e6..73614cf6 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.intersecting.1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.intersecting.1.html
@@ -17,23 +17,23 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.roundRect(0, 0, 100, 50, [40, 40, 40, 40]); ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixel(offscreenCanvas, 2,25, 0,255,0,255, "2,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 97,25, 0,255,0,255, "97,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,1, 255,0,0,255, "1,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,1, 255,0,0,255, "98,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 1,48, 255,0,0,255, "1,48", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,48, 255,0,0,255, "98,48", "255,0,0,255"); +_assertPixel(canvas, 2,25, 0,255,0,255, "2,25", "0,255,0,255"); +_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); +_assertPixel(canvas, 97,25, 0,255,0,255, "97,25", "0,255,0,255"); +_assertPixel(canvas, 1,1, 255,0,0,255, "1,1", "255,0,0,255"); +_assertPixel(canvas, 98,1, 255,0,0,255, "98,1", "255,0,0,255"); +_assertPixel(canvas, 1,48, 255,0,0,255, "1,48", "255,0,0,255"); +_assertPixel(canvas, 98,48, 255,0,0,255, "98,48", "255,0,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.intersecting.1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.intersecting.1.worker.js index c0f4e60c..f93f84b 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.intersecting.1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.intersecting.1.worker.js
@@ -13,23 +13,23 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.roundRect(0, 0, 100, 50, [40, 40, 40, 40]); ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixel(offscreenCanvas, 2,25, 0,255,0,255, "2,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 97,25, 0,255,0,255, "97,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,1, 255,0,0,255, "1,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,1, 255,0,0,255, "98,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 1,48, 255,0,0,255, "1,48", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,48, 255,0,0,255, "98,48", "255,0,0,255"); +_assertPixel(canvas, 2,25, 0,255,0,255, "2,25", "0,255,0,255"); +_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); +_assertPixel(canvas, 97,25, 0,255,0,255, "97,25", "0,255,0,255"); +_assertPixel(canvas, 1,1, 255,0,0,255, "1,1", "255,0,0,255"); +_assertPixel(canvas, 98,1, 255,0,0,255, "98,1", "255,0,0,255"); +_assertPixel(canvas, 1,48, 255,0,0,255, "1,48", "255,0,0,255"); +_assertPixel(canvas, 98,48, 255,0,0,255, "98,48", "255,0,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.intersecting.2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.intersecting.2.html index e849c56..1cb5a0c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.intersecting.2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.intersecting.2.html
@@ -17,23 +17,23 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.roundRect(0, 0, 100, 50, [1000, 1000, 1000, 1000]); ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixel(offscreenCanvas, 2,25, 0,255,0,255, "2,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 97,25, 0,255,0,255, "97,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,1, 255,0,0,255, "1,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,1, 255,0,0,255, "98,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 1,48, 255,0,0,255, "1,48", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,48, 255,0,0,255, "98,48", "255,0,0,255"); +_assertPixel(canvas, 2,25, 0,255,0,255, "2,25", "0,255,0,255"); +_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); +_assertPixel(canvas, 97,25, 0,255,0,255, "97,25", "0,255,0,255"); +_assertPixel(canvas, 1,1, 255,0,0,255, "1,1", "255,0,0,255"); +_assertPixel(canvas, 98,1, 255,0,0,255, "98,1", "255,0,0,255"); +_assertPixel(canvas, 1,48, 255,0,0,255, "1,48", "255,0,0,255"); +_assertPixel(canvas, 98,48, 255,0,0,255, "98,48", "255,0,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.intersecting.2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.intersecting.2.worker.js index 3801c0c..5adfb12b 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.intersecting.2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.intersecting.2.worker.js
@@ -13,23 +13,23 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.roundRect(0, 0, 100, 50, [1000, 1000, 1000, 1000]); ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixel(offscreenCanvas, 2,25, 0,255,0,255, "2,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 97,25, 0,255,0,255, "97,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 1,1, 255,0,0,255, "1,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,1, 255,0,0,255, "98,1", "255,0,0,255"); -_assertPixel(offscreenCanvas, 1,48, 255,0,0,255, "1,48", "255,0,0,255"); -_assertPixel(offscreenCanvas, 98,48, 255,0,0,255, "98,48", "255,0,0,255"); +_assertPixel(canvas, 2,25, 0,255,0,255, "2,25", "0,255,0,255"); +_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255"); +_assertPixel(canvas, 97,25, 0,255,0,255, "97,25", "0,255,0,255"); +_assertPixel(canvas, 1,1, 255,0,0,255, "1,1", "255,0,0,255"); +_assertPixel(canvas, 98,1, 255,0,0,255, "98,1", "255,0,0,255"); +_assertPixel(canvas, 1,48, 255,0,0,255, "1,48", "255,0,0,255"); +_assertPixel(canvas, 98,48, 255,0,0,255, "98,48", "255,0,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.negative.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.negative.html index a718cc5..55e344d3 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.negative.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.negative.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); assert_throws_js(RangeError, () => { ctx.roundRect(0, 0, 0, 0, [-1])}); assert_throws_js(RangeError, () => { ctx.roundRect(0, 0, 0, 0, [1, -1])});
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.negative.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.negative.worker.js index 93e573b..050e5f7 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.negative.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.negative.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); assert_throws_js(RangeError, () => { ctx.roundRect(0, 0, 0, 0, [-1])}); assert_throws_js(RangeError, () => { ctx.roundRect(0, 0, 0, 0, [1, -1])});
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.none.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.none.html index 85d9b80..530efe4 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.none.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.none.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); assert_throws_js(RangeError, () => { ctx.roundRect(0, 0, 100, 50, [])}); t.done();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.none.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.none.worker.js index e1623b9..3209e421 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.none.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.none.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); assert_throws_js(RangeError, () => { ctx.roundRect(0, 0, 100, 50, [])}); t.done();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.toomany.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.toomany.html index c615b0e8b..c667dc69 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.toomany.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.toomany.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); assert_throws_js(RangeError, () => { ctx.roundRect(0, 0, 100, 50, [0, 0, 0, 0, 0])}); t.done();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.toomany.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.toomany.worker.js index 2b35cb5..3b05057 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.toomany.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.radius.toomany.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); assert_throws_js(RangeError, () => { ctx.roundRect(0, 0, 100, 50, [0, 0, 0, 0, 0])}); t.done();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.selfintersect.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.selfintersect.html index c0aad97..b2956458 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.selfintersect.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.selfintersect.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.roundRect(0, 0, 100, 50, [0]); @@ -27,7 +27,7 @@ ctx.beginPath(); ctx.roundRect(45, 20, 10, 10, [0]); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.selfintersect.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.selfintersect.worker.js index b00d7b4..73f3cd3 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.selfintersect.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.selfintersect.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.roundRect(0, 0, 100, 50, [0]); @@ -23,7 +23,7 @@ ctx.beginPath(); ctx.roundRect(45, 20, 10, 10, [0]); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.winding.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.winding.html index 291c3435..c63a3a6 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.winding.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.winding.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -29,10 +29,10 @@ ctx.roundRect(0, 25, 100, -25, [0]); ctx.roundRect(100, 25, -100, 25, [0]); ctx.fill(); -_assertPixel(offscreenCanvas, 25,12, 0,255,0,255, "25,12", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,12, 0,255,0,255, "75,12", "0,255,0,255"); -_assertPixel(offscreenCanvas, 25,37, 0,255,0,255, "25,37", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,37, 0,255,0,255, "75,37", "0,255,0,255"); +_assertPixel(canvas, 25,12, 0,255,0,255, "25,12", "0,255,0,255"); +_assertPixel(canvas, 75,12, 0,255,0,255, "75,12", "0,255,0,255"); +_assertPixel(canvas, 25,37, 0,255,0,255, "25,37", "0,255,0,255"); +_assertPixel(canvas, 75,37, 0,255,0,255, "75,37", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.winding.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.winding.worker.js index 5a765927..7fd2b43 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.winding.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.winding.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -25,10 +25,10 @@ ctx.roundRect(0, 25, 100, -25, [0]); ctx.roundRect(100, 25, -100, 25, [0]); ctx.fill(); -_assertPixel(offscreenCanvas, 25,12, 0,255,0,255, "25,12", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,12, 0,255,0,255, "75,12", "0,255,0,255"); -_assertPixel(offscreenCanvas, 25,37, 0,255,0,255, "25,37", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,37, 0,255,0,255, "75,37", "0,255,0,255"); +_assertPixel(canvas, 25,12, 0,255,0,255, "25,12", "0,255,0,255"); +_assertPixel(canvas, 75,12, 0,255,0,255, "75,12", "0,255,0,255"); +_assertPixel(canvas, 25,37, 0,255,0,255, "25,37", "0,255,0,255"); +_assertPixel(canvas, 75,37, 0,255,0,255, "75,37", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.1.html index 250c812e..e307112 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.1.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,7 +27,7 @@ ctx.beginPath(); ctx.roundRect(0, 50, 100, 0, [0]); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.1.worker.js index 94c436e7..0663ee7 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.1.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,7 +23,7 @@ ctx.beginPath(); ctx.roundRect(0, 50, 100, 0, [0]); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.2.html index e418e4c..637c979f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.2.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,7 +27,7 @@ ctx.beginPath(); ctx.roundRect(50, -100, 0, 250, [0]); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.2.worker.js index 789a6ca8..9b049cf 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.2.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,7 +23,7 @@ ctx.beginPath(); ctx.roundRect(50, -100, 0, 250, [0]); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.3.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.3.html index 3b987a8..551c5ad4 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.3.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.3.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -27,7 +27,7 @@ ctx.beginPath(); ctx.roundRect(50, 25, 0, 0, [0]); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.3.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.3.worker.js index 72b910f9..e66388d9 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.3.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.3.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -23,7 +23,7 @@ ctx.beginPath(); ctx.roundRect(50, 25, 0, 0, [0]); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.4.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.4.html index c37feea..659505f5 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.4.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.4.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,7 +27,7 @@ ctx.roundRect(100, 25, 0, 0, [0]); ctx.lineTo(0, 25); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.4.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.4.worker.js index f6b7f92..53776dbd 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.4.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.4.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,7 +23,7 @@ ctx.roundRect(100, 25, 0, 0, [0]); ctx.lineTo(0, 25); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.5.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.5.html index eb7d57e..28415a3 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.5.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.5.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -27,7 +27,7 @@ ctx.moveTo(0, 0); ctx.roundRect(100, 25, 0, 0, [0]); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.5.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.5.worker.js index 1f0a33f..fafa2df 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.5.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.5.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -23,7 +23,7 @@ ctx.moveTo(0, 0); ctx.roundRect(100, 25, 0, 0, [0]); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.6.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.6.html index 71f87cd..36f9811 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.6.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.6.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -29,7 +29,7 @@ ctx.beginPath(); ctx.roundRect(100, 25, 1000, 0, [0]); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.6.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.6.worker.js index 7371872..afcfe8c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.6.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.roundrect.zero.6.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -25,7 +25,7 @@ ctx.beginPath(); ctx.roundRect(100, 25, 1000, 0, [0]); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.empty.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.empty.html index af6456f..7ac1e1ae 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.empty.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.empty.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -30,7 +30,7 @@ ctx.moveTo(40, 25); ctx.moveTo(60, 25); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.empty.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.empty.worker.js index 67fcbfa..f21efdc 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.empty.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.empty.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -26,7 +26,7 @@ ctx.moveTo(40, 25); ctx.moveTo(60, 25); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.overlap.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.overlap.html index b5f1a76a..35cc909 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.overlap.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.overlap.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#000'; ctx.fillRect(0, 0, 100, 50); @@ -29,7 +29,7 @@ ctx.moveTo(0, 30); ctx.lineTo(100, 30); ctx.stroke(); -_assertPixelApprox(offscreenCanvas, 50,25, 0,127,0,255, "50,25", "0,127,0,255", 1); +_assertPixelApprox(canvas, 50,25, 0,127,0,255, "50,25", "0,127,0,255", 1); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.overlap.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.overlap.worker.js index ede3096..aa7a163 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.overlap.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.overlap.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#000'; ctx.fillRect(0, 0, 100, 50); @@ -25,7 +25,7 @@ ctx.moveTo(0, 30); ctx.lineTo(100, 30); ctx.stroke(); -_assertPixelApprox(offscreenCanvas, 50,25, 0,127,0,255, "50,25", "0,127,0,255", 1); +_assertPixelApprox(canvas, 50,25, 0,127,0,255, "50,25", "0,127,0,255", 1); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.prune.arc.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.prune.arc.html index 94ffcd8e..2d4fb8ed 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.prune.arc.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.prune.arc.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -34,7 +34,7 @@ ctx.moveTo(60, 25); ctx.arc(50, 25, 10, 0, 0, false); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.prune.arc.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.prune.arc.worker.js index 7607fed..5d3a87f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.prune.arc.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.prune.arc.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -30,7 +30,7 @@ ctx.moveTo(60, 25); ctx.arc(50, 25, 10, 0, 0, false); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.prune.closed.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.prune.closed.html index f396919..8890e106 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.prune.closed.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.prune.closed.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -31,7 +31,7 @@ ctx.lineTo(50, 25); ctx.closePath(); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.prune.closed.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.prune.closed.worker.js index e431ef87..cffdfdd 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.prune.closed.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.prune.closed.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -27,7 +27,7 @@ ctx.lineTo(50, 25); ctx.closePath(); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.prune.corner.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.prune.corner.html index 32353773..f9f4b01b 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.prune.corner.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.prune.corner.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -33,7 +33,7 @@ ctx.lineTo(-100, 200); ctx.lineTo(-100, 1000); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.prune.corner.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.prune.corner.worker.js index 66819dbb..de307b1 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.prune.corner.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.prune.corner.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -29,7 +29,7 @@ ctx.lineTo(-100, 200); ctx.lineTo(-100, 1000); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.prune.curve.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.prune.curve.html index be904b6..270d6c3 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.prune.curve.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.prune.curve.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -34,7 +34,7 @@ ctx.moveTo(50, 25); ctx.bezierCurveTo(50, 25, 50, 25, 50, 25); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.prune.curve.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.prune.curve.worker.js index 07137eb..386a452 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.prune.curve.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.prune.curve.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -30,7 +30,7 @@ ctx.moveTo(50, 25); ctx.bezierCurveTo(50, 25, 50, 25, 50, 25); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.prune.line.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.prune.line.html index 3e55a13..bb9e9874 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.prune.line.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.prune.line.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -30,7 +30,7 @@ ctx.moveTo(50, 25); ctx.lineTo(50, 25); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.prune.line.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.prune.line.worker.js index 1c39c1d..736be715 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.prune.line.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.prune.line.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -26,7 +26,7 @@ ctx.moveTo(50, 25); ctx.lineTo(50, 25); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.prune.rect.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.prune.rect.html index d4ee7bd0..833c7fe 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.prune.rect.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.prune.rect.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -30,7 +30,7 @@ ctx.rect(50, 25, 0, 0); ctx.stroke(); ctx.strokeRect(50, 25, 0, 0); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.prune.rect.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.prune.rect.worker.js index d44a0398..7d90a82 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.prune.rect.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.prune.rect.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -26,7 +26,7 @@ ctx.rect(50, 25, 0, 0); ctx.stroke(); ctx.strokeRect(50, 25, 0, 0); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.scale1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.scale1.html index 14433af..c911c09 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.scale1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.scale1.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -36,15 +36,15 @@ ctx.strokeStyle = '#f00'; ctx.stroke(); ctx.restore(); -_assertPixel(offscreenCanvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,0, 0,255,0,255, "50,0", "0,255,0,255"); -_assertPixel(offscreenCanvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255"); -_assertPixel(offscreenCanvas, 0,25, 0,255,0,255, "0,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 99,25, 0,255,0,255, "99,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,49, 0,255,0,255, "50,49", "0,255,0,255"); -_assertPixel(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255"); +_assertPixel(canvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255"); +_assertPixel(canvas, 50,0, 0,255,0,255, "50,0", "0,255,0,255"); +_assertPixel(canvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255"); +_assertPixel(canvas, 0,25, 0,255,0,255, "0,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 99,25, 0,255,0,255, "99,25", "0,255,0,255"); +_assertPixel(canvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255"); +_assertPixel(canvas, 50,49, 0,255,0,255, "50,49", "0,255,0,255"); +_assertPixel(canvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.scale1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.scale1.worker.js index d4171dc..507c60e2 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.scale1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.scale1.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -32,15 +32,15 @@ ctx.strokeStyle = '#f00'; ctx.stroke(); ctx.restore(); -_assertPixel(offscreenCanvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,0, 0,255,0,255, "50,0", "0,255,0,255"); -_assertPixel(offscreenCanvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255"); -_assertPixel(offscreenCanvas, 0,25, 0,255,0,255, "0,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 99,25, 0,255,0,255, "99,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,49, 0,255,0,255, "50,49", "0,255,0,255"); -_assertPixel(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255"); +_assertPixel(canvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255"); +_assertPixel(canvas, 50,0, 0,255,0,255, "50,0", "0,255,0,255"); +_assertPixel(canvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255"); +_assertPixel(canvas, 0,25, 0,255,0,255, "0,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 99,25, 0,255,0,255, "99,25", "0,255,0,255"); +_assertPixel(canvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255"); +_assertPixel(canvas, 50,49, 0,255,0,255, "50,49", "0,255,0,255"); +_assertPixel(canvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.scale2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.scale2.html index 732ef8c..4c516a2 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.scale2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.scale2.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -38,15 +38,15 @@ ctx.strokeStyle = '#f00'; ctx.stroke(); ctx.restore(); -_assertPixel(offscreenCanvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,0, 0,255,0,255, "50,0", "0,255,0,255"); -_assertPixel(offscreenCanvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255"); -_assertPixel(offscreenCanvas, 0,25, 0,255,0,255, "0,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 99,25, 0,255,0,255, "99,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,49, 0,255,0,255, "50,49", "0,255,0,255"); -_assertPixel(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255"); +_assertPixel(canvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255"); +_assertPixel(canvas, 50,0, 0,255,0,255, "50,0", "0,255,0,255"); +_assertPixel(canvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255"); +_assertPixel(canvas, 0,25, 0,255,0,255, "0,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 99,25, 0,255,0,255, "99,25", "0,255,0,255"); +_assertPixel(canvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255"); +_assertPixel(canvas, 50,49, 0,255,0,255, "50,49", "0,255,0,255"); +_assertPixel(canvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.scale2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.scale2.worker.js index d283d04..fe31382 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.scale2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.scale2.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -34,15 +34,15 @@ ctx.strokeStyle = '#f00'; ctx.stroke(); ctx.restore(); -_assertPixel(offscreenCanvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,0, 0,255,0,255, "50,0", "0,255,0,255"); -_assertPixel(offscreenCanvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255"); -_assertPixel(offscreenCanvas, 0,25, 0,255,0,255, "0,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 99,25, 0,255,0,255, "99,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,49, 0,255,0,255, "50,49", "0,255,0,255"); -_assertPixel(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255"); +_assertPixel(canvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255"); +_assertPixel(canvas, 50,0, 0,255,0,255, "50,0", "0,255,0,255"); +_assertPixel(canvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255"); +_assertPixel(canvas, 0,25, 0,255,0,255, "0,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 99,25, 0,255,0,255, "99,25", "0,255,0,255"); +_assertPixel(canvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255"); +_assertPixel(canvas, 50,49, 0,255,0,255, "50,49", "0,255,0,255"); +_assertPixel(canvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.skew.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.skew.html index c959eb8..9988291 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.skew.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.skew.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -51,15 +51,15 @@ ctx.strokeStyle = '#f00'; ctx.stroke(); ctx.restore(); -_assertPixel(offscreenCanvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,0, 0,255,0,255, "50,0", "0,255,0,255"); -_assertPixel(offscreenCanvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255"); -_assertPixel(offscreenCanvas, 0,25, 0,255,0,255, "0,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 99,25, 0,255,0,255, "99,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,49, 0,255,0,255, "50,49", "0,255,0,255"); -_assertPixel(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255"); +_assertPixel(canvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255"); +_assertPixel(canvas, 50,0, 0,255,0,255, "50,0", "0,255,0,255"); +_assertPixel(canvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255"); +_assertPixel(canvas, 0,25, 0,255,0,255, "0,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 99,25, 0,255,0,255, "99,25", "0,255,0,255"); +_assertPixel(canvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255"); +_assertPixel(canvas, 50,49, 0,255,0,255, "50,49", "0,255,0,255"); +_assertPixel(canvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.skew.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.skew.worker.js index 653b6914..8b854ad2 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.skew.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.skew.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -47,15 +47,15 @@ ctx.strokeStyle = '#f00'; ctx.stroke(); ctx.restore(); -_assertPixel(offscreenCanvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,0, 0,255,0,255, "50,0", "0,255,0,255"); -_assertPixel(offscreenCanvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255"); -_assertPixel(offscreenCanvas, 0,25, 0,255,0,255, "0,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 99,25, 0,255,0,255, "99,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,49, 0,255,0,255, "50,49", "0,255,0,255"); -_assertPixel(offscreenCanvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255"); +_assertPixel(canvas, 0,0, 0,255,0,255, "0,0", "0,255,0,255"); +_assertPixel(canvas, 50,0, 0,255,0,255, "50,0", "0,255,0,255"); +_assertPixel(canvas, 99,0, 0,255,0,255, "99,0", "0,255,0,255"); +_assertPixel(canvas, 0,25, 0,255,0,255, "0,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 99,25, 0,255,0,255, "99,25", "0,255,0,255"); +_assertPixel(canvas, 0,49, 0,255,0,255, "0,49", "0,255,0,255"); +_assertPixel(canvas, 50,49, 0,255,0,255, "50,49", "0,255,0,255"); +_assertPixel(canvas, 99,49, 0,255,0,255, "99,49", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.unaffected.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.unaffected.html index 09db7cf..ec96d8b 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.unaffected.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.unaffected.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -32,7 +32,7 @@ ctx.closePath(); ctx.strokeStyle = '#0f0'; ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.unaffected.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.unaffected.worker.js index 61d6ea5..5534fea 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.unaffected.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.unaffected.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -28,7 +28,7 @@ ctx.closePath(); ctx.strokeStyle = '#0f0'; ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.union.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.union.html index 7d7677e..cbb9925 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.union.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.union.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -29,7 +29,7 @@ ctx.moveTo(100, 40); ctx.lineTo(0, 40); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.union.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.union.worker.js index 159507c0..f726705 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.union.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.stroke.union.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -25,7 +25,7 @@ ctx.moveTo(100, 40); ctx.lineTo(0, 40); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.transformation.basic.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.transformation.basic.html index 94f16f95f6..b000df77 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.transformation.basic.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.transformation.basic.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,7 +27,7 @@ ctx.translate(0, -100); ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.transformation.basic.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.transformation.basic.worker.js index ecb5e2f..76da934 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.transformation.basic.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.transformation.basic.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,7 +23,7 @@ ctx.translate(0, -100); ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.transformation.changing.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.transformation.changing.html index d5aa8a94..ec6a682 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.transformation.changing.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.transformation.changing.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -34,7 +34,7 @@ ctx.rotate(Math.PI/2); ctx.scale(0.1, 0.1); ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.transformation.changing.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.transformation.changing.worker.js index 92f1359..12dc1c01 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.transformation.changing.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.transformation.changing.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -30,7 +30,7 @@ ctx.rotate(Math.PI/2); ctx.scale(0.1, 0.1); ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.transformation.multiple.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.transformation.multiple.html index a0f96ae..113dadc 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.transformation.multiple.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.transformation.multiple.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -37,7 +37,7 @@ ctx.stroke(); ctx.translate(0, 50); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.transformation.multiple.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.transformation.multiple.worker.js index 7f2f1de5..abebb1f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.transformation.multiple.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/path-objects/2d.path.transformation.multiple.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -33,7 +33,7 @@ ctx.stroke(); ctx.translate(0, 50); ctx.stroke(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.basic.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.basic.html index 05aafb3..24d9a77 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.basic.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.basic.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); _assertDifferent(ctx.createImageData(ctx.createImageData(1, 1)), null, "ctx.createImageData(ctx.createImageData(1, 1))", "null"); t.done();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.basic.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.basic.worker.js index a618153..54d2cadb 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.basic.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.basic.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); _assertDifferent(ctx.createImageData(ctx.createImageData(1, 1)), null, "ctx.createImageData(ctx.createImageData(1, 1))", "null"); t.done();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.initial.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.initial.html index 08fa6fa..658ae83 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.initial.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.initial.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.initial.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.initial.worker.js index 22244ddd..bfff76b 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.initial.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.initial.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.zero.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.zero.html index b559be9..736725f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.zero.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.zero.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); assert_throws_js(TypeError, function() { ctx.createImageData(null); }); t.done();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.zero.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.zero.worker.js index f616f99..c51067e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.zero.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.zero.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); assert_throws_js(TypeError, function() { ctx.createImageData(null); }); t.done();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.basic.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.basic.html index 5f27e5b..7dca77e4a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.basic.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.basic.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); _assertDifferent(ctx.createImageData(1, 1), null, "ctx.createImageData(1, 1)", "null"); t.done();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.basic.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.basic.worker.js index e4d35f4..e99cbe2 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.basic.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.basic.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); _assertDifferent(ctx.createImageData(1, 1), null, "ctx.createImageData(1, 1)", "null"); t.done();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.initial.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.initial.html index 7723d4ee..76017f5 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.initial.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.initial.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var imgdata = ctx.createImageData(10, 20); _assertSame(imgdata.data.length, imgdata.width*imgdata.height*4, "imgdata.data.length", "imgdata.width*imgdata.height*4");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.initial.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.initial.worker.js index 17d6ef5..0e681dee 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.initial.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.initial.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var imgdata = ctx.createImageData(10, 20); _assertSame(imgdata.data.length, imgdata.width*imgdata.height*4, "imgdata.data.length", "imgdata.width*imgdata.height*4");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.large.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.large.html index c03fe36..f3d19d3f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.large.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.large.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var imgdata = ctx.createImageData(1000, 2000); _assertSame(imgdata.data.length, imgdata.width*imgdata.height*4, "imgdata.data.length", "imgdata.width*imgdata.height*4");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.large.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.large.worker.js index edd0d66..57dda69d4 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.large.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.large.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var imgdata = ctx.createImageData(1000, 2000); _assertSame(imgdata.data.length, imgdata.width*imgdata.height*4, "imgdata.data.length", "imgdata.width*imgdata.height*4");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.negative.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.negative.html index ae09385..f4b4df99 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.negative.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.negative.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var imgdata1 = ctx.createImageData(10, 20); var imgdata2 = ctx.createImageData(-10, 20);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.negative.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.negative.worker.js index eb8c0e6b..a5cb857 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.negative.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.negative.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var imgdata1 = ctx.createImageData(10, 20); var imgdata2 = ctx.createImageData(-10, 20);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.nonfinite.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.nonfinite.html index 46d9673c..d7d1e7f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.nonfinite.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.nonfinite.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); assert_throws_js(TypeError, function() { ctx.createImageData(Infinity, 10); }); assert_throws_js(TypeError, function() { ctx.createImageData(-Infinity, 10); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.nonfinite.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.nonfinite.worker.js index 36c144d8..f398e2a5 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.nonfinite.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.nonfinite.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); assert_throws_js(TypeError, function() { ctx.createImageData(Infinity, 10); }); assert_throws_js(TypeError, function() { ctx.createImageData(-Infinity, 10); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.round.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.round.html index e529f16..f2f0aa89 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.round.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.round.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var imgdata1 = ctx.createImageData(10.01, 10.99); var imgdata2 = ctx.getImageData(0, 0, 10.01, 10.99);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.round.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.round.worker.js index 7a72529..2387498 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.round.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.round.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var imgdata1 = ctx.createImageData(10.01, 10.99); var imgdata2 = ctx.getImageData(0, 0, 10.01, 10.99);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.zero.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.zero.html index ad68d479..7c3a2d9 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.zero.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.zero.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); assert_throws_dom("INDEX_SIZE_ERR", function() { ctx.createImageData(10, 0); }); assert_throws_dom("INDEX_SIZE_ERR", function() { ctx.createImageData(0, 10); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.zero.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.zero.worker.js index ef68090..615a989 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.zero.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.zero.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); assert_throws_dom("INDEX_SIZE_ERR", function() { ctx.createImageData(10, 0); }); assert_throws_dom("INDEX_SIZE_ERR", function() { ctx.createImageData(0, 10); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.basic.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.basic.html index 475ff28b5..d4f4a63 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.basic.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.basic.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); _assertDifferent(ctx.getImageData(0, 0, 100, 50), null, "ctx.getImageData(0, 0, 100, 50)", "null"); t.done();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.basic.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.basic.worker.js index b071796..8accaccc 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.basic.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.basic.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); _assertDifferent(ctx.getImageData(0, 0, 100, 50), null, "ctx.getImageData(0, 0, 100, 50)", "null"); t.done();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.clamp.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.clamp.html index 4c71989..163fc880 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.clamp.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.clamp.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgb(-100, -200, -300)'; ctx.fillRect(0, 0, 100, 50);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.clamp.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.clamp.worker.js index 9974994..3fd5d31c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.clamp.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.clamp.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgb(-100, -200, -300)'; ctx.fillRect(0, 0, 100, 50);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.length.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.length.html index c651477..2f7247f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.length.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.length.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var imgdata = ctx.getImageData(0, 0, 10, 10); _assertSame(imgdata.data.length, imgdata.width*imgdata.height*4, "imgdata.data.length", "imgdata.width*imgdata.height*4");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.length.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.length.worker.js index e89f3629..dd2e3dd 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.length.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.length.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var imgdata = ctx.getImageData(0, 0, 10, 10); _assertSame(imgdata.data.length, imgdata.width*imgdata.height*4, "imgdata.data.length", "imgdata.width*imgdata.height*4");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.nonfinite.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.nonfinite.html index 84c5e26..5efc7366 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.nonfinite.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.nonfinite.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); assert_throws_js(TypeError, function() { ctx.getImageData(Infinity, 10, 10, 10); }); assert_throws_js(TypeError, function() { ctx.getImageData(-Infinity, 10, 10, 10); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.nonfinite.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.nonfinite.worker.js index 38718347..15b3950a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.nonfinite.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.nonfinite.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); assert_throws_js(TypeError, function() { ctx.getImageData(Infinity, 10, 10, 10); }); assert_throws_js(TypeError, function() { ctx.getImageData(-Infinity, 10, 10, 10); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.nonpremul.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.nonpremul.html index b093ea2..27995b2 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.nonpremul.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.nonpremul.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(255, 255, 255, 0.5)'; ctx.fillRect(0, 0, 100, 50);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.nonpremul.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.nonpremul.worker.js index 88e38c4..653e8d2f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.nonpremul.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.nonpremul.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(255, 255, 255, 0.5)'; ctx.fillRect(0, 0, 100, 50);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.alpha.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.alpha.html index ba7be8a..a169cb5 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.alpha.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.alpha.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 0, 0, 0.5)'; ctx.fillRect(0, 0, 100, 50);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.alpha.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.alpha.worker.js index 84a9b0c..0388448 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.alpha.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.alpha.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 0, 0, 0.5)'; ctx.fillRect(0, 0, 100, 50);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.cols.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.cols.html index 01b83d0..09eb58a7 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.cols.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.cols.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#fff'; ctx.fillRect(0, 0, 100, 50);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.cols.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.cols.worker.js index ac5d0a7..6a13c4d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.cols.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.cols.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#fff'; ctx.fillRect(0, 0, 100, 50);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.rgb.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.rgb.html index 56ce4f263..b56adf19 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.rgb.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.rgb.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#48c'; ctx.fillRect(0, 0, 100, 50);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.rgb.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.rgb.worker.js index d2196329..771a777 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.rgb.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.rgb.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#48c'; ctx.fillRect(0, 0, 100, 50);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.rows.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.rows.html index 13381e8..3ad1ced 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.rows.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.rows.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#fff'; ctx.fillRect(0, 0, 100, 50);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.rows.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.rows.worker.js index 7ac50f4..1f75f93 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.rows.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.rows.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#fff'; ctx.fillRect(0, 0, 100, 50);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.range.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.range.html index e2af285..283dd07b 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.range.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.range.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#000'; ctx.fillRect(0, 0, 100, 50);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.range.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.range.worker.js index bb59e07..9389c22 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.range.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.range.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#000'; ctx.fillRect(0, 0, 100, 50);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.negative.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.negative.html index d5bcfa0..a7e3d8574 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.negative.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.negative.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#000'; ctx.fillRect(0, 0, 100, 50);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.negative.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.negative.worker.js index 26a3f38..e057315 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.negative.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.negative.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#000'; ctx.fillRect(0, 0, 100, 50);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.outside.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.outside.html index 4241bab..a071e44 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.outside.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.outside.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#08f'; ctx.fillRect(0, 0, 100, 50);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.outside.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.outside.worker.js index 60c9113..4025ecd 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.outside.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.outside.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#08f'; ctx.fillRect(0, 0, 100, 50);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.size.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.size.html index 0ac5dc00..4fd551d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.size.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.size.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var imgdata1 = ctx.getImageData(0, 0, 10, 10); var imgdata2 = ctx.getImageData(0, 0, 20, 20);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.size.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.size.worker.js index 7861ae97..111f4b5 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.size.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.size.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var imgdata1 = ctx.getImageData(0, 0, 10, 10); var imgdata2 = ctx.getImageData(0, 0, 20, 20);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.unaffected.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.unaffected.html index 268085e..d3c9320b 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.unaffected.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.unaffected.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 50, 50) @@ -34,8 +34,8 @@ var imgdata = ctx.getImageData(0, 0, 50, 50); ctx.restore(); ctx.putImageData(imgdata, 50, 0); -_assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.unaffected.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.unaffected.worker.js index 9f73edd..ba536ab 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.unaffected.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.unaffected.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 50, 50) @@ -30,8 +30,8 @@ var imgdata = ctx.getImageData(0, 0, 50, 50); ctx.restore(); ctx.putImageData(imgdata, 50, 0); -_assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.zero.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.zero.html index 3ea3b330..91cf5a25 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.zero.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.zero.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); assert_throws_dom("INDEX_SIZE_ERR", function() { ctx.getImageData(1, 1, 10, 0); }); assert_throws_dom("INDEX_SIZE_ERR", function() { ctx.getImageData(1, 1, 0, 10); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.zero.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.zero.worker.js index 2266c4f..07e8f36 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.zero.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.zero.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); assert_throws_dom("INDEX_SIZE_ERR", function() { ctx.getImageData(1, 1, 10, 0); }); assert_throws_dom("INDEX_SIZE_ERR", function() { ctx.getImageData(1, 1, 0, 10); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.clamp.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.clamp.html index 27a0602..8b1515c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.clamp.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.clamp.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var imgdata = ctx.getImageData(0, 0, 10, 10); imgdata.data[0] = 100;
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.clamp.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.clamp.worker.js index 9f6c79f8..0e2a33c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.clamp.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.clamp.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var imgdata = ctx.getImageData(0, 0, 10, 10); imgdata.data[0] = 100;
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.nan.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.nan.html index 941834f..9fce409 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.nan.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.nan.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var imgdata = ctx.getImageData(0, 0, 10, 10); imgdata.data[0] = 100;
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.nan.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.nan.worker.js index 9532891..ef2eb21b 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.nan.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.nan.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var imgdata = ctx.getImageData(0, 0, 10, 10); imgdata.data[0] = 100;
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.properties.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.properties.html index b91a905..05a4106 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.properties.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.properties.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var imgdata = ctx.getImageData(0, 0, 10, 10); _assertSame(typeof(imgdata.width), 'number', "typeof(imgdata.width)", "'number'");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.properties.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.properties.worker.js index 2aa38d8..42c89ef 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.properties.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.properties.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var imgdata = ctx.getImageData(0, 0, 10, 10); _assertSame(typeof(imgdata.width), 'number', "typeof(imgdata.width)", "'number'");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.readonly.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.readonly.html index 745fa77..5fbdfc5 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.readonly.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.readonly.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var imgdata = ctx.getImageData(0, 0, 10, 10); var w = imgdata.width;
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.readonly.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.readonly.worker.js index e984530..068761e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.readonly.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.readonly.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var imgdata = ctx.getImageData(0, 0, 10, 10); var w = imgdata.width;
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.round.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.round.html index 1b0e9f3..8b362a01 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.round.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.round.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var imgdata = ctx.getImageData(0, 0, 10, 10); imgdata.data[0] = 0.499;
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.round.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.round.worker.js index dd715e0..4a88db9 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.round.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.round.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var imgdata = ctx.getImageData(0, 0, 10, 10); imgdata.data[0] = 0.499;
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.set.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.set.html index 6b87fd8..95305c5 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.set.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.set.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var imgdata = ctx.getImageData(0, 0, 10, 10); imgdata.data[0] = 100;
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.set.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.set.worker.js index 861f4e06..fcb16ab 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.set.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.set.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var imgdata = ctx.getImageData(0, 0, 10, 10); imgdata.data[0] = 100;
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.string.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.string.html index 5e7f696..a7b5d57 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.string.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.string.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var imgdata = ctx.getImageData(0, 0, 10, 10); imgdata.data[0] = 100;
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.string.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.string.worker.js index 94b7975..6c2dcc8 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.string.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.string.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var imgdata = ctx.getImageData(0, 0, 10, 10); imgdata.data[0] = 100;
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.undefined.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.undefined.html index 220e8b3..a2533a5 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.undefined.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.undefined.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var imgdata = ctx.getImageData(0, 0, 10, 10); imgdata.data[0] = 100;
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.undefined.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.undefined.worker.js index 8284e7f..f6b6299 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.undefined.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.undefined.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var imgdata = ctx.getImageData(0, 0, 10, 10); imgdata.data[0] = 100;
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.alpha.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.alpha.html index c9afd898..64e7f2eb8 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.alpha.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.alpha.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 0, 0.25)'; ctx.fillRect(0, 0, 100, 50) @@ -26,7 +26,7 @@ ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50) ctx.putImageData(imgdata, 0, 0); -_assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,64, "50,25", "0,255,0,64", 2); +_assertPixelApprox(canvas, 50,25, 0,255,0,64, "50,25", "0,255,0,64", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.alpha.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.alpha.worker.js index f4cf4cab..44b791f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.alpha.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.alpha.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgba(0, 255, 0, 0.25)'; ctx.fillRect(0, 0, 100, 50) @@ -22,7 +22,7 @@ ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50) ctx.putImageData(imgdata, 0, 0); -_assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,64, "50,25", "0,255,0,64", 2); +_assertPixelApprox(canvas, 50,25, 0,255,0,64, "50,25", "0,255,0,64", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.basic.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.basic.html index 0be0558..ab4cc73 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.basic.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.basic.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50) @@ -26,7 +26,7 @@ ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50) ctx.putImageData(imgdata, 0, 0); -_assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.basic.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.basic.worker.js index 51b0de83..c3d51c4 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.basic.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.basic.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50) @@ -22,7 +22,7 @@ ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50) ctx.putImageData(imgdata, 0, 0); -_assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.clip.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.clip.html index 4d57777..ebbd0d7 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.clip.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.clip.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50) @@ -29,8 +29,8 @@ ctx.rect(0, 0, 50, 50); ctx.clip(); ctx.putImageData(imgdata, 0, 0); -_assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.clip.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.clip.worker.js index a54227eb..174d915 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.clip.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.clip.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50) @@ -25,8 +25,8 @@ ctx.rect(0, 0, 50, 50); ctx.clip(); ctx.putImageData(imgdata, 0, 0); -_assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.created.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.created.html index bffd114..84ba5116 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.created.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.created.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var imgdata = ctx.createImageData(100, 50); for (var i = 0; i < imgdata.data.length; i += 4) { @@ -30,7 +30,7 @@ ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50) ctx.putImageData(imgdata, 0, 0); -_assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.created.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.created.worker.js index b60c1e3..6f7cea04 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.created.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.created.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var imgdata = ctx.createImageData(100, 50); for (var i = 0; i < imgdata.data.length; i += 4) { @@ -26,7 +26,7 @@ ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50) ctx.putImageData(imgdata, 0, 0); -_assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.cross.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.cross.html index 2489dd19..8d94bbc 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.cross.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.cross.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var offscreenCanvas2 = new OffscreenCanvas(100, 50); var ctx2 = offscreenCanvas2.getContext('2d'); @@ -28,7 +28,7 @@ ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50) ctx.putImageData(imgdata, 0, 0); -_assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.cross.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.cross.worker.js index 90858215a..173808f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.cross.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.cross.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var offscreenCanvas2 = new OffscreenCanvas(100, 50); var ctx2 = offscreenCanvas2.getContext('2d'); @@ -24,7 +24,7 @@ ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50) ctx.putImageData(imgdata, 0, 0); -_assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.negative.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.negative.html index eef79d8f..2f408c4 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.negative.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.negative.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50) @@ -30,11 +30,11 @@ ctx.fillStyle = '#f00'; ctx.fillRect(40, 20, 20, 20) ctx.putImageData(imgdata, 40, 20, 20, 20, -20, -20); -_assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 35,25, 0,255,0,255, "35,25", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 65,25, 0,255,0,255, "65,25", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 50,15, 0,255,0,255, "50,15", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 50,45, 0,255,0,255, "50,45", "0,255,0,255", 2); +_assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 35,25, 0,255,0,255, "35,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 65,25, 0,255,0,255, "65,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 50,15, 0,255,0,255, "50,15", "0,255,0,255", 2); +_assertPixelApprox(canvas, 50,45, 0,255,0,255, "50,45", "0,255,0,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.negative.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.negative.worker.js index e2c29d8..ba83579 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.negative.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.negative.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50) @@ -26,11 +26,11 @@ ctx.fillStyle = '#f00'; ctx.fillRect(40, 20, 20, 20) ctx.putImageData(imgdata, 40, 20, 20, 20, -20, -20); -_assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 35,25, 0,255,0,255, "35,25", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 65,25, 0,255,0,255, "65,25", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 50,15, 0,255,0,255, "50,15", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 50,45, 0,255,0,255, "50,45", "0,255,0,255", 2); +_assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 35,25, 0,255,0,255, "35,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 65,25, 0,255,0,255, "65,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 50,15, 0,255,0,255, "50,15", "0,255,0,255", 2); +_assertPixelApprox(canvas, 50,45, 0,255,0,255, "50,45", "0,255,0,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.outside.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.outside.html index 9f17fc7..37f049e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.outside.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.outside.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50) @@ -29,13 +29,13 @@ ctx.putImageData(imgdata, 200, 200, 0, 0, 100, 50); ctx.putImageData(imgdata, 40, 20, -30, -20, 30, 20); ctx.putImageData(imgdata, -30, 20, 0, 0, 30, 20); -_assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 98,15, 0,255,0,255, "98,15", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 98,45, 0,255,0,255, "98,45", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 1,5, 0,255,0,255, "1,5", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 1,45, 0,255,0,255, "1,45", "0,255,0,255", 2); +_assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 98,15, 0,255,0,255, "98,15", "0,255,0,255", 2); +_assertPixelApprox(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 98,45, 0,255,0,255, "98,45", "0,255,0,255", 2); +_assertPixelApprox(canvas, 1,5, 0,255,0,255, "1,5", "0,255,0,255", 2); +_assertPixelApprox(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 1,45, 0,255,0,255, "1,45", "0,255,0,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.outside.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.outside.worker.js index 4c62f9cc..9dd11107 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.outside.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.outside.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50) @@ -25,13 +25,13 @@ ctx.putImageData(imgdata, 200, 200, 0, 0, 100, 50); ctx.putImageData(imgdata, 40, 20, -30, -20, 30, 20); ctx.putImageData(imgdata, -30, 20, 0, 0, 30, 20); -_assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 98,15, 0,255,0,255, "98,15", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 98,45, 0,255,0,255, "98,45", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 1,5, 0,255,0,255, "1,5", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 1,45, 0,255,0,255, "1,45", "0,255,0,255", 2); +_assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 98,15, 0,255,0,255, "98,15", "0,255,0,255", 2); +_assertPixelApprox(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 98,45, 0,255,0,255, "98,45", "0,255,0,255", 2); +_assertPixelApprox(canvas, 1,5, 0,255,0,255, "1,5", "0,255,0,255", 2); +_assertPixelApprox(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 1,45, 0,255,0,255, "1,45", "0,255,0,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.rect1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.rect1.html index cec56b8..8401ddfd 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.rect1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.rect1.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50) @@ -30,11 +30,11 @@ ctx.fillStyle = '#f00'; ctx.fillRect(40, 20, 20, 20) ctx.putImageData(imgdata, 40, 20, 0, 0, 20, 20); -_assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 35,25, 0,255,0,255, "35,25", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 65,25, 0,255,0,255, "65,25", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 50,15, 0,255,0,255, "50,15", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 50,45, 0,255,0,255, "50,45", "0,255,0,255", 2); +_assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 35,25, 0,255,0,255, "35,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 65,25, 0,255,0,255, "65,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 50,15, 0,255,0,255, "50,15", "0,255,0,255", 2); +_assertPixelApprox(canvas, 50,45, 0,255,0,255, "50,45", "0,255,0,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.rect1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.rect1.worker.js index f5da0fa..71cbb8d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.rect1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.rect1.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50) @@ -26,11 +26,11 @@ ctx.fillStyle = '#f00'; ctx.fillRect(40, 20, 20, 20) ctx.putImageData(imgdata, 40, 20, 0, 0, 20, 20); -_assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 35,25, 0,255,0,255, "35,25", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 65,25, 0,255,0,255, "65,25", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 50,15, 0,255,0,255, "50,15", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 50,45, 0,255,0,255, "50,45", "0,255,0,255", 2); +_assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 35,25, 0,255,0,255, "35,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 65,25, 0,255,0,255, "65,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 50,15, 0,255,0,255, "50,15", "0,255,0,255", 2); +_assertPixelApprox(canvas, 50,45, 0,255,0,255, "50,45", "0,255,0,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.rect2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.rect2.html index faea305..c3b5f48 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.rect2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.rect2.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50) @@ -30,11 +30,11 @@ ctx.fillStyle = '#f00'; ctx.fillRect(40, 20, 20, 20) ctx.putImageData(imgdata, -20, -10, 60, 30, 20, 20); -_assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 35,25, 0,255,0,255, "35,25", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 65,25, 0,255,0,255, "65,25", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 50,15, 0,255,0,255, "50,15", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 50,45, 0,255,0,255, "50,45", "0,255,0,255", 2); +_assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 35,25, 0,255,0,255, "35,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 65,25, 0,255,0,255, "65,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 50,15, 0,255,0,255, "50,15", "0,255,0,255", 2); +_assertPixelApprox(canvas, 50,45, 0,255,0,255, "50,45", "0,255,0,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.rect2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.rect2.worker.js index 35ba665f..19aa4da 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.rect2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.rect2.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50) @@ -26,11 +26,11 @@ ctx.fillStyle = '#f00'; ctx.fillRect(40, 20, 20, 20) ctx.putImageData(imgdata, -20, -10, 60, 30, 20, 20); -_assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 35,25, 0,255,0,255, "35,25", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 65,25, 0,255,0,255, "65,25", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 50,15, 0,255,0,255, "50,15", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 50,45, 0,255,0,255, "50,45", "0,255,0,255", 2); +_assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 35,25, 0,255,0,255, "35,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 65,25, 0,255,0,255, "65,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 50,15, 0,255,0,255, "50,15", "0,255,0,255", 2); +_assertPixelApprox(canvas, 50,45, 0,255,0,255, "50,45", "0,255,0,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.zero.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.zero.html index 30fda0d..7b9231f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.zero.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.zero.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50) @@ -26,7 +26,7 @@ ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50) ctx.putImageData(imgdata, 0, 0, 0, 0, 0, 0); -_assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.zero.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.zero.worker.js index ab85a60..149f9f1 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.zero.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.zero.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50) @@ -22,7 +22,7 @@ ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50) ctx.putImageData(imgdata, 0, 0, 0, 0, 0, 0); -_assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.modified.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.modified.html index dbdf7be..2a14984 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.modified.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.modified.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50) @@ -31,7 +31,7 @@ imgdata.data[i+1] = 255; } ctx.putImageData(imgdata, 45, 20); -_assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.modified.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.modified.worker.js index 1891416..9c016a3 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.modified.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.modified.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50) @@ -27,7 +27,7 @@ imgdata.data[i+1] = 255; } ctx.putImageData(imgdata, 45, 20); -_assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.nonfinite.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.nonfinite.html index d5e3840f..6590f76 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.nonfinite.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.nonfinite.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var imgdata = ctx.getImageData(0, 0, 10, 10); assert_throws_js(TypeError, function() { ctx.putImageData(imgdata, Infinity, 10); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.nonfinite.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.nonfinite.worker.js index c91c1dc..04298fa 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.nonfinite.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.nonfinite.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var imgdata = ctx.getImageData(0, 0, 10, 10); assert_throws_js(TypeError, function() { ctx.putImageData(imgdata, Infinity, 10); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.null.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.null.html index 1691745..3a51c97 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.null.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.null.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); assert_throws_js(TypeError, function() { ctx.putImageData(null, 0, 0); }); t.done();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.null.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.null.worker.js index 837368c..0b5b746 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.null.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.null.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); assert_throws_js(TypeError, function() { ctx.putImageData(null, 0, 0); }); t.done();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.path.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.path.html index c1920b7..f2578a59 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.path.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.path.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50) @@ -27,7 +27,7 @@ ctx.putImageData(imgdata, 0, 0); ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.path.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.path.worker.js index 23118f8..8b28039 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.path.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.path.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50) @@ -23,7 +23,7 @@ ctx.putImageData(imgdata, 0, 0); ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.unaffected.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.unaffected.html index fdfa1f7..0217124 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.unaffected.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.unaffected.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50) @@ -32,7 +32,7 @@ ctx.translate(100, 50); ctx.scale(0.1, 0.1); ctx.putImageData(imgdata, 0, 0); -_assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.unaffected.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.unaffected.worker.js index 4faea199..016f87d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.unaffected.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.unaffected.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50) @@ -28,7 +28,7 @@ ctx.translate(100, 50); ctx.scale(0.1, 0.1); ctx.putImageData(imgdata, 0, 0); -_assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.unchanged.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.unchanged.html index 8759acb..b3aff6f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.unchanged.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.unchanged.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var i = 0; for (var y = 0; y < 16; ++y) {
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.unchanged.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.unchanged.worker.js index 54d31f4..231ba386 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.unchanged.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.unchanged.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var i = 0; for (var y = 0; y < 16; ++y) {
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.wrongtype.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.wrongtype.html index 5da9ee6b..8e8ca53a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.wrongtype.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.wrongtype.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var imgdata = { width: 1, height: 1, data: [255, 0, 0, 255] }; assert_throws_js(TypeError, function() { ctx.putImageData(imgdata, 0, 0); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.wrongtype.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.wrongtype.worker.js index 579ecce..9c58133a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.wrongtype.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.wrongtype.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var imgdata = { width: 1, height: 1, data: [255, 0, 0, 255] }; assert_throws_js(TypeError, function() { ctx.putImageData(imgdata, 0, 0); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.alpha.1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.alpha.1.html index 076e54c..47ab218 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.alpha.1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.alpha.1.html
@@ -17,15 +17,15 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); ctx.shadowColor = 'rgba(255, 0, 0, 0.01)'; ctx.shadowOffsetY = 50; ctx.fillRect(0, -50, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 4); +_assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 4); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.alpha.1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.alpha.1.worker.js index 4ddf97d..59788661 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.alpha.1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.alpha.1.worker.js
@@ -13,15 +13,15 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); ctx.shadowColor = 'rgba(255, 0, 0, 0.01)'; ctx.shadowOffsetY = 50; ctx.fillRect(0, -50, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 4); +_assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 4); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.alpha.2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.alpha.2.html index 215194d..89c4e75 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.alpha.2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.alpha.2.html
@@ -17,15 +17,15 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.shadowColor = 'rgba(0, 0, 255, 0.5)'; ctx.shadowOffsetY = 50; ctx.fillRect(0, -50, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2); +_assertPixelApprox(canvas, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.alpha.2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.alpha.2.worker.js index abce283..ed8e1806 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.alpha.2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.alpha.2.worker.js
@@ -13,15 +13,15 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.shadowColor = 'rgba(0, 0, 255, 0.5)'; ctx.shadowOffsetY = 50; ctx.fillRect(0, -50, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2); +_assertPixelApprox(canvas, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.alpha.3.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.alpha.3.html index 082dc8b..5748ceda 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.alpha.3.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.alpha.3.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,7 +27,7 @@ ctx.shadowOffsetY = 50; ctx.globalAlpha = 0.5; ctx.fillRect(0, -50, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2); +_assertPixelApprox(canvas, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.alpha.3.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.alpha.3.worker.js index 7b2edd51..f0015597 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.alpha.3.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.alpha.3.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,7 +23,7 @@ ctx.shadowOffsetY = 50; ctx.globalAlpha = 0.5; ctx.fillRect(0, -50, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2); +_assertPixelApprox(canvas, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.alpha.4.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.alpha.4.html index 04053859..228ad20 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.alpha.4.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.alpha.4.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,7 +27,7 @@ ctx.shadowOffsetY = 50; ctx.globalAlpha = 0.707; ctx.fillRect(0, -50, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2); +_assertPixelApprox(canvas, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.alpha.4.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.alpha.4.worker.js index e79accc..abb6a4ca 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.alpha.4.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.alpha.4.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,7 +23,7 @@ ctx.shadowOffsetY = 50; ctx.globalAlpha = 0.707; ctx.fillRect(0, -50, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2); +_assertPixelApprox(canvas, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.alpha.5.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.alpha.5.html index a5513cc4..04f7c45 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.alpha.5.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.alpha.5.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -26,7 +26,7 @@ ctx.shadowColor = '#00f'; ctx.shadowOffsetY = 50; ctx.fillRect(0, -50, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2); +_assertPixelApprox(canvas, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.alpha.5.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.alpha.5.worker.js index 2c7e70b..c64d584 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.alpha.5.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.alpha.5.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -22,7 +22,7 @@ ctx.shadowColor = '#00f'; ctx.shadowOffsetY = 50; ctx.fillRect(0, -50, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2); +_assertPixelApprox(canvas, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowBlur.initial.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowBlur.initial.html index 871c28c..e6c4c2fd 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowBlur.initial.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowBlur.initial.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); _assertSame(ctx.shadowBlur, 0, "ctx.shadowBlur", "0"); t.done();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowBlur.initial.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowBlur.initial.worker.js index 79ba81f6..9cf55e7 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowBlur.initial.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowBlur.initial.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); _assertSame(ctx.shadowBlur, 0, "ctx.shadowBlur", "0"); t.done();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowBlur.invalid.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowBlur.invalid.html index 76ecc7c..a506da4 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowBlur.invalid.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowBlur.invalid.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.shadowBlur = 1; ctx.shadowBlur = -2;
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowBlur.invalid.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowBlur.invalid.worker.js index 0102760..1f79c36 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowBlur.invalid.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowBlur.invalid.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.shadowBlur = 1; ctx.shadowBlur = -2;
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowBlur.valid.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowBlur.valid.html index 79adc8f..b69b9c4 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowBlur.valid.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowBlur.valid.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.shadowBlur = 1; _assertSame(ctx.shadowBlur, 1, "ctx.shadowBlur", "1");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowBlur.valid.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowBlur.valid.worker.js index 7cb79d9..b41fa249 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowBlur.valid.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowBlur.valid.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.shadowBlur = 1; _assertSame(ctx.shadowBlur, 1, "ctx.shadowBlur", "1");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowColor.initial.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowColor.initial.html index 73919a3..44a25308 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowColor.initial.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowColor.initial.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); _assertSame(ctx.shadowColor, 'rgba(0, 0, 0, 0)', "ctx.shadowColor", "'rgba(0, 0, 0, 0)'"); t.done();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowColor.initial.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowColor.initial.worker.js index c64636d8..f8132d5 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowColor.initial.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowColor.initial.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); _assertSame(ctx.shadowColor, 'rgba(0, 0, 0, 0)', "ctx.shadowColor", "'rgba(0, 0, 0, 0)'"); t.done();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowColor.invalid.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowColor.invalid.html index 200b34b..ed09bcb 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowColor.invalid.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowColor.invalid.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.shadowColor = '#00ff00'; ctx.shadowColor = 'bogus';
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowColor.invalid.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowColor.invalid.worker.js index 22cc85cc..b100371 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowColor.invalid.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowColor.invalid.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.shadowColor = '#00ff00'; ctx.shadowColor = 'bogus';
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowColor.valid.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowColor.valid.html index 179e19b..9511027 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowColor.valid.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowColor.valid.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.shadowColor = 'lime'; _assertSame(ctx.shadowColor, '#00ff00', "ctx.shadowColor", "'#00ff00'");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowColor.valid.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowColor.valid.worker.js index 439aa128..f47e3660 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowColor.valid.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowColor.valid.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.shadowColor = 'lime'; _assertSame(ctx.shadowColor, '#00ff00', "ctx.shadowColor", "'#00ff00'");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowOffset.initial.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowOffset.initial.html index 2f55e5d..e568569a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowOffset.initial.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowOffset.initial.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); _assertSame(ctx.shadowOffsetX, 0, "ctx.shadowOffsetX", "0"); _assertSame(ctx.shadowOffsetY, 0, "ctx.shadowOffsetY", "0");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowOffset.initial.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowOffset.initial.worker.js index 908aa56..af2e77f4 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowOffset.initial.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowOffset.initial.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); _assertSame(ctx.shadowOffsetX, 0, "ctx.shadowOffsetX", "0"); _assertSame(ctx.shadowOffsetY, 0, "ctx.shadowOffsetY", "0");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowOffset.invalid.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowOffset.invalid.html index 7e199603..58c8efec 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowOffset.invalid.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowOffset.invalid.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.shadowOffsetX = 1; ctx.shadowOffsetY = 2;
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowOffset.invalid.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowOffset.invalid.worker.js index c39639f..8926147 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowOffset.invalid.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowOffset.invalid.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.shadowOffsetX = 1; ctx.shadowOffsetY = 2;
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowOffset.valid.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowOffset.valid.html index 9735513..1ad622c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowOffset.valid.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowOffset.valid.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.shadowOffsetX = 1; ctx.shadowOffsetY = 2;
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowOffset.valid.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowOffset.valid.worker.js index b41199ca..eed84b5 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowOffset.valid.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.attributes.shadowOffset.valid.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.shadowOffsetX = 1; ctx.shadowOffsetY = 2;
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.canvas.alpha.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.canvas.alpha.html index 08dac1d7..299a3ccc 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.canvas.alpha.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.canvas.alpha.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var offscreenCanvas2 = new OffscreenCanvas(100, 50); var ctx2 = offscreenCanvas2.getContext('2d'); @@ -29,7 +29,7 @@ ctx.shadowOffsetY = 50; ctx.shadowColor = '#00f'; ctx.drawImage(offscreenCanvas2, 0, -50); -_assertPixelApprox(offscreenCanvas, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2); +_assertPixelApprox(canvas, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.canvas.alpha.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.canvas.alpha.worker.js index 5413e5f..d3abbbb 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.canvas.alpha.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.canvas.alpha.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var offscreenCanvas2 = new OffscreenCanvas(100, 50); var ctx2 = offscreenCanvas2.getContext('2d'); @@ -25,7 +25,7 @@ ctx.shadowOffsetY = 50; ctx.shadowColor = '#00f'; ctx.drawImage(offscreenCanvas2, 0, -50); -_assertPixelApprox(offscreenCanvas, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2); +_assertPixelApprox(canvas, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.canvas.basic.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.canvas.basic.html index 4ce4c37..5f45432 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.canvas.basic.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.canvas.basic.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var offscreenCanvas2 = new OffscreenCanvas(100, 50); var ctx2 = offscreenCanvas2.getContext('2d'); @@ -29,7 +29,7 @@ ctx.shadowColor = '#0f0'; ctx.shadowOffsetY = 50; ctx.drawImage(offscreenCanvas2, 0, -50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.canvas.basic.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.canvas.basic.worker.js index 9ab4c8b..2a44897 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.canvas.basic.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.canvas.basic.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var offscreenCanvas2 = new OffscreenCanvas(100, 50); var ctx2 = offscreenCanvas2.getContext('2d'); @@ -25,7 +25,7 @@ ctx.shadowColor = '#0f0'; ctx.shadowOffsetY = 50; ctx.drawImage(offscreenCanvas2, 0, -50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.canvas.transparent.1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.canvas.transparent.1.html index a96af3c..14ac60c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.canvas.transparent.1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.canvas.transparent.1.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var offscreenCanvas2 = new OffscreenCanvas(100, 50); var ctx2 = offscreenCanvas2.getContext('2d'); @@ -27,7 +27,7 @@ ctx.shadowColor = '#f00'; ctx.shadowOffsetY = 50; ctx.drawImage(offscreenCanvas2, 0, -50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.canvas.transparent.1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.canvas.transparent.1.worker.js index 62cb548..b9425eb 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.canvas.transparent.1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.canvas.transparent.1.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var offscreenCanvas2 = new OffscreenCanvas(100, 50); var ctx2 = offscreenCanvas2.getContext('2d'); @@ -23,7 +23,7 @@ ctx.shadowColor = '#f00'; ctx.shadowOffsetY = 50; ctx.drawImage(offscreenCanvas2, 0, -50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.canvas.transparent.2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.canvas.transparent.2.html index 964b69b..796fb79 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.canvas.transparent.2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.canvas.transparent.2.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var offscreenCanvas2 = new OffscreenCanvas(100, 50); var ctx2 = offscreenCanvas2.getContext('2d'); @@ -33,9 +33,9 @@ ctx.drawImage(offscreenCanvas2, 50, -50); ctx.shadowColor = '#f00'; ctx.drawImage(offscreenCanvas2, -50, -50); -_assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.canvas.transparent.2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.canvas.transparent.2.worker.js index 83cb5f6..6c8c31b 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.canvas.transparent.2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.canvas.transparent.2.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var offscreenCanvas2 = new OffscreenCanvas(100, 50); var ctx2 = offscreenCanvas2.getContext('2d'); @@ -29,9 +29,9 @@ ctx.drawImage(offscreenCanvas2, 50, -50); ctx.shadowColor = '#f00'; ctx.drawImage(offscreenCanvas2, -50, -50); -_assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.clip.1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.clip.1.html index 2e5f45c954..9b31607d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.clip.1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.clip.1.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 50, 50); @@ -32,8 +32,8 @@ ctx.shadowOffsetX = 50; ctx.fillRect(0, 0, 50, 50); ctx.restore(); -_assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.clip.1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.clip.1.worker.js index 4b3831f..574e22e1 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.clip.1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.clip.1.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 50, 50); @@ -28,8 +28,8 @@ ctx.shadowOffsetX = 50; ctx.fillRect(0, 0, 50, 50); ctx.restore(); -_assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.clip.2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.clip.2.html index 12e6f25..8d439a408 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.clip.2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.clip.2.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 50, 50); @@ -32,8 +32,8 @@ ctx.shadowOffsetX = 50; ctx.fillRect(0, 0, 50, 50); ctx.restore(); -_assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.clip.2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.clip.2.worker.js index dcaf2d0..094ba9d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.clip.2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.clip.2.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 50, 50); @@ -28,8 +28,8 @@ ctx.shadowOffsetX = 50; ctx.fillRect(0, 0, 50, 50); ctx.restore(); -_assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.clip.3.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.clip.3.html index dfe011b7..63c16fa 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.clip.3.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.clip.3.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 50, 50); @@ -33,8 +33,8 @@ ctx.shadowOffsetX = 50; ctx.fillRect(-50, 0, 50, 50); ctx.restore(); -_assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.clip.3.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.clip.3.worker.js index a5c4d1a..01e8bf2 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.clip.3.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.clip.3.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 50, 50); @@ -29,8 +29,8 @@ ctx.shadowOffsetX = 50; ctx.fillRect(-50, 0, 50, 50); ctx.restore(); -_assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.composite.1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.composite.1.html index 340de2e..d45df85 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.composite.1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.composite.1.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,7 +27,7 @@ ctx.shadowOffsetX = 100; ctx.fillStyle = '#0f0'; ctx.fillRect(-100, 0, 200, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.composite.1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.composite.1.worker.js index 079b0471..9883655 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.composite.1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.composite.1.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,7 +23,7 @@ ctx.shadowOffsetX = 100; ctx.fillStyle = '#0f0'; ctx.fillRect(-100, 0, 200, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.composite.2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.composite.2.html index ab62551..e9955e5 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.composite.2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.composite.2.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,7 +27,7 @@ ctx.shadowBlur = 1; ctx.fillStyle = '#0f0'; ctx.fillRect(-10, -10, 120, 70); -_assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.composite.2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.composite.2.worker.js index aaccc39..83da3fd8 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.composite.2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.composite.2.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,7 +23,7 @@ ctx.shadowBlur = 1; ctx.fillStyle = '#0f0'; ctx.fillRect(-10, -10, 120, 70); -_assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.composite.3.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.composite.3.html index f4b074d1..2ba82d7ea 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.composite.3.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.composite.3.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -27,8 +27,8 @@ ctx.shadowBlur = 10; ctx.fillStyle = '#f00'; ctx.fillRect(200, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); +_assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.composite.3.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.composite.3.worker.js index 82fcae1..da5726c5 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.composite.3.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.composite.3.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -23,8 +23,8 @@ ctx.shadowBlur = 10; ctx.fillStyle = '#f00'; ctx.fillRect(200, 0, 100, 50); -_assertPixelApprox(offscreenCanvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); -_assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); +_assertPixelApprox(canvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); +_assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.enable.blur.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.enable.blur.html index feecbbdb..e029b0e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.enable.blur.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.enable.blur.html
@@ -17,15 +17,15 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.globalCompositeOperation = 'destination-atop'; ctx.shadowColor = '#0f0'; ctx.shadowBlur = 0.1; ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.enable.blur.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.enable.blur.worker.js index 2dbfba92..5dbc950b 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.enable.blur.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.enable.blur.worker.js
@@ -13,15 +13,15 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.globalCompositeOperation = 'destination-atop'; ctx.shadowColor = '#0f0'; ctx.shadowBlur = 0.1; ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.enable.off.1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.enable.off.1.html index c3aa14f6..38ebd479 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.enable.off.1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.enable.off.1.html
@@ -17,13 +17,13 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.shadowColor = '#f00'; ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.enable.off.1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.enable.off.1.worker.js index 308f88e1..d230ef1 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.enable.off.1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.enable.off.1.worker.js
@@ -13,13 +13,13 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.shadowColor = '#f00'; ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.enable.off.2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.enable.off.2.html index 528fe152..a2aaa4c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.enable.off.2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.enable.off.2.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.globalCompositeOperation = 'destination-atop'; ctx.shadowColor = '#f00'; ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.enable.off.2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.enable.off.2.worker.js index 2ac9461..89436362 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.enable.off.2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.enable.off.2.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.globalCompositeOperation = 'destination-atop'; ctx.shadowColor = '#f00'; ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.enable.x.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.enable.x.html index f24d3572..a5a9c24 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.enable.x.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.enable.x.html
@@ -17,15 +17,15 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.globalCompositeOperation = 'destination-atop'; ctx.shadowColor = '#0f0'; ctx.shadowOffsetX = 0.1; ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.enable.x.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.enable.x.worker.js index 58992c7..a31b66d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.enable.x.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.enable.x.worker.js
@@ -13,15 +13,15 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.globalCompositeOperation = 'destination-atop'; ctx.shadowColor = '#0f0'; ctx.shadowOffsetX = 0.1; ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.enable.y.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.enable.y.html index 6458f245..346e22a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.enable.y.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.enable.y.html
@@ -17,15 +17,15 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.globalCompositeOperation = 'destination-atop'; ctx.shadowColor = '#0f0'; ctx.shadowOffsetY = 0.1; ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.enable.y.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.enable.y.worker.js index fddc70d..fcb5db8 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.enable.y.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.enable.y.worker.js
@@ -13,15 +13,15 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.globalCompositeOperation = 'destination-atop'; ctx.shadowColor = '#0f0'; ctx.shadowOffsetY = 0.1; ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.gradient.alpha.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.gradient.alpha.html index 2dd5ccc3..6ba5e8a4 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.gradient.alpha.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.gradient.alpha.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var gradient = ctx.createLinearGradient(0, 0, 100, 0); gradient.addColorStop(0, 'rgba(255,0,0,0.5)'); @@ -29,7 +29,7 @@ ctx.shadowColor = '#00f'; ctx.fillStyle = gradient; ctx.fillRect(0, -50, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2); +_assertPixelApprox(canvas, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.gradient.alpha.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.gradient.alpha.worker.js index 50ac32f..b5a64ab 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.gradient.alpha.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.gradient.alpha.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var gradient = ctx.createLinearGradient(0, 0, 100, 0); gradient.addColorStop(0, 'rgba(255,0,0,0.5)'); @@ -25,7 +25,7 @@ ctx.shadowColor = '#00f'; ctx.fillStyle = gradient; ctx.fillRect(0, -50, 100, 50); -_assertPixelApprox(offscreenCanvas, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2); +_assertPixelApprox(canvas, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.gradient.basic.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.gradient.basic.html index c97377e..b5aada86 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.gradient.basic.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.gradient.basic.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var gradient = ctx.createLinearGradient(0, 0, 100, 0); gradient.addColorStop(0, '#f00'); @@ -29,7 +29,7 @@ ctx.shadowOffsetY = 50; ctx.fillStyle = gradient; ctx.fillRect(0, -50, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.gradient.basic.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.gradient.basic.worker.js index c6ffc42d..c73164f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.gradient.basic.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.gradient.basic.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var gradient = ctx.createLinearGradient(0, 0, 100, 0); gradient.addColorStop(0, '#f00'); @@ -25,7 +25,7 @@ ctx.shadowOffsetY = 50; ctx.fillStyle = gradient; ctx.fillRect(0, -50, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.gradient.transparent.1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.gradient.transparent.1.html index 3656da7..67e753d3 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.gradient.transparent.1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.gradient.transparent.1.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var gradient = ctx.createLinearGradient(0, 0, 100, 0); gradient.addColorStop(0, 'rgba(0,0,0,0)'); @@ -29,7 +29,7 @@ ctx.shadowOffsetY = 50; ctx.fillStyle = gradient; ctx.fillRect(0, -50, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.gradient.transparent.1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.gradient.transparent.1.worker.js index 1fac70d8..b83cdaf 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.gradient.transparent.1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.gradient.transparent.1.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var gradient = ctx.createLinearGradient(0, 0, 100, 0); gradient.addColorStop(0, 'rgba(0,0,0,0)'); @@ -25,7 +25,7 @@ ctx.shadowOffsetY = 50; ctx.fillStyle = gradient; ctx.fillRect(0, -50, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.gradient.transparent.2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.gradient.transparent.2.html index 791b1cf..43b43d1 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.gradient.transparent.2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.gradient.transparent.2.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var gradient = ctx.createLinearGradient(0, 0, 100, 0); gradient.addColorStop(0, '#f00'); @@ -33,9 +33,9 @@ ctx.shadowColor = '#0f0'; ctx.fillStyle = gradient; ctx.fillRect(0, -50, 100, 50); -_assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.gradient.transparent.2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.gradient.transparent.2.worker.js index 892bd3b..75e1fefc 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.gradient.transparent.2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.gradient.transparent.2.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var gradient = ctx.createLinearGradient(0, 0, 100, 0); gradient.addColorStop(0, '#f00'); @@ -29,9 +29,9 @@ ctx.shadowColor = '#0f0'; ctx.fillStyle = gradient; ctx.fillRect(0, -50, 100, 50); -_assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.image.alpha.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.image.alpha.html index 4428f0f..c57bba9 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.image.alpha.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.image.alpha.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -36,7 +36,7 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 0, -50); - _assertPixelApprox(offscreenCanvas, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2); + _assertPixelApprox(canvas, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.image.alpha.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.image.alpha.worker.js index e87e8f92..eedb9cc 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.image.alpha.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.image.alpha.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -32,7 +32,7 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 0, -50); - _assertPixelApprox(offscreenCanvas, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2); + _assertPixelApprox(canvas, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.image.basic.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.image.basic.html index 838662ed..850ae707 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.image.basic.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.image.basic.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -36,7 +36,7 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 0, -50); - _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); + _assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.image.basic.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.image.basic.worker.js index 907df36..c6bee03 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.image.basic.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.image.basic.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -32,7 +32,7 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 0, -50); - _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); + _assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.image.scale.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.image.scale.html index 3423979..3f9bdea 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.image.scale.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.image.scale.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -36,9 +36,9 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 0, 0, 100, 50, -10, -50, 240, 50); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.image.scale.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.image.scale.worker.js index 5c3b96a..e39f6168 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.image.scale.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.image.scale.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -32,9 +32,9 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 0, 0, 100, 50, -10, -50, 240, 50); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.image.section.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.image.section.html index 9d11d0a..b141d39 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.image.section.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.image.section.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -36,9 +36,9 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 50, 0, 50, 50, 0, -50, 50, 50); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.image.section.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.image.section.worker.js index 81ef7b5..4fdd2180 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.image.section.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.image.section.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -32,9 +32,9 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 50, 0, 50, 50, 0, -50, 50, 50); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.image.transparent.1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.image.transparent.1.html index c1912c3..9f3160d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.image.transparent.1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.image.transparent.1.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -36,7 +36,7 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 0, -50); - _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); + _assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.image.transparent.1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.image.transparent.1.worker.js index 2d88adf..9f5eda3 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.image.transparent.1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.image.transparent.1.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -32,7 +32,7 @@ promise.then(function(response) { createImageBitmap(response).then(bitmap => { ctx.drawImage(bitmap, 0, -50); - _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); + _assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.image.transparent.2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.image.transparent.2.html index 2981e8b..238c304 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.image.transparent.2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.image.transparent.2.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 50, 50); @@ -40,9 +40,9 @@ ctx.drawImage(bitmap, 50, -50); ctx.shadowColor = '#f00'; ctx.drawImage(bitmap, -50, -50); - _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); - _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); - _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); + _assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); + _assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); + _assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.image.transparent.2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.image.transparent.2.worker.js index be77348..589755ee 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.image.transparent.2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.image.transparent.2.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 50, 50); @@ -36,9 +36,9 @@ ctx.drawImage(bitmap, 50, -50); ctx.shadowColor = '#f00'; ctx.drawImage(bitmap, -50, -50); - _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); - _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); - _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); + _assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); + _assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); + _assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.offset.negativeX.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.offset.negativeX.html index fd630a1..ff47ac6 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.offset.negativeX.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.offset.negativeX.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -26,8 +26,8 @@ ctx.shadowColor = '#0f0'; ctx.shadowOffsetX = -50; ctx.fillRect(50, 0, 50, 50); -_assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.offset.negativeX.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.offset.negativeX.worker.js index 553ed179..3d31f5a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.offset.negativeX.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.offset.negativeX.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -22,8 +22,8 @@ ctx.shadowColor = '#0f0'; ctx.shadowOffsetX = -50; ctx.fillRect(50, 0, 50, 50); -_assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.offset.negativeY.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.offset.negativeY.html index 09b028a..1abc62ee 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.offset.negativeY.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.offset.negativeY.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -26,8 +26,8 @@ ctx.shadowColor = '#0f0'; ctx.shadowOffsetY = -25; ctx.fillRect(0, 25, 100, 25); -_assertPixel(offscreenCanvas, 50,12, 0,255,0,255, "50,12", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,37, 0,255,0,255, "50,37", "0,255,0,255"); +_assertPixel(canvas, 50,12, 0,255,0,255, "50,12", "0,255,0,255"); +_assertPixel(canvas, 50,37, 0,255,0,255, "50,37", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.offset.negativeY.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.offset.negativeY.worker.js index 1e74e7a3..806ff24 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.offset.negativeY.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.offset.negativeY.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -22,8 +22,8 @@ ctx.shadowColor = '#0f0'; ctx.shadowOffsetY = -25; ctx.fillRect(0, 25, 100, 25); -_assertPixel(offscreenCanvas, 50,12, 0,255,0,255, "50,12", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,37, 0,255,0,255, "50,37", "0,255,0,255"); +_assertPixel(canvas, 50,12, 0,255,0,255, "50,12", "0,255,0,255"); +_assertPixel(canvas, 50,37, 0,255,0,255, "50,37", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.offset.positiveX.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.offset.positiveX.html index 28cc0de5..ddfe2028 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.offset.positiveX.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.offset.positiveX.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -26,8 +26,8 @@ ctx.shadowColor = '#0f0'; ctx.shadowOffsetX = 50; ctx.fillRect(0, 0, 50, 50); -_assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.offset.positiveX.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.offset.positiveX.worker.js index f9d016cf6..aded29344 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.offset.positiveX.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.offset.positiveX.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -22,8 +22,8 @@ ctx.shadowColor = '#0f0'; ctx.shadowOffsetX = 50; ctx.fillRect(0, 0, 50, 50); -_assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.offset.positiveY.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.offset.positiveY.html index 9389513..91a64f1 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.offset.positiveY.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.offset.positiveY.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -26,8 +26,8 @@ ctx.shadowColor = '#0f0'; ctx.shadowOffsetY = 25; ctx.fillRect(0, 0, 100, 25); -_assertPixel(offscreenCanvas, 50,12, 0,255,0,255, "50,12", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,37, 0,255,0,255, "50,37", "0,255,0,255"); +_assertPixel(canvas, 50,12, 0,255,0,255, "50,12", "0,255,0,255"); +_assertPixel(canvas, 50,37, 0,255,0,255, "50,37", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.offset.positiveY.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.offset.positiveY.worker.js index ed51ea9..76fdaef 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.offset.positiveY.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.offset.positiveY.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -22,8 +22,8 @@ ctx.shadowColor = '#0f0'; ctx.shadowOffsetY = 25; ctx.fillRect(0, 0, 100, 25); -_assertPixel(offscreenCanvas, 50,12, 0,255,0,255, "50,12", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,37, 0,255,0,255, "50,37", "0,255,0,255"); +_assertPixel(canvas, 50,12, 0,255,0,255, "50,12", "0,255,0,255"); +_assertPixel(canvas, 50,37, 0,255,0,255, "50,37", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.outside.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.outside.html index 6f0aec9..7d275790 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.outside.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.outside.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -32,10 +32,10 @@ ctx.fillRect(25, -100, 50, 25); ctx.shadowOffsetY = -100; ctx.fillRect(25, 125, 50, 25); -_assertPixel(offscreenCanvas, 12,25, 0,255,0,255, "12,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 87,25, 0,255,0,255, "87,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,12, 0,255,0,255, "50,12", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,37, 0,255,0,255, "50,37", "0,255,0,255"); +_assertPixel(canvas, 12,25, 0,255,0,255, "12,25", "0,255,0,255"); +_assertPixel(canvas, 87,25, 0,255,0,255, "87,25", "0,255,0,255"); +_assertPixel(canvas, 50,12, 0,255,0,255, "50,12", "0,255,0,255"); +_assertPixel(canvas, 50,37, 0,255,0,255, "50,37", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.outside.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.outside.worker.js index f848480..25bcf77 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.outside.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.outside.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -28,10 +28,10 @@ ctx.fillRect(25, -100, 50, 25); ctx.shadowOffsetY = -100; ctx.fillRect(25, 125, 50, 25); -_assertPixel(offscreenCanvas, 12,25, 0,255,0,255, "12,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 87,25, 0,255,0,255, "87,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,12, 0,255,0,255, "50,12", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,37, 0,255,0,255, "50,37", "0,255,0,255"); +_assertPixel(canvas, 12,25, 0,255,0,255, "12,25", "0,255,0,255"); +_assertPixel(canvas, 87,25, 0,255,0,255, "87,25", "0,255,0,255"); +_assertPixel(canvas, 50,12, 0,255,0,255, "50,12", "0,255,0,255"); +_assertPixel(canvas, 50,37, 0,255,0,255, "50,37", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.pattern.alpha.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.pattern.alpha.html index 454f34c0..48615ea 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.pattern.alpha.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.pattern.alpha.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var promise = new Promise(function(resolve, reject) { var xhr = new XMLHttpRequest();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.pattern.alpha.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.pattern.alpha.worker.js index 519e8fb..6a53384 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.pattern.alpha.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.pattern.alpha.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var promise = new Promise(function(resolve, reject) { var xhr = new XMLHttpRequest();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.pattern.basic.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.pattern.basic.html index 8ef0fc4..586f7ef 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.pattern.basic.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.pattern.basic.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var promise = new Promise(function(resolve, reject) { var xhr = new XMLHttpRequest();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.pattern.basic.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.pattern.basic.worker.js index 922fd106..6d2dce7c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.pattern.basic.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.pattern.basic.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var promise = new Promise(function(resolve, reject) { var xhr = new XMLHttpRequest();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.pattern.transparent.1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.pattern.transparent.1.html index 185f826..6d97b59 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.pattern.transparent.1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.pattern.transparent.1.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var promise = new Promise(function(resolve, reject) { var xhr = new XMLHttpRequest();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.pattern.transparent.1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.pattern.transparent.1.worker.js index e1a1278d..cda0aa9 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.pattern.transparent.1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.pattern.transparent.1.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var promise = new Promise(function(resolve, reject) { var xhr = new XMLHttpRequest();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.pattern.transparent.2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.pattern.transparent.2.html index 822c4f0..225ccce 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.pattern.transparent.2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.pattern.transparent.2.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var promise = new Promise(function(resolve, reject) { var xhr = new XMLHttpRequest(); @@ -40,9 +40,9 @@ ctx.shadowColor = '#0f0'; ctx.fillStyle = pattern; ctx.fillRect(0, -50, 100, 50); - _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); - _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); - _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); + _assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); + _assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); + _assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.pattern.transparent.2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.pattern.transparent.2.worker.js index b07e747..2069e74 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.pattern.transparent.2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.pattern.transparent.2.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var promise = new Promise(function(resolve, reject) { var xhr = new XMLHttpRequest(); @@ -36,9 +36,9 @@ ctx.shadowColor = '#0f0'; ctx.fillStyle = pattern; ctx.fillRect(0, -50, 100, 50); - _assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); - _assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); - _assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); + _assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); + _assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); + _assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); }, t_fail); }).then(t_pass, t_fail);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.stroke.basic.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.stroke.basic.html index 6ca327f..24d85243 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.stroke.basic.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.stroke.basic.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -30,9 +30,9 @@ ctx.moveTo(0, -25); ctx.lineTo(100, -25); ctx.stroke(); -_assertPixel(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); +_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.stroke.basic.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.stroke.basic.worker.js index 7e64f32..f9cc851 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.stroke.basic.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.stroke.basic.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -26,9 +26,9 @@ ctx.moveTo(0, -25); ctx.lineTo(100, -25); ctx.stroke(); -_assertPixel(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); +_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.stroke.cap.1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.stroke.cap.1.html index 299be7f0..6e477b8 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.stroke.cap.1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.stroke.cap.1.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -33,9 +33,9 @@ ctx.moveTo(100, -25); ctx.lineTo(150, -25); ctx.stroke(); -_assertPixel(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); +_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.stroke.cap.1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.stroke.cap.1.worker.js index 5c235f2..0e9289a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.stroke.cap.1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.stroke.cap.1.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -29,9 +29,9 @@ ctx.moveTo(100, -25); ctx.lineTo(150, -25); ctx.stroke(); -_assertPixel(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); +_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.stroke.cap.2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.stroke.cap.2.html index 2ec15ab..99ae3b1 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.stroke.cap.2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.stroke.cap.2.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -31,9 +31,9 @@ ctx.moveTo(25, -25); ctx.lineTo(75, -25); ctx.stroke(); -_assertPixel(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); +_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.stroke.cap.2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.stroke.cap.2.worker.js index 5d575c5..ba586811 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.stroke.cap.2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.stroke.cap.2.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,9 +27,9 @@ ctx.moveTo(25, -25); ctx.lineTo(75, -25); ctx.stroke(); -_assertPixel(offscreenCanvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); +_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.stroke.join.1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.stroke.join.1.html index e0a1c7fb3..9f22089 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.stroke.join.1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.stroke.join.1.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -32,10 +32,10 @@ ctx.lineTo(-150, -50); ctx.lineTo(-151, -100); ctx.stroke(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.stroke.join.1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.stroke.join.1.worker.js index b22a68c..69563b0 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.stroke.join.1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.stroke.join.1.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -28,10 +28,10 @@ ctx.lineTo(-150, -50); ctx.lineTo(-151, -100); ctx.stroke(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.stroke.join.2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.stroke.join.2.html index f1321cb..e42a21e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.stroke.join.2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.stroke.join.2.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 50, 50); @@ -34,10 +34,10 @@ ctx.lineTo(-150, -50); ctx.lineTo(-151, -100); ctx.stroke(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.stroke.join.2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.stroke.join.2.worker.js index abc3a48..e621f96 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.stroke.join.2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.stroke.join.2.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 50, 50); @@ -30,10 +30,10 @@ ctx.lineTo(-150, -50); ctx.lineTo(-151, -100); ctx.stroke(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.stroke.join.3.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.stroke.join.3.html index 0dabead..d41b5126 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.stroke.join.3.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.stroke.join.3.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -33,10 +33,10 @@ ctx.lineTo(-150, -50); ctx.lineTo(-151, -100); // (not an exact right angle, to avoid some other bug in Firefox 3) ctx.stroke(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.stroke.join.3.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.stroke.join.3.worker.js index 2ea6ab3..cd010721 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.stroke.join.3.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.stroke.join.3.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -29,10 +29,10 @@ ctx.lineTo(-150, -50); ctx.lineTo(-151, -100); // (not an exact right angle, to avoid some other bug in Firefox 3) ctx.stroke(); -_assertPixel(offscreenCanvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); -_assertPixel(offscreenCanvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); +_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255"); +_assertPixel(canvas, 48,48, 0,255,0,255, "48,48", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.transform.1.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.transform.1.html index f40c235a..76688fe 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.transform.1.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.transform.1.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -26,7 +26,7 @@ ctx.shadowColor = '#0f0'; ctx.translate(100, 100); ctx.fillRect(-100, -150, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.transform.1.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.transform.1.worker.js index 959cb0b..8b16e52 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.transform.1.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.transform.1.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -22,7 +22,7 @@ ctx.shadowColor = '#0f0'; ctx.translate(100, 100); ctx.fillRect(-100, -150, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.transform.2.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.transform.2.html index 1b4abe8..01513a2 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.transform.2.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.transform.2.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -26,7 +26,7 @@ ctx.shadowColor = '#0f0'; ctx.rotate(Math.PI) ctx.fillRect(-100, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.transform.2.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.transform.2.worker.js index 75cf056..4f62cdf 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.transform.2.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/shadows/2d.shadow.transform.2.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -22,7 +22,7 @@ ctx.shadowColor = '#0f0'; ctx.rotate(Math.PI) ctx.fillRect(-100, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.align.default.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.align.default.html index 7c7d44c..fda5ee4 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.align.default.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.align.default.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); _assertSame(ctx.textAlign, 'start', "ctx.textAlign", "'start'"); t.done();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.align.default.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.align.default.worker.js index d4fe61a..b2c940f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.align.default.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.align.default.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); _assertSame(ctx.textAlign, 'start', "ctx.textAlign", "'start'"); t.done();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.align.invalid.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.align.invalid.html index e4c64f5e..8b6f409a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.align.invalid.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.align.invalid.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.textAlign = 'start'; ctx.textAlign = 'bogus';
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.align.invalid.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.align.invalid.worker.js index 500c45e..60ad8fa 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.align.invalid.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.align.invalid.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.textAlign = 'start'; ctx.textAlign = 'bogus';
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.align.valid.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.align.valid.html index 8670646..a78b58e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.align.valid.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.align.valid.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.textAlign = 'start'; _assertSame(ctx.textAlign, 'start', "ctx.textAlign", "'start'");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.align.valid.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.align.valid.worker.js index 0e67a663..fdf1907 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.align.valid.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.align.valid.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.textAlign = 'start'; _assertSame(ctx.textAlign, 'start', "ctx.textAlign", "'start'");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.baseline.default.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.baseline.default.html index 8927660..8bd20c6 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.baseline.default.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.baseline.default.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); _assertSame(ctx.textBaseline, 'alphabetic', "ctx.textBaseline", "'alphabetic'"); t.done();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.baseline.default.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.baseline.default.worker.js index 74934e0..ea8693f0 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.baseline.default.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.baseline.default.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); _assertSame(ctx.textBaseline, 'alphabetic', "ctx.textBaseline", "'alphabetic'"); t.done();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.baseline.invalid.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.baseline.invalid.html index 92ac06f5..a850ac1 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.baseline.invalid.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.baseline.invalid.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.textBaseline = 'top'; ctx.textBaseline = 'bogus';
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.baseline.invalid.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.baseline.invalid.worker.js index 117fc3cb..d4cdc85 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.baseline.invalid.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.baseline.invalid.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.textBaseline = 'top'; ctx.textBaseline = 'bogus';
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.baseline.valid.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.baseline.valid.html index f4d270b0..8fdc0588 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.baseline.valid.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.baseline.valid.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.textBaseline = 'top'; _assertSame(ctx.textBaseline, 'top', "ctx.textBaseline", "'top'");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.baseline.valid.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.baseline.valid.worker.js index 5ecfda9..62f6983d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.baseline.valid.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.baseline.valid.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.textBaseline = 'top'; _assertSame(ctx.textBaseline, 'top', "ctx.textBaseline", "'top'");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.align.center.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.align.center.html index 4adf3306..abe6cb7 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.align.center.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.align.center.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts); @@ -31,12 +31,12 @@ ctx.fillStyle = '#0f0'; ctx.textAlign = 'center'; ctx.fillText('DD', 50, 37.5); - _assertPixelApprox(offscreenCanvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2); }).then(t_pass, t_fail); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.align.center.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.align.center.worker.js index 2081bee..ba450334 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.align.center.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.align.center.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts); @@ -27,12 +27,12 @@ ctx.fillStyle = '#0f0'; ctx.textAlign = 'center'; ctx.fillText('DD', 50, 37.5); - _assertPixelApprox(offscreenCanvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2); }).then(t_pass, t_fail); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.align.end.ltr.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.align.end.ltr.html index 1f1a23e..d229fac 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.align.end.ltr.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.align.end.ltr.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts); @@ -32,12 +32,12 @@ ctx.fillStyle = '#0f0'; ctx.textAlign = 'end'; ctx.fillText('DD', 100, 37.5); - _assertPixelApprox(offscreenCanvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2); }).then(t_pass, t_fail); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.align.end.ltr.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.align.end.ltr.worker.js index b370552..7a4c6d3 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.align.end.ltr.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.align.end.ltr.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts); @@ -28,12 +28,12 @@ ctx.fillStyle = '#0f0'; ctx.textAlign = 'end'; ctx.fillText('DD', 100, 37.5); - _assertPixelApprox(offscreenCanvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2); }).then(t_pass, t_fail); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.align.end.rtl.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.align.end.rtl.html index f18e4974b..b285da9 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.align.end.rtl.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.align.end.rtl.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts); @@ -32,12 +32,12 @@ ctx.fillStyle = '#0f0'; ctx.textAlign = 'end'; ctx.fillText('DD', 0, 37.5); - _assertPixelApprox(offscreenCanvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2); }).then(t_pass, t_fail); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.align.end.rtl.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.align.end.rtl.worker.js index a0561c1..5e633f8 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.align.end.rtl.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.align.end.rtl.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts); @@ -28,12 +28,12 @@ ctx.fillStyle = '#0f0'; ctx.textAlign = 'end'; ctx.fillText('DD', 0, 37.5); - _assertPixelApprox(offscreenCanvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2); }).then(t_pass, t_fail); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.align.left.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.align.left.html index 31eead0..12595fa 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.align.left.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.align.left.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts); @@ -31,12 +31,12 @@ ctx.fillStyle = '#0f0'; ctx.textAlign = 'left'; ctx.fillText('DD', 0, 37.5); - _assertPixelApprox(offscreenCanvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2); }).then(t_pass, t_fail); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.align.left.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.align.left.worker.js index fb002a9..adc5b01 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.align.left.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.align.left.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts); @@ -27,12 +27,12 @@ ctx.fillStyle = '#0f0'; ctx.textAlign = 'left'; ctx.fillText('DD', 0, 37.5); - _assertPixelApprox(offscreenCanvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2); }).then(t_pass, t_fail); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.align.right.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.align.right.html index db4416e..d731285 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.align.right.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.align.right.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts); @@ -31,12 +31,12 @@ ctx.fillStyle = '#0f0'; ctx.textAlign = 'right'; ctx.fillText('DD', 100, 37.5); - _assertPixelApprox(offscreenCanvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2); }).then(t_pass, t_fail); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.align.right.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.align.right.worker.js index f77e72c..822712eb 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.align.right.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.align.right.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts); @@ -27,12 +27,12 @@ ctx.fillStyle = '#0f0'; ctx.textAlign = 'right'; ctx.fillText('DD', 100, 37.5); - _assertPixelApprox(offscreenCanvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2); }).then(t_pass, t_fail); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.align.start.ltr.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.align.start.ltr.html index 08c222b..8e888f2 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.align.start.ltr.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.align.start.ltr.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts); @@ -32,12 +32,12 @@ ctx.fillStyle = '#0f0'; ctx.textAlign = 'start'; ctx.fillText('DD', 0, 37.5); - _assertPixelApprox(offscreenCanvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2); }).then(t_pass, t_fail); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.align.start.ltr.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.align.start.ltr.worker.js index 1cefdd0c..1765fb1 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.align.start.ltr.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.align.start.ltr.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts); @@ -28,12 +28,12 @@ ctx.fillStyle = '#0f0'; ctx.textAlign = 'start'; ctx.fillText('DD', 0, 37.5); - _assertPixelApprox(offscreenCanvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2); }).then(t_pass, t_fail); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.align.start.rtl.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.align.start.rtl.html index 3d9670a..c277b0d4 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.align.start.rtl.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.align.start.rtl.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts); @@ -32,12 +32,12 @@ ctx.fillStyle = '#0f0'; ctx.textAlign = 'start'; ctx.fillText('DD', 100, 37.5); - _assertPixelApprox(offscreenCanvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2); }).then(t_pass, t_fail); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.align.start.rtl.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.align.start.rtl.worker.js index 2cc818fc..2670977 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.align.start.rtl.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.align.start.rtl.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts); @@ -28,12 +28,12 @@ ctx.fillStyle = '#0f0'; ctx.textAlign = 'start'; ctx.fillText('DD', 100, 37.5); - _assertPixelApprox(offscreenCanvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2); }).then(t_pass, t_fail); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.baseline.alphabetic.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.baseline.alphabetic.html index 7ad85da..bd478f1 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.baseline.alphabetic.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.baseline.alphabetic.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts); @@ -31,12 +31,12 @@ ctx.fillStyle = '#0f0'; ctx.textBaseline = 'alphabetic'; ctx.fillText('CC', 0, 37.5); - _assertPixelApprox(offscreenCanvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2); }).then(t_pass, t_fail); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.baseline.alphabetic.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.baseline.alphabetic.worker.js index 3c32cd4..d2b5abc 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.baseline.alphabetic.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.baseline.alphabetic.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts); @@ -27,12 +27,12 @@ ctx.fillStyle = '#0f0'; ctx.textBaseline = 'alphabetic'; ctx.fillText('CC', 0, 37.5); - _assertPixelApprox(offscreenCanvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2); }).then(t_pass, t_fail); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.baseline.bottom.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.baseline.bottom.html index 468c59e1..5bd71f2 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.baseline.bottom.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.baseline.bottom.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts); @@ -31,12 +31,12 @@ ctx.fillStyle = '#0f0'; ctx.textBaseline = 'bottom'; ctx.fillText('CC', 0, 50); - _assertPixelApprox(offscreenCanvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2); }).then(t_pass, t_fail); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.baseline.bottom.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.baseline.bottom.worker.js index ebd1163..8df706f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.baseline.bottom.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.baseline.bottom.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts); @@ -27,12 +27,12 @@ ctx.fillStyle = '#0f0'; ctx.textBaseline = 'bottom'; ctx.fillText('CC', 0, 50); - _assertPixelApprox(offscreenCanvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2); }).then(t_pass, t_fail); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.baseline.hanging.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.baseline.hanging.html index bab9898b..d1606117 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.baseline.hanging.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.baseline.hanging.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts); @@ -31,12 +31,12 @@ ctx.fillStyle = '#0f0'; ctx.textBaseline = 'hanging'; ctx.fillText('CC', 0, 12.5); - _assertPixelApprox(offscreenCanvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2); }).then(t_pass, t_fail); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.baseline.hanging.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.baseline.hanging.worker.js index 5567004..58ca029 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.baseline.hanging.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.baseline.hanging.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts); @@ -27,12 +27,12 @@ ctx.fillStyle = '#0f0'; ctx.textBaseline = 'hanging'; ctx.fillText('CC', 0, 12.5); - _assertPixelApprox(offscreenCanvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2); }).then(t_pass, t_fail); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.baseline.ideographic.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.baseline.ideographic.html index 703cc78..a5cc0eb0 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.baseline.ideographic.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.baseline.ideographic.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts); @@ -31,12 +31,12 @@ ctx.fillStyle = '#0f0'; ctx.textBaseline = 'ideographic'; ctx.fillText('CC', 0, 31.25); - _assertPixelApprox(offscreenCanvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2); }).then(t_pass, t_fail); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.baseline.ideographic.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.baseline.ideographic.worker.js index de7d2e4..8dc0ab55 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.baseline.ideographic.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.baseline.ideographic.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts); @@ -27,12 +27,12 @@ ctx.fillStyle = '#0f0'; ctx.textBaseline = 'ideographic'; ctx.fillText('CC', 0, 31.25); - _assertPixelApprox(offscreenCanvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2); }).then(t_pass, t_fail); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.baseline.middle.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.baseline.middle.html index 27aafc2..fd3176c1 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.baseline.middle.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.baseline.middle.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts); @@ -31,12 +31,12 @@ ctx.fillStyle = '#0f0'; ctx.textBaseline = 'middle'; ctx.fillText('CC', 0, 25); - _assertPixelApprox(offscreenCanvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2); }).then(t_pass, t_fail); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.baseline.middle.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.baseline.middle.worker.js index 3bcedbb..72ca109 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.baseline.middle.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.baseline.middle.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts); @@ -27,12 +27,12 @@ ctx.fillStyle = '#0f0'; ctx.textBaseline = 'middle'; ctx.fillText('CC', 0, 25); - _assertPixelApprox(offscreenCanvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2); }).then(t_pass, t_fail); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.baseline.top.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.baseline.top.html index 1212bde..2ddb63c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.baseline.top.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.baseline.top.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts); @@ -31,12 +31,12 @@ ctx.fillStyle = '#0f0'; ctx.textBaseline = 'top'; ctx.fillText('CC', 0, 0); - _assertPixelApprox(offscreenCanvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2); }).then(t_pass, t_fail); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.baseline.top.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.baseline.top.worker.js index bbeb2ec6..daf872b 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.baseline.top.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.baseline.top.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts); @@ -27,12 +27,12 @@ ctx.fillStyle = '#0f0'; ctx.textBaseline = 'top'; ctx.fillText('CC', 0, 0); - _assertPixelApprox(offscreenCanvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,45, 0,255,0,255, "95,45", "0,255,0,255", 2); }).then(t_pass, t_fail); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.basic-manual.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.basic-manual.html index 5c2d69f..5c364f5 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.basic-manual.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.basic-manual.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#000'; ctx.fillRect(0, 0, 100, 50);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.basic-manual.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.basic-manual.worker.js index 22d5558..b75be089 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.basic-manual.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.basic-manual.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#000'; ctx.fillRect(0, 0, 100, 50);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.NaN.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.NaN.html index a452342..4bef0e3 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.NaN.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.NaN.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.NaN.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.NaN.worker.js index 7a6af8f..32a673f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.NaN.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.NaN.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.bound.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.bound.html index 6b9a87c..0941ad7 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.bound.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.bound.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts); @@ -30,10 +30,10 @@ ctx.fillRect(0, 0, 100, 50); ctx.fillStyle = '#0f0'; ctx.fillText('DD', 0, 37.5, 100); - _assertPixelApprox(offscreenCanvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); }).then(t_pass, t_fail); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.bound.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.bound.worker.js index f8d1fd0..0e975c7 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.bound.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.bound.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts); @@ -26,10 +26,10 @@ ctx.fillRect(0, 0, 100, 50); ctx.fillStyle = '#0f0'; ctx.fillText('DD', 0, 37.5, 100); - _assertPixelApprox(offscreenCanvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); }).then(t_pass, t_fail); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.fontface.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.fontface.html index 0b14eb77..f247178c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.fontface.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.fontface.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts); @@ -30,10 +30,10 @@ ctx.fillRect(0, 0, 100, 50); ctx.fillStyle = '#f00'; ctx.fillText('EEEE', -50, 37.5, 40); - _assertPixelApprox(offscreenCanvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); }).then(t_pass, t_fail); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.fontface.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.fontface.worker.js index d80aec76..0ad857c7 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.fontface.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.fontface.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts); @@ -26,10 +26,10 @@ ctx.fillRect(0, 0, 100, 50); ctx.fillStyle = '#f00'; ctx.fillText('EEEE', -50, 37.5, 40); - _assertPixelApprox(offscreenCanvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); }).then(t_pass, t_fail); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.large-manual.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.large-manual.html index 857014d..838b3f8 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.large-manual.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.large-manual.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#000'; ctx.fillRect(0, 0, 100, 50);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.large-manual.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.large-manual.worker.js index 46bc470..e124b08e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.large-manual.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.large-manual.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#000'; ctx.fillRect(0, 0, 100, 50);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.negative.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.negative.html index 96ac7c5..9d06556 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.negative.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.negative.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.negative.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.negative.worker.js index aa8536f..bf852bc5 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.negative.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.negative.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.small.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.small.html index 4599ab0..37c137e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.small.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.small.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.small.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.small.worker.js index 32b1883..44cf210 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.small.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.small.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.zero.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.zero.html index 6174dde..c5bec91 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.zero.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.zero.html
@@ -18,8 +18,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.zero.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.zero.worker.js index eaeb458..6701f5b 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.zero.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.zero.worker.js
@@ -14,8 +14,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.rtl-manual.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.rtl-manual.html index bb214f2e..7363d73 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.rtl-manual.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.rtl-manual.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#000'; ctx.fillRect(0, 0, 100, 50);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.rtl-manual.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.rtl-manual.worker.js index 3f9ccd40..f52a0cc 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.rtl-manual.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.rtl-manual.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#000'; ctx.fillRect(0, 0, 100, 50);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.unaffected.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.unaffected.html index 7d58e30c..8b67e37 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.unaffected.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.unaffected.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -34,8 +34,8 @@ ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.unaffected.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.unaffected.worker.js index 972be269..5430803 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.unaffected.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fill.unaffected.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -30,8 +30,8 @@ ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fontface.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fontface.html index b999585..d9ddd5cdb 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fontface.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fontface.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts); @@ -30,10 +30,10 @@ ctx.fillRect(0, 0, 100, 50); ctx.fillStyle = '#0f0'; ctx.fillText('AA', 0, 50); - _assertPixelApprox(offscreenCanvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); }).then(t_pass, t_fail); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fontface.notinpage.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fontface.notinpage.html index e5cc962..092dc079 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fontface.notinpage.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fontface.notinpage.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts); @@ -30,10 +30,10 @@ ctx.fillRect(0, 0, 100, 50); ctx.fillStyle = '#0f0'; ctx.fillText('AA', 0, 50); - _assertPixelApprox(offscreenCanvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); }).then(t_pass, t_fail); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fontface.notinpage.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fontface.notinpage.worker.js index eadd0bb..e164fb1 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fontface.notinpage.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fontface.notinpage.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts); @@ -26,10 +26,10 @@ ctx.fillRect(0, 0, 100, 50); ctx.fillStyle = '#0f0'; ctx.fillText('AA', 0, 50); - _assertPixelApprox(offscreenCanvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); }).then(t_pass, t_fail); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fontface.repeat.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fontface.repeat.html index 408339dd..fa3367c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fontface.repeat.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fontface.repeat.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts); @@ -31,10 +31,10 @@ ctx.fillStyle = '#0f0'; ctx.fillText('AA', 0, 50); ctx.fillText('AA', 0, 50); - _assertPixelApprox(offscreenCanvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); }).then(t_pass, t_fail); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fontface.repeat.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fontface.repeat.worker.js index d8214ef..8625394 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fontface.repeat.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fontface.repeat.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts); @@ -27,10 +27,10 @@ ctx.fillStyle = '#0f0'; ctx.fillText('AA', 0, 50); ctx.fillText('AA', 0, 50); - _assertPixelApprox(offscreenCanvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); }).then(t_pass, t_fail); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fontface.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fontface.worker.js index 746dbcf..ec8ba80e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fontface.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.fontface.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts); @@ -26,10 +26,10 @@ ctx.fillRect(0, 0, 100, 50); ctx.fillStyle = '#0f0'; ctx.fillText('AA', 0, 50); - _assertPixelApprox(offscreenCanvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 5,5, 0,255,0,255, "5,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 95,5, 0,255,0,255, "95,5", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); }).then(t_pass, t_fail); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.kern.consistent-manual.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.kern.consistent-manual.html index 3b07408c..e8ee39c6 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.kern.consistent-manual.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.kern.consistent-manual.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.kern.consistent-manual.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.kern.consistent-manual.worker.js index 7e1be84..464cab3e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.kern.consistent-manual.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.kern.consistent-manual.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.space.basic.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.space.basic.html index 950fbda..b3880ea 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.space.basic.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.space.basic.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts); @@ -30,8 +30,8 @@ ctx.fillRect(0, 0, 100, 50); ctx.fillStyle = '#0f0'; ctx.fillText('E EE', -100, 37.5); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); }).then(t_pass, t_fail); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.space.basic.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.space.basic.worker.js index 6772078..f2b4c28 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.space.basic.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.space.basic.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts); @@ -26,8 +26,8 @@ ctx.fillRect(0, 0, 100, 50); ctx.fillStyle = '#0f0'; ctx.fillText('E EE', -100, 37.5); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); }).then(t_pass, t_fail); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.space.collapse.end.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.space.collapse.end.html index 71967eb4..13030fe 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.space.collapse.end.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.space.collapse.end.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts); @@ -31,8 +31,8 @@ ctx.fillStyle = '#0f0'; ctx.textAlign = 'right'; ctx.fillText('EE ', 100, 37.5); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); }).then(t_pass, t_fail); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.space.collapse.end.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.space.collapse.end.worker.js index ae71bc9..fcbb9b28 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.space.collapse.end.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.space.collapse.end.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts); @@ -27,8 +27,8 @@ ctx.fillStyle = '#0f0'; ctx.textAlign = 'right'; ctx.fillText('EE ', 100, 37.5); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); }).then(t_pass, t_fail); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.space.collapse.nonspace.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.space.collapse.nonspace.html index f84a1e0..185fe51e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.space.collapse.nonspace.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.space.collapse.nonspace.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts); @@ -30,8 +30,8 @@ ctx.fillRect(0, 0, 100, 50); ctx.fillStyle = '#0f0'; ctx.fillText('E\x0b EE', -150, 37.5); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); }).then(t_pass, t_fail); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.space.collapse.nonspace.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.space.collapse.nonspace.worker.js index 2e7b2a6..7eb2e704 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.space.collapse.nonspace.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.space.collapse.nonspace.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts); @@ -26,8 +26,8 @@ ctx.fillRect(0, 0, 100, 50); ctx.fillStyle = '#0f0'; ctx.fillText('E\x0b EE', -150, 37.5); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); }).then(t_pass, t_fail); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.space.collapse.other.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.space.collapse.other.html index 248912ab..f49f889 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.space.collapse.other.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.space.collapse.other.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts); @@ -30,8 +30,8 @@ ctx.fillRect(0, 0, 100, 50); ctx.fillStyle = '#0f0'; ctx.fillText('E \x09\x0a\x0c\x0d \x09\x0a\x0c\x0dEE', -100, 37.5); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); }).then(t_pass, t_fail); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.space.collapse.other.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.space.collapse.other.worker.js index 11415b2..9b58f33 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.space.collapse.other.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.space.collapse.other.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts); @@ -26,8 +26,8 @@ ctx.fillRect(0, 0, 100, 50); ctx.fillStyle = '#0f0'; ctx.fillText('E \x09\x0a\x0c\x0d \x09\x0a\x0c\x0dEE', -100, 37.5); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); }).then(t_pass, t_fail); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.space.collapse.space.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.space.collapse.space.html index f69d5a4..b0115ae 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.space.collapse.space.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.space.collapse.space.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts); @@ -30,8 +30,8 @@ ctx.fillRect(0, 0, 100, 50); ctx.fillStyle = '#0f0'; ctx.fillText('E EE', -100, 37.5); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); }).then(t_pass, t_fail); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.space.collapse.space.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.space.collapse.space.worker.js index 4def46c..5aecb5d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.space.collapse.space.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.space.collapse.space.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts); @@ -26,8 +26,8 @@ ctx.fillRect(0, 0, 100, 50); ctx.fillStyle = '#0f0'; ctx.fillText('E EE', -100, 37.5); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); }).then(t_pass, t_fail); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.space.collapse.start.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.space.collapse.start.html index 81e4c03..4e9115b3 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.space.collapse.start.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.space.collapse.start.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts); @@ -30,8 +30,8 @@ ctx.fillRect(0, 0, 100, 50); ctx.fillStyle = '#0f0'; ctx.fillText(' EE', 0, 37.5); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); }).then(t_pass, t_fail); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.space.collapse.start.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.space.collapse.start.worker.js index 22f7b2bf..a9e9cef5 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.space.collapse.start.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.space.collapse.start.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts); @@ -26,8 +26,8 @@ ctx.fillRect(0, 0, 100, 50); ctx.fillStyle = '#0f0'; ctx.fillText(' EE', 0, 37.5); - _assertPixelApprox(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); - _assertPixelApprox(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2); + _assertPixelApprox(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2); }).then(t_pass, t_fail); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.stroke.basic-manual.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.stroke.basic-manual.html index e2cc116f..5aee6afc 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.stroke.basic-manual.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.stroke.basic-manual.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#000'; ctx.fillRect(0, 0, 100, 50);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.stroke.basic-manual.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.stroke.basic-manual.worker.js index 9b61de0..8806e011 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.stroke.basic-manual.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.stroke.basic-manual.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#000'; ctx.fillRect(0, 0, 100, 50);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.stroke.unaffected.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.stroke.unaffected.html index 7b0ac45..3c114c4 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.stroke.unaffected.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.stroke.unaffected.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -35,8 +35,8 @@ ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.stroke.unaffected.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.stroke.unaffected.worker.js index ff429ce..003b6996 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.stroke.unaffected.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.draw.stroke.unaffected.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -31,8 +31,8 @@ ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 5,45, 0,255,0,255, "5,45", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.fontKerning.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.fontKerning.html index 7bc480b..30e12f31 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.fontKerning.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.fontKerning.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); _assertSame(ctx.fontKerning, "auto", "ctx.fontKerning", "\"auto\""); ctx.fontKerning = "normal";
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.fontKerning.with.uppercase.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.fontKerning.with.uppercase.html index 4d22b3f..a9a5ae2 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.fontKerning.with.uppercase.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.fontKerning.with.uppercase.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); _assertSame(ctx.fontKerning, "auto", "ctx.fontKerning", "\"auto\""); ctx.fontKerning = "Normal";
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.fontKerning.with.uppercase.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.fontKerning.with.uppercase.worker.js index 5721ca2..a883737 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.fontKerning.with.uppercase.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.fontKerning.with.uppercase.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); _assertSame(ctx.fontKerning, "auto", "ctx.fontKerning", "\"auto\""); ctx.fontKerning = "Normal";
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.fontKerning.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.fontKerning.worker.js index b2f0d01..9478eece 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.fontKerning.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.fontKerning.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); _assertSame(ctx.fontKerning, "auto", "ctx.fontKerning", "\"auto\""); ctx.fontKerning = "normal";
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.fontVariant.settings.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.fontVariant.settings.html index b060b391..08c48f1b 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.fontVariant.settings.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.fontVariant.settings.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); // Setting fontVariantCaps with lower cases _assertSame(ctx.fontVariantCaps, "normal", "ctx.fontVariantCaps", "\"normal\"");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.fontVariant.settings.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.fontVariant.settings.worker.js index 10f0c3f5..d4e9307 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.fontVariant.settings.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.fontVariant.settings.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); // Setting fontVariantCaps with lower cases _assertSame(ctx.fontVariantCaps, "normal", "ctx.fontVariantCaps", "\"normal\"");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.letterSpacing.change.font.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.letterSpacing.change.font.html index cb6b5e3..ff84f45 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.letterSpacing.change.font.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.letterSpacing.change.font.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); _assertSame(ctx.letterSpacing, '0px', "ctx.letterSpacing", "'0px'"); _assertSame(ctx.wordSpacing, '0px', "ctx.wordSpacing", "'0px'");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.letterSpacing.change.font.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.letterSpacing.change.font.worker.js index c5f771e..5a6bf661 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.letterSpacing.change.font.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.letterSpacing.change.font.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); _assertSame(ctx.letterSpacing, '0px', "ctx.letterSpacing", "'0px'"); _assertSame(ctx.wordSpacing, '0px', "ctx.wordSpacing", "'0px'");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.letterSpacing.measure.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.letterSpacing.measure.html index d35b328..b63c81b 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.letterSpacing.measure.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.letterSpacing.measure.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); _assertSame(ctx.letterSpacing, '0px', "ctx.letterSpacing", "'0px'"); _assertSame(ctx.wordSpacing, '0px', "ctx.wordSpacing", "'0px'");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.letterSpacing.measure.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.letterSpacing.measure.worker.js index 4ca6e3d..b9189cb 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.letterSpacing.measure.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.letterSpacing.measure.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); _assertSame(ctx.letterSpacing, '0px', "ctx.letterSpacing", "'0px'"); _assertSame(ctx.wordSpacing, '0px', "ctx.wordSpacing", "'0px'");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.measure.direction.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.measure.direction.html index 46355fb..04774a9 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.measure.direction.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.measure.direction.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.direction = "ltr"; metrics = ctx.measureText('hello');
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.measure.direction.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.measure.direction.worker.js index 5616014e..8f558568 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.measure.direction.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.measure.direction.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.direction = "ltr"; metrics = ctx.measureText('hello');
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.measure.rtl.text.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.measure.rtl.text.html index cca5cef..7eba6766 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.measure.rtl.text.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.measure.rtl.text.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); metrics = ctx.measureText('اَلْعَرَبِيَّةُ'); _assert(metrics.actualBoundingBoxLeft < metrics.actualBoundingBoxRight, "metrics.actualBoundingBoxLeft < metrics.actualBoundingBoxRight");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.measure.rtl.text.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.measure.rtl.text.worker.js index 2430d62c..585e6c0 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.measure.rtl.text.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.measure.rtl.text.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); metrics = ctx.measureText('اَلْعَرَبِيَّةُ'); _assert(metrics.actualBoundingBoxLeft < metrics.actualBoundingBoxRight, "metrics.actualBoundingBoxLeft < metrics.actualBoundingBoxRight");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.measure.textAlign.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.measure.textAlign.html index 66beb1d..f784f56 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.measure.textAlign.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.measure.textAlign.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.textAlign = "right"; metrics = ctx.measureText('hello');
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.measure.textAlign.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.measure.textAlign.worker.js index 12807e0..3af2f47 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.measure.textAlign.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.measure.textAlign.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.textAlign = "right"; metrics = ctx.measureText('hello');
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.nonfinite.spacing.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.nonfinite.spacing.html index 1191e2d..8e80f9a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.nonfinite.spacing.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.nonfinite.spacing.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); _assertSame(ctx.letterSpacing, '0px', "ctx.letterSpacing", "'0px'"); _assertSame(ctx.wordSpacing, '0px', "ctx.wordSpacing", "'0px'");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.nonfinite.spacing.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.nonfinite.spacing.worker.js index b01a27e..adba253 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.nonfinite.spacing.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.nonfinite.spacing.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); _assertSame(ctx.letterSpacing, '0px', "ctx.letterSpacing", "'0px'"); _assertSame(ctx.wordSpacing, '0px', "ctx.wordSpacing", "'0px'");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.spacing.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.spacing.html index 23d39fcd..43e959f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.spacing.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.spacing.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); _assertSame(ctx.letterSpacing, '0px', "ctx.letterSpacing", "'0px'"); _assertSame(ctx.wordSpacing, '0px', "ctx.wordSpacing", "'0px'");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.spacing.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.spacing.worker.js index 5b5a417..6bf7c13 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.spacing.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.spacing.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); _assertSame(ctx.letterSpacing, '0px', "ctx.letterSpacing", "'0px'"); _assertSame(ctx.wordSpacing, '0px', "ctx.wordSpacing", "'0px'");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.textRendering.settings.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.textRendering.settings.html index ff851823..d0c7b88 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.textRendering.settings.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.textRendering.settings.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); // Setting textRendering with lower cases _assertSame(ctx.textRendering, "auto", "ctx.textRendering", "\"auto\"");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.textRendering.settings.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.textRendering.settings.worker.js index 0e6721c1..e8402c2 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.textRendering.settings.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.textRendering.settings.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); // Setting textRendering with lower cases _assertSame(ctx.textRendering, "auto", "ctx.textRendering", "\"auto\"");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.wordSpacing.change.font.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.wordSpacing.change.font.html index 883f41c..f8b72fbf 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.wordSpacing.change.font.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.wordSpacing.change.font.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); _assertSame(ctx.letterSpacing, '0px', "ctx.letterSpacing", "'0px'"); _assertSame(ctx.wordSpacing, '0px', "ctx.wordSpacing", "'0px'");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.wordSpacing.change.font.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.wordSpacing.change.font.worker.js index a787045..993cd28 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.wordSpacing.change.font.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.wordSpacing.change.font.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); _assertSame(ctx.letterSpacing, '0px', "ctx.letterSpacing", "'0px'"); _assertSame(ctx.wordSpacing, '0px', "ctx.wordSpacing", "'0px'");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.wordSpacing.measure.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.wordSpacing.measure.html index 96833f5..9ef479b 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.wordSpacing.measure.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.wordSpacing.measure.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); _assertSame(ctx.letterSpacing, '0px', "ctx.letterSpacing", "'0px'"); _assertSame(ctx.wordSpacing, '0px', "ctx.wordSpacing", "'0px'");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.wordSpacing.measure.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.wordSpacing.measure.worker.js index b30926e4..3e850fc 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.wordSpacing.measure.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.wordSpacing.measure.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); _assertSame(ctx.letterSpacing, '0px', "ctx.letterSpacing", "'0px'"); _assertSame(ctx.wordSpacing, '0px', "ctx.wordSpacing", "'0px'");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.default.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.default.html index 0d355729..191c1a5 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.default.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.default.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); _assertSame(ctx.font, '10px sans-serif', "ctx.font", "'10px sans-serif'"); t.done();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.default.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.default.worker.js index 643304f..dc620ed 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.default.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.default.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); _assertSame(ctx.font, '10px sans-serif', "ctx.font", "'10px sans-serif'"); t.done();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.parse.basic.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.parse.basic.html index 2ae3318..aee5556 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.parse.basic.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.parse.basic.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.font = '20px serif'; _assertSame(ctx.font, '20px serif', "ctx.font", "'20px serif'");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.parse.basic.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.parse.basic.worker.js index 75bf436c..0d8a4aa 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.parse.basic.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.parse.basic.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.font = '20px serif'; _assertSame(ctx.font, '20px serif', "ctx.font", "'20px serif'");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.parse.complex.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.parse.complex.html index 5fe9e9e..361b44d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.parse.complex.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.parse.complex.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.font = 'small-caps italic 400 12px/2 Unknown Font, sans-serif'; _assertSame(ctx.font, 'italic small-caps 12px "Unknown Font", sans-serif', "ctx.font", "'italic small-caps 12px \"Unknown Font\", sans-serif'");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.parse.complex.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.parse.complex.worker.js index 0a4d7c3d..3c05b6f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.parse.complex.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.parse.complex.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.font = 'small-caps italic 400 12px/2 Unknown Font, sans-serif'; _assertSame(ctx.font, 'italic small-caps 12px "Unknown Font", sans-serif', "ctx.font", "'italic small-caps 12px \"Unknown Font\", sans-serif'");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.parse.family.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.parse.family.html index 68cd6ea..70127ba6 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.parse.family.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.parse.family.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.font = '20px cursive,fantasy,monospace,sans-serif,serif,UnquotedFont,"QuotedFont\\\\\\","'; _assertSame(ctx.font, '20px cursive, fantasy, monospace, sans-serif, serif, UnquotedFont, "QuotedFont\\\\\\","', "ctx.font", "'20px cursive, fantasy, monospace, sans-serif, serif, UnquotedFont, \"QuotedFont\\\\\\\\\\\\\",\"'");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.parse.family.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.parse.family.worker.js index 6bc05b68..7640de2 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.parse.family.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.parse.family.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.font = '20px cursive,fantasy,monospace,sans-serif,serif,UnquotedFont,"QuotedFont\\\\\\","'; _assertSame(ctx.font, '20px cursive, fantasy, monospace, sans-serif, serif, UnquotedFont, "QuotedFont\\\\\\","', "ctx.font", "'20px cursive, fantasy, monospace, sans-serif, serif, UnquotedFont, \"QuotedFont\\\\\\\\\\\\\",\"'");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.parse.invalid.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.parse.invalid.html index 8180ea75..483476bc 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.parse.invalid.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.parse.invalid.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.font = '20px serif'; _assertSame(ctx.font, '20px serif', "ctx.font", "'20px serif'");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.parse.invalid.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.parse.invalid.worker.js index 9391661a..a4e19a6 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.parse.invalid.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.parse.invalid.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.font = '20px serif'; _assertSame(ctx.font, '20px serif', "ctx.font", "'20px serif'");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.parse.system.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.parse.system.html index 2978eee..24cb730c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.parse.system.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.parse.system.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.font = 'message-box'; _assertDifferent(ctx.font, 'message-box', "ctx.font", "'message-box'");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.parse.system.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.parse.system.worker.js index 9dfd4dbe..5c2a8b4 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.parse.system.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.parse.system.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.font = 'message-box'; _assertDifferent(ctx.font, 'message-box', "ctx.font", "'message-box'");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.parse.tiny.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.parse.tiny.html index 1fe2a036..6c17ad47 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.parse.tiny.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.parse.tiny.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.font = '1px sans-serif'; _assertSame(ctx.font, '1px sans-serif', "ctx.font", "'1px sans-serif'");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.parse.tiny.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.parse.tiny.worker.js index e973bce7..2171e2c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.parse.tiny.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.parse.tiny.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.font = '1px sans-serif'; _assertSame(ctx.font, '1px sans-serif', "ctx.font", "'1px sans-serif'");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.relative_size.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.relative_size.html index ff00a66..eef3be7 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.relative_size.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.relative_size.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.font = '1em sans-serif'; _assertSame(ctx.font, '10px sans-serif', "ctx.font", "'10px sans-serif'");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.relative_size.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.relative_size.worker.js index bf8d4e6..c4d78b8 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.relative_size.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.font.relative_size.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.font = '1em sans-serif'; _assertSame(ctx.font, '10px sans-serif', "ctx.font", "'10px sans-serif'");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.actualBoundingBox.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.actualBoundingBox.html index d454e12..b7ce281 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.actualBoundingBox.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.actualBoundingBox.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.actualBoundingBox.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.actualBoundingBox.worker.js index 497c8f9..4693bb6 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.actualBoundingBox.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.actualBoundingBox.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.advances.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.advances.html index 9dd9bb2..ed3affc 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.advances.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.advances.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.advances.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.advances.worker.js index 85e77507..f1d4bb98 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.advances.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.advances.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.baselines.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.baselines.html index 9aced387..993fbb0 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.baselines.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.baselines.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.baselines.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.baselines.worker.js index 43f38cf..0c06016 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.baselines.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.baselines.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.emHeights.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.emHeights.html index 420c479..cc91f401 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.emHeights.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.emHeights.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.emHeights.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.emHeights.worker.js index 7b73c20..88432343 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.emHeights.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.emHeights.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox.html index eb4d376c..fca062b6 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox.worker.js index 178501e..2f4b64d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.width.basic.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.width.basic.html index d6371f31..074d62ee 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.width.basic.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.width.basic.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.width.basic.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.width.basic.worker.js index 7ef38f33..a1933c8 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.width.basic.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.width.basic.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.width.empty.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.width.empty.html index 4cd2bc8..45792b4 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.width.empty.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.width.empty.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.width.empty.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.width.empty.worker.js index 02ac5d04..8d806c1 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.width.empty.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.width.empty.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.width.space.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.width.space.html index 682b5c0e..971a41e2 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.width.space.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.width.space.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.width.space.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.width.space.worker.js index 097d082..a52c1d8 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.width.space.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.measure.width.space.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')"); let fonts = (self.fonts ? self.fonts : document.fonts);
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.setFont.mathFont.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.setFont.mathFont.html index e4688d7..ed4752d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.setFont.mathFont.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.setFont.mathFont.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.font = "math serif"; t.done();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.setFont.mathFont.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.setFont.mathFont.worker.js index 5fa8492..39e3031e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.setFont.mathFont.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.setFont.mathFont.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.font = "math serif"; t.done();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.bitmap.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.bitmap.html index 1f4deedfa..9491a4d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.bitmap.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.bitmap.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -26,7 +26,7 @@ ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); ctx.restore(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.bitmap.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.bitmap.worker.js index 926a53c..2cc795c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.bitmap.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.bitmap.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -22,7 +22,7 @@ ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); ctx.restore(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.clip.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.clip.html index fb0f236..f5127c0 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.clip.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.clip.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -28,7 +28,7 @@ ctx.restore(); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.clip.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.clip.worker.js index 661ea84..6cc48350 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.clip.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.clip.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -24,7 +24,7 @@ ctx.restore(); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.fillStyle.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.fillStyle.html index fe7abf6..91b23bd 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.fillStyle.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.fillStyle.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); // Test that restore() undoes any modifications var old = ctx.fillStyle;
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.fillStyle.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.fillStyle.worker.js index ec1d4df..fa4d773 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.fillStyle.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.fillStyle.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); // Test that restore() undoes any modifications var old = ctx.fillStyle;
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.globalAlpha.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.globalAlpha.html index 5ad8d46..01b9616 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.globalAlpha.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.globalAlpha.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); // Test that restore() undoes any modifications var old = ctx.globalAlpha;
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.globalAlpha.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.globalAlpha.worker.js index b492235..8b11054 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.globalAlpha.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.globalAlpha.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); // Test that restore() undoes any modifications var old = ctx.globalAlpha;
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.globalCompositeOperation.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.globalCompositeOperation.html index 0695c49..557d3c0 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.globalCompositeOperation.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.globalCompositeOperation.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); // Test that restore() undoes any modifications var old = ctx.globalCompositeOperation;
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.globalCompositeOperation.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.globalCompositeOperation.worker.js index 65e950d..3534147 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.globalCompositeOperation.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.globalCompositeOperation.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); // Test that restore() undoes any modifications var old = ctx.globalCompositeOperation;
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.lineCap.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.lineCap.html index a40279f..e02cbd46d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.lineCap.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.lineCap.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); // Test that restore() undoes any modifications var old = ctx.lineCap;
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.lineCap.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.lineCap.worker.js index 7e8669c9..70de46a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.lineCap.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.lineCap.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); // Test that restore() undoes any modifications var old = ctx.lineCap;
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.lineJoin.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.lineJoin.html index 9f55029..92100e9 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.lineJoin.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.lineJoin.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); // Test that restore() undoes any modifications var old = ctx.lineJoin;
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.lineJoin.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.lineJoin.worker.js index aa4fcad..1da6db8 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.lineJoin.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.lineJoin.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); // Test that restore() undoes any modifications var old = ctx.lineJoin;
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.lineWidth.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.lineWidth.html index 04c6de6..24f9550 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.lineWidth.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.lineWidth.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); // Test that restore() undoes any modifications var old = ctx.lineWidth;
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.lineWidth.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.lineWidth.worker.js index ce0edbb9..657ded5 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.lineWidth.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.lineWidth.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); // Test that restore() undoes any modifications var old = ctx.lineWidth;
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.miterLimit.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.miterLimit.html index 3501f2b..b674467 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.miterLimit.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.miterLimit.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); // Test that restore() undoes any modifications var old = ctx.miterLimit;
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.miterLimit.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.miterLimit.worker.js index 84298b96..745f291 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.miterLimit.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.miterLimit.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); // Test that restore() undoes any modifications var old = ctx.miterLimit;
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.path.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.path.html index 1e9d7b1..5e6d8264 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.path.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.path.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -27,7 +27,7 @@ ctx.restore(); ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.path.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.path.worker.js index bde4355..4c838e5 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.path.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.path.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -23,7 +23,7 @@ ctx.restore(); ctx.fillStyle = '#0f0'; ctx.fill(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowBlur.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowBlur.html index 7cbadf3..af2ee91 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowBlur.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowBlur.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); // Test that restore() undoes any modifications var old = ctx.shadowBlur;
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowBlur.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowBlur.worker.js index 5e29bb0..12acd3d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowBlur.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowBlur.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); // Test that restore() undoes any modifications var old = ctx.shadowBlur;
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowColor.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowColor.html index d819ad27..5aa01941 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowColor.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowColor.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); // Test that restore() undoes any modifications var old = ctx.shadowColor;
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowColor.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowColor.worker.js index e246a76..b2f9fb9 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowColor.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowColor.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); // Test that restore() undoes any modifications var old = ctx.shadowColor;
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowOffsetX.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowOffsetX.html index 3c70d77..f281234 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowOffsetX.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowOffsetX.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); // Test that restore() undoes any modifications var old = ctx.shadowOffsetX;
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowOffsetX.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowOffsetX.worker.js index 7aab7c3..2711817 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowOffsetX.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowOffsetX.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); // Test that restore() undoes any modifications var old = ctx.shadowOffsetX;
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowOffsetY.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowOffsetY.html index b5508516..643ce99 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowOffsetY.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowOffsetY.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); // Test that restore() undoes any modifications var old = ctx.shadowOffsetY;
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowOffsetY.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowOffsetY.worker.js index 95f6cb1..aaa572a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowOffsetY.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.shadowOffsetY.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); // Test that restore() undoes any modifications var old = ctx.shadowOffsetY;
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.stack.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.stack.html index e9cc0b8..97917680 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.stack.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.stack.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.lineWidth = 1; ctx.save();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.stack.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.stack.worker.js index 13cd880..e1f078e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.stack.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.stack.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.lineWidth = 1; ctx.save();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.stackdepth.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.stackdepth.html index 62ce2c0..53dbc63c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.stackdepth.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.stackdepth.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var limit = 512; for (var i = 1; i < limit; ++i)
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.stackdepth.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.stackdepth.worker.js index 662ca44..a485c194 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.stackdepth.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.stackdepth.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var limit = 512; for (var i = 1; i < limit; ++i)
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.strokeStyle.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.strokeStyle.html index 8c3a5cc..60963729 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.strokeStyle.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.strokeStyle.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); // Test that restore() undoes any modifications var old = ctx.strokeStyle;
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.strokeStyle.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.strokeStyle.worker.js index 3d41d6ab..275ba9e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.strokeStyle.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.strokeStyle.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); // Test that restore() undoes any modifications var old = ctx.strokeStyle;
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.transformation.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.transformation.html index 71ef886..abb7db89 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.transformation.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.transformation.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -27,7 +27,7 @@ ctx.restore(); ctx.fillStyle = '#f00'; ctx.fillRect(-200, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.transformation.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.transformation.worker.js index 241f601..1ef2d6d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.transformation.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.transformation.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -23,7 +23,7 @@ ctx.restore(); ctx.fillStyle = '#f00'; ctx.fillRect(-200, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.underflow.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.underflow.html index ff86a78..986d966 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.underflow.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.underflow.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); for (var i = 0; i < 16; ++i) ctx.restore();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.underflow.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.underflow.worker.js index 66d3dc76..d38cf974 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.underflow.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-canvas-state/2d.state.saverestore.underflow.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); for (var i = 0; i < 16; ++i) ctx.restore();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/2d.canvas.readonly.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/2d.canvas.readonly.html index b1760e6..ec6ffe5 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/2d.canvas.readonly.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/2d.canvas.readonly.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var offscreenCanvas2 = new OffscreenCanvas(100, 50); var d = ctx.canvas;
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/2d.canvas.readonly.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/2d.canvas.readonly.worker.js index 823af953..8f88efd6 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/2d.canvas.readonly.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/2d.canvas.readonly.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var offscreenCanvas2 = new OffscreenCanvas(100, 50); var d = ctx.canvas;
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/2d.canvas.reference.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/2d.canvas.reference.html index a93367b..024b1fe7 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/2d.canvas.reference.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/2d.canvas.reference.html
@@ -17,10 +17,10 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -_assertSame(ctx.canvas, offscreenCanvas, "ctx.canvas", "offscreenCanvas"); +_assertSame(ctx.canvas, canvas, "ctx.canvas", "canvas"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/2d.canvas.reference.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/2d.canvas.reference.worker.js index 052ab9ec..a80e559 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/2d.canvas.reference.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/2d.canvas.reference.worker.js
@@ -13,10 +13,10 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -_assertSame(ctx.canvas, offscreenCanvas, "ctx.canvas", "offscreenCanvas"); +_assertSame(ctx.canvas, canvas, "ctx.canvas", "canvas"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.exists.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.exists.html index 706a8c5..55bdf1cc 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.exists.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.exists.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var offscreenCanvas2 = new OffscreenCanvas(100, 50); _assertDifferent(offscreenCanvas2.getContext('2d'), null, "offscreenCanvas2.getContext('2d')", "null");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.exists.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.exists.worker.js index 8e0d088..97f8cc74 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.exists.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.exists.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var offscreenCanvas2 = new OffscreenCanvas(100, 50); _assertDifferent(offscreenCanvas2.getContext('2d'), null, "offscreenCanvas2.getContext('2d')", "null");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.cache.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.cache.html index e288ed4..a57dbcb6 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.cache.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.cache.html
@@ -17,15 +17,15 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -_assertDifferent(offscreenCanvas.getContext('2d', false, {}, [], 1, "2"), null, "offscreenCanvas.getContext('2d', false, {}, [], 1, \"2\")", "null"); -_assertDifferent(offscreenCanvas.getContext('2d', 123), null, "offscreenCanvas.getContext('2d', 123)", "null"); -_assertDifferent(offscreenCanvas.getContext('2d', "test"), null, "offscreenCanvas.getContext('2d', \"test\")", "null"); -_assertDifferent(offscreenCanvas.getContext('2d', undefined), null, "offscreenCanvas.getContext('2d', undefined)", "null"); -_assertDifferent(offscreenCanvas.getContext('2d', null), null, "offscreenCanvas.getContext('2d', null)", "null"); -_assertDifferent(offscreenCanvas.getContext('2d', Symbol.hasInstance), null, "offscreenCanvas.getContext('2d', Symbol.hasInstance)", "null"); +_assertDifferent(canvas.getContext('2d', false, {}, [], 1, "2"), null, "canvas.getContext('2d', false, {}, [], 1, \"2\")", "null"); +_assertDifferent(canvas.getContext('2d', 123), null, "canvas.getContext('2d', 123)", "null"); +_assertDifferent(canvas.getContext('2d', "test"), null, "canvas.getContext('2d', \"test\")", "null"); +_assertDifferent(canvas.getContext('2d', undefined), null, "canvas.getContext('2d', undefined)", "null"); +_assertDifferent(canvas.getContext('2d', null), null, "canvas.getContext('2d', null)", "null"); +_assertDifferent(canvas.getContext('2d', Symbol.hasInstance), null, "canvas.getContext('2d', Symbol.hasInstance)", "null"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.cache.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.cache.worker.js index 3b22e2f8..df330e3 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.cache.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.cache.worker.js
@@ -13,15 +13,15 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -_assertDifferent(offscreenCanvas.getContext('2d', false, {}, [], 1, "2"), null, "offscreenCanvas.getContext('2d', false, {}, [], 1, \"2\")", "null"); -_assertDifferent(offscreenCanvas.getContext('2d', 123), null, "offscreenCanvas.getContext('2d', 123)", "null"); -_assertDifferent(offscreenCanvas.getContext('2d', "test"), null, "offscreenCanvas.getContext('2d', \"test\")", "null"); -_assertDifferent(offscreenCanvas.getContext('2d', undefined), null, "offscreenCanvas.getContext('2d', undefined)", "null"); -_assertDifferent(offscreenCanvas.getContext('2d', null), null, "offscreenCanvas.getContext('2d', null)", "null"); -_assertDifferent(offscreenCanvas.getContext('2d', Symbol.hasInstance), null, "offscreenCanvas.getContext('2d', Symbol.hasInstance)", "null"); +_assertDifferent(canvas.getContext('2d', false, {}, [], 1, "2"), null, "canvas.getContext('2d', false, {}, [], 1, \"2\")", "null"); +_assertDifferent(canvas.getContext('2d', 123), null, "canvas.getContext('2d', 123)", "null"); +_assertDifferent(canvas.getContext('2d', "test"), null, "canvas.getContext('2d', \"test\")", "null"); +_assertDifferent(canvas.getContext('2d', undefined), null, "canvas.getContext('2d', undefined)", "null"); +_assertDifferent(canvas.getContext('2d', null), null, "canvas.getContext('2d', null)", "null"); +_assertDifferent(canvas.getContext('2d', Symbol.hasInstance), null, "canvas.getContext('2d', Symbol.hasInstance)", "null"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.create.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.create.html index c71c239..a626318 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.create.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.create.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); _assertDifferent((new OffscreenCanvas(100, 50)).getContext('2d', false, {}, [], 1, "2"), null, "(new OffscreenCanvas(100, 50)).getContext('2d', false, {}, [], 1, \"2\")", "null"); _assertDifferent((new OffscreenCanvas(100, 50)).getContext('2d', 123), null, "(new OffscreenCanvas(100, 50)).getContext('2d', 123)", "null");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.create.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.create.worker.js index 1504256..f34c5a1 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.create.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.create.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); _assertDifferent((new OffscreenCanvas(100, 50)).getContext('2d', false, {}, [], 1, "2"), null, "(new OffscreenCanvas(100, 50)).getContext('2d', false, {}, [], 1, \"2\")", "null"); _assertDifferent((new OffscreenCanvas(100, 50)).getContext('2d', 123), null, "(new OffscreenCanvas(100, 50)).getContext('2d', 123)", "null");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.shared.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.shared.html index 84beb9c..dfdcbfe6 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.shared.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.shared.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -var ctx2 = offscreenCanvas.getContext('2d'); +var ctx2 = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx2.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.shared.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.shared.worker.js index 2d04cae..7a782139 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.shared.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.shared.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -var ctx2 = offscreenCanvas.getContext('2d'); +var ctx2 = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx2.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.unique.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.unique.html index bff697f0..c7e71da 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.unique.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.unique.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var offscreenCanvas2 = new OffscreenCanvas(100, 50); _assertSame(offscreenCanvas2.getContext('2d'), offscreenCanvas2.getContext('2d'), "offscreenCanvas2.getContext('2d')", "offscreenCanvas2.getContext('2d')");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.unique.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.unique.worker.js index 284a933..a2a744df 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.unique.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.unique.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var offscreenCanvas2 = new OffscreenCanvas(100, 50); _assertSame(offscreenCanvas2.getContext('2d'), offscreenCanvas2.getContext('2d'), "offscreenCanvas2.getContext('2d')", "offscreenCanvas2.getContext('2d')");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/context.arguments.missing.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/context.arguments.missing.html index 4d62ed6..b69f63c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/context.arguments.missing.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/context.arguments.missing.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var offscreenCanvas2 = new OffscreenCanvas(100, 50); assert_throws_js(TypeError, function() { offscreenCanvas2.getContext(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/context.arguments.missing.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/context.arguments.missing.worker.js index 46c0d1ff..f03ca52 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/context.arguments.missing.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/context.arguments.missing.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var offscreenCanvas2 = new OffscreenCanvas(100, 50); assert_throws_js(TypeError, function() { offscreenCanvas2.getContext(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/context.casesensitive.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/context.casesensitive.html index b601a9e..e7ee0c6 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/context.casesensitive.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/context.casesensitive.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var offscreenCanvas2 = new OffscreenCanvas(100, 50); assert_throws_js(TypeError, function() { offscreenCanvas2.getContext('2D'); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/context.casesensitive.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/context.casesensitive.worker.js index 0b114b7..265fe95 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/context.casesensitive.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/context.casesensitive.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var offscreenCanvas2 = new OffscreenCanvas(100, 50); assert_throws_js(TypeError, function() { offscreenCanvas2.getContext('2D'); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/context.emptystring.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/context.emptystring.html index c577efc1..c8f8943 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/context.emptystring.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/context.emptystring.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var offscreenCanvas2 = new OffscreenCanvas(100, 50); assert_throws_js(TypeError, function() { offscreenCanvas2.getContext(""); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/context.emptystring.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/context.emptystring.worker.js index 893c296c..45612d3 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/context.emptystring.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/context.emptystring.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var offscreenCanvas2 = new OffscreenCanvas(100, 50); assert_throws_js(TypeError, function() { offscreenCanvas2.getContext(""); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badname.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badname.html index 1ce3ab0f..d1b0f2f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badname.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badname.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var offscreenCanvas2 = new OffscreenCanvas(100, 50); assert_throws_js(TypeError, function() { offscreenCanvas2.getContext('This is not an implemented context in any real browser'); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badname.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badname.worker.js index a30bb74..cc50c2bdb 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badname.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badname.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var offscreenCanvas2 = new OffscreenCanvas(100, 50); assert_throws_js(TypeError, function() { offscreenCanvas2.getContext('This is not an implemented context in any real browser'); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badsuffix.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badsuffix.html index 898dc05c..30178af 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badsuffix.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badsuffix.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var offscreenCanvas2 = new OffscreenCanvas(100, 50); assert_throws_js(TypeError, function() { offscreenCanvas2.getContext("2d#"); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badsuffix.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badsuffix.worker.js index 3c5af3b4..7b3d8a0 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badsuffix.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badsuffix.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var offscreenCanvas2 = new OffscreenCanvas(100, 50); assert_throws_js(TypeError, function() { offscreenCanvas2.getContext("2d#"); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.nullsuffix.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.nullsuffix.html index 73b2fcb..2a22549 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.nullsuffix.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.nullsuffix.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var offscreenCanvas2 = new OffscreenCanvas(100, 50); assert_throws_js(TypeError, function() { offscreenCanvas2.getContext("2d\0"); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.nullsuffix.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.nullsuffix.worker.js index 7183e2a..b659410 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.nullsuffix.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.nullsuffix.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var offscreenCanvas2 = new OffscreenCanvas(100, 50); assert_throws_js(TypeError, function() { offscreenCanvas2.getContext("2d\0"); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.unicode.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.unicode.html index 85c951c..0c826595 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.unicode.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.unicode.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var offscreenCanvas2 = new OffscreenCanvas(100, 50); assert_throws_js(TypeError, function() { offscreenCanvas2.getContext("2\uFF44"); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.unicode.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.unicode.worker.js index ae2e5cd8..cade5a20 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.unicode.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.unicode.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var offscreenCanvas2 = new OffscreenCanvas(100, 50); assert_throws_js(TypeError, function() { offscreenCanvas2.getContext("2\uFF44"); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.colour.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.colour.html index cdcebc4..a447262a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.colour.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.colour.html
@@ -17,10 +17,10 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -_assertPixel(offscreenCanvas, 20,20, 0,0,0,0, "20,20", "0,0,0,0"); +_assertPixel(canvas, 20,20, 0,0,0,0, "20,20", "0,0,0,0"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.colour.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.colour.worker.js index 0273677..baf8129 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.colour.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.colour.worker.js
@@ -13,10 +13,10 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -_assertPixel(offscreenCanvas, 20,20, 0,0,0,0, "20,20", "0,0,0,0"); +_assertPixel(canvas, 20,20, 0,0,0,0, "20,20", "0,0,0,0"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.2dstate.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.2dstate.html index 34e8e9b..76b76070 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.2dstate.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.2dstate.html
@@ -17,70 +17,70 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -offscreenCanvas.width = 100; +canvas.width = 100; var default_val; default_val = ctx.strokeStyle; ctx.strokeStyle = "#ff0000"; -offscreenCanvas.width = 100; +canvas.width = 100; _assertSame(ctx.strokeStyle, default_val, "ctx.strokeStyle", "default_val"); default_val = ctx.fillStyle; ctx.fillStyle = "#ff0000"; -offscreenCanvas.width = 100; +canvas.width = 100; _assertSame(ctx.fillStyle, default_val, "ctx.fillStyle", "default_val"); default_val = ctx.globalAlpha; ctx.globalAlpha = 0.5; -offscreenCanvas.width = 100; +canvas.width = 100; _assertSame(ctx.globalAlpha, default_val, "ctx.globalAlpha", "default_val"); default_val = ctx.lineWidth; ctx.lineWidth = 0.5; -offscreenCanvas.width = 100; +canvas.width = 100; _assertSame(ctx.lineWidth, default_val, "ctx.lineWidth", "default_val"); default_val = ctx.lineCap; ctx.lineCap = "round"; -offscreenCanvas.width = 100; +canvas.width = 100; _assertSame(ctx.lineCap, default_val, "ctx.lineCap", "default_val"); default_val = ctx.lineJoin; ctx.lineJoin = "round"; -offscreenCanvas.width = 100; +canvas.width = 100; _assertSame(ctx.lineJoin, default_val, "ctx.lineJoin", "default_val"); default_val = ctx.miterLimit; ctx.miterLimit = 0.5; -offscreenCanvas.width = 100; +canvas.width = 100; _assertSame(ctx.miterLimit, default_val, "ctx.miterLimit", "default_val"); default_val = ctx.shadowOffsetX; ctx.shadowOffsetX = 5; -offscreenCanvas.width = 100; +canvas.width = 100; _assertSame(ctx.shadowOffsetX, default_val, "ctx.shadowOffsetX", "default_val"); default_val = ctx.shadowOffsetY; ctx.shadowOffsetY = 5; -offscreenCanvas.width = 100; +canvas.width = 100; _assertSame(ctx.shadowOffsetY, default_val, "ctx.shadowOffsetY", "default_val"); default_val = ctx.shadowBlur; ctx.shadowBlur = 5; -offscreenCanvas.width = 100; +canvas.width = 100; _assertSame(ctx.shadowBlur, default_val, "ctx.shadowBlur", "default_val"); default_val = ctx.shadowColor; ctx.shadowColor = "#ff0000"; -offscreenCanvas.width = 100; +canvas.width = 100; _assertSame(ctx.shadowColor, default_val, "ctx.shadowColor", "default_val"); default_val = ctx.globalCompositeOperation; ctx.globalCompositeOperation = "copy"; -offscreenCanvas.width = 100; +canvas.width = 100; _assertSame(ctx.globalCompositeOperation, default_val, "ctx.globalCompositeOperation", "default_val"); t.done();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.2dstate.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.2dstate.worker.js index 3b6978b..273c5f0b 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.2dstate.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.2dstate.worker.js
@@ -13,70 +13,70 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -offscreenCanvas.width = 100; +canvas.width = 100; var default_val; default_val = ctx.strokeStyle; ctx.strokeStyle = "#ff0000"; -offscreenCanvas.width = 100; +canvas.width = 100; _assertSame(ctx.strokeStyle, default_val, "ctx.strokeStyle", "default_val"); default_val = ctx.fillStyle; ctx.fillStyle = "#ff0000"; -offscreenCanvas.width = 100; +canvas.width = 100; _assertSame(ctx.fillStyle, default_val, "ctx.fillStyle", "default_val"); default_val = ctx.globalAlpha; ctx.globalAlpha = 0.5; -offscreenCanvas.width = 100; +canvas.width = 100; _assertSame(ctx.globalAlpha, default_val, "ctx.globalAlpha", "default_val"); default_val = ctx.lineWidth; ctx.lineWidth = 0.5; -offscreenCanvas.width = 100; +canvas.width = 100; _assertSame(ctx.lineWidth, default_val, "ctx.lineWidth", "default_val"); default_val = ctx.lineCap; ctx.lineCap = "round"; -offscreenCanvas.width = 100; +canvas.width = 100; _assertSame(ctx.lineCap, default_val, "ctx.lineCap", "default_val"); default_val = ctx.lineJoin; ctx.lineJoin = "round"; -offscreenCanvas.width = 100; +canvas.width = 100; _assertSame(ctx.lineJoin, default_val, "ctx.lineJoin", "default_val"); default_val = ctx.miterLimit; ctx.miterLimit = 0.5; -offscreenCanvas.width = 100; +canvas.width = 100; _assertSame(ctx.miterLimit, default_val, "ctx.miterLimit", "default_val"); default_val = ctx.shadowOffsetX; ctx.shadowOffsetX = 5; -offscreenCanvas.width = 100; +canvas.width = 100; _assertSame(ctx.shadowOffsetX, default_val, "ctx.shadowOffsetX", "default_val"); default_val = ctx.shadowOffsetY; ctx.shadowOffsetY = 5; -offscreenCanvas.width = 100; +canvas.width = 100; _assertSame(ctx.shadowOffsetY, default_val, "ctx.shadowOffsetY", "default_val"); default_val = ctx.shadowBlur; ctx.shadowBlur = 5; -offscreenCanvas.width = 100; +canvas.width = 100; _assertSame(ctx.shadowBlur, default_val, "ctx.shadowBlur", "default_val"); default_val = ctx.shadowColor; ctx.shadowColor = "#ff0000"; -offscreenCanvas.width = 100; +canvas.width = 100; _assertSame(ctx.shadowColor, default_val, "ctx.shadowColor", "default_val"); default_val = ctx.globalCompositeOperation; ctx.globalCompositeOperation = "copy"; -offscreenCanvas.width = 100; +canvas.width = 100; _assertSame(ctx.globalCompositeOperation, default_val, "ctx.globalCompositeOperation", "default_val"); t.done();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.clip.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.clip.html index 5b82c56..a5c5955 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.clip.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.clip.html
@@ -17,16 +17,16 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -offscreenCanvas.width = 100; +canvas.width = 100; ctx.rect(0, 0, 1, 1); ctx.clip(); -offscreenCanvas.width = 100; +canvas.width = 100; ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 20,20, 0,255,0,255, "20,20", "0,255,0,255"); +_assertPixel(canvas, 20,20, 0,255,0,255, "20,20", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.clip.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.clip.worker.js index d700f60..a12a6235 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.clip.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.clip.worker.js
@@ -13,16 +13,16 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -offscreenCanvas.width = 100; +canvas.width = 100; ctx.rect(0, 0, 1, 1); ctx.clip(); -offscreenCanvas.width = 100; +canvas.width = 100; ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 20,20, 0,255,0,255, "20,20", "0,255,0,255"); +_assertPixel(canvas, 20,20, 0,255,0,255, "20,20", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.different.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.different.html index 6fba410..2a16c90 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.different.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.different.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 50, 50); -_assertPixel(offscreenCanvas, 20,20, 255,0,0,255, "20,20", "255,0,0,255"); -offscreenCanvas.width = 50; -_assertPixel(offscreenCanvas, 20,20, 0,0,0,0, "20,20", "0,0,0,0"); +_assertPixel(canvas, 20,20, 255,0,0,255, "20,20", "255,0,0,255"); +canvas.width = 50; +_assertPixel(canvas, 20,20, 0,0,0,0, "20,20", "0,0,0,0"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.different.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.different.worker.js index de81db23..5f98f51 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.different.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.different.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 50, 50); -_assertPixel(offscreenCanvas, 20,20, 255,0,0,255, "20,20", "255,0,0,255"); -offscreenCanvas.width = 50; -_assertPixel(offscreenCanvas, 20,20, 0,0,0,0, "20,20", "0,0,0,0"); +_assertPixel(canvas, 20,20, 255,0,0,255, "20,20", "255,0,0,255"); +canvas.width = 50; +_assertPixel(canvas, 20,20, 0,0,0,0, "20,20", "0,0,0,0"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.gradient.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.gradient.html index e9de67d..ff306d3 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.gradient.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.gradient.html
@@ -17,19 +17,19 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -offscreenCanvas.width = 50; +canvas.width = 50; var g = ctx.createLinearGradient(0, 0, 100, 0); g.addColorStop(0, '#0f0'); g.addColorStop(1, '#0f0'); -offscreenCanvas.width = 100; +canvas.width = 100; ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.gradient.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.gradient.worker.js index 7ade246..064eb52 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.gradient.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.gradient.worker.js
@@ -13,19 +13,19 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -offscreenCanvas.width = 50; +canvas.width = 50; var g = ctx.createLinearGradient(0, 0, 100, 0); g.addColorStop(0, '#0f0'); g.addColorStop(1, '#0f0'); -offscreenCanvas.width = 100; +canvas.width = 100; ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.fillStyle = g; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.path.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.path.html index 66ab6cf..ff39b7d1 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.path.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.path.html
@@ -17,15 +17,15 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -offscreenCanvas.width = 100; +canvas.width = 100; ctx.rect(0, 0, 100, 50); -offscreenCanvas.width = 100; +canvas.width = 100; ctx.fillStyle = '#f00'; ctx.fill(); -_assertPixel(offscreenCanvas, 20,20, 0,0,0,0, "20,20", "0,0,0,0"); +_assertPixel(canvas, 20,20, 0,0,0,0, "20,20", "0,0,0,0"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.path.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.path.worker.js index ca3d877..7057d46 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.path.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.path.worker.js
@@ -13,15 +13,15 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -offscreenCanvas.width = 100; +canvas.width = 100; ctx.rect(0, 0, 100, 50); -offscreenCanvas.width = 100; +canvas.width = 100; ctx.fillStyle = '#f00'; ctx.fill(); -_assertPixel(offscreenCanvas, 20,20, 0,0,0,0, "20,20", "0,0,0,0"); +_assertPixel(canvas, 20,20, 0,0,0,0, "20,20", "0,0,0,0"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.pattern.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.pattern.html index 82726e94..9a589bbe 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.pattern.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.pattern.html
@@ -17,19 +17,19 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -offscreenCanvas.width = 30; +canvas.width = 30; ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 30, 50); -var p = ctx.createPattern(offscreenCanvas, 'repeat-x'); -offscreenCanvas.width = 100; +var p = ctx.createPattern(canvas, 'repeat-x'); +canvas.width = 100; ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.fillStyle = p; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.pattern.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.pattern.worker.js index 8ba6a56..ccbd3f3 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.pattern.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.pattern.worker.js
@@ -13,19 +13,19 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -offscreenCanvas.width = 30; +canvas.width = 30; ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 30, 50); -var p = ctx.createPattern(offscreenCanvas, 'repeat-x'); -offscreenCanvas.width = 100; +var p = ctx.createPattern(canvas, 'repeat-x'); +canvas.width = 100; ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.fillStyle = p; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.same.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.same.html index db96fa9..a2050a1 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.same.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.same.html
@@ -17,15 +17,15 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -offscreenCanvas.width = 100; +canvas.width = 100; ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 50, 50); -_assertPixel(offscreenCanvas, 20,20, 255,0,0,255, "20,20", "255,0,0,255"); -offscreenCanvas.width = 100; -_assertPixel(offscreenCanvas, 20,20, 0,0,0,0, "20,20", "0,0,0,0"); +_assertPixel(canvas, 20,20, 255,0,0,255, "20,20", "255,0,0,255"); +canvas.width = 100; +_assertPixel(canvas, 20,20, 0,0,0,0, "20,20", "0,0,0,0"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.same.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.same.worker.js index d179a28..c67c57a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.same.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.same.worker.js
@@ -13,15 +13,15 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -offscreenCanvas.width = 100; +canvas.width = 100; ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 50, 50); -_assertPixel(offscreenCanvas, 20,20, 255,0,0,255, "20,20", "255,0,0,255"); -offscreenCanvas.width = 100; -_assertPixel(offscreenCanvas, 20,20, 0,0,0,0, "20,20", "0,0,0,0"); +_assertPixel(canvas, 20,20, 255,0,0,255, "20,20", "255,0,0,255"); +canvas.width = 100; +_assertPixel(canvas, 20,20, 0,0,0,0, "20,20", "0,0,0,0"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.transform.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.transform.html index 7415afec..85912f4 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.transform.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.transform.html
@@ -17,15 +17,15 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -offscreenCanvas.width = 100; +canvas.width = 100; ctx.scale(0.1, 0.1); -offscreenCanvas.width = 100; +canvas.width = 100; ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 20,20, 0,255,0,255, "20,20", "0,255,0,255"); +_assertPixel(canvas, 20,20, 0,255,0,255, "20,20", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.transform.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.transform.worker.js index 5591c67..d88e7b0 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.transform.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/initial.reset.transform.worker.js
@@ -13,15 +13,15 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -offscreenCanvas.width = 100; +canvas.width = 100; ctx.scale(0.1, 0.1); -offscreenCanvas.width = 100; +canvas.width = 100; ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 20,20, 0,255,0,255, "20,20", "0,255,0,255"); +_assertPixel(canvas, 20,20, 0,255,0,255, "20,20", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.default.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.default.html index 79bfb87..6ebd35f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.default.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.default.html
@@ -17,11 +17,11 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -_assertSame(offscreenCanvas.width, 100, "offscreenCanvas.width", "100"); -_assertSame(offscreenCanvas.height, 50, "offscreenCanvas.height", "50"); +_assertSame(canvas.width, 100, "canvas.width", "100"); +_assertSame(canvas.height, 50, "canvas.height", "50"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.default.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.default.worker.js index 6cb6269..c77b8a4 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.default.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.default.worker.js
@@ -13,11 +13,11 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -_assertSame(offscreenCanvas.width, 100, "offscreenCanvas.width", "100"); -_assertSame(offscreenCanvas.height, 50, "offscreenCanvas.height", "50"); +_assertSame(canvas.width, 100, "canvas.width", "100"); +_assertSame(canvas.height, 50, "canvas.height", "50"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.html index f05472a7..fda4e92 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.html
@@ -17,25 +17,25 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -offscreenCanvas.width = "100"; -offscreenCanvas.height = "100"; -_assertSame(offscreenCanvas.width, 100, "offscreenCanvas.width", "100"); -_assertSame(offscreenCanvas.height, 100, "offscreenCanvas.height", "100"); -offscreenCanvas.width = "+1.5e2"; -offscreenCanvas.height = "0x96"; -_assertSame(offscreenCanvas.width, 150, "offscreenCanvas.width", "150"); -_assertSame(offscreenCanvas.height, 150, "offscreenCanvas.height", "150"); -offscreenCanvas.width = 301.999; -offscreenCanvas.height = 301.001; -_assertSame(offscreenCanvas.width, 301, "offscreenCanvas.width", "301"); -_assertSame(offscreenCanvas.height, 301, "offscreenCanvas.height", "301"); -assert_throws_js(TypeError, function() { offscreenCanvas.width = "400x"; }); -assert_throws_js(TypeError, function() { offscreenCanvas.height = "foo"; }); -_assertSame(offscreenCanvas.width, 301, "offscreenCanvas.width", "301"); -_assertSame(offscreenCanvas.height, 301, "offscreenCanvas.height", "301"); +canvas.width = "100"; +canvas.height = "100"; +_assertSame(canvas.width, 100, "canvas.width", "100"); +_assertSame(canvas.height, 100, "canvas.height", "100"); +canvas.width = "+1.5e2"; +canvas.height = "0x96"; +_assertSame(canvas.width, 150, "canvas.width", "150"); +_assertSame(canvas.height, 150, "canvas.height", "150"); +canvas.width = 301.999; +canvas.height = 301.001; +_assertSame(canvas.width, 301, "canvas.width", "301"); +_assertSame(canvas.height, 301, "canvas.height", "301"); +assert_throws_js(TypeError, function() { canvas.width = "400x"; }); +assert_throws_js(TypeError, function() { canvas.height = "foo"; }); +_assertSame(canvas.width, 301, "canvas.width", "301"); +_assertSame(canvas.height, 301, "canvas.height", "301"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.set.zero.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.set.zero.html index 73ebe928..4bf7b9c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.set.zero.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.set.zero.html
@@ -17,13 +17,13 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -offscreenCanvas.width = 0; -offscreenCanvas.height = 0; -_assertSame(offscreenCanvas.width, 0, "offscreenCanvas.width", "0"); -_assertSame(offscreenCanvas.height, 0, "offscreenCanvas.height", "0"); +canvas.width = 0; +canvas.height = 0; +_assertSame(canvas.width, 0, "canvas.width", "0"); +_assertSame(canvas.height, 0, "canvas.height", "0"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.set.zero.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.set.zero.worker.js index bebe7cf..2ecf199 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.set.zero.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.set.zero.worker.js
@@ -13,13 +13,13 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -offscreenCanvas.width = 0; -offscreenCanvas.height = 0; -_assertSame(offscreenCanvas.width, 0, "offscreenCanvas.width", "0"); -_assertSame(offscreenCanvas.height, 0, "offscreenCanvas.height", "0"); +canvas.width = 0; +canvas.height = 0; +_assertSame(canvas.width, 0, "canvas.width", "0"); +_assertSame(canvas.height, 0, "canvas.height", "0"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.worker.js index 8703a037..16350ae 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.worker.js
@@ -13,25 +13,25 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -offscreenCanvas.width = "100"; -offscreenCanvas.height = "100"; -_assertSame(offscreenCanvas.width, 100, "offscreenCanvas.width", "100"); -_assertSame(offscreenCanvas.height, 100, "offscreenCanvas.height", "100"); -offscreenCanvas.width = "+1.5e2"; -offscreenCanvas.height = "0x96"; -_assertSame(offscreenCanvas.width, 150, "offscreenCanvas.width", "150"); -_assertSame(offscreenCanvas.height, 150, "offscreenCanvas.height", "150"); -offscreenCanvas.width = 301.999; -offscreenCanvas.height = 301.001; -_assertSame(offscreenCanvas.width, 301, "offscreenCanvas.width", "301"); -_assertSame(offscreenCanvas.height, 301, "offscreenCanvas.height", "301"); -assert_throws_js(TypeError, function() { offscreenCanvas.width = "400x"; }); -assert_throws_js(TypeError, function() { offscreenCanvas.height = "foo"; }); -_assertSame(offscreenCanvas.width, 301, "offscreenCanvas.width", "301"); -_assertSame(offscreenCanvas.height, 301, "offscreenCanvas.height", "301"); +canvas.width = "100"; +canvas.height = "100"; +_assertSame(canvas.width, 100, "canvas.width", "100"); +_assertSame(canvas.height, 100, "canvas.height", "100"); +canvas.width = "+1.5e2"; +canvas.height = "0x96"; +_assertSame(canvas.width, 150, "canvas.width", "150"); +_assertSame(canvas.height, 150, "canvas.height", "150"); +canvas.width = 301.999; +canvas.height = 301.001; +_assertSame(canvas.width, 301, "canvas.width", "301"); +_assertSame(canvas.height, 301, "canvas.height", "301"); +assert_throws_js(TypeError, function() { canvas.width = "400x"; }); +assert_throws_js(TypeError, function() { canvas.height = "foo"; }); +_assertSame(canvas.width, 301, "canvas.width", "301"); +_assertSame(canvas.height, 301, "canvas.height", "301"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.decimal.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.decimal.html index 504cc601..a74fe15 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.decimal.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.decimal.html
@@ -17,13 +17,13 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -offscreenCanvas.width = '100.999'; -offscreenCanvas.height = '100.999'; -_assertSame(offscreenCanvas.width, 100, "offscreenCanvas.width", "100"); -_assertSame(offscreenCanvas.height, 100, "offscreenCanvas.height", "100"); +canvas.width = '100.999'; +canvas.height = '100.999'; +_assertSame(canvas.width, 100, "canvas.width", "100"); +_assertSame(canvas.height, 100, "canvas.height", "100"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.decimal.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.decimal.worker.js index 6b54225..7b982e8 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.decimal.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.decimal.worker.js
@@ -13,13 +13,13 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -offscreenCanvas.width = '100.999'; -offscreenCanvas.height = '100.999'; -_assertSame(offscreenCanvas.width, 100, "offscreenCanvas.width", "100"); -_assertSame(offscreenCanvas.height, 100, "offscreenCanvas.height", "100"); +canvas.width = '100.999'; +canvas.height = '100.999'; +_assertSame(canvas.width, 100, "canvas.width", "100"); +_assertSame(canvas.height, 100, "canvas.height", "100"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.em.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.em.html index 7a24ef2..5a8eee2 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.em.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.em.html
@@ -17,10 +17,10 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -assert_throws_js(TypeError, function() { offscreenCanvas.width = '100em'; }); +assert_throws_js(TypeError, function() { canvas.width = '100em'; }); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.em.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.em.worker.js index 7ed22e7..a0248d4 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.em.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.em.worker.js
@@ -13,10 +13,10 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -assert_throws_js(TypeError, function() { offscreenCanvas.width = '100em'; }); +assert_throws_js(TypeError, function() { canvas.width = '100em'; }); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.empty.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.empty.html index 38291495..eab54b0 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.empty.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.empty.html
@@ -17,13 +17,13 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -offscreenCanvas.width = ''; -offscreenCanvas.height = ''; -_assertSame(offscreenCanvas.width, 0, "offscreenCanvas.width", "0"); -_assertSame(offscreenCanvas.height, 0, "offscreenCanvas.height", "0"); +canvas.width = ''; +canvas.height = ''; +_assertSame(canvas.width, 0, "canvas.width", "0"); +_assertSame(canvas.height, 0, "canvas.height", "0"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.empty.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.empty.worker.js index 0fb9808..93b6cd6 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.empty.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.empty.worker.js
@@ -13,13 +13,13 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -offscreenCanvas.width = ''; -offscreenCanvas.height = ''; -_assertSame(offscreenCanvas.width, 0, "offscreenCanvas.width", "0"); -_assertSame(offscreenCanvas.height, 0, "offscreenCanvas.height", "0"); +canvas.width = ''; +canvas.height = ''; +_assertSame(canvas.width, 0, "canvas.width", "0"); +_assertSame(canvas.height, 0, "canvas.height", "0"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.exp.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.exp.html index 43f89d6..abfddf1 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.exp.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.exp.html
@@ -17,13 +17,13 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -offscreenCanvas.width = '100e1'; -offscreenCanvas.height = '100e1'; -_assertSame(offscreenCanvas.width, 1000.0, "offscreenCanvas.width", "1000.0"); -_assertSame(offscreenCanvas.height, 1000.0, "offscreenCanvas.height", "1000.0"); +canvas.width = '100e1'; +canvas.height = '100e1'; +_assertSame(canvas.width, 1000.0, "canvas.width", "1000.0"); +_assertSame(canvas.height, 1000.0, "canvas.height", "1000.0"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.exp.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.exp.worker.js index 8a77b25..79fb413 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.exp.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.exp.worker.js
@@ -13,13 +13,13 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -offscreenCanvas.width = '100e1'; -offscreenCanvas.height = '100e1'; -_assertSame(offscreenCanvas.width, 1000.0, "offscreenCanvas.width", "1000.0"); -_assertSame(offscreenCanvas.height, 1000.0, "offscreenCanvas.height", "1000.0"); +canvas.width = '100e1'; +canvas.height = '100e1'; +_assertSame(canvas.width, 1000.0, "canvas.width", "1000.0"); +_assertSame(canvas.height, 1000.0, "canvas.height", "1000.0"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.hex.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.hex.html index 9bedc00..fba2890 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.hex.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.hex.html
@@ -17,13 +17,13 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -offscreenCanvas.width = '0x100'; -offscreenCanvas.height = '0x100'; -_assertSame(offscreenCanvas.width, 256, "offscreenCanvas.width", "256"); -_assertSame(offscreenCanvas.height, 256, "offscreenCanvas.height", "256"); +canvas.width = '0x100'; +canvas.height = '0x100'; +_assertSame(canvas.width, 256, "canvas.width", "256"); +_assertSame(canvas.height, 256, "canvas.height", "256"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.hex.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.hex.worker.js index a6a011b..b178c55 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.hex.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.hex.worker.js
@@ -13,13 +13,13 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -offscreenCanvas.width = '0x100'; -offscreenCanvas.height = '0x100'; -_assertSame(offscreenCanvas.width, 256, "offscreenCanvas.width", "256"); -_assertSame(offscreenCanvas.height, 256, "offscreenCanvas.height", "256"); +canvas.width = '0x100'; +canvas.height = '0x100'; +_assertSame(canvas.width, 256, "canvas.width", "256"); +_assertSame(canvas.height, 256, "canvas.height", "256"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.junk.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.junk.html index 7af63cc2..3ffb674b 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.junk.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.junk.html
@@ -17,10 +17,10 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -assert_throws_js(TypeError, function() { offscreenCanvas.width = '#!?'; }); +assert_throws_js(TypeError, function() { canvas.width = '#!?'; }); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.junk.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.junk.worker.js index 3c8ec3f..6efd3ae 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.junk.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.junk.worker.js
@@ -13,10 +13,10 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -assert_throws_js(TypeError, function() { offscreenCanvas.width = '#!?'; }); +assert_throws_js(TypeError, function() { canvas.width = '#!?'; }); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.minus.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.minus.html index cc5c207..5643554 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.minus.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.minus.html
@@ -17,10 +17,10 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -assert_throws_js(TypeError, function() { offscreenCanvas.width = '-100'; }); +assert_throws_js(TypeError, function() { canvas.width = '-100'; }); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.minus.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.minus.worker.js index 8dac7a07..a583752 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.minus.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.minus.worker.js
@@ -13,10 +13,10 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -assert_throws_js(TypeError, function() { offscreenCanvas.width = '-100'; }); +assert_throws_js(TypeError, function() { canvas.width = '-100'; }); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.octal.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.octal.html index 59e95f0f..d452217 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.octal.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.octal.html
@@ -17,13 +17,13 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -offscreenCanvas.width = '0100'; -offscreenCanvas.height = '0100'; -_assertSame(offscreenCanvas.width, 100, "offscreenCanvas.width", "100"); -_assertSame(offscreenCanvas.height, 100, "offscreenCanvas.height", "100"); +canvas.width = '0100'; +canvas.height = '0100'; +_assertSame(canvas.width, 100, "canvas.width", "100"); +_assertSame(canvas.height, 100, "canvas.height", "100"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.octal.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.octal.worker.js index 165316f..23f228e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.octal.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.octal.worker.js
@@ -13,13 +13,13 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -offscreenCanvas.width = '0100'; -offscreenCanvas.height = '0100'; -_assertSame(offscreenCanvas.width, 100, "offscreenCanvas.width", "100"); -_assertSame(offscreenCanvas.height, 100, "offscreenCanvas.height", "100"); +canvas.width = '0100'; +canvas.height = '0100'; +_assertSame(canvas.width, 100, "canvas.width", "100"); +_assertSame(canvas.height, 100, "canvas.height", "100"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.onlyspace.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.onlyspace.html index 55d05b8..4164123 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.onlyspace.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.onlyspace.html
@@ -17,13 +17,13 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -offscreenCanvas.width = ' '; -offscreenCanvas.height = ' '; -_assertSame(offscreenCanvas.width, 0, "offscreenCanvas.width", "0"); -_assertSame(offscreenCanvas.height, 0, "offscreenCanvas.height", "0"); +canvas.width = ' '; +canvas.height = ' '; +_assertSame(canvas.width, 0, "canvas.width", "0"); +_assertSame(canvas.height, 0, "canvas.height", "0"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.onlyspace.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.onlyspace.worker.js index b2e5d6c..a4b86624 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.onlyspace.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.onlyspace.worker.js
@@ -13,13 +13,13 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -offscreenCanvas.width = ' '; -offscreenCanvas.height = ' '; -_assertSame(offscreenCanvas.width, 0, "offscreenCanvas.width", "0"); -_assertSame(offscreenCanvas.height, 0, "offscreenCanvas.height", "0"); +canvas.width = ' '; +canvas.height = ' '; +_assertSame(canvas.width, 0, "canvas.width", "0"); +_assertSame(canvas.height, 0, "canvas.height", "0"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.percent.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.percent.html index d0fcffa5..d6288e9 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.percent.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.percent.html
@@ -17,10 +17,10 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -assert_throws_js(TypeError, function() { offscreenCanvas.width = '100%'; }); +assert_throws_js(TypeError, function() { canvas.width = '100%'; }); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.percent.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.percent.worker.js index f38d649..e07fa60 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.percent.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.percent.worker.js
@@ -13,10 +13,10 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -assert_throws_js(TypeError, function() { offscreenCanvas.width = '100%'; }); +assert_throws_js(TypeError, function() { canvas.width = '100%'; }); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.plus.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.plus.html index 95649e6c..79d531f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.plus.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.plus.html
@@ -17,13 +17,13 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -offscreenCanvas.width = '+100'; -offscreenCanvas.height = '+100'; -_assertSame(offscreenCanvas.width, 100, "offscreenCanvas.width", "100"); -_assertSame(offscreenCanvas.height, 100, "offscreenCanvas.height", "100"); +canvas.width = '+100'; +canvas.height = '+100'; +_assertSame(canvas.width, 100, "canvas.width", "100"); +_assertSame(canvas.height, 100, "canvas.height", "100"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.plus.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.plus.worker.js index 6aaedc05..240a6bd7 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.plus.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.plus.worker.js
@@ -13,13 +13,13 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -offscreenCanvas.width = '+100'; -offscreenCanvas.height = '+100'; -_assertSame(offscreenCanvas.width, 100, "offscreenCanvas.width", "100"); -_assertSame(offscreenCanvas.height, 100, "offscreenCanvas.height", "100"); +canvas.width = '+100'; +canvas.height = '+100'; +_assertSame(canvas.width, 100, "canvas.width", "100"); +_assertSame(canvas.height, 100, "canvas.height", "100"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.space.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.space.html index c436c4d..695afa5 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.space.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.space.html
@@ -17,13 +17,13 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -offscreenCanvas.width = ' 100'; -offscreenCanvas.height = ' 100'; -_assertSame(offscreenCanvas.width, 100, "offscreenCanvas.width", "100"); -_assertSame(offscreenCanvas.height, 100, "offscreenCanvas.height", "100"); +canvas.width = ' 100'; +canvas.height = ' 100'; +_assertSame(canvas.width, 100, "canvas.width", "100"); +_assertSame(canvas.height, 100, "canvas.height", "100"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.space.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.space.worker.js index d8d8d0d..2993020 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.space.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.space.worker.js
@@ -13,13 +13,13 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -offscreenCanvas.width = ' 100'; -offscreenCanvas.height = ' 100'; -_assertSame(offscreenCanvas.width, 100, "offscreenCanvas.width", "100"); -_assertSame(offscreenCanvas.height, 100, "offscreenCanvas.height", "100"); +canvas.width = ' 100'; +canvas.height = ' 100'; +_assertSame(canvas.width, 100, "canvas.width", "100"); +_assertSame(canvas.height, 100, "canvas.height", "100"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.trailingjunk.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.trailingjunk.html index cd27200..fff231f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.trailingjunk.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.trailingjunk.html
@@ -17,10 +17,10 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -assert_throws_js(TypeError, function() { offscreenCanvas.width = '100#!?'; }); +assert_throws_js(TypeError, function() { canvas.width = '100#!?'; }); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.trailingjunk.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.trailingjunk.worker.js index 8d3225f..f8d916c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.trailingjunk.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.trailingjunk.worker.js
@@ -13,10 +13,10 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -assert_throws_js(TypeError, function() { offscreenCanvas.width = '100#!?'; }); +assert_throws_js(TypeError, function() { canvas.width = '100#!?'; }); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.whitespace.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.whitespace.html index 5f72fd40e..b7f0c4b 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.whitespace.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.whitespace.html
@@ -17,13 +17,13 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -offscreenCanvas.width = ' 100'; -offscreenCanvas.height = ' 100'; -_assertSame(offscreenCanvas.width, 100, "offscreenCanvas.width", "100"); -_assertSame(offscreenCanvas.height, 100, "offscreenCanvas.height", "100"); +canvas.width = ' 100'; +canvas.height = ' 100'; +_assertSame(canvas.width, 100, "canvas.width", "100"); +_assertSame(canvas.height, 100, "canvas.height", "100"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.whitespace.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.whitespace.worker.js index 283efbb..ea38398 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.whitespace.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.whitespace.worker.js
@@ -13,13 +13,13 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -offscreenCanvas.width = ' 100'; -offscreenCanvas.height = ' 100'; -_assertSame(offscreenCanvas.width, 100, "offscreenCanvas.width", "100"); -_assertSame(offscreenCanvas.height, 100, "offscreenCanvas.height", "100"); +canvas.width = ' 100'; +canvas.height = ' 100'; +_assertSame(canvas.width, 100, "canvas.width", "100"); +_assertSame(canvas.height, 100, "canvas.height", "100"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.zero.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.zero.html index 5265f89b..9a84c95 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.zero.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.zero.html
@@ -17,13 +17,13 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -offscreenCanvas.width = '0'; -offscreenCanvas.height = '0'; -_assertSame(offscreenCanvas.width, 0, "offscreenCanvas.width", "0"); -_assertSame(offscreenCanvas.height, 0, "offscreenCanvas.height", "0"); +canvas.width = '0'; +canvas.height = '0'; +_assertSame(canvas.width, 0, "canvas.width", "0"); +_assertSame(canvas.height, 0, "canvas.height", "0"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.zero.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.zero.worker.js index 8f21b46..4d97a96 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.zero.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.zero.worker.js
@@ -13,13 +13,13 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -offscreenCanvas.width = '0'; -offscreenCanvas.height = '0'; -_assertSame(offscreenCanvas.width, 0, "offscreenCanvas.width", "0"); -_assertSame(offscreenCanvas.height, 0, "offscreenCanvas.height", "0"); +canvas.width = '0'; +canvas.height = '0'; +_assertSame(canvas.width, 0, "canvas.width", "0"); +_assertSame(canvas.height, 0, "canvas.height", "0"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidl.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidl.html index 021ecf3..968dad9 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidl.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidl.html
@@ -17,13 +17,13 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -offscreenCanvas.width = 120; -offscreenCanvas.height = 60; -_assertSame(offscreenCanvas.width, 120, "offscreenCanvas.width", "120"); -_assertSame(offscreenCanvas.height, 60, "offscreenCanvas.height", "60"); +canvas.width = 120; +canvas.height = 60; +_assertSame(canvas.width, 120, "canvas.width", "120"); +_assertSame(canvas.height, 60, "canvas.height", "60"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidl.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidl.worker.js index 56b70b9..3f8050d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidl.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidl.worker.js
@@ -13,13 +13,13 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -offscreenCanvas.width = 120; -offscreenCanvas.height = 60; -_assertSame(offscreenCanvas.width, 120, "offscreenCanvas.width", "120"); -_assertSame(offscreenCanvas.height, 60, "offscreenCanvas.height", "60"); +canvas.width = 120; +canvas.height = 60; +_assertSame(canvas.width, 120, "canvas.width", "120"); +_assertSame(canvas.height, 60, "canvas.height", "60"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidlzero.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidlzero.html index 968e7b4..5f31f69 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidlzero.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidlzero.html
@@ -17,13 +17,13 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -offscreenCanvas.width = 0; -offscreenCanvas.height = 0; -_assertSame(offscreenCanvas.width, 0, "offscreenCanvas.width", "0"); -_assertSame(offscreenCanvas.height, 0, "offscreenCanvas.height", "0"); +canvas.width = 0; +canvas.height = 0; +_assertSame(canvas.width, 0, "canvas.width", "0"); +_assertSame(canvas.height, 0, "canvas.height", "0"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidlzero.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidlzero.worker.js index 9191072..4ace1f5 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidlzero.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidlzero.worker.js
@@ -13,13 +13,13 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); -offscreenCanvas.width = 0; -offscreenCanvas.height = 0; -_assertSame(offscreenCanvas.width, 0, "offscreenCanvas.width", "0"); -_assertSame(offscreenCanvas.height, 0, "offscreenCanvas.height", "0"); +canvas.width = 0; +canvas.height = 0; +_assertSame(canvas.width, 0, "canvas.width", "0"); +_assertSame(canvas.height, 0, "canvas.height", "0"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.large.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.large.html index 60d9edd..9f41e2e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.large.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.large.html
@@ -17,14 +17,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var n = 2147483647; // 2^31 - 1, which should be supported by any sensible definition of "long" -offscreenCanvas.width = n; -offscreenCanvas.height = n; -_assertSame(offscreenCanvas.width, n, "offscreenCanvas.width", "n"); -_assertSame(offscreenCanvas.height, n, "offscreenCanvas.height", "n"); +canvas.width = n; +canvas.height = n; +_assertSame(canvas.width, n, "canvas.width", "n"); +_assertSame(canvas.height, n, "canvas.height", "n"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.large.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.large.worker.js index 5ed2a1ee..b20ff5496 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.large.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/the-offscreen-canvas/size.large.worker.js
@@ -13,14 +13,14 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); var n = 2147483647; // 2^31 - 1, which should be supported by any sensible definition of "long" -offscreenCanvas.width = n; -offscreenCanvas.height = n; -_assertSame(offscreenCanvas.width, n, "offscreenCanvas.width", "n"); -_assertSame(offscreenCanvas.height, n, "offscreenCanvas.height", "n"); +canvas.width = n; +canvas.height = n; +_assertSame(canvas.width, n, "canvas.width", "n"); +_assertSame(canvas.height, n, "canvas.height", "n"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.order.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.order.html index 127472dd..94ec72b 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.order.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.order.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -26,7 +26,7 @@ ctx.rotate(Math.PI / 2); ctx.fillStyle = '#0f0'; ctx.fillRect(0, -50, 50, 50); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.order.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.order.worker.js index 6585412a..d3a8f63 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.order.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.order.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -22,7 +22,7 @@ ctx.rotate(Math.PI / 2); ctx.fillStyle = '#0f0'; ctx.fillRect(0, -50, 50, 50); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.rotate.direction.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.rotate.direction.html index 1f32f8d..aa0493a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.rotate.direction.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.rotate.direction.html
@@ -17,15 +17,15 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.rotate(Math.PI / 2); ctx.fillStyle = '#0f0'; ctx.fillRect(0, -100, 50, 100); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.rotate.direction.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.rotate.direction.worker.js index 40596fe..38195b5 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.rotate.direction.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.rotate.direction.worker.js
@@ -13,15 +13,15 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.rotate(Math.PI / 2); ctx.fillStyle = '#0f0'; ctx.fillRect(0, -100, 50, 100); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.rotate.nonfinite.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.rotate.nonfinite.html index b51fea4..defe2fe 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.rotate.nonfinite.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.rotate.nonfinite.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -28,7 +28,7 @@ ctx.rotate(NaN); ctx.fillStyle = '#0f0'; ctx.fillRect(-100, -10, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.rotate.nonfinite.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.rotate.nonfinite.worker.js index 4d8f6fd2..a8aead4 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.rotate.nonfinite.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.rotate.nonfinite.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -24,7 +24,7 @@ ctx.rotate(NaN); ctx.fillStyle = '#0f0'; ctx.fillRect(-100, -10, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.rotate.radians.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.rotate.radians.html index a77a7d9..48104af 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.rotate.radians.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.rotate.radians.html
@@ -17,15 +17,15 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.rotate(Math.PI); // should fail obviously if this is 3.1 degrees ctx.fillStyle = '#0f0'; ctx.fillRect(-100, -50, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.rotate.radians.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.rotate.radians.worker.js index b41f501b..5a2ac2f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.rotate.radians.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.rotate.radians.worker.js
@@ -13,15 +13,15 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.rotate(Math.PI); // should fail obviously if this is 3.1 degrees ctx.fillStyle = '#0f0'; ctx.fillRect(-100, -50, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.rotate.wrap.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.rotate.wrap.html index 65ec6a6fc..a524af7 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.rotate.wrap.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.rotate.wrap.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -28,9 +28,9 @@ // be safe enough on reasonable implementations ctx.fillStyle = '#0f0'; ctx.fillRect(-100, -50, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,2, 0,255,0,255, "98,2", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,47, 0,255,0,255, "98,47", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,2, 0,255,0,255, "98,2", "0,255,0,255"); +_assertPixel(canvas, 98,47, 0,255,0,255, "98,47", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.rotate.wrap.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.rotate.wrap.worker.js index 91d5b155..bc7dff2e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.rotate.wrap.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.rotate.wrap.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -24,9 +24,9 @@ // be safe enough on reasonable implementations ctx.fillStyle = '#0f0'; ctx.fillRect(-100, -50, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,2, 0,255,0,255, "98,2", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,47, 0,255,0,255, "98,47", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,2, 0,255,0,255, "98,2", "0,255,0,255"); +_assertPixel(canvas, 98,47, 0,255,0,255, "98,47", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.rotate.wrapnegative.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.rotate.wrapnegative.html index 1b95ff5..2c5222d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.rotate.wrapnegative.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.rotate.wrapnegative.html
@@ -17,17 +17,17 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.rotate(-Math.PI * (1 + 4096)); ctx.fillStyle = '#0f0'; ctx.fillRect(-100, -50, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,2, 0,255,0,255, "98,2", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,47, 0,255,0,255, "98,47", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,2, 0,255,0,255, "98,2", "0,255,0,255"); +_assertPixel(canvas, 98,47, 0,255,0,255, "98,47", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.rotate.wrapnegative.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.rotate.wrapnegative.worker.js index faab3d7e..ca0e473 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.rotate.wrapnegative.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.rotate.wrapnegative.worker.js
@@ -13,17 +13,17 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.rotate(-Math.PI * (1 + 4096)); ctx.fillStyle = '#0f0'; ctx.fillRect(-100, -50, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,2, 0,255,0,255, "98,2", "0,255,0,255"); -_assertPixel(offscreenCanvas, 98,47, 0,255,0,255, "98,47", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 98,2, 0,255,0,255, "98,2", "0,255,0,255"); +_assertPixel(canvas, 98,47, 0,255,0,255, "98,47", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.rotate.zero.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.rotate.zero.html index 958bcc8..e1e000c5 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.rotate.zero.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.rotate.zero.html
@@ -17,15 +17,15 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.rotate(0); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.rotate.zero.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.rotate.zero.worker.js index d9e3fba..2d63676 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.rotate.zero.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.rotate.zero.worker.js
@@ -13,15 +13,15 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.rotate(0); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.scale.basic.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.scale.basic.html index 60ba359..17f8beab 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.scale.basic.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.scale.basic.html
@@ -17,15 +17,15 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.scale(2, 4); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 50, 12.5); -_assertPixel(offscreenCanvas, 90,40, 0,255,0,255, "90,40", "0,255,0,255"); +_assertPixel(canvas, 90,40, 0,255,0,255, "90,40", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.scale.basic.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.scale.basic.worker.js index 9f811a8..282328b 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.scale.basic.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.scale.basic.worker.js
@@ -13,15 +13,15 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.scale(2, 4); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 50, 12.5); -_assertPixel(offscreenCanvas, 90,40, 0,255,0,255, "90,40", "0,255,0,255"); +_assertPixel(canvas, 90,40, 0,255,0,255, "90,40", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.scale.large.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.scale.large.html index 25bc9de..07277d5 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.scale.large.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.scale.large.html
@@ -17,15 +17,15 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.scale(1e5, 1e5); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 1, 1); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.scale.large.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.scale.large.worker.js index e7c45c0..702b78d1 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.scale.large.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.scale.large.worker.js
@@ -13,15 +13,15 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.scale(1e5, 1e5); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 1, 1); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.scale.multiple.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.scale.multiple.html index 3c9c022..ab8bb21 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.scale.multiple.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.scale.multiple.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -26,7 +26,7 @@ ctx.scale(Math.sqrt(2), Math.sqrt(2)); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 50, 25); -_assertPixel(offscreenCanvas, 90,40, 0,255,0,255, "90,40", "0,255,0,255"); +_assertPixel(canvas, 90,40, 0,255,0,255, "90,40", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.scale.multiple.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.scale.multiple.worker.js index ddd936c..6419173 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.scale.multiple.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.scale.multiple.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -22,7 +22,7 @@ ctx.scale(Math.sqrt(2), Math.sqrt(2)); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 50, 25); -_assertPixel(offscreenCanvas, 90,40, 0,255,0,255, "90,40", "0,255,0,255"); +_assertPixel(canvas, 90,40, 0,255,0,255, "90,40", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.scale.negative.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.scale.negative.html index 31cd43e4..eaa3261 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.scale.negative.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.scale.negative.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -32,8 +32,8 @@ ctx.fillStyle = '#0f0'; ctx.fillRect(50, -50, 50, 50); ctx.restore(); -_assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.scale.negative.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.scale.negative.worker.js index 9775c21..2a87b12 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.scale.negative.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.scale.negative.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -28,8 +28,8 @@ ctx.fillStyle = '#0f0'; ctx.fillRect(50, -50, 50, 50); ctx.restore(); -_assertPixel(offscreenCanvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); -_assertPixel(offscreenCanvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); +_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255"); +_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.scale.nonfinite.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.scale.nonfinite.html index 7fbc9e7..97f6c145 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.scale.nonfinite.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.scale.nonfinite.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -32,7 +32,7 @@ ctx.scale(Infinity, Infinity); ctx.fillStyle = '#0f0'; ctx.fillRect(-100, -10, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.scale.nonfinite.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.scale.nonfinite.worker.js index 7368616..6ec8a8d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.scale.nonfinite.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.scale.nonfinite.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -28,7 +28,7 @@ ctx.scale(Infinity, Infinity); ctx.fillStyle = '#0f0'; ctx.fillRect(-100, -10, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.scale.zero.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.scale.zero.html index c6e36af5..6b78598 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.scale.zero.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.scale.zero.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -34,7 +34,7 @@ ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.restore(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.scale.zero.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.scale.zero.worker.js index 05a9848..e0399211 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.scale.zero.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.scale.zero.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -30,7 +30,7 @@ ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.restore(); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.setTransform.multiple.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.setTransform.multiple.html index 4d73261..5299bec 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.setTransform.multiple.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.setTransform.multiple.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -26,7 +26,7 @@ ctx.setTransform(2,0, 0,2, 0,0); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 50, 25); -_assertPixel(offscreenCanvas, 75,35, 0,255,0,255, "75,35", "0,255,0,255"); +_assertPixel(canvas, 75,35, 0,255,0,255, "75,35", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.setTransform.multiple.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.setTransform.multiple.worker.js index 093dd9d1..0a1f034 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.setTransform.multiple.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.setTransform.multiple.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -22,7 +22,7 @@ ctx.setTransform(2,0, 0,2, 0,0); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 50, 25); -_assertPixel(offscreenCanvas, 75,35, 0,255,0,255, "75,35", "0,255,0,255"); +_assertPixel(canvas, 75,35, 0,255,0,255, "75,35", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.setTransform.nonfinite.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.setTransform.nonfinite.html index fb2d120..91fd054d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.setTransform.nonfinite.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.setTransform.nonfinite.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -100,7 +100,7 @@ ctx.setTransform(0, 0, 0, 0, Infinity, Infinity); ctx.fillStyle = '#0f0'; ctx.fillRect(-100, -10, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.setTransform.nonfinite.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.setTransform.nonfinite.worker.js index d3a2035b..0a0f397 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.setTransform.nonfinite.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.setTransform.nonfinite.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -96,7 +96,7 @@ ctx.setTransform(0, 0, 0, 0, Infinity, Infinity); ctx.fillStyle = '#0f0'; ctx.fillRect(-100, -10, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.setTransform.skewed.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.setTransform.skewed.html index 76713127..505fde2 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.setTransform.skewed.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.setTransform.skewed.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); // Create green with a red square ring inside it ctx.fillStyle = '#0f0'; @@ -40,14 +40,14 @@ for (var i = 0; i < pts.length; ++i) ctx.lineTo(pts[i][0], pts[i][1]); ctx.fill(); -_assertPixel(offscreenCanvas, 21,11, 0,255,0,255, "21,11", "0,255,0,255"); -_assertPixel(offscreenCanvas, 79,11, 0,255,0,255, "79,11", "0,255,0,255"); -_assertPixel(offscreenCanvas, 21,39, 0,255,0,255, "21,39", "0,255,0,255"); -_assertPixel(offscreenCanvas, 79,39, 0,255,0,255, "79,39", "0,255,0,255"); -_assertPixel(offscreenCanvas, 39,19, 0,255,0,255, "39,19", "0,255,0,255"); -_assertPixel(offscreenCanvas, 61,19, 0,255,0,255, "61,19", "0,255,0,255"); -_assertPixel(offscreenCanvas, 39,31, 0,255,0,255, "39,31", "0,255,0,255"); -_assertPixel(offscreenCanvas, 61,31, 0,255,0,255, "61,31", "0,255,0,255"); +_assertPixel(canvas, 21,11, 0,255,0,255, "21,11", "0,255,0,255"); +_assertPixel(canvas, 79,11, 0,255,0,255, "79,11", "0,255,0,255"); +_assertPixel(canvas, 21,39, 0,255,0,255, "21,39", "0,255,0,255"); +_assertPixel(canvas, 79,39, 0,255,0,255, "79,39", "0,255,0,255"); +_assertPixel(canvas, 39,19, 0,255,0,255, "39,19", "0,255,0,255"); +_assertPixel(canvas, 61,19, 0,255,0,255, "61,19", "0,255,0,255"); +_assertPixel(canvas, 39,31, 0,255,0,255, "39,31", "0,255,0,255"); +_assertPixel(canvas, 61,31, 0,255,0,255, "61,31", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.setTransform.skewed.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.setTransform.skewed.worker.js index 77d5265..2293a6a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.setTransform.skewed.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.setTransform.skewed.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); // Create green with a red square ring inside it ctx.fillStyle = '#0f0'; @@ -36,14 +36,14 @@ for (var i = 0; i < pts.length; ++i) ctx.lineTo(pts[i][0], pts[i][1]); ctx.fill(); -_assertPixel(offscreenCanvas, 21,11, 0,255,0,255, "21,11", "0,255,0,255"); -_assertPixel(offscreenCanvas, 79,11, 0,255,0,255, "79,11", "0,255,0,255"); -_assertPixel(offscreenCanvas, 21,39, 0,255,0,255, "21,39", "0,255,0,255"); -_assertPixel(offscreenCanvas, 79,39, 0,255,0,255, "79,39", "0,255,0,255"); -_assertPixel(offscreenCanvas, 39,19, 0,255,0,255, "39,19", "0,255,0,255"); -_assertPixel(offscreenCanvas, 61,19, 0,255,0,255, "61,19", "0,255,0,255"); -_assertPixel(offscreenCanvas, 39,31, 0,255,0,255, "39,31", "0,255,0,255"); -_assertPixel(offscreenCanvas, 61,31, 0,255,0,255, "61,31", "0,255,0,255"); +_assertPixel(canvas, 21,11, 0,255,0,255, "21,11", "0,255,0,255"); +_assertPixel(canvas, 79,11, 0,255,0,255, "79,11", "0,255,0,255"); +_assertPixel(canvas, 21,39, 0,255,0,255, "21,39", "0,255,0,255"); +_assertPixel(canvas, 79,39, 0,255,0,255, "79,39", "0,255,0,255"); +_assertPixel(canvas, 39,19, 0,255,0,255, "39,19", "0,255,0,255"); +_assertPixel(canvas, 61,19, 0,255,0,255, "61,19", "0,255,0,255"); +_assertPixel(canvas, 39,31, 0,255,0,255, "39,31", "0,255,0,255"); +_assertPixel(canvas, 61,31, 0,255,0,255, "61,31", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.transform.identity.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.transform.identity.html index 747454ae9..22d061a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.transform.identity.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.transform.identity.html
@@ -17,15 +17,15 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.transform(1,0, 0,1, 0,0); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.transform.identity.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.transform.identity.worker.js index f6ae63c8..d9d0c0e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.transform.identity.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.transform.identity.worker.js
@@ -13,15 +13,15 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.transform(1,0, 0,1, 0,0); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.transform.multiply.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.transform.multiply.html index 11f1efe..6600f4e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.transform.multiply.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.transform.multiply.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -26,7 +26,7 @@ ctx.transform(-2,1, 3/2,-1/2, 1,-2); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.transform.multiply.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.transform.multiply.worker.js index 9c0788f6..5d33513 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.transform.multiply.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.transform.multiply.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -22,7 +22,7 @@ ctx.transform(-2,1, 3/2,-1/2, 1,-2); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.transform.nonfinite.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.transform.nonfinite.html index f117765..970a0ad 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.transform.nonfinite.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.transform.nonfinite.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -100,7 +100,7 @@ ctx.transform(0, 0, 0, 0, Infinity, Infinity); ctx.fillStyle = '#0f0'; ctx.fillRect(-100, -10, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.transform.nonfinite.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.transform.nonfinite.worker.js index fa26244..631d98e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.transform.nonfinite.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.transform.nonfinite.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -96,7 +96,7 @@ ctx.transform(0, 0, 0, 0, Infinity, Infinity); ctx.fillStyle = '#0f0'; ctx.fillRect(-100, -10, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.transform.skewed.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.transform.skewed.html index 7c033162..cc081295 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.transform.skewed.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.transform.skewed.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); // Create green with a red square ring inside it ctx.fillStyle = '#0f0'; @@ -40,14 +40,14 @@ for (var i = 0; i < pts.length; ++i) ctx.lineTo(pts[i][0], pts[i][1]); ctx.fill(); -_assertPixel(offscreenCanvas, 21,11, 0,255,0,255, "21,11", "0,255,0,255"); -_assertPixel(offscreenCanvas, 79,11, 0,255,0,255, "79,11", "0,255,0,255"); -_assertPixel(offscreenCanvas, 21,39, 0,255,0,255, "21,39", "0,255,0,255"); -_assertPixel(offscreenCanvas, 79,39, 0,255,0,255, "79,39", "0,255,0,255"); -_assertPixel(offscreenCanvas, 39,19, 0,255,0,255, "39,19", "0,255,0,255"); -_assertPixel(offscreenCanvas, 61,19, 0,255,0,255, "61,19", "0,255,0,255"); -_assertPixel(offscreenCanvas, 39,31, 0,255,0,255, "39,31", "0,255,0,255"); -_assertPixel(offscreenCanvas, 61,31, 0,255,0,255, "61,31", "0,255,0,255"); +_assertPixel(canvas, 21,11, 0,255,0,255, "21,11", "0,255,0,255"); +_assertPixel(canvas, 79,11, 0,255,0,255, "79,11", "0,255,0,255"); +_assertPixel(canvas, 21,39, 0,255,0,255, "21,39", "0,255,0,255"); +_assertPixel(canvas, 79,39, 0,255,0,255, "79,39", "0,255,0,255"); +_assertPixel(canvas, 39,19, 0,255,0,255, "39,19", "0,255,0,255"); +_assertPixel(canvas, 61,19, 0,255,0,255, "61,19", "0,255,0,255"); +_assertPixel(canvas, 39,31, 0,255,0,255, "39,31", "0,255,0,255"); +_assertPixel(canvas, 61,31, 0,255,0,255, "61,31", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.transform.skewed.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.transform.skewed.worker.js index 0c9f9d2..cf1481d 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.transform.skewed.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.transform.skewed.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); // Create green with a red square ring inside it ctx.fillStyle = '#0f0'; @@ -36,14 +36,14 @@ for (var i = 0; i < pts.length; ++i) ctx.lineTo(pts[i][0], pts[i][1]); ctx.fill(); -_assertPixel(offscreenCanvas, 21,11, 0,255,0,255, "21,11", "0,255,0,255"); -_assertPixel(offscreenCanvas, 79,11, 0,255,0,255, "79,11", "0,255,0,255"); -_assertPixel(offscreenCanvas, 21,39, 0,255,0,255, "21,39", "0,255,0,255"); -_assertPixel(offscreenCanvas, 79,39, 0,255,0,255, "79,39", "0,255,0,255"); -_assertPixel(offscreenCanvas, 39,19, 0,255,0,255, "39,19", "0,255,0,255"); -_assertPixel(offscreenCanvas, 61,19, 0,255,0,255, "61,19", "0,255,0,255"); -_assertPixel(offscreenCanvas, 39,31, 0,255,0,255, "39,31", "0,255,0,255"); -_assertPixel(offscreenCanvas, 61,31, 0,255,0,255, "61,31", "0,255,0,255"); +_assertPixel(canvas, 21,11, 0,255,0,255, "21,11", "0,255,0,255"); +_assertPixel(canvas, 79,11, 0,255,0,255, "79,11", "0,255,0,255"); +_assertPixel(canvas, 21,39, 0,255,0,255, "21,39", "0,255,0,255"); +_assertPixel(canvas, 79,39, 0,255,0,255, "79,39", "0,255,0,255"); +_assertPixel(canvas, 39,19, 0,255,0,255, "39,19", "0,255,0,255"); +_assertPixel(canvas, 61,19, 0,255,0,255, "61,19", "0,255,0,255"); +_assertPixel(canvas, 39,31, 0,255,0,255, "39,31", "0,255,0,255"); +_assertPixel(canvas, 61,31, 0,255,0,255, "61,31", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.translate.basic.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.translate.basic.html index 1163ee5..9c595708 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.translate.basic.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.translate.basic.html
@@ -17,15 +17,15 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.translate(100, 50); ctx.fillStyle = '#0f0'; ctx.fillRect(-100, -50, 100, 50); -_assertPixel(offscreenCanvas, 90,40, 0,255,0,255, "90,40", "0,255,0,255"); +_assertPixel(canvas, 90,40, 0,255,0,255, "90,40", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.translate.basic.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.translate.basic.worker.js index a338f75..55926e4 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.translate.basic.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.translate.basic.worker.js
@@ -13,15 +13,15 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.translate(100, 50); ctx.fillStyle = '#0f0'; ctx.fillRect(-100, -50, 100, 50); -_assertPixel(offscreenCanvas, 90,40, 0,255,0,255, "90,40", "0,255,0,255"); +_assertPixel(canvas, 90,40, 0,255,0,255, "90,40", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.translate.nonfinite.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.translate.nonfinite.html index 370c5e2..1f06fcc 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.translate.nonfinite.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.translate.nonfinite.html
@@ -17,8 +17,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -32,7 +32,7 @@ ctx.translate(Infinity, Infinity); ctx.fillStyle = '#0f0'; ctx.fillRect(-100, -10, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.translate.nonfinite.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.translate.nonfinite.worker.js index 0d73df8..bd8722c6 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.translate.nonfinite.worker.js +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/transformations/2d.transformation.translate.nonfinite.worker.js
@@ -13,8 +13,8 @@ }); t.step(function() { -var offscreenCanvas = new OffscreenCanvas(100, 50); -var ctx = offscreenCanvas.getContext('2d'); +var canvas = new OffscreenCanvas(100, 50); +var ctx = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); @@ -28,7 +28,7 @@ ctx.translate(Infinity, Infinity); ctx.fillStyle = '#0f0'; ctx.fillRect(-100, -10, 100, 50); -_assertPixel(offscreenCanvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); +_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255"); t.done(); });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/tools/gentestutils.py b/third_party/blink/web_tests/external/wpt/html/canvas/tools/gentestutils.py index 7fe21ee..732f32f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/tools/gentestutils.py +++ b/third_party/blink/web_tests/external/wpt/html/canvas/tools/gentestutils.py
@@ -199,30 +199,15 @@ def expand_test_code(code): code = re.sub(r'@nonfinite ([^(]+)\(([^)]+)\)(.*)', lambda m: expand_nonfinite(m.group(1), m.group(2), m.group(3)), code) # must come before '@assert throws' - if ISOFFSCREENCANVAS: - code = re.sub(r'@assert pixel (\d+,\d+) == (\d+,\d+,\d+,\d+);', - r'_assertPixel(offscreenCanvas, \1, \2, "\1", "\2");', - code) - else: - code = re.sub(r'@assert pixel (\d+,\d+) == (\d+,\d+,\d+,\d+);', + code = re.sub(r'@assert pixel (\d+,\d+) == (\d+,\d+,\d+,\d+);', r'_assertPixel(canvas, \1, \2, "\1", "\2");', code) - if ISOFFSCREENCANVAS: - code = re.sub(r'@assert pixel (\d+,\d+) ==~ (\d+,\d+,\d+,\d+);', - r'_assertPixelApprox(offscreenCanvas, \1, \2, "\1", "\2", 2);', - code) - else: - code = re.sub(r'@assert pixel (\d+,\d+) ==~ (\d+,\d+,\d+,\d+);', + code = re.sub(r'@assert pixel (\d+,\d+) ==~ (\d+,\d+,\d+,\d+);', r'_assertPixelApprox(canvas, \1, \2, "\1", "\2", 2);', code) - if ISOFFSCREENCANVAS: - code = re.sub(r'@assert pixel (\d+,\d+) ==~ (\d+,\d+,\d+,\d+) \+/- (\d+);', - r'_assertPixelApprox(offscreenCanvas, \1, \2, "\1", "\2", \3);', - code) - else: - code = re.sub(r'@assert pixel (\d+,\d+) ==~ (\d+,\d+,\d+,\d+) \+/- (\d+);', + code = re.sub(r'@assert pixel (\d+,\d+) ==~ (\d+,\d+,\d+,\d+) \+/- (\d+);', r'_assertPixelApprox(canvas, \1, \2, "\1", "\2", \3);', code)
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/tools/templates.yaml b/third_party/blink/web_tests/external/wpt/html/canvas/tools/templates.yaml index 6d6c4750..f2bc2569 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/tools/templates.yaml +++ b/third_party/blink/web_tests/external/wpt/html/canvas/tools/templates.yaml
@@ -18,8 +18,8 @@ }); t.step(function() { - var offscreenCanvas = new OffscreenCanvas(100, 50); - var ctx = offscreenCanvas.getContext(%(context_args)s); + var canvas = new OffscreenCanvas(100, 50); + var ctx = canvas.getContext(%(context_args)s); %(code)s }); @@ -42,8 +42,8 @@ }); t.step(function() { - var offscreenCanvas = new OffscreenCanvas(100, 50); - var ctx = offscreenCanvas.getContext(%(context_args)s); + var canvas = new OffscreenCanvas(100, 50); + var ctx = canvas.getContext(%(context_args)s); %(code)s });
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/tools/yaml/offscreen/drawing-images-to-the-canvas.yaml b/third_party/blink/web_tests/external/wpt/html/canvas/tools/yaml/offscreen/drawing-images-to-the-canvas.yaml index a1651886..f2be7b8e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/tools/yaml/offscreen/drawing-images-to-the-canvas.yaml +++ b/third_party/blink/web_tests/external/wpt/html/canvas/tools/yaml/offscreen/drawing-images-to-the-canvas.yaml
@@ -289,7 +289,7 @@ ctx.fillRect(0, 0, 50, 50); ctx.fillStyle = '#f00'; ctx.fillRect(50, 0, 50, 50); - ctx.drawImage(offscreenCanvas, 50, 0); + ctx.drawImage(canvas, 50, 0); @assert pixel 0,0 ==~ 0,255,0,255; @assert pixel 99,0 ==~ 0,255,0,255; @assert pixel 0,49 ==~ 0,255,0,255; @@ -305,7 +305,7 @@ ctx.fillRect(0, 1, 100, 49); ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 1); - ctx.drawImage(offscreenCanvas, 0, 1); + ctx.drawImage(canvas, 0, 1); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 2); @assert pixel 0,0 ==~ 0,255,0,255;
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/tools/yaml/offscreen/fill-and-stroke-styles.yaml b/third_party/blink/web_tests/external/wpt/html/canvas/tools/yaml/offscreen/fill-and-stroke-styles.yaml index 73089d04..7a57a47 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/tools/yaml/offscreen/fill-and-stroke-styles.yaml +++ b/third_party/blink/web_tests/external/wpt/html/canvas/tools/yaml/offscreen/fill-and-stroke-styles.yaml
@@ -250,7 +250,7 @@ testing: - 2d.gradient.interpolate.linear code: | - offscreenCanvas.width = 200; + canvas.width = 200; var g = ctx.createLinearGradient(0, 0, 200, 0); g.addColorStop(0, '#ff0'); g.addColorStop(0.5, '#0ff'); @@ -266,7 +266,7 @@ testing: - 2d.gradient.interpolate.overlap code: | - offscreenCanvas.width = 200; + canvas.width = 200; var g = ctx.createLinearGradient(0, 0, 200, 0); g.addColorStop(0, '#f00'); g.addColorStop(0, '#ff0'); @@ -1044,21 +1044,21 @@ testing: - 2d.pattern.zerocanvas code: | - offscreenCanvas.width = 0; - offscreenCanvas.height = 10; - @assert offscreenCanvas.width === 0; - @assert offscreenCanvas.height === 10; - @assert throws INVALID_STATE_ERR ctx.createPattern(offscreenCanvas, 'repeat'); - offscreenCanvas.width = 10; - offscreenCanvas.height = 0; - @assert offscreenCanvas.width === 10; - @assert offscreenCanvas.height === 0; - @assert throws INVALID_STATE_ERR ctx.createPattern(offscreenCanvas, 'repeat'); - offscreenCanvas.width = 0; - offscreenCanvas.height = 0; - @assert offscreenCanvas.width === 0; - @assert offscreenCanvas.height === 0; - @assert throws INVALID_STATE_ERR ctx.createPattern(offscreenCanvas, 'repeat'); + canvas.width = 0; + canvas.height = 10; + @assert canvas.width === 0; + @assert canvas.height === 10; + @assert throws INVALID_STATE_ERR ctx.createPattern(canvas, 'repeat'); + canvas.width = 10; + canvas.height = 0; + @assert canvas.width === 10; + @assert canvas.height === 0; + @assert throws INVALID_STATE_ERR ctx.createPattern(canvas, 'repeat'); + canvas.width = 0; + canvas.height = 0; + @assert canvas.width === 0; + @assert canvas.height === 0; + @assert throws INVALID_STATE_ERR ctx.createPattern(canvas, 'repeat'); t.done(); - name: 2d.pattern.basic.nocontext @@ -1130,42 +1130,42 @@ testing: - 2d.pattern.unrecognised code: | - @assert ctx.createPattern(offscreenCanvas, null) != null; + @assert ctx.createPattern(canvas, null) != null; t.done(); - name: 2d.pattern.repeat.undefined testing: - 2d.pattern.unrecognised code: | - @assert throws SYNTAX_ERR ctx.createPattern(offscreenCanvas, undefined); + @assert throws SYNTAX_ERR ctx.createPattern(canvas, undefined); t.done(); - name: 2d.pattern.repeat.unrecognised testing: - 2d.pattern.unrecognised code: | - @assert throws SYNTAX_ERR ctx.createPattern(offscreenCanvas, "invalid"); + @assert throws SYNTAX_ERR ctx.createPattern(canvas, "invalid"); t.done(); - name: 2d.pattern.repeat.unrecognisednull testing: - 2d.pattern.unrecognised code: | - @assert throws SYNTAX_ERR ctx.createPattern(offscreenCanvas, "null"); + @assert throws SYNTAX_ERR ctx.createPattern(canvas, "null"); t.done(); - name: 2d.pattern.repeat.case testing: - 2d.pattern.exact code: | - @assert throws SYNTAX_ERR ctx.createPattern(offscreenCanvas, "Repeat"); + @assert throws SYNTAX_ERR ctx.createPattern(canvas, "Repeat"); t.done(); - name: 2d.pattern.repeat.nullsuffix testing: - 2d.pattern.exact code: | - @assert throws SYNTAX_ERR ctx.createPattern(offscreenCanvas, "repeat\0"); + @assert throws SYNTAX_ERR ctx.createPattern(canvas, "repeat\0"); t.done(); - name: 2d.pattern.modify.canvas1
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/tools/yaml/offscreen/filters.yaml b/third_party/blink/web_tests/external/wpt/html/canvas/tools/yaml/offscreen/filters.yaml index f9cf1cb..93bb242 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/tools/yaml/offscreen/filters.yaml +++ b/third_party/blink/web_tests/external/wpt/html/canvas/tools/yaml/offscreen/filters.yaml
@@ -131,7 +131,7 @@ let outputColor = getColor(color, slopes, intercepts); ctx.fillStyle = `rgb(${color[0]}, ${color[1]}, ${color[2]})`; ctx.fillRect(0, 0, 10, 10); - _assertPixelApprox(offscreenCanvas, 5, 5, outputColor[0],outputColor[1],outputColor[2],255, "5,5", `${outputColor[0]},${outputColor[1]},${outputColor[2]}`, 2); + _assertPixelApprox(canvas, 5, 5, outputColor[0],outputColor[1],outputColor[2],255, "5,5", `${outputColor[0]},${outputColor[1]},${outputColor[2]}`, 2); } t.done(); @@ -155,7 +155,7 @@ for (const color of inputColors) { ctx.fillStyle = `rgba(${color[0]}, ${color[1]}, ${color[2]}, 1)`, ctx.fillRect(0, 0, 10, 10); - _assertPixel(offscreenCanvas, 5, 5, color[0],color[1],color[2],255, "5,5", `${color[0]},${color[1]},${color[2]}`); + _assertPixel(canvas, 5, 5, color[0],color[1],color[2],255, "5,5", `${color[0]},${color[1]},${color[2]}`); } t.done(); @@ -192,7 +192,7 @@ let outputColor = getColor(color, amplitudes, exponents, offsets); ctx.fillStyle = `rgb(${color[0]}, ${color[1]}, ${color[2]})`; ctx.fillRect(0, 0, 10, 10); - _assertPixelApprox(offscreenCanvas, 5, 5, outputColor[0],outputColor[1],outputColor[2],255, "5,5", `${outputColor[0]},${outputColor[1]},${outputColor[2]}`, 2); + _assertPixelApprox(canvas, 5, 5, outputColor[0],outputColor[1],outputColor[2],255, "5,5", `${outputColor[0]},${outputColor[1]},${outputColor[2]}`, 2); } t.done(); @@ -238,7 +238,7 @@ let outputColor = getColor(color, [tableValuesR, tableValuesG, tableValuesB]); ctx.fillStyle = `rgb(${color[0]}, ${color[1]}, ${color[2]})`; ctx.fillRect(0, 0, 10, 10); - _assertPixelApprox(offscreenCanvas, 5, 5, outputColor[0],outputColor[1],outputColor[2],255, "5,5", `${outputColor[0]},${outputColor[1]},${outputColor[2]}`, 2); + _assertPixelApprox(canvas, 5, 5, outputColor[0],outputColor[1],outputColor[2],255, "5,5", `${outputColor[0]},${outputColor[1]},${outputColor[2]}`, 2); } t.done() @@ -284,6 +284,6 @@ let outputColor = getColor(color, [tableValuesR, tableValuesG, tableValuesB]); ctx.fillStyle = `rgb(${color[0]}, ${color[1]}, ${color[2]})`; ctx.fillRect(0, 0, 10, 10); - _assertPixelApprox(offscreenCanvas, 5, 5, outputColor[0],outputColor[1],outputColor[2],255, "5,5", `${outputColor[0]},${outputColor[1]},${outputColor[2]}`, 2); + _assertPixelApprox(canvas, 5, 5, outputColor[0],outputColor[1],outputColor[2],255, "5,5", `${outputColor[0]},${outputColor[1]},${outputColor[2]}`, 2); } t.done();
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/tools/yaml/offscreen/meta.yaml b/third_party/blink/web_tests/external/wpt/html/canvas/tools/yaml/offscreen/meta.yaml index 3a11476..a26f256e 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/tools/yaml/offscreen/meta.yaml +++ b/third_party/blink/web_tests/external/wpt/html/canvas/tools/yaml/offscreen/meta.yaml
@@ -43,13 +43,13 @@ 'desc': 'Resetting the canvas state resets 2D state variables', 'testing': [ 'initial.reset' ], 'code': - """offscreenCanvas.width = 100; + """canvas.width = 100; var default_val; """ + "".join( """ default_val = ctx.%(key)s; ctx.%(key)s = %(value)s; - offscreenCanvas.width = 100; + canvas.width = 100; @assert ctx.%(key)s === default_val; """ % { 'key':key, 'value':value } for key,value in state) + "\nt.done();", @@ -168,7 +168,7 @@ 'testing': [ '2d.composite.%s' % op ], 'images': [ 'yellow75.png' ], 'code': """ - var offscreenCanvas2 = new OffscreenCanvas(offscreenCanvas.width, offscreenCanvas.height); + var offscreenCanvas2 = new OffscreenCanvas(canvas.width, canvas.height); var ctx2 = offscreenCanvas2.getContext('2d'); var promise = new Promise(function(resolve, reject) { var xhr = new XMLHttpRequest(); @@ -525,15 +525,15 @@ testing = ["size.nonnegativeinteger"] if exp is None: testing.append("size.error") - code += "offscreenCanvas.width = '%s';\noffscreenCanvas.height = '%s';\n" % (string, string) - code += "@assert offscreenCanvas.width === 100;\n@assert offscreenCanvas.height === 50;\n" + code += "canvas.width = '%s';\ncanvas.height = '%s';\n" % (string, string) + code += "@assert canvas.width === 100;\n@assert canvas.height === 50;\n" expected = None elif exp == "exception": - code += "@assert throws TypeError offscreenCanvas.width = '%s';\n" % string + code += "@assert throws TypeError canvas.width = '%s';\n" % string expected = None else: - code += "offscreenCanvas.width = '%s';\noffscreenCanvas.height = '%s';\n" % (string, string) - code += "@assert offscreenCanvas.width === %s;\n@assert offscreenCanvas.height === %s;\n" % (exp, exp) + code += "canvas.width = '%s';\ncanvas.height = '%s';\n" % (string, string) + code += "@assert canvas.width === %s;\n@assert canvas.height === %s;\n" % (exp, exp) expected = None code += "t.done();\n"
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/tools/yaml/offscreen/the-offscreen-canvas.yaml b/third_party/blink/web_tests/external/wpt/html/canvas/tools/yaml/offscreen/the-offscreen-canvas.yaml index 752a7b14..3e92426 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/tools/yaml/offscreen/the-offscreen-canvas.yaml +++ b/third_party/blink/web_tests/external/wpt/html/canvas/tools/yaml/offscreen/the-offscreen-canvas.yaml
@@ -3,7 +3,7 @@ testing: - 2d.canvas code: | - @assert ctx.canvas === offscreenCanvas; + @assert ctx.canvas === canvas; t.done(); - name: 2d.canvas.readonly @@ -45,12 +45,12 @@ testing: - context.2d.extraargs code: | - @assert offscreenCanvas.getContext('2d', false, {}, [], 1, "2") !== null; - @assert offscreenCanvas.getContext('2d', 123) !== null; - @assert offscreenCanvas.getContext('2d', "test") !== null; - @assert offscreenCanvas.getContext('2d', undefined) !== null; - @assert offscreenCanvas.getContext('2d', null) !== null; - @assert offscreenCanvas.getContext('2d', Symbol.hasInstance) !== null; + @assert canvas.getContext('2d', false, {}, [], 1, "2") !== null; + @assert canvas.getContext('2d', 123) !== null; + @assert canvas.getContext('2d', "test") !== null; + @assert canvas.getContext('2d', undefined) !== null; + @assert canvas.getContext('2d', null) !== null; + @assert canvas.getContext('2d', Symbol.hasInstance) !== null; t.done(); - name: 2d.getcontext.unique @@ -67,7 +67,7 @@ testing: - context.unique code: | - var ctx2 = offscreenCanvas.getContext('2d'); + var ctx2 = canvas.getContext('2d'); ctx.fillStyle = '#f00'; ctx2.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -153,7 +153,7 @@ ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 50, 50); @assert pixel 20,20 == 255,0,0,255; - offscreenCanvas.width = 50; + canvas.width = 50; @assert pixel 20,20 == 0,0,0,0; t.done(); @@ -162,11 +162,11 @@ testing: - initial.reset code: | - offscreenCanvas.width = 100; + canvas.width = 100; ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 50, 50); @assert pixel 20,20 == 255,0,0,255; - offscreenCanvas.width = 100; + canvas.width = 100; @assert pixel 20,20 == 0,0,0,0; t.done(); @@ -175,9 +175,9 @@ testing: - initial.reset code: | - offscreenCanvas.width = 100; + canvas.width = 100; ctx.rect(0, 0, 100, 50); - offscreenCanvas.width = 100; + canvas.width = 100; ctx.fillStyle = '#f00'; ctx.fill(); @assert pixel 20,20 == 0,0,0,0; @@ -188,10 +188,10 @@ testing: - initial.reset code: | - offscreenCanvas.width = 100; + canvas.width = 100; ctx.rect(0, 0, 1, 1); ctx.clip(); - offscreenCanvas.width = 100; + canvas.width = 100; ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @assert pixel 20,20 == 0,255,0,255; @@ -202,9 +202,9 @@ testing: - initial.reset code: | - offscreenCanvas.width = 100; + canvas.width = 100; ctx.scale(0.1, 0.1); - offscreenCanvas.width = 100; + canvas.width = 100; ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @assert pixel 20,20 == 0,255,0,255; @@ -215,11 +215,11 @@ testing: - initial.reset code: | - offscreenCanvas.width = 50; + canvas.width = 50; var g = ctx.createLinearGradient(0, 0, 100, 0); g.addColorStop(0, '#0f0'); g.addColorStop(1, '#0f0'); - offscreenCanvas.width = 100; + canvas.width = 100; ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.fillStyle = g; @@ -232,11 +232,11 @@ testing: - initial.reset code: | - offscreenCanvas.width = 30; + canvas.width = 30; ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 30, 50); - var p = ctx.createPattern(offscreenCanvas, 'repeat-x'); - offscreenCanvas.width = 100; + var p = ctx.createPattern(canvas, 'repeat-x'); + canvas.width = 100; ctx.fillStyle = '#f00'; ctx.fillRect(0, 0, 100, 50); ctx.fillStyle = p; @@ -250,10 +250,10 @@ - size.width - size.height code: | - offscreenCanvas.width = 0; - offscreenCanvas.height = 0; - @assert offscreenCanvas.width === 0; - @assert offscreenCanvas.height === 0; + canvas.width = 0; + canvas.height = 0; + @assert canvas.width === 0; + @assert canvas.height === 0; t.done(); - name: size.attributes.idl @@ -264,22 +264,22 @@ webidl: - es-unsigned-long code: | - offscreenCanvas.width = "100"; - offscreenCanvas.height = "100"; - @assert offscreenCanvas.width === 100; - @assert offscreenCanvas.height === 100; - offscreenCanvas.width = "+1.5e2"; - offscreenCanvas.height = "0x96"; - @assert offscreenCanvas.width === 150; - @assert offscreenCanvas.height === 150; - offscreenCanvas.width = 301.999; - offscreenCanvas.height = 301.001; - @assert offscreenCanvas.width === 301; - @assert offscreenCanvas.height === 301; - @assert throws TypeError offscreenCanvas.width = "400x"; - @assert throws TypeError offscreenCanvas.height = "foo"; - @assert offscreenCanvas.width === 301; - @assert offscreenCanvas.height === 301; + canvas.width = "100"; + canvas.height = "100"; + @assert canvas.width === 100; + @assert canvas.height === 100; + canvas.width = "+1.5e2"; + canvas.height = "0x96"; + @assert canvas.width === 150; + @assert canvas.height === 150; + canvas.width = 301.999; + canvas.height = 301.001; + @assert canvas.width === 301; + @assert canvas.height === 301; + @assert throws TypeError canvas.width = "400x"; + @assert throws TypeError canvas.height = "foo"; + @assert canvas.width === 301; + @assert canvas.height === 301; t.done(); - name: size.attributes.default @@ -288,8 +288,8 @@ - size.default - size.missing code: | - @assert offscreenCanvas.width === 100; - @assert offscreenCanvas.height === 50; + @assert canvas.width === 100; + @assert canvas.height === 50; t.done(); - name: size.attributes.reflect.setidl @@ -297,10 +297,10 @@ testing: - size.reflect code: | - offscreenCanvas.width = 120; - offscreenCanvas.height = 60; - @assert offscreenCanvas.width === 120; - @assert offscreenCanvas.height === 60; + canvas.width = 120; + canvas.height = 60; + @assert canvas.width === 120; + @assert canvas.height === 60; t.done(); - name: size.attributes.reflect.setidlzero @@ -308,10 +308,10 @@ testing: - size.reflect code: | - offscreenCanvas.width = 0; - offscreenCanvas.height = 0; - @assert offscreenCanvas.width === 0; - @assert offscreenCanvas.height === 0; + canvas.width = 0; + canvas.height = 0; + @assert canvas.width === 0; + @assert canvas.height === 0; t.done(); - name: size.large @@ -322,10 +322,10 @@ limit on the size. code: | var n = 2147483647; // 2^31 - 1, which should be supported by any sensible definition of "long" - offscreenCanvas.width = n; - offscreenCanvas.height = n; - @assert offscreenCanvas.width === n; - @assert offscreenCanvas.height === n; + canvas.width = n; + canvas.height = n; + @assert canvas.width === n; + @assert canvas.height === n; t.done(); - name: 2d.text.setFont.mathFont
diff --git a/third_party/blink/web_tests/external/wpt/webcodecs/full-cycle-test.https.any.js b/third_party/blink/web_tests/external/wpt/webcodecs/full-cycle-test.https.any.js new file mode 100644 index 0000000..3d159d3 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/webcodecs/full-cycle-test.https.any.js
@@ -0,0 +1,85 @@ +// META: global=window,dedicatedworker +// META: script=/webcodecs/video-encoder-utils.js +// META: variant=?av1 +// META: variant=?vp8 +// META: variant=?vp9_p0 +// META: variant=?vp9_p2 +// META: variant=?h264_avc +// META: variant=?h264_annexb + +var ENCODER_CONFIG = null; +promise_setup(async () => { + const config = { + '?av1': {codec: 'av01.0.04M.08'}, // Not supported yet + '?vp8': {codec: 'vp8'}, + '?vp9_p0': {codec: 'vp09.00.10.08'}, + '?vp9_p2': {codec: 'vp09.02.10.10'}, + '?h264_avc': {codec: 'avc1.42001E', avc: {format: 'avc'}}, + '?h264_annexb': {codec: 'avc1.42001E', avc: {format: 'annexb'}} + }[location.search]; + config.hardwareAcceleration = 'prefer-software'; + config.width = 320; + config.height = 200; + config.bitrate = 1000000; + config.bitrateMode = "constant"; + config.framerate = 30; + ENCODER_CONFIG = config; +}); + +promise_test(async t => { + let encoder_config = { ...ENCODER_CONFIG }; + const w = encoder_config.width; + const h = encoder_config.height; + let next_ts = 0 + let frames_to_encode = 16; + let frames_encoded = 0; + let frames_decoded = 0; + + await checkEncoderSupport(t, encoder_config); + let decoder = new VideoDecoder({ + output(frame) { + assert_equals(frame.visibleRect.width, w, "visibleRect.width"); + assert_equals(frame.visibleRect.height, h, "visibleRect.height"); + assert_equals(frame.timestamp, next_ts++, "timestamp"); + frames_decoded++; + assert_true(validateBlackDots(frame, frame.timestamp), + "frame doesn't match. ts: " + frame.timestamp); + frame.close(); + }, + error(e) { + assert_unreached(e.message); + } + }); + + const encoder_init = { + output(chunk, metadata) { + let config = metadata.decoderConfig; + if (config) { + config.hardwareAcceleration = encoder_config.hardwareAcceleration; + decoder.configure(config); + } + decoder.decode(chunk); + frames_encoded++; + }, + error(e) { + assert_unreached(e.message); + } + }; + + let encoder = new VideoEncoder(encoder_init); + encoder.configure(encoder_config); + + for (let i = 0; i < frames_to_encode; i++) { + let frame = createDottedFrame(w, h, i); + let keyframe = (i % 5 == 0); + encoder.encode(frame, { keyFrame: keyframe }); + frame.close(); + } + await encoder.flush(); + await decoder.flush(); + encoder.close(); + decoder.close(); + assert_equals(frames_encoded, frames_to_encode); + assert_equals(frames_decoded, frames_to_encode); +}, 'Encoding and decoding cycle'); +
diff --git a/third_party/blink/web_tests/external/wpt/webcodecs/reconfiguring-encoder.https.any.js b/third_party/blink/web_tests/external/wpt/webcodecs/reconfiguring-encoder.https.any.js new file mode 100644 index 0000000..e4ed3b8 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/webcodecs/reconfiguring-encoder.https.any.js
@@ -0,0 +1,119 @@ +// META: global=window,dedicatedworker +// META: script=/webcodecs/video-encoder-utils.js +// META: variant=?av1 +// META: variant=?vp8 +// META: variant=?vp9_p0 +// META: variant=?vp9_p2 +// META: variant=?h264_avc +// META: variant=?h264_annexb + +var ENCODER_CONFIG = null; +promise_setup(async () => { + const config = { + '?av1': {codec: 'av01.0.04M.08'}, // Not supported yet + '?vp8': {codec: 'vp8'}, + '?vp9_p0': {codec: 'vp09.00.10.08'}, + '?vp9_p2': {codec: 'vp09.02.10.10'}, + '?h264_avc': {codec: 'avc1.42001E', avc: {format: 'avc'}}, + '?h264_annexb': {codec: 'avc1.42001E', avc: {format: 'annexb'}} + }[location.search]; + config.hardwareAcceleration = 'prefer-software'; + config.bitrateMode = "constant"; + config.scalabilityMode = "L1T2"; + config.framerate = 30; + ENCODER_CONFIG = config; +}); + +promise_test(async t => { + let original_w = 800; + let original_h = 600; + let original_bitrate = 3_000_000; + + let new_w = 640; + let new_h = 480; + let new_bitrate = 2_000_000; + + let next_ts = 0 + let reconf_ts = 0; + let frames_to_encode = 16; + let before_reconf_frames = 0; + let after_reconf_frames = 0; + + let process_video_chunk = function (chunk, metadata) { + let config = metadata.decoderConfig; + var data = new Uint8Array(chunk.data); + assert_greater_than_equal(data.length, 0); + let after_reconf = (reconf_ts != 0) && (chunk.timestamp >= reconf_ts); + if (after_reconf) { + after_reconf_frames++; + if (config) { + assert_equals(config.codedWidth, new_w); + assert_equals(config.codedHeight, new_h); + } + } else { + before_reconf_frames++; + if (config) { + assert_equals(config.codedWidth, original_w); + assert_equals(config.codedHeight, original_h); + } + } + }; + + const init = { + output: (chunk, md) => { + try { + process_video_chunk(chunk, md); + } catch (e) { + assert_unreached(e.message); + } + }, + error: (e) => { + assert_unreached(e.message); + }, + }; + const params = { + ...ENCODER_CONFIG, + width: original_w, + height: original_h, + bitrate: original_bitrate, + }; + await checkEncoderSupport(t, params); + + let encoder = new VideoEncoder(init); + encoder.configure(params); + + // Remove this flush after crbug.com/1275789 is fixed + await encoder.flush(); + + // Encode |frames_to_encode| frames with original settings + for (let i = 0; i < frames_to_encode; i++) { + var frame = createFrame(original_w, original_h, next_ts++); + encoder.encode(frame, {}); + } + + params.width = new_w; + params.height = new_h; + params.bitrate = new_bitrate; + + // Reconfigure encoder and run |frames_to_encode| frames with new settings + encoder.configure(params); + reconf_ts = next_ts; + + for (let i = 0; i < frames_to_encode; i++) { + var frame = createFrame(new_w, new_h, next_ts++); + encoder.encode(frame, {}); + } + + await encoder.flush(); + + // Configure back to original config + params.width = original_w; + params.height = original_h; + params.bitrate = original_bitrate; + encoder.configure(params); + await encoder.flush(); + + encoder.close(); + assert_equals(before_reconf_frames, frames_to_encode); + assert_equals(after_reconf_frames, frames_to_encode); +}, "Reconfiguring encoder");
diff --git a/third_party/blink/web_tests/external/wpt/webcodecs/temporal-svc-encoding.https.any.js b/third_party/blink/web_tests/external/wpt/webcodecs/temporal-svc-encoding.https.any.js new file mode 100644 index 0000000..c759250 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/webcodecs/temporal-svc-encoding.https.any.js
@@ -0,0 +1,105 @@ +// META: global=window,dedicatedworker +// META: script=/webcodecs/video-encoder-utils.js +// META: variant=?av1 +// META: variant=?vp8 +// META: variant=?vp9 +// META: variant=?h264 + +var ENCODER_CONFIG = null; +promise_setup(async () => { + const config = { + '?av1': {codec: 'av01.0.04M.08'}, // Not supported yet + '?vp8': {codec: 'vp8'}, + '?vp9': {codec: 'vp09.00.10.08'}, + '?h264': {codec: 'avc1.42001E', avc: {format: 'annexb'}} + }[location.search]; + config.hardwareAcceleration = 'prefer-software'; + config.width = 320; + config.height = 200; + config.bitrate = 1000000; + config.bitrateMode = "constant"; + config.framerate = 30; + ENCODER_CONFIG = config; +}); + +async function svc_test(t, layers, base_layer_decimator) { + let encoder_config = { ...ENCODER_CONFIG }; + encoder_config.scalabilityMode = "L1T" + layers; + const w = encoder_config.width; + const h = encoder_config.height; + await checkEncoderSupport(t, encoder_config); + + let frames_to_encode = 24; + let frames_decoded = 0; + let frames_encoded = 0; + let chunks = []; + let corrupted_frames = []; + + const encoder_init = { + output(chunk, metadata) { + frames_encoded++; + + // Filter out all frames, but base layer. + assert_own_property(metadata, "svc"); + assert_own_property(metadata.svc, "temporalLayerId"); + assert_less_than(metadata.svc.temporalLayerId, layers); + if (metadata.svc.temporalLayerId == 0) + chunks.push(chunk); + }, + error(e) { + assert_unreached(e.message); + } + }; + + let encoder = new VideoEncoder(encoder_init); + encoder.configure(encoder_config); + + for (let i = 0; i < frames_to_encode; i++) { + let frame = createDottedFrame(w, h, i); + encoder.encode(frame, { keyFrame: false }); + frame.close(); + } + await encoder.flush(); + + let decoder = new VideoDecoder({ + output(frame) { + frames_decoded++; + // Check that we have intended number of dots and no more. + // Completely black frame shouldn't pass the test. + if(!validateBlackDots(frame, frame.timestamp) || + validateBlackDots(frame, frame.timestamp + 1)) { + corrupted_frames.push(frame.timestamp) + } + frame.close(); + }, + error(e) { + assert_unreached(e.message); + } + }); + + let decoder_config = { + codec: encoder_config.codec, + hardwareAcceleration: encoder_config.hardwareAcceleration, + codedWidth: w, + codedHeight: h, + }; + decoder.configure(decoder_config); + + for (let chunk of chunks) { + decoder.decode(chunk); + } + await decoder.flush(); + + encoder.close(); + decoder.close(); + assert_equals(frames_encoded, frames_to_encode); + + let base_layer_frames = frames_to_encode / base_layer_decimator; + assert_equals(chunks.length, base_layer_frames); + assert_equals(frames_decoded, base_layer_frames); + assert_equals(corrupted_frames.length, 0, + `corrupted_frames: ${corrupted_frames}`); +} + +promise_test(async t => { return svc_test(t, 2, 2) }, "SVC L1T2"); +promise_test(async t => { return svc_test(t, 3, 4) }, "SVC L1T3");
diff --git a/third_party/blink/web_tests/external/wpt/webcodecs/video-encoder-utils.js b/third_party/blink/web_tests/external/wpt/webcodecs/video-encoder-utils.js new file mode 100644 index 0000000..58f0ce8 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/webcodecs/video-encoder-utils.js
@@ -0,0 +1,97 @@ +async function checkEncoderSupport(test, config) { + let supported = false; + try { + const support = await VideoEncoder.isConfigSupported(config); + supported = support.supported; + } catch (e) {} + + if (!supported) { + // Mark the test 'passed', unfortunately assert_implements_optional() + // doesn't do it by itself. + test.done(); + } + + assert_implements_optional(supported, 'Unsupported config: ' + + JSON.stringify(config)); +} + +function fourColorsFrame(ctx, width, height, text) { + const kYellow = "#FFFF00"; + const kRed = "#FF0000"; + const kBlue = "#0000FF"; + const kGreen = "#00FF00"; + + ctx.fillStyle = kYellow; + ctx.fillRect(0, 0, width / 2, height / 2); + + ctx.fillStyle = kRed; + ctx.fillRect(width / 2, 0, width / 2, height / 2); + + ctx.fillStyle = kBlue; + ctx.fillRect(0, height / 2, width / 2, height / 2); + + ctx.fillStyle = kGreen; + ctx.fillRect(width / 2, height / 2, width / 2, height / 2); + + ctx.fillStyle = 'white'; + ctx.font = (height / 10) + 'px sans-serif'; + ctx.fillText(text, width / 2, height / 2); +} + +// Paints |count| black dots on the |ctx|, so their presence can be validated +// later. This is an analog of the most basic bar code. +function putBlackDots(ctx, width, height, count) { + ctx.fillStyle = 'black'; + const dot_size = 10; + const step = dot_size * 3; + + for (let i = 1; i <= count; i++) { + let x = i * step; + let y = step * (x / width + 1); + x %= width; + ctx.fillRect(x, y, dot_size, dot_size); + } +} + +// Validates that frame has |count| black dots in predefined places. +function validateBlackDots(frame, count) { + const width = frame.displayWidth; + const height = frame.displayHeight; + let cnv = new OffscreenCanvas(width, height); + var ctx = cnv.getContext('2d'); + ctx.drawImage(frame, 0, 0); + const dot_size = 10; + const step = dot_size * 3; + + for (let i = 1; i <= count; i++) { + let x = i * step + dot_size / 2; + let y = step * (x / width + 1) + dot_size / 2; + x %= width; + let rgba = ctx.getImageData(x, y, 1, 1).data; + const tolerance = 40; + if (rgba[0] > tolerance || rgba[1] > tolerance || rgba[2] > tolerance) { + // The dot is too bright to be a black dot. + return false; + } + } + return true; +} + +function createFrame(width, height, ts = 0) { + let text = ts.toString(); + let cnv = new OffscreenCanvas(width, height); + var ctx = cnv.getContext('2d'); + fourColorsFrame(ctx, width, height, text); + return new VideoFrame(cnv, { timestamp: ts }); +} + +function createDottedFrame(width, height, dots, ts) { + if (ts === undefined) + ts = dots; + let text = ts.toString(); + let cnv = new OffscreenCanvas(width, height); + var ctx = cnv.getContext('2d'); + fourColorsFrame(ctx, width, height, text); + putBlackDots(ctx, width, height, dots); + return new VideoFrame(cnv, { timestamp: ts }); +} \ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/webcodecs/video-encoder.https.any.js b/third_party/blink/web_tests/external/wpt/webcodecs/video-encoder.https.any.js index cad0c4f..4999276 100644 --- a/third_party/blink/web_tests/external/wpt/webcodecs/video-encoder.https.any.js +++ b/third_party/blink/web_tests/external/wpt/webcodecs/video-encoder.https.any.js
@@ -1,6 +1,7 @@ // META: global=window,dedicatedworker // META: script=/common/media.js // META: script=/webcodecs/utils.js +// META: script=/webcodecs/video-encoder-utils.js const defaultConfig = { codec: 'vp8', @@ -8,27 +9,6 @@ height: 480 }; -let bitmap_blob = null; - -async function generateBitmap(width, height) { - if (!bitmap_blob) { - let response = await fetch("pattern.png"); - bitmap_blob = await response.blob(); - } - - var size = { - resizeWidth: width, - resizeHeight: height - }; - - return createImageBitmap(bitmap_blob, size); -} - -async function createVideoFrame(width, height, timestamp) { - let bitmap = await generateBitmap(width, height); - return new VideoFrame(bitmap, { timestamp: timestamp }); -} - promise_test(t => { // VideoEncoderInit lacks required fields. assert_throws_js(TypeError, () => { new VideoEncoder({}); }); @@ -81,8 +61,8 @@ let encoder = new VideoEncoder(codecInit); encoder.configure(encoderConfig); - let frame1 = await createVideoFrame(640, 480, 0); - let frame2 = await createVideoFrame(640, 480, 33333); + let frame1 = createFrame(640, 480, 0); + let frame2 = createFrame(640, 480, 33333); encoder.encode(frame1); encoder.encode(frame2); @@ -129,17 +109,15 @@ const frames_count = 100; let frames = []; for (let i = 0; i < frames_count; i++) { - let frame = await createVideoFrame(320, 200, i * 16000); + let frame = createFrame(320, 200, i * 16000); frames.push(frame); } for (let frame of frames) encoder.encode(frame); - // Some encodes should have already started being processed, but not all - // 100 of them. assert_greater_than(encoder.encodeQueueSize, 0); - assert_less_than(encoder.encodeQueueSize, frames_count); + assert_less_than_equal(encoder.encodeQueueSize, frames_count); await encoder.flush(); // We can guarantee that all encodes are processed after a flush. @@ -163,7 +141,7 @@ const timestamp_step = 40000; const expected_callbacks_before_reset = 3; let codecInit = getDefaultCodecInit(t); - let bitmap = await generateBitmap(320, 200); + let original = createFrame(320, 200, 0); let encoder = null; let reset_completed = false; codecInit.output = (chunk, metadata) => { @@ -188,7 +166,7 @@ // and make sure no more chunks are emitted afterwards. let encodes_before_reset = expected_callbacks_before_reset * 10; for (let i = 0; i < encodes_before_reset; i++) { - let frame = new VideoFrame(bitmap, { timestamp: timestamp }); + let frame = new VideoFrame(original, { timestamp: timestamp }); timestamp += timestamp_step; encoder.encode(frame); frame.close(); @@ -208,7 +186,7 @@ const frames_after_reset = 5; for (let i = 0; i < frames_after_reset; i++) { - let frame = await createVideoFrame(800, 600, timestamp + 1); + let frame = createFrame(800, 600, timestamp + 1); timestamp += timestamp_step; encoder.encode(frame); frame.close(); @@ -236,8 +214,8 @@ encoder.configure(config); - let frame1 = await createVideoFrame(640, 480, 0); - let frame2 = await createVideoFrame(640, 480, 33333); + let frame1 = createFrame(640, 480, 0); + let frame2 = createFrame(640, 480, 33333); encoder.encode(frame1); encoder.configure(config); @@ -247,16 +225,16 @@ await encoder.flush(); // We can guarantee that all encodes are processed after a flush. - assert_equals(encoder.encodeQueueSize, 0); + assert_equals(encoder.encodeQueueSize, 0, "queue size after encode"); - assert_true(output_chunks.length == 2); + assert_equals(output_chunks.length, 2, "number of chunks"); assert_equals(output_chunks[0].timestamp, frame1.timestamp); assert_equals(output_chunks[1].timestamp, frame2.timestamp); output_chunks = []; - let frame3 = await createVideoFrame(640, 480, 66666); - let frame4 = await createVideoFrame(640, 480, 100000); + let frame3 = createFrame(640, 480, 66666); + let frame4 = createFrame(640, 480, 100000); encoder.encode(frame3); @@ -276,7 +254,7 @@ promise_test(async t => { let encoder = new VideoEncoder(getDefaultCodecInit(t)); - let frame = await createVideoFrame(640, 480, 0); + let frame = createFrame(640, 480, 0); return testClosedCodec(t, encoder, defaultConfig, frame); }, 'Verify closed VideoEncoder operations'); @@ -284,7 +262,7 @@ promise_test(async t => { let encoder = new VideoEncoder(getDefaultCodecInit(t)); - let frame = await createVideoFrame(640, 480, 0); + let frame = createFrame(640, 480, 0); return testUnconfiguredCodec(t, encoder, frame); }, 'Verify unconfigured VideoEncoder operations'); @@ -292,7 +270,7 @@ promise_test(async t => { let encoder = new VideoEncoder(getDefaultCodecInit(t)); - let frame = await createVideoFrame(640, 480, 0); + let frame = createFrame(640, 480, 0); frame.close(); encoder.configure(defaultConfig); @@ -311,7 +289,7 @@ let config = defaultConfig; encoder.configure(config); - let frame = await createVideoFrame(640, 480, -10000); + let frame = createFrame(640, 480, -10000); encoder.encode(frame); frame.close(); await encoder.flush();
diff --git a/third_party/polymer/v3_0/chromium_dts.patch b/third_party/polymer/v3_0/chromium_dts.patch index e07bcdc..d58acd2 100644 --- a/third_party/polymer/v3_0/chromium_dts.patch +++ b/third_party/polymer/v3_0/chromium_dts.patch
@@ -92,3 +92,15 @@ /** * Alternative text content for accessibility support. +diff --git a/components-chromium/iron-list/iron-list.d.ts b/components-chromium/iron-list/iron-list.d.ts +index e469a76eccfbf..06629b5b15945 100644 +--- a/components-chromium/iron-list/iron-list.d.ts ++++ b/components-chromium/iron-list/iron-list.d.ts +@@ -574,6 +574,7 @@ interface IronListElement extends Templatizer, IronResizableBehavior, IronScroll + readonly _estRowsInView: any; + readonly _physicalRows: any; + readonly _scrollOffset: any; ++ preserveFocus: boolean; + attached(): void; + detached(): void; +
diff --git a/third_party/polymer/v3_0/components-chromium/iron-list/iron-list.d.ts b/third_party/polymer/v3_0/components-chromium/iron-list/iron-list.d.ts index e469a76..06629b5 100644 --- a/third_party/polymer/v3_0/components-chromium/iron-list/iron-list.d.ts +++ b/third_party/polymer/v3_0/components-chromium/iron-list/iron-list.d.ts
@@ -574,6 +574,7 @@ readonly _estRowsInView: any; readonly _physicalRows: any; readonly _scrollOffset: any; + preserveFocus: boolean; attached(): void; detached(): void;
diff --git a/third_party/sqlite/README.md b/third_party/sqlite/README.md index d7cda54..b492bb2 100644 --- a/third_party/sqlite/README.md +++ b/third_party/sqlite/README.md
@@ -61,7 +61,7 @@ 1. Create new release branch Use the SQLite git commit hash for the release, found at - [sqlite/releases](https://github.com/sqlite/sqlite/releases), when creating + [sqlite/tags](https://github.com/sqlite/sqlite/tags), when creating a new release branch. For example, "[562fd18b9dc27216191c0a6477bba9b175f7f0d2](https://github.com/sqlite/sqlite/commit/562fd18b9dc27216191c0a6477bba9b175f7f0d2)" corresponds to the 3.31.1 release. The commit is used instead of the tag @@ -82,15 +82,14 @@ git fetch origin export VERSION=3.33.0 git checkout -b chromium-version-$VERSION \ - --track origin/chromum-version-$VERSION + --track origin/chromium-version-$VERSION ``` 3. Generate and commit the SQLite amalgamations. ```sh ../scripts/generate_amalgamation.py - git add amalgamation - git add amalgamation_dev + git add amalgamation amalgamation_dev git commit -m "Amalgamations for release $VERSION" ``` @@ -113,7 +112,7 @@ ```sh roll-dep src/third_party/sqlite/src --roll-to <git hash of merged CL> ``` - 2. Update the version in //third_party/sqlite/README.chromium. Append the + 2. Update the version in //third_party/sqlite/README.chromium. Amend the commit created by roll-dep above. ## Cherry-pick unreleased commit from SQLite.
diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl index 41999ee4..246aeff 100644 --- a/tools/mb/mb_config.pyl +++ b/tools/mb/mb_config.pyl
@@ -327,6 +327,7 @@ 'fuchsia-fyi-arm64-rel': 'release_bot_fuchsia_arm64', 'fuchsia-fyi-x64-dbg': 'debug_bot_fuchsia', 'fuchsia-fyi-x64-rel': 'release_bot_fuchsia', + 'fuchsia-fyi-x64-asan': 'asan_bot_fuchsia', 'ios14-beta-simulator': 'ios_simulator_debug_static_bot_xctest', 'ios14-sdk-simulator': 'ios_simulator_debug_static_bot_xctest_arm64', 'ios15-beta-simulator': 'ios_simulator_debug_static_bot_xctest', @@ -1682,6 +1683,10 @@ 'arm64', 'official_optimize_goma', ], + 'asan_bot_fuchsia': [ + 'asan', 'release_bot', 'fuchsia', + ], + 'asan_clang_fuzzer_static_v8_heap_minimal_symbols_release': [ 'asan', 'fuzzer', 'static', 'v8_heap', 'minimal_symbols', 'release_bot', ],
diff --git a/tools/mb/mb_config_expectations/chromium.fyi.json b/tools/mb/mb_config_expectations/chromium.fyi.json index 30728be..2f9fe80 100644 --- a/tools/mb/mb_config_expectations/chromium.fyi.json +++ b/tools/mb/mb_config_expectations/chromium.fyi.json
@@ -514,6 +514,16 @@ "use_goma": true } }, + "fuchsia-fyi-x64-asan": { + "gn_args": { + "dcheck_always_on": false, + "is_asan": true, + "is_component_build": false, + "is_debug": false, + "target_os": "fuchsia", + "use_goma": true + } + }, "fuchsia-fyi-x64-dbg": { "gn_args": { "is_component_build": true,
diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml index e9fda08..5aa659b 100644 --- a/tools/metrics/histograms/enums.xml +++ b/tools/metrics/histograms/enums.xml
@@ -51752,6 +51752,7 @@ <int value="-1242867644" label="BorealisDiskManagement:enabled"/> <int value="-1241868814" label="WebAuthenticationPhoneSupport:disabled"/> <int value="-1241747717" label="enable-android-password-link"/> + <int value="-1241240800" label="UseULPLanguagesInChrome:enabled"/> <int value="-1241002324" label="FocusMode:enabled"/> <int value="-1239515260" label="OmniboxDisableCGIParamMatching:disabled"/> <int value="-1239262870" label="TextFragmentAnchor:enabled"/> @@ -54070,6 +54071,7 @@ <int value="483155358" label="GlobalMediaControlsForChromeOS:disabled"/> <int value="484581911" label="ServiceWorkerSubresourceFilter:disabled"/> <int value="484596410" label="EnterpriseRealtimeExtensionRequest:disabled"/> + <int value="485652022" label="UseULPLanguagesInChrome:disabled"/> <int value="485957747" label="finch-seed-ignore-pending-download"/> <int value="487605950" label="PerformantSplitViewResizing:disabled"/> <int value="487810392" label="EnablePalmOnToolTypePalm:enabled"/> @@ -55146,6 +55148,7 @@ <int value="1284910808" label="disable-checker-imaging"/> <int value="1285169797" label="ClipboardHistoryNudgeSessionReset:disabled"/> <int value="1285905715" label="WebXRHitTest:enabled"/> + <int value="1286564383" label="UsbNotificationController:enabled"/> <int value="1287625114" label="EnableIncognitoShortcutOnDesktop:disabled"/> <int value="1287947083" label="WebAssemblyCodeProtectionPku:enabled"/> <int value="1288612648" label="PluginVmFullscreen:enabled"/> @@ -55530,6 +55533,7 @@ <int value="1581002467" label="enable-explicit-dma-fences"/> <int value="1582400283" label="VideoTutorials:enabled"/> <int value="1583543236" label="QuickSettingsNetworkRevamp:disabled"/> + <int value="1584012382" label="UsbNotificationController:disabled"/> <int value="1584039096" label="highlight-all-webviews"/> <int value="1584425198" label="NtpModules:enabled"/> <int value="1584536816" label="LimitAltTabToActiveDesk:enabled"/>
diff --git a/tools/metrics/histograms/metadata/blink/histograms.xml b/tools/metrics/histograms/metadata/blink/histograms.xml index 307c2ae..6fba7be 100644 --- a/tools/metrics/histograms/metadata/blink/histograms.xml +++ b/tools/metrics/histograms/metadata/blink/histograms.xml
@@ -3736,7 +3736,7 @@ </histogram> <histogram name="Blink.{CookieOperation}Time.Manager{ManagerState}" units="ms" - expires_after="2022-02-09"> + expires_after="2022-08-09"> <owner>cduvall@chromium.org</owner> <owner>jam@chromium.org</owner> <summary>
diff --git a/tools/metrics/histograms/metadata/phonehub/histograms.xml b/tools/metrics/histograms/metadata/phonehub/histograms.xml index 5451b8e..779d074 100644 --- a/tools/metrics/histograms/metadata/phonehub/histograms.xml +++ b/tools/metrics/histograms/metadata/phonehub/histograms.xml
@@ -90,6 +90,28 @@ <token key="MediaType" variants="CameraRollMediaType"/> </histogram> +<histogram name="PhoneHub.CameraRoll.DownloadItem.TransferRate" units="KB/s" + expires_after="2022-10-31"> + <owner>jasonsun@chromium.org</owner> + <owner>chromeos-cross-device-eng@google.com</owner> + <summary> + Measures the data transfer rate of downloading a recent photo or video taken + on a connected phone via Phone Hub. Emitted when an item is downloaded + successfully. + </summary> +</histogram> + +<histogram name="PhoneHub.CameraRoll.Latency.RefreshItems" units="ms" + expires_after="2022-10-31"> + <owner>jasonsun@chromium.org</owner> + <owner>chromeos-cross-device-eng@google.com</owner> + <summary> + Measures the amount of time it takes for the Chromebook to receive the + up-to-date set of recent photos and videos taken on a connected phone and + display their thumbnails on the Phone Hub tray. + </summary> +</histogram> + <histogram name="PhoneHub.CameraRoll.OptInEntryPoint" enum="PhoneHubCameraRollOptInEntryPoint" expires_after="2022-10-31"> <owner>jianbing@google.com</owner>
diff --git a/tools/origin_trials/generate_token.py b/tools/origin_trials/generate_token.py index bf5005f0..e56161f 100755 --- a/tools/origin_trials/generate_token.py +++ b/tools/origin_trials/generate_token.py
@@ -267,11 +267,11 @@ expiry) data_to_sign = GenerateDataToSign(args.version[1], token_data) signature = Sign(private_key, data_to_sign) - return args, token_data, signature + return args, token_data, signature, expiry def main(): - args, token_data, signature = GenerateTokenAndSignature() + args, token_data, signature, expiry = GenerateTokenAndSignature() # Output the token details print("Token details:")
diff --git a/ui/android/java/res/values-v17/styles.xml b/ui/android/java/res/values-v17/styles.xml index 46440fa..51df0a0 100644 --- a/ui/android/java/res/values-v17/styles.xml +++ b/ui/android/java/res/values-v17/styles.xml
@@ -343,6 +343,11 @@ <item name="android:textColor">@color/chip_text_color_secondary</item> </style> + <!-- Toast UI --> + <style name="TextAppearance.Toast" parent="TextAppearance.TextSmall"> + <item name="android:textColor">@color/default_text_color_light</item> + </style> + <!-- Dividers --> <style name="HorizontalDivider" tools:ignore="UnusedResources">
diff --git a/ui/base/ime/ash/input_method_manager.h b/ui/base/ime/ash/input_method_manager.h index d7ba6de..68d4d279 100644 --- a/ui/base/ime/ash/input_method_manager.h +++ b/ui/base/ime/ash/input_method_manager.h
@@ -64,7 +64,6 @@ bool checked; unsigned int modified; - std::vector<MenuItem> children; }; enum ImeMenuFeature {
diff --git a/ui/base/resource/resource_bundle.h b/ui/base/resource/resource_bundle.h index ceca1e5..5e53e16 100644 --- a/ui/base/resource/resource_bundle.h +++ b/ui/base/resource/resource_bundle.h
@@ -400,9 +400,7 @@ friend class ChromeBrowserMainMacBrowserTest; class BitmapImageSource; - friend class BitmapImageSource; class LottieImageSource; - friend class LottieImageSource; using IdToStringMap = std::unordered_map<int, std::u16string>;
diff --git a/ui/display/display_unittest.cc b/ui/display/display_unittest.cc index 3f11809..6ef905fa 100644 --- a/ui/display/display_unittest.cc +++ b/ui/display/display_unittest.cc
@@ -16,39 +16,39 @@ TEST(DisplayTest, WorkArea) { Display display(0, gfx::Rect(0, 0, 100, 100)); - EXPECT_EQ("0,0 100x100", display.bounds().ToString()); - EXPECT_EQ("0,0 100x100", display.work_area().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 100, 100), display.bounds()); + EXPECT_EQ(gfx::Rect(0, 0, 100, 100), display.work_area()); display.set_work_area(gfx::Rect(3, 4, 90, 80)); - EXPECT_EQ("0,0 100x100", display.bounds().ToString()); - EXPECT_EQ("3,4 90x80", display.work_area().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 100, 100), display.bounds()); + EXPECT_EQ(gfx::Rect(3, 4, 90, 80), display.work_area()); display.SetScaleAndBounds(1.0f, gfx::Rect(10, 20, 50, 50)); - EXPECT_EQ("10,20 50x50", display.bounds().ToString()); - EXPECT_EQ("13,24 40x30", display.work_area().ToString()); + EXPECT_EQ(gfx::Rect(10, 20, 50, 50), display.bounds()); + EXPECT_EQ(gfx::Rect(13, 24, 40, 30), display.work_area()); display.SetSize(gfx::Size(200, 200)); - EXPECT_EQ("13,24 190x180", display.work_area().ToString()); + EXPECT_EQ(gfx::Rect(13, 24, 190, 180), display.work_area()); display.UpdateWorkAreaFromInsets(gfx::Insets(3, 4, 5, 6)); - EXPECT_EQ("14,23 190x192", display.work_area().ToString()); + EXPECT_EQ(gfx::Rect(14, 23, 190, 192), display.work_area()); } TEST(DisplayTest, Scale) { Display display(0, gfx::Rect(0, 0, 100, 100)); display.set_work_area(gfx::Rect(10, 10, 80, 80)); - EXPECT_EQ("0,0 100x100", display.bounds().ToString()); - EXPECT_EQ("10,10 80x80", display.work_area().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 100, 100), display.bounds()); + EXPECT_EQ(gfx::Rect(10, 10, 80, 80), display.work_area()); // Scale it back to 2x display.SetScaleAndBounds(2.0f, gfx::Rect(0, 0, 140, 140)); - EXPECT_EQ("0,0 70x70", display.bounds().ToString()); - EXPECT_EQ("10,10 50x50", display.work_area().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 70, 70), display.bounds()); + EXPECT_EQ(gfx::Rect(10, 10, 50, 50), display.work_area()); // Scale it back to 1x display.SetScaleAndBounds(1.0f, gfx::Rect(0, 0, 100, 100)); - EXPECT_EQ("0,0 100x100", display.bounds().ToString()); - EXPECT_EQ("10,10 80x80", display.work_area().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 100, 100), display.bounds()); + EXPECT_EQ(gfx::Rect(10, 10, 80, 80), display.work_area()); } // https://crbug.com/517944
diff --git a/ui/display/manager/display_change_observer_unittest.cc b/ui/display/manager/display_change_observer_unittest.cc index 390f5df..5d095de8 100644 --- a/ui/display/manager/display_change_observer_unittest.cc +++ b/ui/display/manager/display_change_observer_unittest.cc
@@ -121,74 +121,74 @@ const bool listing_all_modes = GetParam(); if (listing_all_modes) { ASSERT_EQ(13u, display_modes.size()); - EXPECT_EQ("640x480", display_modes[0].size().ToString()); + EXPECT_EQ(gfx::Size(640, 480), display_modes[0].size()); EXPECT_TRUE(display_modes[0].is_interlaced()); EXPECT_EQ(display_modes[0].refresh_rate(), 60); - EXPECT_EQ("1024x600", display_modes[1].size().ToString()); + EXPECT_EQ(gfx::Size(1024, 600), display_modes[1].size()); EXPECT_FALSE(display_modes[1].is_interlaced()); EXPECT_EQ(display_modes[1].refresh_rate(), 60); - EXPECT_EQ("1024x600", display_modes[2].size().ToString()); + EXPECT_EQ(gfx::Size(1024, 600), display_modes[2].size()); EXPECT_TRUE(display_modes[2].is_interlaced()); EXPECT_EQ(display_modes[2].refresh_rate(), 60); - EXPECT_EQ("1024x600", display_modes[3].size().ToString()); + EXPECT_EQ(gfx::Size(1024, 600), display_modes[3].size()); EXPECT_FALSE(display_modes[3].is_interlaced()); EXPECT_EQ(display_modes[3].refresh_rate(), 70); - EXPECT_EQ("1024x768", display_modes[4].size().ToString()); + EXPECT_EQ(gfx::Size(1024, 768), display_modes[4].size()); EXPECT_TRUE(display_modes[4].is_interlaced()); EXPECT_EQ(display_modes[4].refresh_rate(), 60); - EXPECT_EQ("1024x768", display_modes[5].size().ToString()); + EXPECT_EQ(gfx::Size(1024, 768), display_modes[5].size()); EXPECT_TRUE(display_modes[5].is_interlaced()); EXPECT_EQ(display_modes[5].refresh_rate(), 70); - EXPECT_EQ("1280x720", display_modes[6].size().ToString()); + EXPECT_EQ(gfx::Size(1280, 720), display_modes[6].size()); EXPECT_FALSE(display_modes[6].is_interlaced()); EXPECT_EQ(display_modes[6].refresh_rate(), 60); - EXPECT_EQ("1280x720", display_modes[7].size().ToString()); + EXPECT_EQ(gfx::Size(1280, 720), display_modes[7].size()); EXPECT_TRUE(display_modes[7].is_interlaced()); EXPECT_EQ(display_modes[7].refresh_rate(), 60); - EXPECT_EQ("1920x1080", display_modes[8].size().ToString()); + EXPECT_EQ(gfx::Size(1920, 1080), display_modes[8].size()); EXPECT_FALSE(display_modes[8].is_interlaced()); EXPECT_EQ(display_modes[8].refresh_rate(), 60); - EXPECT_EQ("1920x1080", display_modes[9].size().ToString()); + EXPECT_EQ(gfx::Size(1920, 1080), display_modes[9].size()); EXPECT_FALSE(display_modes[9].is_interlaced()); EXPECT_EQ(display_modes[9].refresh_rate(), 70); - EXPECT_EQ("1920x1080", display_modes[10].size().ToString()); + EXPECT_EQ(gfx::Size(1920, 1080), display_modes[10].size()); EXPECT_FALSE(display_modes[10].is_interlaced()); EXPECT_EQ(display_modes[10].refresh_rate(), 80); - EXPECT_EQ("1920x1200", display_modes[11].size().ToString()); + EXPECT_EQ(gfx::Size(1920, 1200), display_modes[11].size()); EXPECT_FALSE(display_modes[11].is_interlaced()); EXPECT_EQ(display_modes[11].refresh_rate(), 60); - EXPECT_EQ("1920x1200", display_modes[12].size().ToString()); + EXPECT_EQ(gfx::Size(1920, 1200), display_modes[12].size()); EXPECT_FALSE(display_modes[12].is_interlaced()); EXPECT_EQ(display_modes[12].refresh_rate(), 75); } else { ASSERT_EQ(6u, display_modes.size()); - EXPECT_EQ("640x480", display_modes[0].size().ToString()); + EXPECT_EQ(gfx::Size(640, 480), display_modes[0].size()); EXPECT_TRUE(display_modes[0].is_interlaced()); EXPECT_EQ(display_modes[0].refresh_rate(), 60); - EXPECT_EQ("1024x600", display_modes[1].size().ToString()); + EXPECT_EQ(gfx::Size(1024, 600), display_modes[1].size()); EXPECT_FALSE(display_modes[1].is_interlaced()); EXPECT_EQ(display_modes[1].refresh_rate(), 70); - EXPECT_EQ("1024x768", display_modes[2].size().ToString()); + EXPECT_EQ(gfx::Size(1024, 768), display_modes[2].size()); EXPECT_TRUE(display_modes[2].is_interlaced()); EXPECT_EQ(display_modes[2].refresh_rate(), 70); - EXPECT_EQ("1280x720", display_modes[3].size().ToString()); + EXPECT_EQ(gfx::Size(1280, 720), display_modes[3].size()); EXPECT_FALSE(display_modes[3].is_interlaced()); EXPECT_EQ(display_modes[3].refresh_rate(), 60); - EXPECT_EQ("1920x1080", display_modes[4].size().ToString()); + EXPECT_EQ(gfx::Size(1920, 1080), display_modes[4].size()); EXPECT_FALSE(display_modes[4].is_interlaced()); EXPECT_EQ(display_modes[4].refresh_rate(), 80); - EXPECT_EQ("1920x1200", display_modes[5].size().ToString()); + EXPECT_EQ(gfx::Size(1920, 1200), display_modes[5].size()); EXPECT_FALSE(display_modes[5].is_interlaced()); EXPECT_EQ(display_modes[5].refresh_rate(), 60); } @@ -320,19 +320,19 @@ if (listing_all_modes) { ASSERT_EQ(2u, display_modes.size()); - EXPECT_EQ("1920x1080", display_modes[0].size().ToString()); + EXPECT_EQ(gfx::Size(1920, 1080), display_modes[0].size()); EXPECT_FALSE(display_modes[0].is_interlaced()); EXPECT_FALSE(display_modes[0].native()); EXPECT_EQ(display_modes[0].refresh_rate(), 60); - EXPECT_EQ("1920x1080", display_modes[1].size().ToString()); + EXPECT_EQ(gfx::Size(1920, 1080), display_modes[1].size()); EXPECT_TRUE(display_modes[1].is_interlaced()); EXPECT_TRUE(display_modes[1].native()); EXPECT_EQ(display_modes[1].refresh_rate(), 60); } else { // Only the native mode will be listed. ASSERT_EQ(1u, display_modes.size()); - EXPECT_EQ("1920x1080", display_modes[0].size().ToString()); + EXPECT_EQ(gfx::Size(1920, 1080), display_modes[0].size()); EXPECT_TRUE(display_modes[0].is_interlaced()); EXPECT_TRUE(display_modes[0].native()); EXPECT_EQ(display_modes[0].refresh_rate(), 60);
diff --git a/ui/display/manager/display_manager_utilities_unittest.cc b/ui/display/manager/display_manager_utilities_unittest.cc index ca57909d..987be5e 100644 --- a/ui/display/manager/display_manager_utilities_unittest.cc +++ b/ui/display/manager/display_manager_utilities_unittest.cc
@@ -149,14 +149,14 @@ display_1.set_bounds(gfx::Rect(740, 0, 150, 300)); display_2.set_bounds(gfx::Rect(759, 300, 133, 182)); EXPECT_TRUE(ComputeBoundary(display_1, display_2, &edge_1, &edge_2)); - EXPECT_EQ("759,299 131x1", edge_1.ToString()); - EXPECT_EQ("759,300 131x1", edge_2.ToString()); + EXPECT_EQ(gfx::Rect(759, 299, 131, 1), edge_1); + EXPECT_EQ(gfx::Rect(759, 300, 131, 1), edge_2); display_1.set_bounds(gfx::Rect(0, 0, 400, 400)); display_2.set_bounds(gfx::Rect(400, 150, 400, 400)); EXPECT_TRUE(ComputeBoundary(display_1, display_2, &edge_1, &edge_2)); - EXPECT_EQ("399,150 1x250", edge_1.ToString()); - EXPECT_EQ("400,150 1x250", edge_2.ToString()); + EXPECT_EQ(gfx::Rect(399, 150, 1, 250), edge_1); + EXPECT_EQ(gfx::Rect(400, 150, 1, 250), edge_2); } } // namespace display
diff --git a/ui/display/manager/managed_display_info_unittest.cc b/ui/display/manager/managed_display_info_unittest.cc index e2155c2..c38ce2b 100644 --- a/ui/display/manager/managed_display_info_unittest.cc +++ b/ui/display/manager/managed_display_info_unittest.cc
@@ -20,53 +20,53 @@ ManagedDisplayInfo info = ManagedDisplayInfo::CreateFromSpecWithID("200x100", 10); EXPECT_EQ(10, info.id()); - EXPECT_EQ("0,0 200x100", info.bounds_in_native().ToString()); - EXPECT_EQ("200x100", info.size_in_pixel().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 200, 100), info.bounds_in_native()); + EXPECT_EQ(gfx::Size(200, 100), info.size_in_pixel()); EXPECT_EQ(Display::ROTATE_0, info.GetActiveRotation()); - EXPECT_EQ("0,0,0,0", info.overscan_insets_in_dip().ToString()); + EXPECT_EQ(gfx::Insets(), info.overscan_insets_in_dip()); info = ManagedDisplayInfo::CreateFromSpecWithID("10+20-300x400*2/o", 10); - EXPECT_EQ("10,20 300x400", info.bounds_in_native().ToString()); - EXPECT_EQ("288x380", info.size_in_pixel().ToString()); + EXPECT_EQ(gfx::Rect(10, 20, 300, 400), info.bounds_in_native()); + EXPECT_EQ(gfx::Size(288, 380), info.size_in_pixel()); EXPECT_EQ(Display::ROTATE_0, info.GetActiveRotation()); - EXPECT_EQ("5,3,5,3", info.overscan_insets_in_dip().ToString()); + EXPECT_EQ(gfx::Insets(5, 3, 5, 3), info.overscan_insets_in_dip()); info = ManagedDisplayInfo::CreateFromSpecWithID("10+20-300x400*2/ob", 10); - EXPECT_EQ("10,20 300x400", info.bounds_in_native().ToString()); - EXPECT_EQ("288x380", info.size_in_pixel().ToString()); + EXPECT_EQ(gfx::Rect(10, 20, 300, 400), info.bounds_in_native()); + EXPECT_EQ(gfx::Size(288, 380), info.size_in_pixel()); EXPECT_EQ(Display::ROTATE_0, info.GetActiveRotation()); - EXPECT_EQ("5,3,5,3", info.overscan_insets_in_dip().ToString()); + EXPECT_EQ(gfx::Insets(5, 3, 5, 3), info.overscan_insets_in_dip()); info = ManagedDisplayInfo::CreateFromSpecWithID("10+20-300x400*2/or", 10); - EXPECT_EQ("10,20 300x400", info.bounds_in_native().ToString()); - EXPECT_EQ("380x288", info.size_in_pixel().ToString()); + EXPECT_EQ(gfx::Rect(10, 20, 300, 400), info.bounds_in_native()); + EXPECT_EQ(gfx::Size(380, 288), info.size_in_pixel()); EXPECT_EQ(Display::ROTATE_90, info.GetActiveRotation()); // TODO(oshima): This should be rotated too. Fix this. - EXPECT_EQ("5,3,5,3", info.overscan_insets_in_dip().ToString()); + EXPECT_EQ(gfx::Insets(5, 3, 5, 3), info.overscan_insets_in_dip()); info = ManagedDisplayInfo::CreateFromSpecWithID("10+20-300x400*2/or@1.5", 10); - EXPECT_EQ("10,20 300x400", info.bounds_in_native().ToString()); - EXPECT_EQ("380x288", info.size_in_pixel().ToString()); + EXPECT_EQ(gfx::Rect(10, 20, 300, 400), info.bounds_in_native()); + EXPECT_EQ(gfx::Size(380, 288), info.size_in_pixel()); EXPECT_EQ(Display::ROTATE_90, info.GetActiveRotation()); - EXPECT_EQ("5,3,5,3", info.overscan_insets_in_dip().ToString()); - EXPECT_EQ("10,6,10,6", info.GetOverscanInsetsInPixel().ToString()); + EXPECT_EQ(gfx::Insets(5, 3, 5, 3), info.overscan_insets_in_dip()); + EXPECT_EQ(gfx::Insets(10, 6, 10, 6), info.GetOverscanInsetsInPixel()); info = ManagedDisplayInfo::CreateFromSpecWithID("10+20-300x400*2/l@1.5", 10); - EXPECT_EQ("10,20 300x400", info.bounds_in_native().ToString()); + EXPECT_EQ(gfx::Rect(10, 20, 300, 400), info.bounds_in_native()); EXPECT_EQ(Display::ROTATE_270, info.GetActiveRotation()); EXPECT_EQ(1.5f, info.zoom_factor()); info = ManagedDisplayInfo::CreateFromSpecWithID( "250x200#300x200|250x200%59.9|150x100%60|150x100*2|200x150*1.25%30", 10); - EXPECT_EQ("0,0 250x200", info.bounds_in_native().ToString()); + EXPECT_EQ(gfx::Rect(0, 0, 250, 200), info.bounds_in_native()); EXPECT_EQ(5u, info.display_modes().size()); // Modes are sorted in DIP for external display. - EXPECT_EQ("150x100", info.display_modes()[0].size().ToString()); - EXPECT_EQ("150x100", info.display_modes()[1].size().ToString()); - EXPECT_EQ("200x150", info.display_modes()[2].size().ToString()); - EXPECT_EQ("250x200", info.display_modes()[3].size().ToString()); - EXPECT_EQ("300x200", info.display_modes()[4].size().ToString()); + EXPECT_EQ(gfx::Size(150, 100), info.display_modes()[0].size()); + EXPECT_EQ(gfx::Size(150, 100), info.display_modes()[1].size()); + EXPECT_EQ(gfx::Size(200, 150), info.display_modes()[2].size()); + EXPECT_EQ(gfx::Size(250, 200), info.display_modes()[3].size()); + EXPECT_EQ(gfx::Size(300, 200), info.display_modes()[4].size()); EXPECT_EQ(60.0f, info.display_modes()[0].refresh_rate()); EXPECT_EQ(60.0f, info.display_modes()[1].refresh_rate());
diff --git a/ui/gfx/BUILD.gn b/ui/gfx/BUILD.gn index e89ad85..b16085e 100644 --- a/ui/gfx/BUILD.gn +++ b/ui/gfx/BUILD.gn
@@ -768,7 +768,7 @@ "geometry/cubic_bezier_unittest.cc", "geometry/insets_unittest.cc", "geometry/matrix3_unittest.cc", - "geometry/point3_unittest.cc", + "geometry/point3_f_unittest.cc", "geometry/point_f_unittest.cc", "geometry/point_unittest.cc", "geometry/quad_unittest.cc",
diff --git a/ui/gfx/geometry/point3_f.h b/ui/gfx/geometry/point3_f.h index e295e988..1673d7b 100644 --- a/ui/gfx/geometry/point3_f.h +++ b/ui/gfx/geometry/point3_f.h
@@ -45,6 +45,8 @@ z_ = z; } + bool IsOrigin() const { return x_ == 0 && y_ == 0 && z_ == 0; } + // Offset the point by the given vector. void operator+=(const Vector3dF& v) { x_ += v.x(); @@ -69,6 +71,8 @@ PointF AsPointF() const { return PointF(x_, y_); } + Vector3dF OffsetFromOrigin() const { return Vector3dF(x_, y_, z_); } + // Returns a string representation of 3d point. std::string ToString() const;
diff --git a/ui/gfx/geometry/point3_unittest.cc b/ui/gfx/geometry/point3_f_unittest.cc similarity index 76% rename from ui/gfx/geometry/point3_unittest.cc rename to ui/gfx/geometry/point3_f_unittest.cc index e1926ef..aa80582 100644 --- a/ui/gfx/geometry/point3_unittest.cc +++ b/ui/gfx/geometry/point3_f_unittest.cc
@@ -2,15 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "ui/gfx/geometry/point3_f.h" + #include <stddef.h> #include "base/cxx17_backports.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/gfx/geometry/point3_f.h" namespace gfx { -TEST(Point3Test, VectorArithmetic) { +TEST(Point3FTest, VectorArithmetic) { gfx::Point3F a(1.6f, 5.1f, 3.2f); gfx::Vector3dF v1(3.1f, -3.2f, 9.3f); gfx::Vector3dF v2(-8.1f, 1.2f, 3.3f); @@ -39,7 +40,7 @@ EXPECT_EQ(Point3F(12.8f, 0.7f, 9.2f).ToString(), a.ToString()); } -TEST(Point3Test, VectorFromPoints) { +TEST(Point3FTest, VectorFromPoints) { gfx::Point3F a(1.6f, 5.2f, 3.2f); gfx::Vector3dF v1(3.1f, -3.2f, 9.3f); @@ -47,7 +48,7 @@ EXPECT_EQ((b - a).ToString(), v1.ToString()); } -TEST(Point3Test, Scale) { +TEST(Point3FTest, Scale) { EXPECT_EQ(Point3F().ToString(), ScalePoint(Point3F(), 2.f).ToString()); EXPECT_EQ(Point3F().ToString(), ScalePoint(Point3F(), 2.f, 2.f, 2.f).ToString()); @@ -68,4 +69,19 @@ EXPECT_EQ(Point3F(12.f, -6.f, 6.f).ToString(), point.ToString()); } +TEST(Point3FTest, IsOrigin) { + EXPECT_TRUE(Point3F().IsOrigin()); + EXPECT_FALSE(Point3F(0, 0, 0.1f).IsOrigin()); + EXPECT_FALSE(Point3F(0, 0.1f, 0).IsOrigin()); + EXPECT_FALSE(Point3F(0.1f, 0, 0).IsOrigin()); + EXPECT_FALSE(Point3F(0, 0, -0.1f).IsOrigin()); + EXPECT_FALSE(Point3F(0, -0.1f, 0).IsOrigin()); + EXPECT_FALSE(Point3F(-0.1f, 0, 0).IsOrigin()); +} + +TEST(Point3FTest, OffsetFromOrigin) { + EXPECT_EQ(Vector3dF(1.25f, 2.5f, -3.75f), + Point3F(1.25f, 2.5f, -3.75f).OffsetFromOrigin()); +} + } // namespace gfx
diff --git a/ui/gtk/BUILD.gn b/ui/gtk/BUILD.gn index db29cdc..6cf6871 100644 --- a/ui/gtk/BUILD.gn +++ b/ui/gtk/BUILD.gn
@@ -4,6 +4,8 @@ import("//build/config/chromeos/ui_mode.gni") import("//build/config/features.gni") +import("//build/config/linux/gtk/gtk.gni") +import("//build/config/linux/pkg_config.gni") import("//build/config/ozone.gni") import("//build/config/ui.gni") import("//printing/buildflags/buildflags.gni") @@ -18,6 +20,34 @@ public = [ "gtk_types.h" ] } +pkg_config("gtk_internal_config") { + # We dlopen() GTK, so make sure not to add a link-time dependency on it. + ignore_libs = true + + # Gtk requires gmodule, but it does not list it as a dependency in some + # misconfigured systems. + packages = [ + "gmodule-2.0", + "gthread-2.0", + ] + if (gtk_version == 3) { + packages += [ + "gtk+-3.0", + "gtk+-unix-print-3.0", + ] + } else { + assert(gtk_version == 4) + packages += [ + "gtk4", + "gtk4-unix-print", + ] + } +} + +group("gtk_config") { + public_configs = [ ":gtk_internal_config" ] +} + generate_stubs("gtk_stubs") { visibility = [ ":gtk" ] sigs = [ @@ -30,9 +60,8 @@ extra_header = "gtk.fragment" output_name = "gtk_stubs" public_deps = [ + ":gtk_config", ":gtk_types", - "//build/config/linux/gtk", - "//build/config/linux/gtk:gtkprint", ] logging_function = "LogNoop()" logging_include = "ui/gtk/log_noop.h"
diff --git a/ui/ozone/platform/scenic/scenic_surface.cc b/ui/ozone/platform/scenic/scenic_surface.cc index cacc9f1..45b1e8f 100644 --- a/ui/ozone/platform/scenic/scenic_surface.cc +++ b/ui/ozone/platform/scenic/scenic_surface.cc
@@ -548,7 +548,7 @@ image_pipe_->AddImage(image_id, image_id, 0, image_format); image_pipe_->PresentImage(image_id, last_frame_present_time_.ToZxTime(), {}, - {}, {}); + {}, [](fuchsia::images::PresentationInfo) {}); image_pipe_->RemoveBufferCollection(image_id); }
diff --git a/ui/ozone/platform/wayland/gpu/wayland_buffer_manager_gpu.h b/ui/ozone/platform/wayland/gpu/wayland_buffer_manager_gpu.h index 7fb4a7b..3b4debe 100644 --- a/ui/ozone/platform/wayland/gpu/wayland_buffer_manager_gpu.h +++ b/ui/ozone/platform/wayland/gpu/wayland_buffer_manager_gpu.h
@@ -82,7 +82,7 @@ // Methods, which can be used when in both in-process-gpu and out of process // modes. These calls are forwarded to the browser process through the // WaylandConnection mojo interface. See more in - // ui/ozone/platform/wayland/mojom/wayland_connection.mojom. + // ui/ozone/platform/wayland/mojom/wayland_buffer_manager.mojom. // // Asks Wayland to create generic dmabuf-based wl_buffer. void CreateDmabufBasedBuffer(base::ScopedFD dmabuf_fd,
diff --git a/ui/ozone/platform/wayland/host/wayland_buffer_manager_host.h b/ui/ozone/platform/wayland/host/wayland_buffer_manager_host.h index 8e491dc..4be1778 100644 --- a/ui/ozone/platform/wayland/host/wayland_buffer_manager_host.h +++ b/ui/ozone/platform/wayland/host/wayland_buffer_manager_host.h
@@ -77,7 +77,7 @@ // // Called by the GPU and asks to import a wl_buffer based on a gbm file // descriptor using zwp_linux_dmabuf protocol. Check comments in the - // ui/ozone/platform/wayland/mojom/wayland_connection.mojom. + // ui/ozone/platform/wayland/mojom/wayland_buffer_manager.mojom. void CreateDmabufBasedBuffer(mojo::PlatformHandle dmabuf_fd, const gfx::Size& size, const std::vector<uint32_t>& strides, @@ -88,15 +88,15 @@ uint32_t buffer_id) override; // Called by the GPU and asks to import a wl_buffer based on a shared memory // file descriptor using wl_shm protocol. Check comments in the - // ui/ozone/platform/wayland/mojom/wayland_connection.mojom. + // ui/ozone/platform/wayland/mojom/wayland_buffer_manager.mojom. void CreateShmBasedBuffer(mojo::PlatformHandle shm_fd, uint64_t length, const gfx::Size& size, uint32_t buffer_id) override; // Called by the GPU and asks to import a solid color wl_buffer. Check - // comments in the ui/ozone/platform/wayland/mojom/wayland_connection.mojom. - // The availability of this depends on existence of surface-augmenter - // protocol. + // comments in the + // ui/ozone/platform/wayland/mojom/wayland_buffer_manager.mojom. The + // availability of this depends on existence of surface-augmenter protocol. void CreateSolidColorBuffer(const gfx::Size& size, SkColor color, uint32_t buffer_id) override;
diff --git a/ui/webui/resources/cr_elements/cr_scrollable_behavior.m.d.ts b/ui/webui/resources/cr_elements/cr_scrollable_behavior.m.d.ts index 7b35319f..921bad4 100644 --- a/ui/webui/resources/cr_elements/cr_scrollable_behavior.m.d.ts +++ b/ui/webui/resources/cr_elements/cr_scrollable_behavior.m.d.ts
@@ -2,11 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +import {IronListElement} from 'chrome://resources/polymer/v3_0/iron-list/iron-list.js'; + export {CrScrollableBehavior}; interface CrScrollableBehavior { updateScrollableContents(): void; requestUpdateScroll(): void; + saveScroll(list: IronListElement): void; + restoreScroll(list: IronListElement): void; } declare const CrScrollableBehavior: object;
