Remove external output API (#96)

Author: JSUYA

flutter/shell/platform/tizen/BUILD.gn

@@ -39,7 +39,6 @@ config("flutter_tizen_config") {
     "${sysroot_path}/usr/include/elementary-1",
     "${sysroot_path}/usr/include/emile-1",
     "${sysroot_path}/usr/include/eo-1",
-    "${sysroot_path}/usr/include/eom",
     "${sysroot_path}/usr/include/ethumb-1",
     "${sysroot_path}/usr/include/ethumb-client-1",
     "${sysroot_path}/usr/include/evas-1",
@@ -144,7 +143,6 @@ template("embedder") {
       "eina",
       "eldbus",
       "elementary",
-      "eom",
       "evas",
       "feedback",
       "flutter_engine",

flutter/shell/platform/tizen/flutter_tizen.cc

@@ -204,8 +204,7 @@ FlutterDesktopViewRef FlutterDesktopViewCreateFromNewWindow(
   if (window_properties.renderer_type == FlutterDesktopRendererType::kEvasGL) {
     window = std::make_unique<flutter::TizenWindowElementary>(
         window_geometry, window_properties.transparent,
-        window_properties.focusable, window_properties.top_level,
-        window_properties.external_output_type);
+        window_properties.focusable, window_properties.top_level);
   } else {
     window = std::make_unique<flutter::TizenWindowEcoreWl2>(
         window_geometry, window_properties.transparent,

flutter/shell/platform/tizen/public/flutter_tizen.h

@@ -63,8 +63,6 @@ typedef struct {
   bool top_level;
   // The renderer type of the engine.
   FlutterDesktopRendererType renderer_type;
-  // The external output type of the window.
-  FlutterDesktopExternalOutputType external_output_type;
   // The user-defined pixel ratio.
   double user_pixel_ratio;
   // The precreated window handle.

flutter/shell/platform/tizen/tizen_window_elementary.cc

@@ -5,7 +5,6 @@
 #include "tizen_window_elementary.h"
 
 #include <efl_extension.h>
-#include <eom.h>
 #include <ui/efl_util.h>
 
 #include "flutter/shell/platform/embedder/embedder.h"
@@ -56,20 +55,11 @@ uint32_t EvasModifierToEcoreEventModifiers(const Evas_Modifier* evas_modifier) {
 
 }  // namespace
 
-TizenWindowElementary::TizenWindowElementary(
-    TizenGeometry geometry,
-    bool transparent,
-    bool focusable,
-    bool top_level,
-    FlutterDesktopExternalOutputType external_output_type)
-    : TizenWindow(geometry, transparent, focusable, top_level),
-      external_output_type_(external_output_type) {
-  if (external_output_type_ != FlutterDesktopExternalOutputType::kNone &&
-      !InitializeExternalOutputManager()) {
-    FT_LOG(Error) << "Failed to initialize the External Output Manager.";
-    return;
-  }
-
+TizenWindowElementary::TizenWindowElementary(TizenGeometry geometry,
+                                             bool transparent,
+                                             bool focusable,
+                                             bool top_level)
+    : TizenWindow(geometry, transparent, focusable, top_level) {
   if (!CreateWindow()) {
     FT_LOG(Error) << "Failed to create a platform window.";
     return;
@@ -82,9 +72,6 @@ TizenWindowElementary::TizenWindowElementary(
 }
 
 TizenWindowElementary::~TizenWindowElementary() {
-  if (external_output_type_ != FlutterDesktopExternalOutputType::kNone) {
-    DestroyExternalOutputManager();
-  }
   UnregisterEventHandlers();
   DestroyWindow();
 }
@@ -101,14 +88,10 @@ bool TizenWindowElementary::CreateWindow() {
   elm_win_aux_hint_add(elm_win_, "wm.policy.win.user.geometry", "1");
 
   int32_t width = 0, height = 0;
-  if (external_output_type_ != FlutterDesktopExternalOutputType::kNone) {
-    eom_get_output_resolution(external_output_id_, &width, &height);
-  } else {
-    Ecore_Evas* ecore_evas =
-        ecore_evas_ecore_evas_get(evas_object_evas_get(elm_win_));
-    ecore_evas_screen_geometry_get(ecore_evas, nullptr, nullptr, &width,
-                                   &height);
-  }
+  Ecore_Evas* ecore_evas =
+      ecore_evas_ecore_evas_get(evas_object_evas_get(elm_win_));
+  ecore_evas_screen_geometry_get(ecore_evas, nullptr, nullptr, &width, &height);
+
   if (width == 0 || height == 0) {
     FT_LOG(Error) << "Invalid screen size: " << width << " x " << height;
     return false;
@@ -134,14 +117,6 @@ bool TizenWindowElementary::CreateWindow() {
   evas_object_image_alpha_set(image_, EINA_TRUE);
   elm_win_resize_object_add(elm_win_, image_);
 
-  if (external_output_type_ != FlutterDesktopExternalOutputType::kNone) {
-    if (eom_set_output_window(external_output_id_, elm_win_) !=
-        EOM_ERROR_NONE) {
-      FT_LOG(Error) << "eom_set_output_window() failed.";
-      return false;
-    }
-  }
-
   return elm_win_ && image_;
 }
 
@@ -450,54 +425,4 @@ void TizenWindowElementary::PrepareInputMethod() {
       [this](std::string str) { view_delegate_->OnCommit(str); });
 }
 
-int32_t TizenWindowElementary::GetExternalOutputId() {
-  int32_t num_ids = 0;
-  eom_output_id* output_ids = eom_get_eom_output_ids(&num_ids);
-  if (!output_ids || num_ids == 0) {
-    FT_LOG(Error) << "No external output found.";
-    return 0;
-  }
-
-  eom_output_id output_id = 0;
-  for (int32_t i = 0; i < num_ids; i++) {
-    eom_output_type_e output_type = EOM_OUTPUT_TYPE_UNKNOWN;
-    eom_get_output_type(output_ids[i], &output_type);
-
-    if (external_output_type_ == FlutterDesktopExternalOutputType::kHDMI &&
-        (output_type == EOM_OUTPUT_TYPE_HDMIA ||
-         output_type == EOM_OUTPUT_TYPE_HDMIB)) {
-      output_id = output_ids[i];
-      break;
-    }
-  }
-  free(output_ids);
-  return output_id;
-}
-
-bool TizenWindowElementary::InitializeExternalOutputManager() {
-  if (eom_init()) {
-    FT_LOG(Error) << "eom_init() failed.";
-    return false;
-  }
-
-  external_output_id_ = GetExternalOutputId();
-  if (external_output_id_ == 0) {
-    FT_LOG(Error) << "Invalid external output ID.";
-    return false;
-  }
-
-  int ret = eom_set_output_attribute(external_output_id_,
-                                     EOM_OUTPUT_ATTRIBUTE_NORMAL);
-  if (ret != EOM_ERROR_NONE) {
-    FT_LOG(Error)
-        << "eom_set_output_attribute() failed. Cannot use external output.";
-    return false;
-  }
-  return true;
-}
-
-void TizenWindowElementary::DestroyExternalOutputManager() {
-  eom_deinit();
-}
-
 }  // namespace flutter

flutter/shell/platform/tizen/tizen_window_elementary.h

@@ -22,8 +22,7 @@ class TizenWindowElementary : public TizenWindow {
   TizenWindowElementary(TizenGeometry geometry,
                         bool transparent,
                         bool focusable,
-                        bool top_level,
-                        FlutterDesktopExternalOutputType external_output_type);
+                        bool top_level);
 
   ~TizenWindowElementary();
 
@@ -56,12 +55,6 @@ class TizenWindowElementary : public TizenWindow {
   void UpdateFlutterCursor(const std::string& kind) override;
 
  private:
-  bool InitializeExternalOutputManager();
-
-  void DestroyExternalOutputManager();
-
-  int GetExternalOutputId();
-
   bool CreateWindow();
 
   void DestroyWindow();
@@ -80,10 +73,6 @@ class TizenWindowElementary : public TizenWindow {
   Evas_Smart_Cb rotation_changed_callback_ = nullptr;
   std::unordered_map<Evas_Callback_Type, Evas_Object_Event_Cb>
       evas_object_callbacks_;
-
-  int32_t external_output_id_;
-  FlutterDesktopExternalOutputType external_output_type_ =
-      FlutterDesktopExternalOutputType::kNone;
 };
 
 }  // namespace flutter

tools/generate_sysroot.py

@@ -85,8 +85,6 @@
   'jsoncpp-devel',
   'libatk',
   'libatk-bridge-2_0-0',
-  'libeom',
-  'libeom-devel',
   'libfeedback',
   'libfeedback-devel',
   'libdlog',