From e6cdd4f0b02e38b229cde0383124aede4371da48 Mon Sep 17 00:00:00 2001 From: Jihoon Chung Date: Wed, 10 Jul 2013 21:36:40 +0900 Subject: [PATCH] [Release] wrt_0.8.237 Change-Id: Ie338ec8661bf798daec5705da4207d0fc9e52162 --- packaging/wrt.spec | 2 +- src/view/webkit/view_logic.cpp | 6 +++++- src/wrt-client/window_data.cpp | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/packaging/wrt.spec b/packaging/wrt.spec index fbb0f35..fc1faa9 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.235 +Version: 0.8.237 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 9dd358d..a87aa49 100644 --- a/src/view/webkit/view_logic.cpp +++ b/src/view/webkit/view_logic.cpp @@ -98,7 +98,7 @@ const char CONTENT_HANDLER_AKS_REMEMBER[] = "Remember dicision"; const char* const DEFAULT_ENCODING = "UTF-8"; #ifdef CSP_ENABLED const char* const DEFAULT_CSP_POLICY = - "default-src '*'; script-src 'self'; style-src 'self'; object-src 'none';"; + "default-src *; script-src 'self'; style-src 'self'; object-src 'none';"; #endif // SCHEME const char * const SCHEME_BOX_SLASH = "box://"; @@ -323,6 +323,10 @@ void ViewLogic::showWidget() void ViewLogic::hideWidget() { LogDebug("hiding widget"); + if (m_model->SettingList.Get().getAccessibility() == Accessibility_Enable) + { + elm_access_object_unregister(m_currentEwkView); + } ViewModule::StorageSupport::deinitializeStorage(m_model); m_appsSupport->deinitialize(); m_vibrationSupport->deinitialize(); diff --git a/src/wrt-client/window_data.cpp b/src/wrt-client/window_data.cpp index 4ed50e0..c0183ea 100644 --- a/src/wrt-client/window_data.cpp +++ b/src/wrt-client/window_data.cpp @@ -263,7 +263,7 @@ Evas_Object* WindowData::createFocus(Evas_Object* parent) // doesn't restore after focus-out and focus-in. To support focus restore // for ewkview, WRT add selectable elementary(button) to manage focus Evas_Object* focus = elm_button_add(parent); - elm_object_style_set(focus, "focus"); + elm_object_style_set(focus, "transparent"); elm_object_part_content_set(parent, ELM_SWALLOW_CONTENT, focus); evas_object_size_hint_weight_set(focus, EVAS_HINT_EXPAND, -- 2.7.4