In Tizen 5.0, upgrading EFL to opensource EFL 1.20 version.
Upstream has deprecated ecore-wayland and changed its policy to use ecore-wl2.
In crosswalk, there is one api with an ecore-wayland dependency(ecore_wl_screen_size_get()).
This can be replaced by elm_win_screen_size_get() api.
So removed the ecore-wayland dependency and used elm_win_screen_size_get().
Change-Id: Ic9f3b5ee66e44ebc05ba2eb2f22a111aa883d903
Signed-off-by: min7.choi <min7.choi@samsung.com>
BuildRequires: pkgconfig(deviced)
BuildRequires: pkgconfig(dlog)
BuildRequires: pkgconfig(ecore)
-BuildRequires: pkgconfig(ecore-wayland)
BuildRequires: pkgconfig(efl-extension)
BuildRequires: pkgconfig(elementary)
BuildRequires: pkgconfig(glib-2.0)
#include "runtime/browser/native_window.h"
#include <efl_util.h>
-#include <Ecore_Wayland.h>
#include <EWebKit.h>
#include <EWebKit_internal.h>
#include <cstdint>
window_ = CreateWindowInternal();
elm_win_conformant_set(window_, EINA_TRUE);
int w, h;
- ecore_wl_screen_size_get(&w, &h);
+ elm_win_screen_size_get(window_, NULL, NULL, &w, &h);
evas_object_resize(window_, w, h);
elm_win_size_base_set(window_, w, h);
elm_win_autodel_set(window_, EINA_TRUE);
*/
#include <runtime/browser/notification_window.h>
-#include <Ecore_Wayland.h>
#include <efl_util.h>
namespace runtime {
#include <Elementary.h>
#include <bundle_internal.h>
-#include <Ecore_Wayland.h>
#include "common/application_data.h"
#include "common/command_line.h"
ChooseOrientation(splash_map, window->orientation());
if (used_orientation == wgt::parse::ScreenOrientation::NONE) return;
- auto dimensions = GetDimensions();
+ auto dimensions = GetDimensions(window);
SetBackground(splash_map[used_orientation], window->evas_object(),
dimensions, app_path);
is_active_ = false;
}
-std::pair<int, int> SplashScreen::GetDimensions() {
+std::pair<int, int> SplashScreen::GetDimensions(NativeWindow* window) {
int w, h;
- ecore_wl_screen_size_get(&w, &h);
+ elm_win_screen_size_get(window->evas_object(), NULL, NULL, &w, &h);
evas_object_resize(background_, w, h);
return std::make_pair(w, h);
}
void HideSplashScreen(HideReason reason);
private:
- std::pair<int, int> GetDimensions();
+ std::pair<int, int> GetDimensions(NativeWindow* window);
void SetBackground(const wgt::parse::LaunchScreenData& splash_data,
Evas_Object* parent, const SplashScreenBound& bound,
const std::string& app_path);
'capi-system-info',
'chromium-efl',
'ecore',
- 'ecore-wayland',
'elementary',
'efl-extension',
'deviced',