Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Wait for first frame before checking layer tree #20910

Merged
blasten merged 1 commit into from
Aug 31, 2020
Merged

Wait for first frame before checking layer tree #20910

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
7 changes: 4 additions & 3 deletions shell/common/shell_unittests.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -599,13 +599,11 @@ TEST_F(ShellTest,

TEST_F(ShellTest, OnPlatformViewDestroyDisablesThreadMerger) {
auto settings = CreateSettingsForFixture();
fml::AutoResetWaitableEvent end_frame_latch;
fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger;
auto end_frame_callback =
[&](bool should_resubmit_frame,
fml::RefPtr<fml::RasterThreadMerger> thread_merger) {
raster_thread_merger = thread_merger;
end_frame_latch.Signal();
};
auto external_view_embedder = std::make_shared<ShellTestExternalViewEmbedder>(
end_frame_callback, PostPrerollResult::kSuccess, true);
Expand Down Expand Up @@ -639,7 +637,10 @@ TEST_F(ShellTest, OnPlatformViewDestroyDisablesThreadMerger) {

PumpOneFrame(shell.get(), 100, 100, builder);

end_frame_latch.Wait();
auto result =
shell->WaitForFirstFrame(fml::TimeDelta::FromMilliseconds(1000));
ASSERT_TRUE(result.ok());

ASSERT_TRUE(raster_thread_merger->IsEnabled());

ValidateDestroyPlatformView(shell.get());
Expand Down