Skip to content

Commit 5de5ada

Browse files
swift-kimswift-kim
committed
Make public members of FlutterTizenEngine class private
1 parent f89ac53 commit 5de5ada

7 files changed

+129
-96
lines changed

‎shell/platform/tizen/flutter_tizen.cc

+14-13
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ void FlutterDesktopShutdownEngine(FlutterDesktopEngineRef engine_ref) {
5656
void FlutterDesktopPluginRegistrarEnableInputBlocking(
5757
FlutterDesktopPluginRegistrarRef registrar,
5858
const char* channel) {
59-
registrar->engine->message_dispatcher->EnableInputBlockingForChannel(channel);
59+
registrar->engine->message_dispatcher()->EnableInputBlockingForChannel(
60+
channel);
6061
}
6162

6263
FlutterDesktopPluginRegistrarRef FlutterDesktopGetPluginRegistrar(
@@ -65,17 +66,17 @@ FlutterDesktopPluginRegistrarRef FlutterDesktopGetPluginRegistrar(
6566
// Currently, one registrar acts as the registrar for all plugins, so the
6667
// name is ignored. It is part of the API to reduce churn in the future when
6768
// aligning more closely with the Flutter registrar system.
68-
return EngineFromHandle(engine)->GetPluginRegistrar();
69+
return EngineFromHandle(engine)->plugin_registrar();
6970
}
7071

7172
FlutterDesktopMessengerRef FlutterDesktopEngineGetMessenger(
7273
FlutterDesktopEngineRef engine) {
73-
return EngineFromHandle(engine)->messenger.get();
74+
return EngineFromHandle(engine)->messenger();
7475
}
7576

7677
FlutterDesktopMessengerRef FlutterDesktopPluginRegistrarGetMessenger(
7778
FlutterDesktopPluginRegistrarRef registrar) {
78-
return registrar->engine->messenger.get();
79+
return registrar->engine->messenger();
7980
}
8081

8182
void FlutterDesktopPluginRegistrarSetDestructionHandler(
@@ -114,8 +115,8 @@ void FlutterDesktopMessengerSetCallback(FlutterDesktopMessengerRef messenger,
114115
const char* channel,
115116
FlutterDesktopMessageCallback callback,
116117
void* user_data) {
117-
messenger->engine->message_dispatcher->SetMessageCallback(channel, callback,
118-
user_data);
118+
messenger->engine->message_dispatcher()->SetMessageCallback(channel, callback,
119+
user_data);
119120
}
120121

121122
void FlutterDesktopNotifyLocaleChange(FlutterDesktopEngineRef engine) {
@@ -127,27 +128,27 @@ void FlutterDesktopNotifyLowMemoryWarning(FlutterDesktopEngineRef engine) {
127128
}
128129

129130
void FlutterDesktopNotifyAppIsInactive(FlutterDesktopEngineRef engine) {
130-
EngineFromHandle(engine)->lifecycle_channel->AppIsInactive();
131+
EngineFromHandle(engine)->lifecycle_channel()->AppIsInactive();
131132
}
132133

133134
void FlutterDesktopNotifyAppIsResumed(FlutterDesktopEngineRef engine) {
134-
EngineFromHandle(engine)->lifecycle_channel->AppIsResumed();
135+
EngineFromHandle(engine)->lifecycle_channel()->AppIsResumed();
135136
}
136137

137138
void FlutterDesktopNotifyAppIsPaused(FlutterDesktopEngineRef engine) {
138-
EngineFromHandle(engine)->lifecycle_channel->AppIsPaused();
139+
EngineFromHandle(engine)->lifecycle_channel()->AppIsPaused();
139140
}
140141

141142
void FlutterDesktopNotifyAppIsDetached(FlutterDesktopEngineRef engine) {
142-
EngineFromHandle(engine)->lifecycle_channel->AppIsDetached();
143+
EngineFromHandle(engine)->lifecycle_channel()->AppIsDetached();
143144
}
144145

145146
void FlutterRegisterViewFactory(
146147
FlutterDesktopPluginRegistrarRef registrar,
147148
const char* view_type,
148149
std::unique_ptr<PlatformViewFactory> view_factory) {
149-
view_factory->SetWindow(registrar->engine->renderer->GetWindowHandle());
150-
registrar->engine->platform_view_channel->ViewFactories().insert(
150+
view_factory->SetWindow(registrar->engine->renderer()->GetWindowHandle());
151+
registrar->engine->platform_view_channel()->ViewFactories().insert(
151152
std::pair<std::string, std::unique_ptr<PlatformViewFactory>>(
152153
view_type, std::move(view_factory)));
153154
}
@@ -166,7 +167,7 @@ static FlutterDesktopTextureRegistrarRef HandleForTextureRegistrar(
166167

167168
FlutterDesktopTextureRegistrarRef FlutterDesktopRegistrarGetTextureRegistrar(
168169
FlutterDesktopPluginRegistrarRef registrar) {
169-
return HandleForTextureRegistrar(registrar->engine->GetTextureRegistrar());
170+
return HandleForTextureRegistrar(registrar->engine->texture_registrar());
170171
}
171172

172173
int64_t FlutterDesktopTextureRegistrarRegisterExternalTexture(

‎shell/platform/tizen/flutter_tizen_engine.cc

+41-47
Original file line numberDiff line numberDiff line change
@@ -70,17 +70,17 @@ FlutterTizenEngine::FlutterTizenEngine(const FlutterProjectBundle& project)
7070
}
7171
});
7272

73-
messenger = std::make_unique<FlutterDesktopMessenger>();
74-
messenger->engine = this;
75-
message_dispatcher =
76-
std::make_unique<IncomingMessageDispatcher>(messenger.get());
73+
messenger_ = std::make_unique<FlutterDesktopMessenger>();
74+
messenger_->engine = this;
75+
message_dispatcher_ =
76+
std::make_unique<IncomingMessageDispatcher>(messenger_.get());
7777

7878
plugin_registrar_ = std::make_unique<FlutterDesktopPluginRegistrar>();
7979
plugin_registrar_->engine = this;
8080
}
8181

8282
FlutterTizenEngine::~FlutterTizenEngine() {
83-
renderer = nullptr;
83+
renderer_ = nullptr;
8484
}
8585

8686
void FlutterTizenEngine::InitializeRenderer(int32_t x,
@@ -92,8 +92,8 @@ void FlutterTizenEngine::InitializeRenderer(int32_t x,
9292
TizenRenderer::WindowGeometry geometry = {x, y, width, height};
9393

9494
#ifdef TIZEN_RENDERER_EVAS_GL
95-
renderer = std::make_unique<TizenRendererEvasGL>(geometry, transparent,
96-
focusable, *this);
95+
renderer_ = std::make_unique<TizenRendererEvasGL>(geometry, transparent,
96+
focusable, *this);
9797

9898
render_loop_ = std::make_unique<TizenRenderEventLoop>(
9999
std::this_thread::get_id(), // main thread
@@ -103,10 +103,10 @@ void FlutterTizenEngine::InitializeRenderer(int32_t x,
103103
FT_LOG(Error) << "Could not post an engine task.";
104104
}
105105
},
106-
renderer.get());
106+
renderer_.get());
107107
#else
108-
renderer = std::make_unique<TizenRendererEcoreWl2>(geometry, transparent,
109-
focusable, *this);
108+
renderer_ = std::make_unique<TizenRendererEcoreWl2>(geometry, transparent,
109+
focusable, *this);
110110

111111
tizen_vsync_waiter_ = std::make_unique<TizenVsyncWaiter>(this);
112112
#endif
@@ -117,7 +117,7 @@ bool FlutterTizenEngine::RunEngine(const char* entrypoint) {
117117
FT_LOG(Error) << "The engine has already started.";
118118
return false;
119119
}
120-
if (IsHeaded() && !renderer->IsValid()) {
120+
if (IsHeaded() && !renderer_->IsValid()) {
121121
FT_LOG(Error) << "The display was not valid.";
122122
return false;
123123
}
@@ -212,7 +212,7 @@ bool FlutterTizenEngine::RunEngine(const char* entrypoint) {
212212
}
213213
auto engine = reinterpret_cast<FlutterTizenEngine*>(user_data);
214214
auto message = engine->ConvertToDesktopMessage(*engine_message);
215-
engine->message_dispatcher->HandleMessage(message);
215+
engine->message_dispatcher_->HandleMessage(message);
216216
};
217217
args.custom_task_runners = &custom_task_runners;
218218
#ifndef TIZEN_RENDERER_EVAS_GL
@@ -226,7 +226,6 @@ bool FlutterTizenEngine::RunEngine(const char* entrypoint) {
226226
if (aot_data_) {
227227
args.aot_data = aot_data_.get();
228228
}
229-
230229
if (entrypoint) {
231230
args.custom_dart_entrypoint = entrypoint;
232231
}
@@ -243,25 +242,26 @@ bool FlutterTizenEngine::RunEngine(const char* entrypoint) {
243242

244243
internal_plugin_registrar_ =
245244
std::make_unique<PluginRegistrar>(plugin_registrar_.get());
246-
247-
platform_channel = std::make_unique<PlatformChannel>(
248-
internal_plugin_registrar_->messenger(), renderer.get());
249-
settings_channel = std::make_unique<SettingsChannel>(
245+
lifecycle_channel_ = std::make_unique<LifecycleChannel>(
250246
internal_plugin_registrar_->messenger());
251-
lifecycle_channel = std::make_unique<LifecycleChannel>(
247+
platform_channel_ = std::make_unique<PlatformChannel>(
248+
internal_plugin_registrar_->messenger(), renderer_.get());
249+
settings_channel_ = std::make_unique<SettingsChannel>(
252250
internal_plugin_registrar_->messenger());
253251

254252
if (IsHeaded()) {
255253
texture_registrar_ = std::make_unique<FlutterTizenTextureRegistrar>(this);
256-
key_event_channel = std::make_unique<KeyEventChannel>(
254+
key_event_channel_ = std::make_unique<KeyEventChannel>(
257255
internal_plugin_registrar_->messenger());
258-
navigation_channel = std::make_unique<NavigationChannel>(
256+
navigation_channel_ = std::make_unique<NavigationChannel>(
259257
internal_plugin_registrar_->messenger());
260-
text_input_channel = std::make_unique<TextInputChannel>(
258+
text_input_channel_ = std::make_unique<TextInputChannel>(
261259
internal_plugin_registrar_->messenger(),
262260
std::make_unique<TizenInputMethodContext>(this));
263-
platform_view_channel = std::make_unique<PlatformViewChannel>(
261+
platform_view_channel_ = std::make_unique<PlatformViewChannel>(
264262
internal_plugin_registrar_->messenger());
263+
text_input_channel_ = std::make_unique<TextInputChannel>(
264+
internal_plugin_registrar_->messenger(), this);
265265
key_event_handler_ = std::make_unique<KeyEventHandler>(this);
266266
touch_event_handler_ = std::make_unique<TouchEventHandler>(this);
267267

@@ -275,8 +275,8 @@ bool FlutterTizenEngine::RunEngine(const char* entrypoint) {
275275

276276
bool FlutterTizenEngine::StopEngine() {
277277
if (engine_) {
278-
if (platform_view_channel) {
279-
platform_view_channel->Dispose();
278+
if (platform_view_channel_) {
279+
platform_view_channel_->Dispose();
280280
}
281281
if (plugin_registrar_destruction_callback_) {
282282
plugin_registrar_destruction_callback_(plugin_registrar_.get());
@@ -288,14 +288,6 @@ bool FlutterTizenEngine::StopEngine() {
288288
return false;
289289
}
290290

291-
FlutterDesktopPluginRegistrarRef FlutterTizenEngine::GetPluginRegistrar() {
292-
return plugin_registrar_.get();
293-
}
294-
295-
FlutterTizenTextureRegistrar* FlutterTizenEngine::GetTextureRegistrar() {
296-
return texture_registrar_.get();
297-
}
298-
299291
void FlutterTizenEngine::SetPluginRegistrarDestructionCallback(
300292
FlutterDesktopOnPluginRegistrarDestroyed callback) {
301293
plugin_registrar_destruction_callback_ = callback;
@@ -360,7 +352,7 @@ void FlutterTizenEngine::SendWindowMetrics(int32_t width,
360352
#ifdef TV_PROFILE
361353
double dpi = 72.0;
362354
#else
363-
double dpi = static_cast<double>(renderer->GetDpi());
355+
double dpi = static_cast<double>(renderer_->GetDpi());
364356
#endif
365357
double scale_factor = dpi / 90.0 * kProfileFactor;
366358
event.pixel_ratio = std::max(scale_factor, 1.0);
@@ -373,14 +365,14 @@ void FlutterTizenEngine::SendWindowMetrics(int32_t width,
373365
// This must be called at least once in order to initialize the value of
374366
// transformation_.
375367
void FlutterTizenEngine::SetWindowOrientation(int32_t degree) {
376-
if (!renderer) {
368+
if (!renderer_->IsValid()) {
377369
return;
378370
}
379371

380-
renderer->SetRotate(degree);
372+
renderer_->SetRotate(degree);
381373
// Compute renderer transformation based on the angle of rotation.
382374
double rad = (360 - degree) * M_PI / 180;
383-
auto geometry = renderer->GetCurrentGeometry();
375+
auto geometry = renderer_->GetCurrentGeometry();
384376
double width = geometry.w;
385377
double height = geometry.h;
386378

@@ -400,10 +392,12 @@ void FlutterTizenEngine::SetWindowOrientation(int32_t degree) {
400392
};
401393
touch_event_handler_->rotation = degree;
402394
if (degree == 90 || degree == 270) {
403-
renderer->ResizeWithRotation(geometry.x, geometry.y, height, width, degree);
395+
renderer_->ResizeWithRotation(geometry.x, geometry.y, height, width,
396+
degree);
404397
SendWindowMetrics(height, width, 0.0);
405398
} else {
406-
renderer->ResizeWithRotation(geometry.x, geometry.y, width, height, degree);
399+
renderer_->ResizeWithRotation(geometry.x, geometry.y, width, height,
400+
degree);
407401
SendWindowMetrics(width, height, 0.0);
408402
}
409403
}
@@ -479,23 +473,23 @@ FlutterRendererConfig FlutterTizenEngine::GetRendererConfig() {
479473
config.open_gl.struct_size = sizeof(config.open_gl);
480474
config.open_gl.make_current = [](void* user_data) -> bool {
481475
return reinterpret_cast<FlutterTizenEngine*>(user_data)
482-
->renderer->OnMakeCurrent();
476+
->renderer_->OnMakeCurrent();
483477
};
484478
config.open_gl.make_resource_current = [](void* user_data) -> bool {
485479
return reinterpret_cast<FlutterTizenEngine*>(user_data)
486-
->renderer->OnMakeResourceCurrent();
480+
->renderer_->OnMakeResourceCurrent();
487481
};
488482
config.open_gl.clear_current = [](void* user_data) -> bool {
489483
return reinterpret_cast<FlutterTizenEngine*>(user_data)
490-
->renderer->OnClearCurrent();
484+
->renderer_->OnClearCurrent();
491485
};
492486
config.open_gl.present = [](void* user_data) -> bool {
493487
return reinterpret_cast<FlutterTizenEngine*>(user_data)
494-
->renderer->OnPresent();
488+
->renderer_->OnPresent();
495489
};
496490
config.open_gl.fbo_callback = [](void* user_data) -> uint32_t {
497491
return reinterpret_cast<FlutterTizenEngine*>(user_data)
498-
->renderer->OnGetFBO();
492+
->renderer_->OnGetFBO();
499493
};
500494
config.open_gl.surface_transformation =
501495
[](void* user_data) -> FlutterTransformation {
@@ -504,17 +498,17 @@ FlutterRendererConfig FlutterTizenEngine::GetRendererConfig() {
504498
config.open_gl.gl_proc_resolver = [](void* user_data,
505499
const char* name) -> void* {
506500
return reinterpret_cast<FlutterTizenEngine*>(user_data)
507-
->renderer->OnProcResolver(name);
501+
->renderer_->OnProcResolver(name);
508502
};
509503
config.open_gl.gl_external_texture_frame_callback =
510504
[](void* user_data, int64_t texture_id, size_t width, size_t height,
511505
FlutterOpenGLTexture* texture) -> bool {
512506
auto engine = reinterpret_cast<FlutterTizenEngine*>(user_data);
513-
if (!engine->GetTextureRegistrar()) {
507+
if (!engine->texture_registrar()) {
514508
return false;
515509
}
516-
return engine->GetTextureRegistrar()->PopulateTexture(texture_id, width,
517-
height, texture);
510+
return engine->texture_registrar()->PopulateTexture(texture_id, width,
511+
height, texture);
518512
};
519513
} else {
520514
config.type = kSoftware;

0 commit comments

Comments
 (0)