From 599ea5cab9134c3f6cb4d5f00f3016e89a0819e3 Mon Sep 17 00:00:00 2001 From: "sung-su.kim" Date: Wed, 3 Jul 2013 20:15:22 +0900 Subject: [PATCH] [Release] wrt_0.8.233 Change-Id: Id2878f6e9abc183a0f1e173eb4de38252926cb22 --- packaging/wrt.spec | 2 +- src/view/webkit/view_logic.cpp | 9 ++++++++- src/wrt-client/process_pool/smack_labeling_support.cpp | 14 +++++++++++++- src/wrt-client/wrt-client.cpp | 7 +++++++ wrt_env.sh | 1 + 5 files changed, 30 insertions(+), 3 deletions(-) diff --git a/packaging/wrt.spec b/packaging/wrt.spec index 0195c14..46184ee 100644 --- a/packaging/wrt.spec +++ b/packaging/wrt.spec @@ -1,7 +1,7 @@ #git:framework/web/wrt Name: wrt Summary: web runtime -Version: 0.8.232 +Version: 0.8.233 Release: 1 Group: Development/Libraries License: Apache License, Version 2.0 diff --git a/src/view/webkit/view_logic.cpp b/src/view/webkit/view_logic.cpp index 75fdb66..d32b485 100644 --- a/src/view/webkit/view_logic.cpp +++ b/src/view/webkit/view_logic.cpp @@ -881,6 +881,7 @@ void ViewLogic::resumeWebkit(Evas_Object *wkView) Assert(wkView); ewk_view_resume(wkView); + ewk_view_foreground_set(wkView, true); return; } @@ -891,6 +892,7 @@ void ViewLogic::suspendWebkit(Evas_Object *wkView) Assert(wkView); ewk_view_suspend(wkView); + ewk_view_foreground_set(wkView, false); return; } @@ -2143,7 +2145,12 @@ void ViewLogic::viewFrameRenderedCallback( Evas_Object* /*obj*/, void* /*eventInfo*/) { - //LogInfo("enter"); + static bool logEnable = (getenv("WRT_FRAME_RENDERED_LOG_ENABLE") != NULL); + + if (logEnable) + { + LogInfo("enter"); + } } void ViewLogic::mediacontrolRotateHorizontal(void* data, diff --git a/src/wrt-client/process_pool/smack_labeling_support.cpp b/src/wrt-client/process_pool/smack_labeling_support.cpp index 8833960..187fed2 100644 --- a/src/wrt-client/process_pool/smack_labeling_support.cpp +++ b/src/wrt-client/process_pool/smack_labeling_support.cpp @@ -169,7 +169,19 @@ int set_app_smack_label(const char* app_path) goto err_set_app_smack_label; } - strncpy(s_smack_label, smack_label, sizeof(s_smack_label)); + if (smack_label) + { + strncpy(s_smack_label, smack_label, sizeof(s_smack_label)); + s_smack_label[SMACK_LABEL_LEN] = '\0'; + + free(smack_label); + smack_label = NULL; + } + else + { + LogError("## smack_label is NULL! ##"); + strcpy(s_smack_label, ""); + } if (send_SIGUSR1_to_threads() != 0) { diff --git a/src/wrt-client/wrt-client.cpp b/src/wrt-client/wrt-client.cpp index 57debb3..4adfc48 100644 --- a/src/wrt-client/wrt-client.cpp +++ b/src/wrt-client/wrt-client.cpp @@ -655,6 +655,13 @@ int WrtClient::appcoreLowMemoryCallback(void* /*data*/) // TODO call RunnableWidgetObject API regarding low memory // The API should be implemented + // temporary solution because we have no way to get ewk_context from runnable object. + if (s_preparedEwkContext) + { + ewk_context_cache_clear(s_preparedEwkContext); + ewk_context_notify_low_memory(s_preparedEwkContext); + } + return 0; } diff --git a/wrt_env.sh b/wrt_env.sh index a489dad..999140b 100644 --- a/wrt_env.sh +++ b/wrt_env.sh @@ -1,3 +1,4 @@ #export WRT_PROCESS_POOL_DISABLE=ON #export WRT_WILL_SEND_REQUEST_LOG_ENABLE=ON #export WRT_LOAD_PLUGINS_LOG_ENABLE=ON +#export WRT_FRAME_RENDERED_LOG_ENABLE=ON -- 2.7.4