Skip to content

Commit 9a3333f

Browse files
authored
Fix typos (#210)
1 parent ae8bd9f commit 9a3333f

11 files changed

+24
-26
lines changed

shell/platform/tizen/channels/platform_view_channel.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,4 +281,5 @@ void PlatformViewChannel::OnTouch(
281281

282282
result->Success();
283283
}
284+
284285
} // namespace flutter

shell/platform/tizen/external_texture.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,19 @@ enum class ExternalTextureExtensionType { kNone, kNativeSurface, kDmaBuffer };
2424

2525
struct ExternalTextureGLState {
2626
GLuint gl_texture;
27-
ExternalTextureExtensionType gl_extention;
27+
ExternalTextureExtensionType gl_extension;
2828
};
2929

3030
static std::atomic_long next_texture_id = {1};
3131

3232
// An adaptation class of flutter engine and external texture interface.
3333
class ExternalTexture : public std::enable_shared_from_this<ExternalTexture> {
3434
public:
35-
ExternalTexture(ExternalTextureExtensionType gl_extention =
35+
ExternalTexture(ExternalTextureExtensionType gl_extension =
3636
ExternalTextureExtensionType::kNone)
3737
: state_(std::make_unique<ExternalTextureGLState>()),
3838
texture_id_(next_texture_id++) {
39-
state_->gl_extention = gl_extention;
39+
state_->gl_extension = gl_extension;
4040
}
4141
virtual ~ExternalTexture() = default;
4242

shell/platform/tizen/external_texture_surface_gl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace flutter {
1515
class ExternalTextureSurfaceGL : public ExternalTexture {
1616
public:
1717
ExternalTextureSurfaceGL(
18-
ExternalTextureExtensionType gl_extention,
18+
ExternalTextureExtensionType gl_extension,
1919
FlutterDesktopGpuBufferTextureCallback texture_callback,
2020
FlutterDesktopGpuBufferDestructionCallback destruction_callback,
2121
void* user_data);

shell/platform/tizen/external_texture_surface_gl_linux.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
namespace flutter {
1313

1414
ExternalTextureSurfaceGL::ExternalTextureSurfaceGL(
15-
ExternalTextureExtensionType gl_extention,
15+
ExternalTextureExtensionType gl_extension,
1616
FlutterDesktopGpuBufferTextureCallback texture_callback,
1717
FlutterDesktopGpuBufferDestructionCallback destruction_callback,
1818
void* user_data)
19-
: ExternalTexture(gl_extention),
19+
: ExternalTexture(gl_extension),
2020
texture_callback_(texture_callback),
2121
destruction_callback_(destruction_callback),
2222
user_data_(user_data) {}

shell/platform/tizen/external_texture_surface_gl_tizen.cc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ static void OnCollectTexture(void* textureGL) {
4545
}
4646

4747
ExternalTextureSurfaceGL::ExternalTextureSurfaceGL(
48-
ExternalTextureExtensionType gl_extention,
48+
ExternalTextureExtensionType gl_extension,
4949
FlutterDesktopGpuBufferTextureCallback texture_callback,
5050
FlutterDesktopGpuBufferDestructionCallback destruction_callback,
5151
void* user_data)
52-
: ExternalTexture(gl_extention),
52+
: ExternalTexture(gl_extension),
5353
texture_callback_(texture_callback),
5454
destruction_callback_(destruction_callback),
5555
user_data_(user_data) {}
@@ -90,12 +90,12 @@ bool ExternalTextureSurfaceGL::PopulateTexture(
9090

9191
#ifdef TIZEN_RENDERER_EVAS_GL
9292
EvasGLImage egl_src_image = nullptr;
93-
if (state_->gl_extention == ExternalTextureExtensionType::kNativeSurface) {
93+
if (state_->gl_extension == ExternalTextureExtensionType::kNativeSurface) {
9494
int attribs[] = {EVAS_GL_IMAGE_PRESERVED, GL_TRUE, 0};
9595
egl_src_image = evasglCreateImageForContext(
9696
g_evas_gl, evas_gl_current_context_get(g_evas_gl),
9797
EVAS_GL_NATIVE_SURFACE_TIZEN, tbm_surface, attribs);
98-
} else if (state_->gl_extention == ExternalTextureExtensionType::kDmaBuffer) {
98+
} else if (state_->gl_extension == ExternalTextureExtensionType::kDmaBuffer) {
9999
FT_LOG(Error)
100100
<< "EGL_EXT_image_dma_buf_import is not supported this renderer.";
101101
return false;
@@ -127,13 +127,13 @@ bool ExternalTextureSurfaceGL::PopulateTexture(
127127
eglGetProcAddress("eglCreateImageKHR"));
128128
EGLImageKHR egl_src_image = nullptr;
129129

130-
if (state_->gl_extention == ExternalTextureExtensionType::kNativeSurface) {
130+
if (state_->gl_extension == ExternalTextureExtensionType::kNativeSurface) {
131131
const EGLint attribs[] = {EGL_IMAGE_PRESERVED_KHR, EGL_TRUE, EGL_NONE,
132132
EGL_NONE};
133133
egl_src_image =
134134
n_eglCreateImageKHR(eglGetCurrentDisplay(), EGL_NO_CONTEXT,
135135
EGL_NATIVE_SURFACE_TIZEN, tbm_surface, attribs);
136-
} else if (state_->gl_extention == ExternalTextureExtensionType::kDmaBuffer) {
136+
} else if (state_->gl_extension == ExternalTextureExtensionType::kDmaBuffer) {
137137
EGLint attribs[50];
138138
int atti = 0;
139139
int plane_fd_ext[4] = {EGL_DMA_BUF_PLANE0_FD_EXT, EGL_DMA_BUF_PLANE1_FD_EXT,
@@ -172,7 +172,7 @@ bool ExternalTextureSurfaceGL::PopulateTexture(
172172
}
173173

174174
if (!egl_src_image) {
175-
if (state_->gl_extention != ExternalTextureExtensionType::kNone) {
175+
if (state_->gl_extension != ExternalTextureExtensionType::kNone) {
176176
FT_LOG(Error) << "eglCreateImageKHR failed with an error "
177177
<< eglGetError() << " for texture ID: " << texture_id_;
178178
} else {

shell/platform/tizen/flutter_tizen_texture_registrar.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,10 @@ FlutterTizenTextureRegistrar::CreateExternalTexture(
9797
case kFlutterDesktopGpuBufferTexture:
9898
ExternalTextureExtensionType gl_extension =
9999
ExternalTextureExtensionType::kNone;
100-
if (engine_->renderer()->IsSupportedExtention(
100+
if (engine_->renderer()->IsSupportedExtension(
101101
"EGL_TIZEN_image_native_surface")) {
102102
gl_extension = ExternalTextureExtensionType::kNativeSurface;
103-
} else if (engine_->renderer()->IsSupportedExtention(
103+
} else if (engine_->renderer()->IsSupportedExtension(
104104
"EGL_EXT_image_dma_buf_import")) {
105105
gl_extension = ExternalTextureExtensionType::kDmaBuffer;
106106
}

shell/platform/tizen/tizen_renderer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class TizenRenderer {
5757
int32_t height,
5858
int32_t degree) = 0;
5959
virtual void SetPreferredOrientations(const std::vector<int>& rotations) = 0;
60-
virtual bool IsSupportedExtention(const char* name) = 0;
60+
virtual bool IsSupportedExtension(const char* name) = 0;
6161

6262
protected:
6363
explicit TizenRenderer(Geometry geometry,

shell/platform/tizen/tizen_renderer_ecore_wl2.cc

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ bool TizenRendererEcoreWl2::SetupEglSurface() {
384384
FT_LOG(Error) << "ChooseEGLConfiguration() failed.";
385385
return false;
386386
}
387-
egl_extention_str_ = eglQueryString(egl_display_, EGL_EXTENSIONS);
387+
egl_extension_str_ = eglQueryString(egl_display_, EGL_EXTENSIONS);
388388

389389
const EGLint context_attribs[] = {EGL_CONTEXT_CLIENT_VERSION, 2, EGL_NONE};
390390
egl_context_ = eglCreateContext(egl_display_, egl_config_, EGL_NO_CONTEXT,
@@ -590,11 +590,8 @@ void TizenRendererEcoreWl2::SetPreferredOrientations(
590590
rotations.size());
591591
}
592592

593-
bool TizenRendererEcoreWl2::IsSupportedExtention(const char* name) {
594-
if (strstr(egl_extention_str_.c_str(), name)) {
595-
return true;
596-
}
597-
return false;
593+
bool TizenRendererEcoreWl2::IsSupportedExtension(const char* name) {
594+
return strstr(egl_extension_str_.c_str(), name);
598595
}
599596

600597
void TizenRendererEcoreWl2::SetTizenPolicyNotificationLevel(int level) {

shell/platform/tizen/tizen_renderer_ecore_wl2.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class TizenRendererEcoreWl2 : public TizenRenderer {
4949
int32_t height,
5050
int32_t angle) override;
5151
void SetPreferredOrientations(const std::vector<int>& rotations) override;
52-
bool IsSupportedExtention(const char* name) override;
52+
bool IsSupportedExtension(const char* name) override;
5353

5454
private:
5555
bool InitializeRenderer();
@@ -85,7 +85,7 @@ class TizenRendererEcoreWl2 : public TizenRenderer {
8585
EGLContext egl_resource_context_ = EGL_NO_CONTEXT;
8686
EGLSurface egl_resource_surface_ = EGL_NO_SURFACE;
8787

88-
std::string egl_extention_str_;
88+
std::string egl_extension_str_;
8989

9090
tizen_policy* tizen_policy_ = nullptr;
9191
};

shell/platform/tizen/tizen_renderer_evas_gl.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -767,7 +767,7 @@ void TizenRendererEvasGL::SetPreferredOrientations(
767767
rotations.size());
768768
}
769769

770-
bool TizenRendererEvasGL::IsSupportedExtention(const char* name) {
770+
bool TizenRendererEvasGL::IsSupportedExtension(const char* name) {
771771
return strcmp(name, "EGL_TIZEN_image_native_surface") == 0;
772772
}
773773

0 commit comments

Comments
 (0)