Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed first background image skipped after launch #19915

Merged
merged 1 commit into from
Aug 31, 2023
Merged

Fixed first background image skipped after launch #19915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion components/ntp_background_images/browser/view_counter_model.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,11 @@ bool ViewCounterModel::ShouldShowBrandedWallpaper() const {
}

void ViewCounterModel::RegisterPageView() {
RegisterPageViewForBrandedImages();
// Call BG images first to know this calling is after showing
// branded image or not. If this calling is from branded image
// showing, background image index should not be changed.
RegisterPageViewForBackgroundImages();
RegisterPageViewForBrandedImages();
}

void ViewCounterModel::RegisterPageViewForBrandedImages() {
Expand Down
21 changes: 19 additions & 2 deletions components/ntp_background_images/browser/view_counter_model_unittest.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,16 @@ TEST_F(ViewCounterModelTest, NTPBackgroundImagesTest) {
EXPECT_EQ(expected_wallpaper_index, model.current_wallpaper_image_index());
model.RegisterPageView();
}

// It's time for sponsored image.
EXPECT_EQ(0, model.count_to_branded_wallpaper_);
const auto bg_index = model.current_wallpaper_image_index();
model.RegisterPageView();

// Check bg image index is not changed if sponsored image is shown.
// Only |count_to_branded_wallpapaer_| is reset.
EXPECT_NE(0, model.count_to_branded_wallpaper_);
EXPECT_EQ(bg_index, model.current_wallpaper_image_index());
}

// Test for background images only case (SI option is disabled)
Expand Down Expand Up @@ -234,10 +244,17 @@ TEST_F(ViewCounterModelTest, NTPFailedToLoadSponsoredImagesTest) {
const int initial_wallpaper_image_index =
model.current_wallpaper_image_index();

// Simulate that sponsored image ad was frequency capped by ads service. In
// this case next background wallpaper will be shown.
// Simulate that sponsored image ad was frequency capped by ads service.
// If |count_to_branded_wallpaper_| is zero when RegisterPageView() is called,
// only |count_to_branded_wallpaper_| is reset and background image index is
// not changed because it's time to show branded image. So, need to increase
// background image explicitely when background image is shown as ads was
// frequency capped. Client(ViewCounterService) calls this increase method
// when it's capped.
model.IncreaseBackgroundWallpaperImageIndex();
model.RegisterPageView();

// Check background index is increased properly.
int expected_image_index =
(initial_wallpaper_image_index + 1) % model.total_image_count_;
EXPECT_EQ(expected_image_index, model.current_wallpaper_image_index());
Expand Down