[Release] wrt_0.8.238

Change-Id: I8874d58030cb892e4632cd6669690c174bc9f3a8

diff --git a/packaging/wrt.spec b/packaging/wrt.spec
index fc1faa9..4f97293 100644 (file)
--- a/packaging/wrt.spec
+++ b/packaging/wrt.spec
@@ -1,7 +1,7 @@
 #git:framework/web/wrt
 Name:       wrt
 Summary:    web runtime
-Version:    0.8.237
+Version:    0.8.238
 Release:    1
 Group:      Development/Libraries
 License:    Apache License, Version 2.0

diff --git a/src/api_new/CMakeLists.txt b/src/api_new/CMakeLists.txt
index 34b6668..6d332ba 100644 (file)
--- a/src/api_new/CMakeLists.txt
+++ b/src/api_new/CMakeLists.txt
@@ -28,7 +28,6 @@ SET_TARGET_PROPERTIES(${TARGET_CORE_MODULE_LIB} PROPERTIES
 PKG_CHECK_MODULES(CORE_MODULE_DEP
     wrt-plugin-js-overlay
     dpl-efl
-    security-wrt-ocsp
     wrt-popup-wrt-runner
     REQUIRED
 )

diff --git a/src/api_new/runnable_widget_object.cpp b/src/api_new/runnable_widget_object.cpp
index 653d781..f8a3684 100644 (file)
--- a/src/api_new/runnable_widget_object.cpp
+++ b/src/api_new/runnable_widget_object.cpp
@@ -30,7 +30,6 @@
 #include <signal.h>
 #include <dpl/wrt-dao-ro/widget_dao_read_only.h>
 #include <runnable_widget_object_state.h>
-#include <wrt_ocsp_api.h>
 #include <popup-runner/PopupInvoker.h>
 #include "ewk_context_manager.h"
 
@@ -77,33 +76,8 @@ bool RunnableWidgetObject::CheckBeforeLaunch()
     set_process_config(DPL::ToUTF8String(widgetModel->TizenId).c_str());
 #endif
 
-    // Inform view controller about new widget model displaying
-    ADD_PROFILING_POINT("OCSPCheck", "start");
-
-    wrt_ocsp_widget_verification_status_t response;
-    if (m_widgetModel->Type.Get().appType == WrtDB::APP_TYPE_WAC20) {
-        wrt_ocsp_initialize();
-        wrt_ocsp_verify_widget(WrtDB::WidgetDAOReadOnly::getHandle(
-                                   m_widgetModel->TizenId), &response);
-        wrt_ocsp_shutdown();
-    } else {
-        response = WRT_OCSP_WIDGET_VERIFICATION_STATUS_GOOD;
-    }
-    ADD_PROFILING_POINT("OCSPCheck", "stop");
-
-    LogDebug("WRT OCSP response " << static_cast<int>(response));
-    if (response == WRT_OCSP_WIDGET_VERIFICATION_STATUS_GOOD) {
-        change.commit();
-        return true;
-    } else {
-        if (!GlobalSettings::PopupsTestModeEnabled()) {
-            Wrt::Popup::PopupInvoker().showInfo(
-                _("IDS_IM_POP_WIDGET_REVOKED_TITLE"),
-                _("IDS_IM_POP_WIDGET_REVOKED_ERROR"),
-                _("IDS_IM_BUTTON_OK"));
-        }
-        return false;
-    }
+    change.commit();
+    return true;
 }
 
 bool RunnableWidgetObject::PrepareView(const std::string &startUrl,

diff --git a/src/view/common/scheme_action_map.cpp b/src/view/common/scheme_action_map.cpp
index ff81c5e..77ca39d 100644 (file)
--- a/src/view/common/scheme_action_map.cpp
+++ b/src/view/common/scheme_action_map.cpp
@@ -326,9 +326,6 @@ bool HandleUri(const char* uri,
 
     UriAction action;
     switch (appType) {
-    case WrtDB::APP_TYPE_WAC20:
-        action = g_wacActionMap[type][context];
-        break;
     case WrtDB::APP_TYPE_TIZENWEBAPP:
         action = g_tizenActionMap[type][context];
         break;

diff --git a/src/view/common/scheme_action_map_data.h b/src/view/common/scheme_action_map_data.h
index aabc65a..8246e09 100644 (file)
--- a/src/view/common/scheme_action_map_data.h
+++ b/src/view/common/scheme_action_map_data.h
@@ -44,15 +44,9 @@ enum UriAction {
  *           value "_new" is also treated this way). Tizen won't satisfy this
  *           requirement. It should open new windows in WRT.
  *
- * Multiview - Not supported in WAC application. Therefore opening WIDGET scheme
- *           in new window will result in launching appssvc, which won't be able
- *           to handle it. The correct behaviour has to be defined. In case of
- *           Tizen, new window will be opened in WRT.
- *
  * Video - YOUTUBE and RSTP are handled by video player.
  *
- * File scheme - FILE scheme has to be handled by WRT with exception to new
- *           window in WAC application (no support for multiple views)
+ * File scheme - FILE scheme has to be handled by WRT
  *
  * WS-1510/20/30/40/50 - All remaining cases are always handled by appsvc
  */
@@ -76,23 +70,5 @@ const UriAction g_tizenActionMap[Scheme::COUNT][SchemeActionMap::COUNT] = {
     { URI_ACTION_VIDEO, URI_ACTION_VIDEO, URI_ACTION_VIDEO }      // RTSP
 };
 
-// WAC
-const UriAction g_wacActionMap[Scheme::COUNT][SchemeActionMap::COUNT] = {
-    //  TOP_LEVEL           FRAME_LEVEL         NEW_WINDOW
-    { URI_ACTION_WRT, URI_ACTION_WRT, URI_ACTION_APPSVC },        // FILE
-    { URI_ACTION_APPSVC, URI_ACTION_APPSVC, URI_ACTION_APPSVC },  // SMS
-    { URI_ACTION_APPSVC, URI_ACTION_APPSVC, URI_ACTION_APPSVC },  // SMSTO
-    { URI_ACTION_APPSVC, URI_ACTION_APPSVC, URI_ACTION_APPSVC },  // MMSTO
-    { URI_ACTION_APPSVC, URI_ACTION_APPSVC, URI_ACTION_APPSVC },  // MAILTO
-    { URI_ACTION_WRT, URI_ACTION_WRT, URI_ACTION_WRT },        // DATA
-    { URI_ACTION_APPSVC, URI_ACTION_APPSVC, URI_ACTION_APPSVC },  // TEL
-    { URI_ACTION_APPSVC, URI_ACTION_WRT, URI_ACTION_APPSVC },     // HTTP
-    { URI_ACTION_APPSVC, URI_ACTION_WRT, URI_ACTION_APPSVC },     // HTTPS
-    { URI_ACTION_WRT, URI_ACTION_WRT, URI_ACTION_APPSVC },        // WIDGET
-#ifdef APP_SCHEME_ENABLED
-    { URI_ACTION_WRT, URI_ACTION_WRT, URI_ACTION_APPSVC },        // APP
-#endif
-    { URI_ACTION_VIDEO, URI_ACTION_VIDEO, URI_ACTION_VIDEO }      // RTSP
-};
 }
 }

diff --git a/src/view/webkit/view_logic_scheme_support.cpp b/src/view/webkit/view_logic_scheme_support.cpp
index 21e0f90..3bdabc2 100644 (file)
--- a/src/view/webkit/view_logic_scheme_support.cpp
+++ b/src/view/webkit/view_logic_scheme_support.cpp
@@ -127,15 +127,6 @@ bool SchemeSupport::filterURIByScheme(Ewk_Policy_Decision* policyDecision,
             // policy of new window should be applied,
             // regardless level of this frame
             ctx = NEW_WINDOW;
-        } else if (model->Type.Get().appType ==
-                   WrtDB::APP_TYPE_WAC20)
-        {
-            // In case of WAC,
-            // policy of new window should be applied,
-            // only top level frame (this may be changed by WAC spec)
-            if (ctx == TOP_LEVEL) {
-                ctx = NEW_WINDOW;
-            }
         }
     }
 

diff --git a/src/wrt-client/window_data.cpp b/src/wrt-client/window_data.cpp
index c0183ea..4ed50e0 100644 (file)
--- 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, "transparent");
+    elm_object_style_set(focus, "focus");
     elm_object_part_content_set(parent, ELM_SWALLOW_CONTENT, focus);
     evas_object_size_hint_weight_set(focus,
                                      EVAS_HINT_EXPAND,

diff --git a/src/wrt-launcher/wrt-launcher.cpp b/src/wrt-launcher/wrt-launcher.cpp
index edfa038..e4450ab 100644 (file)
--- a/src/wrt-launcher/wrt-launcher.cpp
+++ b/src/wrt-launcher/wrt-launcher.cpp
@@ -192,9 +192,6 @@ static void print_help(FILE *stream, int /*exit_code*/)
         "                                                 If widget is running, 0(zero) will be returned.\n"
         "   -d                        --debug             Activate debug mode\n"
         "   -t [second]               --timeout           Set timeout of response from widget in debug mode\n"
-        "   -c [1]or[0]               --compliance-mode   Set compliancemode\n"
-        "   -i [imei]                 --fake-imei         Set fakeimei\n"
-        "   -m [meid]                 --fake-meid         Set fakemeid\n"
         "    if you emit this option, 5 seconds is set in debug mode\n"
         );
 }
@@ -259,9 +256,6 @@ int main(int argc, char* argv[])
             { "is-running", required_argument, 0, 'r' },
             { "debug", no_argument, 0, 'd' },
             { "timeout", required_argument, 0, 't' },
-            { "compliance-mode", required_argument, 0, 'c' },
-            { "fake-imei", required_argument, 0, 'i' },
-            { "fake-meid", required_argument, 0, 'm' },
             { 0, 0, 0, 0 }
         };
 
@@ -353,32 +347,6 @@ int main(int argc, char* argv[])
                 isDebugMode = true;
                 break;
 
-            case 'c':
-                strncpy(temp_arg, optarg, strlen(optarg));
-                if (!attachDbConnection()) {
-                    return FALSE;
-                }
-                if (!strcmp("1", temp_arg)) {
-                    WrtDB::GlobalDAO::setComplianceMode(true);
-                } else {
-                    WrtDB::GlobalDAO::setComplianceMode(false);
-                }
-                break;
-            case 'i':
-                strncpy(temp_arg, optarg, strlen(optarg));
-                if (!attachDbConnection()) {
-                    return FALSE;
-                }
-                WrtDB::GlobalDAO::setComplianceFakeImei(temp_arg);
-                break;
-            case 'm':
-                strncpy(temp_arg, optarg, strlen(optarg));
-                if (!attachDbConnection()) {
-                    return FALSE;
-                }
-                WrtDB::GlobalDAO::setComplianceFakeMeid(temp_arg);
-                break;
-
             case -1:
                 break;