Skip to content

Commit 5a343b3

Browse files
authored
TizenRenderer: Remove renderer type getter (#17)
The embedder does not require a type getter of renderer because -rtti option is enabled. So, remove getter method.
1 parent 8cf66d2 commit 5a343b3

8 files changed

+21
-29
lines changed

flutter/shell/platform/tizen/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ template("embedder") {
174174
defines += invoker.defines
175175
defines += [ "FLUTTER_ENGINE_NO_PROTOTYPES" ]
176176

177-
if (api_version == "6.5") {
177+
if (api_version == "6.5" && target_name != "flutter_tizen_wearable") {
178178
sources += [
179179
"flutter_tizen_nui.cc",
180180
"tizen_view_nui.cc",

flutter/shell/platform/tizen/flutter_tizen.cc

+4-6
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include "flutter/shell/platform/tizen/public/flutter_platform_view.h"
1616
#include "flutter/shell/platform/tizen/tizen_view.h"
1717
#ifdef NUI_SUPPORT
18+
#include "flutter/shell/platform/tizen/tizen_renderer_egl.h"
1819
#include "flutter/shell/platform/tizen/tizen_view_nui.h"
1920
#endif
2021
#include "flutter/shell/platform/tizen/tizen_window.h"
@@ -280,13 +281,10 @@ void FlutterDesktopViewOnKeyEvent(FlutterDesktopViewRef view,
280281
size_t timestamp,
281282
bool is_down) {
282283
#ifdef NUI_SUPPORT
283-
if (auto* tizen_view = dynamic_cast<flutter::TizenViewNui*>(
284+
if (auto* nui_view = dynamic_cast<flutter::TizenViewNui*>(
284285
ViewFromHandle(view)->tizen_view())) {
285-
if (ViewFromHandle(view)->engine()->renderer()->type() ==
286-
FlutterDesktopRendererType::kEGL) {
287-
tizen_view->OnKey(device_name, device_class, device_subclass, key, string,
288-
nullptr, modifiers, scan_code, timestamp, is_down);
289-
}
286+
nui_view->OnKey(device_name, device_class, device_subclass, key, string,
287+
nullptr, modifiers, scan_code, timestamp, is_down);
290288
}
291289
#else
292290
ViewFromHandle(view)->OnKey(key, string, nullptr, modifiers, scan_code,

flutter/shell/platform/tizen/flutter_tizen_engine.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ bool FlutterTizenEngine::RunEngine() {
160160

161161
FlutterTaskRunnerDescription render_task_runner = {};
162162

163-
if (IsHeaded() && renderer_->type() == FlutterDesktopRendererType::kEvasGL) {
163+
if (IsHeaded() && dynamic_cast<TizenRendererEvasGL*>(renderer_.get())) {
164164
render_task_runner.struct_size = sizeof(FlutterTaskRunnerDescription);
165165
render_task_runner.user_data = render_loop_.get();
166166
render_task_runner.runs_task_on_current_thread_callback =
@@ -209,7 +209,7 @@ bool FlutterTizenEngine::RunEngine() {
209209
args.update_semantics_node_callback = OnUpdateSemanticsNode;
210210
args.update_semantics_custom_action_callback = OnUpdateSemanticsCustomActions;
211211

212-
if (IsHeaded() && renderer_->type() == FlutterDesktopRendererType::kEGL) {
212+
if (IsHeaded() && dynamic_cast<TizenRendererEgl*>(renderer_.get())) {
213213
vsync_waiter_ = std::make_unique<TizenVsyncWaiter>(this);
214214
args.vsync_callback = [](void* user_data, intptr_t baton) -> void {
215215
auto* engine = reinterpret_cast<FlutterTizenEngine*>(user_data);

flutter/shell/platform/tizen/flutter_tizen_texture_registrar.cc

+3-2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include "flutter/shell/platform/tizen/external_texture_surface_evas_gl.h"
1616
#include "flutter/shell/platform/tizen/flutter_tizen_engine.h"
1717
#include "flutter/shell/platform/tizen/logger.h"
18+
#include "flutter/shell/platform/tizen/tizen_renderer_evas_gl.h"
1819

1920
namespace flutter {
2021

@@ -44,8 +45,8 @@ int64_t FlutterTizenTextureRegistrar::RegisterTexture(
4445
}
4546
}
4647
FlutterDesktopRendererType renderer_type = FlutterDesktopRendererType::kEGL;
47-
if (engine_->renderer()) {
48-
renderer_type = engine_->renderer()->type();
48+
if (dynamic_cast<TizenRendererEvasGL*>(engine_->renderer())) {
49+
renderer_type = FlutterDesktopRendererType::kEvasGL;
4950
}
5051
std::unique_ptr<ExternalTexture> texture_gl =
5152
CreateExternalTexture(texture_info, renderer_type);

flutter/shell/platform/tizen/flutter_tizen_view.cc

+9-6
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
#ifdef NUI_SUPPORT
1111
#include "flutter/shell/platform/tizen/tizen_view_nui.h"
1212
#endif
13+
#ifndef WEARABLE_PROFILE
14+
#include "flutter/shell/platform/tizen/tizen_renderer_egl.h"
15+
#endif
1316
#include "flutter/shell/platform/tizen/tizen_window.h"
1417

1518
namespace {
@@ -131,10 +134,9 @@ bool FlutterTizenView::OnMakeResourceCurrent() {
131134
bool FlutterTizenView::OnPresent() {
132135
bool result = engine_->renderer()->OnPresent();
133136
#ifdef NUI_SUPPORT
134-
if (auto* view = dynamic_cast<TizenViewNui*>(tizen_view_.get())) {
135-
if (engine_->renderer()->type() == FlutterDesktopRendererType::kEGL) {
136-
view->RequestRendering();
137-
}
137+
if (auto* nui_view =
138+
dynamic_cast<flutter::TizenViewNui*>(tizen_view_.get())) {
139+
nui_view->RequestRendering();
138140
}
139141
#endif
140142
return result;
@@ -165,8 +167,8 @@ void FlutterTizenView::OnRotate(int32_t degree) {
165167
TizenGeometry geometry = tizen_view_->GetGeometry();
166168
int32_t width = geometry.width;
167169
int32_t height = geometry.height;
168-
169-
if (engine_->renderer()->type() == FlutterDesktopRendererType::kEGL) {
170+
#ifndef WEARABLE_PROFILE
171+
if (dynamic_cast<TizenRendererEgl*>(engine_->renderer())) {
170172
rotation_degree_ = degree;
171173
// Compute renderer transformation based on the angle of rotation.
172174
double rad = (360 - rotation_degree_) * M_PI / 180;
@@ -190,6 +192,7 @@ void FlutterTizenView::OnRotate(int32_t degree) {
190192
std::swap(width, height);
191193
}
192194
}
195+
#endif
193196

194197
engine_->renderer()->ResizeSurface(width, height);
195198

flutter/shell/platform/tizen/tizen_renderer.h

-6
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77

88
#include <cstdint>
99

10-
#include "flutter/shell/platform/tizen/public/flutter_tizen.h"
11-
1210
namespace flutter {
1311

1412
class TizenRenderer {
@@ -26,8 +24,6 @@ class TizenRenderer {
2624

2725
bool IsValid() { return is_valid_; }
2826

29-
FlutterDesktopRendererType type() { return type_; }
30-
3127
virtual bool OnMakeCurrent() = 0;
3228

3329
virtual bool OnClearCurrent() = 0;
@@ -46,8 +42,6 @@ class TizenRenderer {
4642

4743
protected:
4844
bool is_valid_ = false;
49-
50-
FlutterDesktopRendererType type_;
5145
};
5246

5347
} // namespace flutter

flutter/shell/platform/tizen/tizen_renderer_egl.cc

+1-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@
1919

2020
namespace flutter {
2121

22-
TizenRendererEgl::TizenRendererEgl() {
23-
type_ = FlutterDesktopRendererType::kEGL;
24-
}
22+
TizenRendererEgl::TizenRendererEgl() {}
2523

2624
TizenRendererEgl::~TizenRendererEgl() {
2725
DestroySurface();

flutter/shell/platform/tizen/tizen_renderer_evas_gl.cc

+1-3
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ EVAS_GL_GLOBAL_GLES2_DEFINE();
1414

1515
namespace flutter {
1616

17-
TizenRendererEvasGL::TizenRendererEvasGL() {
18-
type_ = FlutterDesktopRendererType::kEvasGL;
19-
}
17+
TizenRendererEvasGL::TizenRendererEvasGL() {}
2018

2119
TizenRendererEvasGL::~TizenRendererEvasGL() {
2220
DestroySurface();

0 commit comments

Comments
 (0)