Skip to content

Commit b22338b

Browse files
committed
Use explicit config type and atomic access in shutdown test
1 parent 902255b commit b22338b

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

‎engine/src/flutter/shell/platform/embedder/tests/embedder_gl_unittests.cc‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class ResourceReleaseTestContext final : public EmbedderTestContextGL {
6161
public:
6262
explicit ResourceReleaseTestContext(std::string assets_path)
6363
: EmbedderTestContextGL(std::move(assets_path)) {
64-
auto& config = GetRendererConfig().open_gl;
64+
FlutterOpenGLRendererConfig& config = GetRendererConfig().open_gl;
6565
make_resource_ = config.make_resource_current;
6666
clear_current_ = config.clear_current;
6767
config.make_resource_current = [](void* data) {
@@ -71,7 +71,7 @@ class ResourceReleaseTestContext final : public EmbedderTestContextGL {
7171
if (current) {
7272
std::scoped_lock lock(self->mutex_);
7373
self->resource_thread_ = std::this_thread::get_id();
74-
self->resource_current = true;
74+
self->resource_current.store(true);
7575
}
7676
return current;
7777
};
@@ -81,8 +81,8 @@ class ResourceReleaseTestContext final : public EmbedderTestContextGL {
8181
const bool cleared = self->clear_current_(data);
8282
std::scoped_lock lock(self->mutex_);
8383
if (cleared && self->resource_thread_ == std::this_thread::get_id()) {
84-
self->resource_current = false;
85-
self->resource_released = true;
84+
self->resource_current.store(false);
85+
self->resource_released.store(true);
8686
}
8787
return cleared;
8888
};
@@ -106,11 +106,11 @@ TEST_F(EmbedderTest, ShutdownReleasesOpenGLResourceContextOnItsThread) {
106106
builder.SetSurface(DlISize(1, 1));
107107
auto engine = builder.LaunchEngine();
108108
ASSERT_TRUE(engine.is_valid());
109-
ASSERT_TRUE(context.resource_current);
110-
ASSERT_FALSE(context.resource_released);
109+
ASSERT_TRUE(context.resource_current.load());
110+
ASSERT_FALSE(context.resource_released.load());
111111
engine.reset();
112-
EXPECT_TRUE(context.resource_released);
113-
EXPECT_FALSE(context.resource_current);
112+
EXPECT_TRUE(context.resource_released.load());
113+
EXPECT_FALSE(context.resource_current.load());
114114
}
115115

116116
//------------------------------------------------------------------------------

0 commit comments

Comments
 (0)