Resolve conflicts & additional clean-up

Author: swift-kim

shell/platform/tizen/external_texture_pixel_gl.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/tizen/external_texture_pixel_gl.h"
+#include "external_texture_pixel_gl.h"
 
 #ifdef TIZEN_RENDERER_EVAS_GL
 #undef EFL_BETA_API_SUPPORT

shell/platform/tizen/external_texture_pixel_gl_stub.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/tizen/external_texture_pixel_gl.h"
+#include "external_texture_pixel_gl.h"
 
 namespace flutter {
 

shell/platform/tizen/external_texture_surface_gl.cc

@@ -4,8 +4,6 @@
 
 #include "external_texture_surface_gl.h"
 
-#include "flutter/shell/platform/common/public/flutter_texture_registrar.h"
-
 #ifdef TIZEN_RENDERER_EVAS_GL
 #undef EFL_BETA_API_SUPPORT
 #include <Evas_GL_GLES3_Helpers.h>
@@ -20,6 +18,7 @@ EVAS_GL_GLOBAL_GLES3_DECLARE();
 
 #include <tbm_surface.h>
 
+#include "flutter/shell/platform/common/public/flutter_texture_registrar.h"
 #include "flutter/shell/platform/tizen/logger.h"
 
 namespace flutter {

shell/platform/tizen/tizen_input_method_context.cc

@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/tizen/tizen_input_method_context.h"
+#include "tizen_input_method_context.h"
 
 #include "flutter/shell/platform/tizen/flutter_tizen_engine.h"
-#include "flutter/shell/platform/tizen/tizen_log.h"
+#include "flutter/shell/platform/tizen/logger.h"
 
 namespace {
 
@@ -44,10 +44,8 @@ bool TextInputTypeToEcoreIMFInputPanelLayout(
     *panel_layout = ECORE_IMF_INPUT_PANEL_LAYOUT_PASSWORD;
   } else if (text_input_type == "TextInputType.name" ||
              text_input_type == "TextInputType.address") {
-    FT_LOGW(
-        "Actual requested text input type is [%s], but select "
-        "TextInputType.text as fallback type",
-        text_input_type.c_str());
+    FT_LOG(Warn) << "The requested input type " << text_input_type
+                 << "is not supported.";
     *panel_layout = ECORE_IMF_INPUT_PANEL_LAYOUT_NORMAL;
   } else {
     return false;
@@ -138,6 +136,7 @@ void InputPanelStateChangedCallback(void* data,
 
   self->OnInputPannelStateChanged(value);
 }
+
 }  // namespace
 
 namespace flutter {
@@ -158,18 +157,17 @@ void TizenInputMethodContext::Init() {
 
   const char* imf_id = ecore_imf_context_default_id_get();
   if (imf_id == nullptr) {
-    // Try to get fallback id
+    // Try to get a fallback ID.
     imf_id = GetEcoreImfContextAvailableID();
   }
-
   if (imf_id == nullptr) {
-    FT_LOGE("Failed to get imf context id");
+    FT_LOG(Error) << "Failed to get an IMF context ID.";
     return;
   }
 
   imf_context_ = ecore_imf_context_add(imf_id);
   if (imf_context_ == nullptr) {
-    FT_LOGE("Failed to create Ecore_IMF_Context");
+    FT_LOG(Error) << "Failed to create Ecore_IMF_Context.";
     return;
   }
 
@@ -241,23 +239,24 @@ void TizenInputMethodContext::HideInputPannel() {
 
 void TizenInputMethodContext::OnCommit(std::string str) {
   if (!on_commit_callback_) {
-    FT_LOGW("Please, set OnCommitCallback");
+    FT_LOG(Warn) << "SetOnCommitCallback() has not been called.";
     return;
   }
   on_commit_callback_(str);
 }
 
 void TizenInputMethodContext::OnPreedit(std::string str, int cursor_pos) {
   if (!on_preedit_callback_) {
-    FT_LOGW("Please, set OnInputPannelStateChangedCallback");
+    FT_LOG(Warn) << "SetOnPreeditCallback() has not been called.";
     return;
   }
   on_preedit_callback_(str, cursor_pos);
 }
 
 void TizenInputMethodContext::OnInputPannelStateChanged(int state) {
   if (!on_input_pannel_state_changed_callback_) {
-    FT_LOGW("Please, set OnPreeditCallback");
+    FT_LOG(Warn)
+        << "SetOnInputPannelStateChangedCallback() has not been called.";
     return;
   }
   on_input_pannel_state_changed_callback_(state);
@@ -310,4 +309,5 @@ void TizenInputMethodContext::SetInputPannelOptions() {
   ecore_imf_context_input_panel_language_set(
       imf_context_, ECORE_IMF_INPUT_PANEL_LANG_AUTOMATIC);
 }
+
 }  // namespace flutter

shell/platform/tizen/tizen_vsync_waiter.cc

@@ -130,7 +130,7 @@ bool TdmClient::CreateTdm() {
 
   vblank_ = tdm_client_output_create_vblank(output_, &ret);
   if (ret != TDM_ERROR_NONE && vblank_ != NULL) {
-    FT_LOG(Error) << "Failed to create a vblank object";
+    FT_LOG(Error) << "Failed to create a vblank object.";
     return false;
   }