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

Commit 63f0b5f

Browse files
committed
Revert "Test logs"
This reverts commit 01dee39.
1 parent eedf60b commit 63f0b5f

File tree

4 files changed

+0
-30
lines changed

4 files changed

+0
-30
lines changed

shell/platform/embedder/tests/embedder_config_builder.cc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,6 @@ void EmbedderConfigBuilder::SetMetalRendererConfig(SkISize surface_size) {
201201

202202
void EmbedderConfigBuilder::SetVulkanRendererConfig(SkISize surface_size) {
203203
#ifdef SHELL_ENABLE_VULKAN
204-
FML_LOG(ERROR) << "==== bdero ==== SetVulkanRendererConfig";
205204
renderer_config_.type = FlutterRendererType::kVulkan;
206205
renderer_config_.vulkan = vulkan_renderer_config_;
207206
context_.SetupSurface(surface_size);
@@ -469,12 +468,9 @@ void EmbedderConfigBuilder::InitializeMetalRendererConfig() {
469468
#ifdef SHELL_ENABLE_VULKAN
470469

471470
void EmbedderConfigBuilder::InitializeVulkanRendererConfig() {
472-
FML_LOG(ERROR) << "==== bdero ==== InitializeVulkanRendererConfig";
473471
if (context_.GetContextType() != EmbedderTestContextType::kVulkanContext) {
474-
FML_LOG(ERROR) << "==== bdero ==== InitializeVulkanRendererConfig SKIPPED";
475472
return;
476473
}
477-
FML_LOG(ERROR) << "==== bdero ==== context_.GetContextType() must be Vulkan";
478474

479475
vulkan_renderer_config_.struct_size = sizeof(FlutterVulkanRendererConfig);
480476
vulkan_renderer_config_.version =

shell/platform/embedder/tests/embedder_test.cc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ std::string EmbedderTest::GetFixturesDirectory() const {
2525

2626
EmbedderTestContext& EmbedderTest::GetEmbedderContext(
2727
EmbedderTestContextType type) {
28-
FML_LOG(ERROR) << "==== bdero ==== GetEmbedderContext";
2928
// Setup the embedder context lazily instead of in the constructor because we
3029
// don't to do all the work if the test won't end up using context.
3130
if (!embedder_contexts_[type]) {
@@ -37,9 +36,6 @@ EmbedderTestContext& EmbedderTest::GetEmbedderContext(
3736
break;
3837
#ifdef SHELL_ENABLE_VULKAN
3938
case EmbedderTestContextType::kVulkanContext:
40-
41-
FML_LOG(ERROR) << "==== bdero ==== GetEmbedderContext: "
42-
"EmbedderTestContextVulkan was constructed";
4339
embedder_contexts_[type] =
4440
std::make_unique<EmbedderTestContextVulkan>(GetFixturesDirectory());
4541
break;

shell/platform/embedder/tests/embedder_unittests.cc

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,6 @@ TEST_F(EmbedderTest, VMAndIsolateSnapshotSizesAreRedundantInAOTMode) {
592592
///
593593
TEST_F(EmbedderTest,
594594
CompositorMustBeAbleToRenderKnownSceneWithSoftwareCompositor) {
595-
FML_LOG(ERROR) << "====bdero==== 0 BEGIN";
596595
auto& context = GetEmbedderContext(EmbedderTestContextType::kSoftwareContext);
597596

598597
EmbedderConfigBuilder builder(context);
@@ -607,12 +606,8 @@ TEST_F(EmbedderTest,
607606

608607
auto scene_image = context.GetNextSceneImage();
609608

610-
FML_LOG(ERROR) << "====bdero==== 1 GetNextSceneImage";
611-
612609
context.GetCompositor().SetNextPresentCallback(
613610
[&](const FlutterLayer** layers, size_t layers_count) {
614-
FML_LOG(ERROR) << "====bdero==== Present callback BEGIN";
615-
616611
ASSERT_EQ(layers_count, 5u);
617612

618613
// Layer Root
@@ -698,17 +693,12 @@ TEST_F(EmbedderTest,
698693
ASSERT_EQ(*layers[4], layer);
699694
}
700695

701-
FML_LOG(ERROR) << "====bdero==== Present callback latch";
702696
latch.CountDown();
703-
704-
FML_LOG(ERROR) << "====bdero==== Present callback END";
705697
});
706698

707699
context.GetCompositor().SetPlatformViewRendererCallback(
708700
[&](const FlutterLayer& layer, GrDirectContext*
709701
/* don't use because software compositor */) -> sk_sp<SkImage> {
710-
FML_LOG(ERROR) << "====bdero==== Renderer callback BEGIN";
711-
712702
auto surface = CreateRenderSurface(
713703
layer, nullptr /* null because software compositor */);
714704
auto canvas = surface->getCanvas();
@@ -741,7 +731,6 @@ TEST_F(EmbedderTest,
741731
<< "Test was asked to composite an unknown platform view.";
742732
}
743733

744-
FML_LOG(ERROR) << "====bdero==== Renderer callback END";
745734
return surface->makeImageSnapshot();
746735
});
747736

@@ -750,12 +739,8 @@ TEST_F(EmbedderTest,
750739
CREATE_NATIVE_ENTRY(
751740
[&latch](Dart_NativeArguments args) { latch.CountDown(); }));
752741

753-
FML_LOG(ERROR) << "====bdero==== 2 Before LaunchEngine";
754-
755742
auto engine = builder.LaunchEngine();
756743

757-
FML_LOG(ERROR) << "====bdero==== 3 After LaunchEngine";
758-
759744
// Send a window metrics events so frames may be scheduled.
760745
FlutterWindowMetricsEvent event = {};
761746
event.struct_size = sizeof(event);
@@ -770,16 +755,12 @@ TEST_F(EmbedderTest,
770755
kSuccess);
771756
ASSERT_TRUE(engine.is_valid());
772757

773-
FML_LOG(ERROR) << "====bdero==== 4 Before latch";
774758
latch.Wait();
775-
FML_LOG(ERROR) << "====bdero==== 5 After latch";
776759

777760
ASSERT_TRUE(ImageMatchesFixture("compositor_software.png", scene_image));
778761

779762
// There should no present calls on the root surface.
780763
ASSERT_EQ(context.GetSurfacePresentCount(), 0u);
781-
782-
FML_LOG(ERROR) << "====bdero==== 6 END";
783764
}
784765

785766
//------------------------------------------------------------------------------

testing/test_vulkan_context.cc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,12 +109,9 @@ TestVulkanContext::TestVulkanContext() {
109109
}
110110

111111
TestVulkanContext::~TestVulkanContext() {
112-
FML_LOG(ERROR) << "~TestVulkanContext begin";
113112
if (context_) {
114113
context_->releaseResourcesAndAbandonContext();
115114
}
116-
117-
FML_LOG(ERROR) << "~TestVulkanContext end";
118115
}
119116

120117
std::optional<TestVulkanImage> TestVulkanContext::CreateImage(

0 commit comments

Comments
 (0)