From 927e10040e9a4cdc6450685058a21b45dfe46016 Mon Sep 17 00:00:00 2001 From: "jaekuk, lee" Date: Wed, 23 Nov 2016 20:09:37 +0900 Subject: [PATCH] Apply renaming of SplashScreenHandler Change-Id: Ie8dbcf0bdbdfd430deacdc7b94cfa7abfce443d7 Signed-off-by: jaekuk, lee --- common/application_data.cc | 6 +++--- common/application_data.h | 6 +++--- runtime/browser/splash_screen.cc | 12 ++++++------ runtime/browser/splash_screen.h | 10 +++++----- runtime/browser/web_application.h | 1 - 5 files changed, 17 insertions(+), 18 deletions(-) mode change 100644 => 100755 common/application_data.cc mode change 100644 => 100755 common/application_data.h mode change 100644 => 100755 runtime/browser/splash_screen.cc mode change 100644 => 100755 runtime/browser/splash_screen.h diff --git a/common/application_data.cc b/common/application_data.cc old mode 100644 new mode 100755 index 091b7e5..0559c10 --- a/common/application_data.cc +++ b/common/application_data.cc @@ -89,7 +89,7 @@ std::shared_ptr return setting_info_; } -std::shared_ptr +std::shared_ptr ApplicationData::splash_screen_info() const { return splash_screen_info_; } @@ -215,9 +215,9 @@ bool ApplicationData::LoadManifestData() { wgt::parse::SettingInfo::Key())); splash_screen_info_ = - std::static_pointer_cast( + std::static_pointer_cast( widget_config_parser->GetManifestData( - wgt::parse::SplashScreenInfo::Key())); + wgt::parse::LaunchScreenInfo::Key())); tizen_application_info_ = std::static_pointer_cast( diff --git a/common/application_data.h b/common/application_data.h old mode 100644 new mode 100755 index 43d9c59..1a58ca9 --- a/common/application_data.h +++ b/common/application_data.h @@ -24,12 +24,12 @@ #include #include #include +#include #include #include #include #include #include -#include #include #include #include @@ -68,7 +68,7 @@ class ApplicationData { permissions_info() const; std::shared_ptr setting_info() const; - std::shared_ptr + std::shared_ptr splash_screen_info() const; std::shared_ptr tizen_application_info() const; @@ -101,7 +101,7 @@ class ApplicationData { permissions_info_; std::shared_ptr setting_info_; - std::shared_ptr + std::shared_ptr splash_screen_info_; std::shared_ptr tizen_application_info_; diff --git a/runtime/browser/splash_screen.cc b/runtime/browser/splash_screen.cc old mode 100644 new mode 100755 index 9a4cd4f..89649c6 --- a/runtime/browser/splash_screen.cc +++ b/runtime/browser/splash_screen.cc @@ -25,7 +25,7 @@ #include "common/logger.h" #include "runtime/browser/native_window.h" -#include "wgt_manifest_handlers/splash_screen_handler.h" +#include "wgt_manifest_handlers/launch_screen_handler.h" using ScreenOrientation = runtime::NativeWindow::ScreenOrientation; @@ -35,7 +35,7 @@ enum class BorderOption { REPEAT = 1, STRETCH, ROUND }; wgt::parse::ScreenOrientation ChooseOrientation( const std::map& splash_map, + wgt::parse::LaunchScreenData>& splash_map, ScreenOrientation screen_orientation) { auto orientation_pair = splash_map.end(); @@ -96,7 +96,7 @@ namespace runtime { SplashScreen::SplashScreen( runtime::NativeWindow* window, - std::shared_ptr ss_info, + std::shared_ptr ss_info, const std::string& app_path) : ss_info_(ss_info), window_(window), @@ -106,7 +106,7 @@ SplashScreen::SplashScreen( is_active_(false) { LOGGER(DEBUG) << "start of create splash screen"; if (ss_info == nullptr) return; - auto splash_map = ss_info->splash_screen_data(); + auto splash_map = ss_info->launch_screen_data(); auto used_orientation = ChooseOrientation(splash_map, window->orientation()); if (used_orientation == wgt::parse::ScreenOrientation::NONE) return; @@ -153,7 +153,7 @@ std::pair SplashScreen::GetDimensions() { } void SplashScreen::SetBackground( - const wgt::parse::SplashScreenData& splash_data, Evas_Object* parent, + const wgt::parse::LaunchScreenData& splash_data, Evas_Object* parent, const SplashScreenBound& bound, const std::string& app_path) { background_ = elm_bg_add(parent); if (!background_) return; @@ -216,7 +216,7 @@ void SplashScreen::SetBackground( } void SplashScreen::SetImage( - const wgt::parse::SplashScreenData& splash_data, Evas_Object* parent, + const wgt::parse::LaunchScreenData& splash_data, Evas_Object* parent, const SplashScreenBound& bound, const std::string& app_path) { if (!background_) return; image_ = elm_image_add(background_); diff --git a/runtime/browser/splash_screen.h b/runtime/browser/splash_screen.h old mode 100644 new mode 100755 index 90fc979..11d49cd --- a/runtime/browser/splash_screen.h +++ b/runtime/browser/splash_screen.h @@ -26,7 +26,7 @@ #include #include "runtime/browser/native_window.h" -#include "wgt_manifest_handlers/splash_screen_handler.h" +#include "wgt_manifest_handlers/launch_screen_handler.h" namespace runtime { @@ -36,21 +36,21 @@ class SplashScreen { enum class HideReason { RENDERED, LOADFINISHED, CUSTOM }; SplashScreen(NativeWindow* window, - std::shared_ptr ss_info, + std::shared_ptr ss_info, const std::string& app_path); void HideSplashScreen(HideReason reason); private: std::pair GetDimensions(); - void SetBackground(const wgt::parse::SplashScreenData& splash_data, + void SetBackground(const wgt::parse::LaunchScreenData& splash_data, Evas_Object* parent, const SplashScreenBound& bound, const std::string& app_path); - void SetImage(const wgt::parse::SplashScreenData& splash_data, + void SetImage(const wgt::parse::LaunchScreenData& splash_data, Evas_Object* parent, const SplashScreenBound& bound, const std::string& app_path); - std::shared_ptr ss_info_; + std::shared_ptr ss_info_; NativeWindow* window_; Evas_Object* image_; Evas_Object* background_; diff --git a/runtime/browser/web_application.h b/runtime/browser/web_application.h index 9dcaa08..8e72b25 100755 --- a/runtime/browser/web_application.h +++ b/runtime/browser/web_application.h @@ -132,7 +132,6 @@ class WebApplication : public WebView::EventListener { std::string csp_rule_; std::string csp_report_rule_; bool lang_changed_mode_; - }; } // namespace runtime -- 2.7.4