From 30616a988bbc2c0d39557ed5424bb137e9348afe Mon Sep 17 00:00:00 2001 From: Taejeong Lee Date: Thu, 28 Mar 2013 16:29:58 +0900 Subject: [PATCH] [Release] wrt_0.8.170 Change-Id: I90fb2e3db91ce86040d3956d270629a231b1f756 --- CMakeLists.txt | 2 +- packaging/wrt.spec | 4 ++-- src/CMakeLists.txt | 1 - src/api_new/ewk_context_manager.cpp | 3 ++- src/wrt-client/CMakeLists.txt | 1 + src/wrt-client/window_data.cpp | 1 + src/wrt-client/wrt-client.cpp | 21 +++++++++++++++++++++ 7 files changed, 28 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c80552b..b10b0cb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,7 +44,7 @@ OPTION(DPL_LOG "DPL logs status" ON) OPTION(WITH_TESTS "Build tests" OFF) #enable csp policy support OPTION(CSP_SUPPORT "Support for csp policy" OFF) -OPTION(APP_SCHEME_SUPPORT "Support for app:// scheme" OFF) +OPTION(APP_SCHEME_SUPPORT "Support for app:// scheme" ON) OPTION(CORS_WHITELISTING_SUPPORT "CORS white listing for access positions" OFF) IF(CSP_SUPPORT) ADD_DEFINITIONS("-DCSP_ENABLED") diff --git a/packaging/wrt.spec b/packaging/wrt.spec index 0e2bf97..ed8cdf6 100644 --- a/packaging/wrt.spec +++ b/packaging/wrt.spec @@ -1,7 +1,7 @@ -#git:framework/web/wrt wrt_0.8.169 +#git:framework/web/wrt wrt_0.8.170 Name: wrt Summary: web runtime -Version: 0.8.169 +Version: 0.8.170 Release: 1 Group: Development/Libraries License: Apache License, Version 2.0 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 29f071b..f2b9ee1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -38,7 +38,6 @@ SET(WRT_CORE_INCLUDES ${WRT_SRC_DIR}/plugin-service ${WRT_SRC_DIR}/domain ${WRT_SRC_DIR}/profiling - ${WRT_SRC_DIR}/popup-process ${WRT_SRC_DIR}/view ) diff --git a/src/api_new/ewk_context_manager.cpp b/src/api_new/ewk_context_manager.cpp index c64db81..c9476dc 100644 --- a/src/api_new/ewk_context_manager.cpp +++ b/src/api_new/ewk_context_manager.cpp @@ -103,7 +103,8 @@ bool EwkContextManager::initialize() free(proxy); } - ewk_context_certificate_file_set(m_ewkContext, caCertPath.c_str()); + // temp - this api was moved to wrt-client for performance + //ewk_context_certificate_file_set(m_ewkContext, caCertPath.c_str()); // set local stroage database path WrtDB::WidgetDAOReadOnly dao(DPL::FromUTF8String(m_appId)); diff --git a/src/wrt-client/CMakeLists.txt b/src/wrt-client/CMakeLists.txt index eaec1e7..2e868a4 100644 --- a/src/wrt-client/CMakeLists.txt +++ b/src/wrt-client/CMakeLists.txt @@ -26,6 +26,7 @@ PKG_CHECK_MODULES(CLIENT_DEP dpl-wrt-dao-ro wrt-plugin-js-overlay appcore-efl + wrt-popup-wrt-runner REQUIRED ) diff --git a/src/wrt-client/window_data.cpp b/src/wrt-client/window_data.cpp index a4a2ead..8a22767 100644 --- a/src/wrt-client/window_data.cpp +++ b/src/wrt-client/window_data.cpp @@ -84,6 +84,7 @@ void WindowData::init() m_user_layout = createUserLayout(m_navigation); evas_object_show(m_user_layout); + UG_INIT_EFL(m_win, UG_OPT_INDICATOR_ENABLE); m_initialized = true; } diff --git a/src/wrt-client/wrt-client.cpp b/src/wrt-client/wrt-client.cpp index 1373097..d561c29 100644 --- a/src/wrt-client/wrt-client.cpp +++ b/src/wrt-client/wrt-client.cpp @@ -33,6 +33,7 @@ #include #include #include "webkit/bundles/plugin_module_support.h" +#include #include "process_pool.h" #include "menu_db_util.h" @@ -47,6 +48,7 @@ const std::string VIEWMODE_TYPE_FULLSCREEN = "fullscreen"; const std::string VIEWMODE_TYPE_MAXIMIZED = "maximized"; char const* const ELM_SWALLOW_CONTENT = "elm.swallow.content"; const char* const BUNDLE_PATH = "/usr/lib/wrt-wk2-bundles/libwrt-wk2-bundle.so"; +const char* const caCertPath = "/opt/usr/share/certs/ca-certificate.crt"; // process pool const char* const DUMMY_PROCESS_PATH = "/usr/bin/wrt_launchpad_daemon_candidate"; @@ -819,6 +821,15 @@ int main(int argc, setenv("WRT_LAUNCHING_PERFORMANCE", "1", 1); s_preparedEwkContext = ewk_context_new_with_injected_bundle_path(BUNDLE_PATH); + if (s_preparedEwkContext == NULL) + { + LogInfo("Creating webkit context was failed!"); + exit(-1); + } + + LogInfo("ewk_context_certificate_file_set()"); + ewk_context_certificate_file_set(s_preparedEwkContext, caCertPath); + int client_fd = __connect_process_pool_server(); if (client_fd == -1) @@ -862,8 +873,18 @@ int main(int argc, s_preparedEwkContext = ewk_context_new_with_injected_bundle_path( BUNDLE_PATH); + if (s_preparedEwkContext == NULL) + { + LogInfo("Creating webkit context was failed!"); + Wrt::Popup::PopupInvoker().showInfo("Error", "Creating webkit context was failed.", "OK"); + exit(-1); + } + // plugin init PluginModuleSupport::init(s_preparedEwkContext, tizenId); + + LogInfo("ewk_context_certificate_file_set()"); + ewk_context_certificate_file_set(s_preparedEwkContext, caCertPath); } } -- 2.7.4