Skip to content

Commit 2df8308

Browse files
committed
Fix abstraction level
1 parent b3bb0d6 commit 2df8308

File tree

6 files changed

+18
-37
lines changed

6 files changed

+18
-37
lines changed

shell/platform/tizen/tizen_view.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ class FlutterTizenView;
1616

1717
class TizenView : public TizenViewBase {
1818
public:
19-
TizenView();
20-
19+
TizenView() = default;
2120
virtual ~TizenView() = default;
2221

2322
std::string GetType() override { return "view"; };

shell/platform/tizen/tizen_view_base.h

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
// Use of this source code is governed by a BSD-style license that can be
44
// found in the LICENSE file.
55

6-
#ifndef EMBEDDER_TIZEN_BASE_HANDLE_H_
7-
#define EMBEDDER_TIZEN_BASE_HANDLE_H_
6+
#ifndef EMBEDDER_TIZEN_VIEW_BASE_H_
7+
#define EMBEDDER_TIZEN_VIEW_BASE_H_
88

99
#include <cstdint>
1010
#include <string>
@@ -22,17 +22,16 @@ class TizenViewBase {
2222
int32_t left = 0, top = 0, width = 0, height = 0;
2323
};
2424

25-
TizenViewBase(){};
26-
25+
TizenViewBase() = default;
2726
virtual ~TizenViewBase() = default;
2827

2928
// Returns a valid pointer the platform object that rendering can be bound to
3029
// by rendering backend.
31-
virtual void* GetRenderTarget();
30+
virtual void* GetRenderTarget() = 0;
3231

33-
virtual void* GetRenderTargetDisplay();
32+
virtual void* GetRenderTargetDisplay() = 0;
3433

35-
virtual uintptr_t GetWindowId();
34+
virtual uintptr_t GetWindowId() = 0;
3635

3736
// Returns the geometry of the current render target.
3837
virtual Geometry GetRenderTargetGeometry() = 0;
@@ -61,14 +60,19 @@ class TizenViewBase {
6160

6261
virtual void Show() = 0;
6362

64-
virtual TizenInputMethodContext* input_method_context() = 0;
65-
6663
virtual std::string GetType() = 0;
6764

65+
TizenInputMethodContext* input_method_context() {
66+
return input_method_context_.get();
67+
}
68+
6869
protected:
6970
FlutterTizenView* view_ = nullptr;
71+
72+
// The Tizen input method context. nullptr if not set.
73+
std::unique_ptr<TizenInputMethodContext> input_method_context_;
7074
};
7175

7276
} // namespace flutter
7377

74-
#endif // EMBEDDER_TIZEN_BASE_HANDLE_H_
78+
#endif // EMBEDDER_TIZEN_VIEW_BASE_H_

shell/platform/tizen/tizen_view_elementary.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,6 @@ class TizenViewElementary : public TizenView {
4545

4646
void OnGeometryChanged(Geometry geometry) override;
4747

48-
TizenInputMethodContext* input_method_context() override {
49-
return input_method_context_.get();
50-
}
51-
5248
private:
5349
bool CreateView();
5450

@@ -66,9 +62,6 @@ class TizenViewElementary : public TizenView {
6662
std::unordered_map<Evas_Callback_Type, Evas_Object_Event_Cb>
6763
evas_object_callbacks_;
6864
std::vector<Ecore_Event_Handler*> ecore_event_key_handlers_;
69-
70-
// The Tizen input method context. nullptr if not set.
71-
std::unique_ptr<TizenInputMethodContext> input_method_context_;
7265
};
7366

7467
} // namespace flutter

shell/platform/tizen/tizen_window.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@
66
#ifndef EMBEDDER_TIZEN_WINDOW_H_
77
#define EMBEDDER_TIZEN_WINDOW_H_
88

9+
#include "flutter/shell/platform/tizen/tizen_view_base.h"
10+
911
#include <cstdint>
1012
#include <string>
1113
#include <vector>
1214

13-
#include "flutter/shell/platform/tizen/tizen_view_base.h"
14-
1515
namespace flutter {
1616

1717
class FlutterTizenView;
1818

1919
class TizenWindow : public TizenViewBase {
2020
public:
21-
TizenWindow();
21+
TizenWindow() = default;
2222
virtual ~TizenWindow() = default;
2323

2424
virtual void* GetWindowHandle();

shell/platform/tizen/tizen_window_ecore_wl2.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
#ifndef EMBEDDER_TIZEN_WINDOW_ECORE_WL2_H_
77
#define EMBEDDER_TIZEN_WINDOW_ECORE_WL2_H_
88

9-
#include "flutter/shell/platform/tizen/tizen_view_base.h"
109
#include "flutter/shell/platform/tizen/tizen_window.h"
1110

1211
#define EFL_BETA_API_SUPPORT
@@ -53,10 +52,6 @@ class TizenWindowEcoreWl2 : public TizenWindow {
5352

5453
void OnGeometryChanged(Geometry geometry) override;
5554

56-
TizenInputMethodContext* input_method_context() override {
57-
return input_method_context_.get();
58-
}
59-
6055
private:
6156
bool CreateWindow();
6257

@@ -82,9 +77,6 @@ class TizenWindowEcoreWl2 : public TizenWindow {
8277
std::vector<Ecore_Event_Handler*> ecore_event_handlers_;
8378

8479
tizen_policy* tizen_policy_ = nullptr;
85-
86-
// The Tizen input method context. nullptr if not set.
87-
std::unique_ptr<TizenInputMethodContext> input_method_context_;
8880
};
8981

9082
} // namespace flutter

shell/platform/tizen/tizen_window_elementary.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,6 @@ class TizenWindowElementary : public TizenWindow {
5252

5353
void OnGeometryChanged(Geometry geometry) override;
5454

55-
TizenInputMethodContext* input_method_context() override {
56-
return input_method_context_.get();
57-
}
58-
5955
private:
6056
bool CreateWindow();
6157

@@ -75,9 +71,6 @@ class TizenWindowElementary : public TizenWindow {
7571
Evas_Smart_Cb rotation_changed_callback_;
7672
std::unordered_map<Evas_Callback_Type, Evas_Object_Event_Cb>
7773
evas_object_callbacks_;
78-
79-
// The Tizen input method context. nullptr if not set.
80-
std::unique_ptr<TizenInputMethodContext> input_method_context_;
8174
};
8275

8376
} // namespace flutter

0 commit comments

Comments
 (0)