Rebase and resolve conflicts

Author: swift-kim

shell/platform/tizen/flutter_project_bundle.cc

@@ -5,14 +5,19 @@
 
 #include "flutter_project_bundle.h"
 
+#ifdef __X64_SHELL__
+#include "flutter/shell/platform/common/path_utils.h"
+#else
 #include <app_common.h>
+#endif
 
 #include <filesystem>
 
 #include "flutter/shell/platform/tizen/tizen_log.h"
 
 namespace flutter {
 
+#ifndef __X64_SHELL__
 namespace {
 
 // Returns the path of the directory containing the app binary, or an empty
@@ -28,6 +33,7 @@ std::filesystem::path GetExecutableDirectory() {
 }
 
 }  // namespace
+#endif
 
 FlutterProjectBundle::FlutterProjectBundle(
     const FlutterDesktopEngineProperties& properties)

shell/platform/tizen/flutter_tizen_engine.h

@@ -137,6 +137,7 @@ class FlutterTizenEngine : public TizenRenderer::Delegate {
   std::unique_ptr<PlatformViewChannel> platform_view_channel;
 
  private:
+  // Whether the engine is running in headed or headless mode.
   bool IsHeaded() { return renderer != nullptr; }
 
   FlutterDesktopMessage ConvertToDesktopMessage(

shell/platform/tizen/flutter_tizen_engine_unittest.cc

@@ -1,5 +1,4 @@
-// Copyright 2020 Samsung Electronics Co., Ltd. All rights reserved.
-// Copyright 2013 The Flutter Authors. All rights reserved.
+// Copyright 2021 Samsung Electronics Co., Ltd. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -9,52 +8,22 @@
 namespace flutter {
 namespace testing {
 
-class FlutterTizenEngineTestSimple : public ::testing::Test {
- protected:
-  void SetUp() { ecore_init(); }
-};
-
-TEST_F(FlutterTizenEngineTestSimple, Create_Headless) {
-  flutter::FlutterTizenEngine* tizen_engine =
-      new flutter::FlutterTizenEngine(false);
-  EXPECT_TRUE(tizen_engine != nullptr);
-  delete tizen_engine;
-}
-
-// TODO
-TEST_F(FlutterTizenEngineTestSimple, DISABLED_Create_Headed) {
-  flutter::FlutterTizenEngine* tizen_engine =
-      new flutter::FlutterTizenEngine(true);
-  EXPECT_TRUE(tizen_engine != nullptr);
-  delete tizen_engine;
-}
-
 class FlutterTizenEngineTest : public ::testing::Test {
  public:
   FlutterTizenEngineTest() {
     ecore_init();
-
-    std::string tpk_root;
-    char path[256];
-    EXPECT_TRUE(getcwd(path, sizeof(path)) != NULL);
-    tpk_root = path + std::string("/tpkroot");
-
-    assets_path_ = tpk_root + "/res/flutter_assets";
-    icu_data_path_ = tpk_root + "/res/icudtl.dat";
-    aot_lib_path_ = tpk_root + "/lib/libapp.so";
-
-    switches_.push_back("--disable-observatory");
+    elm_init(0, nullptr);
   }
 
  protected:
   void SetUp() {
-    engine_prop_.assets_path = assets_path_.c_str();
-    engine_prop_.icu_data_path = icu_data_path_.c_str();
-    engine_prop_.aot_library_path = aot_lib_path_.c_str();
-    engine_prop_.switches = switches_.data();
-    engine_prop_.switches_count = switches_.size();
+    FlutterDesktopEngineProperties engine_prop = {};
+    engine_prop.assets_path = "foo/flutter_assets";
+    engine_prop.icu_data_path = "foo/icudtl.dat";
+    engine_prop.aot_library_path = "foo/libapp.so";
 
-    auto engine = std::make_unique<flutter::FlutterTizenEngine>(false);
+    FlutterProjectBundle project(engine_prop);
+    auto engine = std::make_unique<FlutterTizenEngine>(project);
     engine_ = engine.release();
   }
 
@@ -65,49 +34,53 @@ class FlutterTizenEngineTest : public ::testing::Test {
     engine_ = nullptr;
   }
 
-  std::string assets_path_;
-  std::string icu_data_path_;
-  std::string aot_lib_path_;
   flutter::FlutterTizenEngine* engine_;
-  FlutterDesktopEngineProperties engine_prop_ = {};
-  std::vector<const char*> switches_;
+};
+
+class FlutterTizenEngineTestHeaded : public FlutterTizenEngineTest {
+ protected:
+  void SetUp() {
+    FlutterTizenEngineTest::SetUp();
+    engine_->InitializeRenderer(0, 0, 800, 600);
+  }
 };
 
 TEST_F(FlutterTizenEngineTest, Run) {
   EXPECT_TRUE(engine_ != nullptr);
-  EXPECT_TRUE(engine_->RunEngine(engine_prop_));
+  EXPECT_TRUE(engine_->RunEngine());
   EXPECT_TRUE(true);
 }
 
 // TODO
 TEST_F(FlutterTizenEngineTest, DISABLED_Run_Twice) {
-  EXPECT_TRUE(engine_ != nullptr);
-  EXPECT_TRUE(engine_->RunEngine(engine_prop_));
-  EXPECT_FALSE(engine_->RunEngine(engine_prop_));
+  EXPECT_TRUE(engine_->RunEngine());
+  EXPECT_FALSE(engine_->RunEngine());
   EXPECT_TRUE(true);
 }
 
 TEST_F(FlutterTizenEngineTest, Stop) {
-  EXPECT_TRUE(engine_ != nullptr);
-  EXPECT_TRUE(engine_->RunEngine(engine_prop_));
+  EXPECT_TRUE(engine_->RunEngine());
   EXPECT_TRUE(engine_->StopEngine());
 }
 
 TEST_F(FlutterTizenEngineTest, Stop_Twice) {
-  EXPECT_TRUE(engine_ != nullptr);
-  EXPECT_TRUE(engine_->RunEngine(engine_prop_));
+  EXPECT_TRUE(engine_->RunEngine());
   EXPECT_TRUE(engine_->StopEngine());
   EXPECT_FALSE(engine_->StopEngine());
 }
 
 TEST_F(FlutterTizenEngineTest, GetPluginRegistrar) {
-  EXPECT_TRUE(engine_ != nullptr);
+  EXPECT_TRUE(engine_->RunEngine());
   EXPECT_TRUE(engine_->GetPluginRegistrar() != nullptr);
 }
 
-// TODO
-TEST_F(FlutterTizenEngineTest, DISABLED_GetTextureRegistrar) {
-  EXPECT_TRUE(engine_ != nullptr);
+TEST_F(FlutterTizenEngineTest, GetTextureRegistrar) {
+  EXPECT_TRUE(engine_->RunEngine());
+  EXPECT_TRUE(engine_->GetTextureRegistrar() == nullptr);
+}
+
+TEST_F(FlutterTizenEngineTestHeaded, GetTextureRegistrar) {
+  EXPECT_TRUE(engine_->RunEngine());
   EXPECT_TRUE(engine_->GetTextureRegistrar() != nullptr);
 }
 

shell/platform/tizen/flutter_tizen_shell.cc

@@ -1,67 +1,58 @@
-#include <assert.h>
+// Copyright 2021 Samsung Electronics Co., Ltd. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 #include <unistd.h>
-#include <chrono>
-#include <iostream>
-#include <thread>
+
+#include <string>
+#include <vector>
 
 #include "flutter/shell/platform/tizen/flutter_tizen_engine.h"
 #include "flutter/shell/platform/tizen/public/flutter_tizen.h"
 
-extern int gApp_width;
-extern int gApp_height;
-
-std::string TPK_ROOT_PATH = "/tpkroot";
-std::string LIB_PATH = "/lib";
-std::string RES_PATH = "/res";
-
 class FlutterApp {
  public:
   explicit FlutterApp() {}
   virtual ~FlutterApp() {}
 
   bool OnCreate() {
     printf("Launching a Flutter application...\n");
-    std::string assets_path;
-    std::string icu_data_path;
-    std::string aot_lib_path;
-    FlutterDesktopEngineProperties engine_prop = {};
-    std::vector<const char*> switches;
 
-    std::string tpk_root;
-    if (app_path_.empty()) {
-      char path[256];
-      getcwd(path, sizeof(path));
-      tpk_root = path + std::string("/tpkroot");
-    } else {
-      tpk_root = app_path_;
-    }
+    FlutterDesktopWindowProperties window_prop = {};
+    window_prop.headed = true;
+    window_prop.x = 0;
+    window_prop.y = 0;
+    window_prop.width = window_width_;
+    window_prop.height = window_height_;
 
-    assets_path = tpk_root + "/res/flutter_assets";
-    icu_data_path = tpk_root + "/res/icudtl.dat";
-    aot_lib_path = tpk_root + "/lib/libapp.so";
+    std::string assets_path = app_path_ + "/res/flutter_assets";
+    std::string icu_data_path = app_path_ + "/res/icudtl.dat";
+    std::string aot_lib_path = app_path_ + "/lib/libapp.so";
 
+    std::vector<const char*> switches;
     switches.push_back("--disable-observatory");
     switches.push_back("--verbose-logging");
     switches.push_back("--enable-dart-profiling");
     switches.push_back("--enable-checked-mode");
 
+    FlutterDesktopEngineProperties engine_prop = {};
     engine_prop.assets_path = assets_path.c_str();
     engine_prop.icu_data_path = icu_data_path.c_str();
     engine_prop.aot_library_path = aot_lib_path.c_str();
     engine_prop.switches = switches.data();
     engine_prop.switches_count = switches.size();
-    engine_ = FlutterDesktopRunEngine(engine_prop, true);
+    engine_ = FlutterDesktopRunEngine(window_prop, engine_prop);
 
     if (!engine_) {
       printf("Could not launch a Flutter application.\n");
       return false;
     }
-    // RegisterPlugins(this);
+
     return true;
   }
 
   void OnTerminate() {
-    printf("Shutting down the application...");
+    printf("Shutting down the application...\n");
 
     FlutterDesktopShutdownEngine(engine_);
     engine_ = nullptr;
@@ -71,20 +62,26 @@ class FlutterApp {
 
   int Run(int argc, char** argv) {
     ecore_init();
-    elm_init(0, 0);
+    elm_init(0, nullptr);
     elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
     elm_config_accel_preference_set("opengl");
 
     for (int i = 1; i < argc; i++) {
       if (strstr(argv[i], "--width=") == argv[i]) {
-        gApp_width = std::atoi(argv[i] + strlen("--width="));
+        window_width_ = std::atoi(argv[i] + strlen("--width="));
       } else if (strstr(argv[i], "--height=") == argv[i]) {
-        gApp_height = std::atoi(argv[i] + strlen("--height="));
+        window_height_ = std::atoi(argv[i] + strlen("--height="));
       } else if (strstr(argv[i], "--tpkroot=") == argv[i]) {
         app_path_ = argv[i] + strlen("--tpkroot=");
       }
     }
 
+    if (app_path_.empty()) {
+      char path[256];
+      getcwd(path, sizeof(path));
+      app_path_ = path + std::string("/tpkroot");
+    }
+
     ecore_idler_add(
         [](void* data) -> Eina_Bool {
           FlutterApp* app = (FlutterApp*)data;
@@ -94,6 +91,7 @@ class FlutterApp {
         this);
     ecore_main_loop_begin();
     OnTerminate();
+
     return 0;
   }
 
@@ -107,6 +105,9 @@ class FlutterApp {
 
  private:
   std::string app_path_ = {};
+  int32_t window_width_ = 0;
+  int32_t window_height_ = 0;
+
   FlutterDesktopEngineRef engine_ = nullptr;
 };
 

shell/platform/tizen/tizen_renderer_evas_gl.cc

@@ -6,8 +6,6 @@
 
 #ifdef __X64_SHELL__
 #include "tizen_evas_gl_helper.h"
-int gApp_width = 800;
-int gApp_height = 600;
 #else
 #include <Evas_GL_GLES3_Helpers.h>
 #endif
@@ -667,10 +665,6 @@ Evas_Object* TizenRendererEvasGL::SetupEvasWindow(int32_t* width,
   int32_t x = initial_geometry_.x;
   int32_t y = initial_geometry_.y;
 
-#ifdef __X64_SHELL__
-  width = gApp_width;
-  height = gApp_height;
-#endif
   elm_win_alpha_set(evas_window_, EINA_FALSE);
   evas_object_move(evas_window_, x, y);
   evas_object_resize(evas_window_, *width, *height);