Do not use elm_config_preferred_engine_set anymore

As of elementary 1.13, elm_config_preferred_engine_set is deprecated.

Opengl is chosen by default, and using elm_config_preferred_engine_set
does nothing anymore.

Also, instead of setting ELM_ACCEL environment variable, we can now use
elm_config_accel_preference_set. With that information, elm will pick
the right engine automatically for us.

Bug: http://107.108.218.239/bugzilla/show_bug.cgi?id=12675
Reviewed by: Antonio Gomes, Hyunhak Kim, Piotr Tworek

Change-Id: Ib72afeb59a3d447879166bed632f4a902f5fc0ae
Signed-off-by: Arnaud Renevier <a.renevier@samsung.com>

diff --git a/tizen_src/chromium_impl/content/shell/browser/shell_efl.cc b/tizen_src/chromium_impl/content/shell/browser/shell_efl.cc
index 7bb0dc5..84b2464 100644 (file)
--- a/tizen_src/chromium_impl/content/shell/browser/shell_efl.cc
+++ b/tizen_src/chromium_impl/content/shell/browser/shell_efl.cc
@@ -175,7 +175,6 @@ void OnShellWindowDelRequest(void* data, Evas_Object*, void*) {
 // static
 void Shell::PlatformInitialize(const gfx::Size& default_window_size) {
   elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
-  elm_config_preferred_engine_set("opengl_x11");
   PathsEfl::Register();
   LOG(INFO) << "EFL Shell platform initialized";
 }

diff --git a/tizen_src/chromium_impl/efl/init.cc b/tizen_src/chromium_impl/efl/init.cc
index 37129fc..1662e91 100644 (file)
--- a/tizen_src/chromium_impl/efl/init.cc
+++ b/tizen_src/chromium_impl/efl/init.cc
@@ -27,14 +27,13 @@ scoped_ptr<base::MessagePump> MessagePumpFactory() {
 
 int Initialize(int argc, const char* argv[]) {
   elm_init(argc, (char**)argv);
+  elm_config_accel_preference_set("hw");
+
   ecore_init();
   ecore_x_init(NULL);
   eina_init();
   evas_init();
 
-  setenv("ELM_ACCEL", "hw", 1);
-  elm_config_preferred_engine_set("opengl_x11");
-
   if (!base::MessageLoop::InitMessagePumpForUIFactory(&MessagePumpFactory)) {
     LOG(ERROR) << "Failed to install EFL message pump!";
     return 1;

diff --git a/tizen_src/ewk/efl_webview_app/mini_browser.c b/tizen_src/ewk/efl_webview_app/mini_browser.c
index d82aa48..f379a8d 100755 (executable)
--- a/tizen_src/ewk/efl_webview_app/mini_browser.c
+++ b/tizen_src/ewk/efl_webview_app/mini_browser.c
@@ -645,7 +645,6 @@ static bool __br_app_create(void *data)
     return false;
   }
 
-  elm_config_preferred_engine_set("opengl_x11");
   app_data *ad = (app_data *) data;
 
   ad->main_window = _create_main_window(ad);

diff --git a/tizen_src/ewk/ubrowser/main.cc b/tizen_src/ewk/ubrowser/main.cc
index 6863b82..b9150f4 100644 (file)
--- a/tizen_src/ewk/ubrowser/main.cc
+++ b/tizen_src/ewk/ubrowser/main.cc
@@ -92,7 +92,6 @@ static bool app_create(void *data) {
   if (!ewk_init())
     return false;
 
-  elm_config_preferred_engine_set("opengl_x11");
   elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
 
   app_data->browser = new Browser(desktop_ui);
@@ -126,7 +125,6 @@ int main(int argc, char** argv) {
   AppData data;
   memset(&data, 0, sizeof(data));
 
-  setenv("ELM_ACCEL", "opengl", 0);
 
   for (int i = 1; i < argc; ++i)
     if (argv[i][0] != '-')
@@ -137,6 +135,7 @@ int main(int argc, char** argv) {
 
   ewk_set_arguments(argc, argv);
   elm_init(argc, argv);
+  elm_config_accel_preference_set("opengl");
   parse_options(argc, argv);
 
   int ret = 0;

diff --git a/tizen_src/ewk/unittest/execute_utc_blink.cpp b/tizen_src/ewk/unittest/execute_utc_blink.cpp
index 0d1bb26..359261e 100755 (executable)
--- a/tizen_src/ewk/unittest/execute_utc_blink.cpp
+++ b/tizen_src/ewk/unittest/execute_utc_blink.cpp
@@ -21,8 +21,6 @@ int main(int argc, char* argv[])
   setenv("ELM_ENGINE", "gl", 1);
   elm_init(0, NULL);
 
-  elm_config_preferred_engine_set("opengl_x11");
-
   testing::InitGoogleTest(&argc, argv);
   int retval = RUN_ALL_TESTS();