[Release] wrt_0.8.226

Change-Id: I2f302fb7b02d5d6d62131d9db74fa2561f553a49

diff --git a/packaging/wrt.spec b/packaging/wrt.spec
index d9cedf0..d217b2d 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.225
+Version:    0.8.226
 Release:    1
 Group:      Development/Libraries
 License:    Apache License, Version 2.0

diff --git a/src/domain/widget_data_types.cpp b/src/domain/widget_data_types.cpp
index 87ebb73..55a14e8 100644 (file)
--- a/src/domain/widget_data_types.cpp
+++ b/src/domain/widget_data_types.cpp
@@ -100,7 +100,8 @@ WidgetSettingList::WidgetSettingList() :
     m_Encryption(Encryption_Disable),
     m_BackgroundSupport(BackgroundSupport_Disable),
     m_ProgressbarPresence(ProgressBar_Disable),
-    m_HWkeyEvent(HWkeyEvent_Enable)
+    m_HWkeyEvent(HWkeyEvent_Enable),
+    m_Accessibility(Accessibility_Enable)
 {}
 
 WidgetSettingList::WidgetSettingList(WrtDB::WidgetSettings &widgetSettings)
@@ -113,6 +114,7 @@ WidgetSettingList::WidgetSettingList(WrtDB::WidgetSettings &widgetSettings)
     m_BackgroundSupport = BackgroundSupport_Disable;
     m_ProgressbarPresence = ProgressBar_Disable;
     m_HWkeyEvent = HWkeyEvent_Enable;
+    m_Accessibility = Accessibility_Enable;
 
     FOREACH(it, widgetSettings)
     {
@@ -164,8 +166,7 @@ WidgetSettingList::WidgetSettingList(WrtDB::WidgetSettings &widgetSettings)
             } else if (value == SETTING_VALUE_DISABLE) {
                 m_ContextMenu = ContextMenu_Disable;
             } else {
-                LogError("Invalid contextmenu value!! [" <<
-                         value << "]");
+                LogError("Invalid contextmenu value!! [" << value << "]");
                 m_ContextMenu = ContextMenu_Enable;
             }
         } else if (name == SETTING_NAME_ENCRYPTION) {
@@ -176,8 +177,7 @@ WidgetSettingList::WidgetSettingList(WrtDB::WidgetSettings &widgetSettings)
             {
                 m_Encryption = Encryption_Disable;
             } else {
-                LogError("Invalid encryption value!! [" <<
-                         value << "]");
+                LogError("Invalid encryption value!! [" << value << "]");
                 m_Encryption = Encryption_Disable;
             }
         } else if (name == SETTING_NAME_BACKGROUND_SUPPORT) {
@@ -211,10 +211,18 @@ WidgetSettingList::WidgetSettingList(WrtDB::WidgetSettings &widgetSettings)
             } else if (value == SETTING_VALUE_HWKEY_EVENT_DISABLE) {
                 m_HWkeyEvent = HWkeyEvent_Disable;
             } else {
-                LogError("Invalid hwkey-event value!! [" <<
-                         value << "]");
+                LogError("Invalid hwkey-event value!! [" << value << "]");
                 m_HWkeyEvent = HWkeyEvent_Enable;
             }
+        } else if (name == SETTING_NAME_ACCESSIBILITY) {
+            if (value == SETTING_VALUE_ACCESSIBILITY_ENABLE) {
+                m_Accessibility = Accessibility_Enable;
+            } else if (value == SETTING_VALUE_ACCESSIBILITY_DISABLE) {
+                m_Accessibility = Accessibility_Disable;
+            } else {
+                LogError("Invalid accessibility value!! [" << value << "]");
+                m_Accessibility = Accessibility_Enable;
+            }
         } else {
             LogError("Invalid setting name!! [" << name << "]");
         }
@@ -296,6 +304,13 @@ WidgetSettingHWkeyEventPresence WidgetSettingList::getHWkeyEvent() const
     return m_HWkeyEvent;
 }
 
+WidgetSettingAccessibility WidgetSettingList::getAccessibility() const
+{
+    LogDebug("m_Accessibility: " << m_Accessibility);
+
+    return m_Accessibility;
+}
+
 bool WidgetSettingList::operator ==(const WidgetSettingList& other) const
 {
     return m_RotationLock == other.m_RotationLock &&
@@ -306,5 +321,6 @@ bool WidgetSettingList::operator ==(const WidgetSettingList& other) const
            m_BackgroundSupport == other.m_BackgroundSupport &&
            m_UserAgent == other.m_UserAgent &&
            m_ProgressbarPresence == other.m_ProgressbarPresence &&
-           m_HWkeyEvent == other.m_HWkeyEvent;
+           m_HWkeyEvent == other.m_HWkeyEvent &&
+           m_Accessibility == other.m_Accessibility;
 }

diff --git a/src/domain/widget_data_types.h b/src/domain/widget_data_types.h
index 9d8f654..26f4842 100644 (file)
--- a/src/domain/widget_data_types.h
+++ b/src/domain/widget_data_types.h
@@ -112,6 +112,8 @@ static const DPL::String SETTING_NAME_PROGRESSBAR_PRESENCE =
     L"progressbar-presence";
 static const DPL::String SETTING_NAME_HWKEY_EVENT =
     L"hwkey-event";
+static const DPL::String SETTING_NAME_ACCESSIBILITY =
+    L"accessibility";
 static const DPL::String SETTING_VALUE_ENABLE =
     L"enable";
 static const DPL::String SETTING_VALUE_DISABLE =
@@ -144,6 +146,10 @@ static const DPL::String SETTING_VALUE_HWKEY_EVENT_ENABLE =
     L"enable";
 static const DPL::String SETTING_VALUE_HWKEY_EVENT_DISABLE =
     L"disable";
+static const DPL::String SETTING_VALUE_ACCESSIBILITY_ENABLE =
+    L"enable";
+static const DPL::String SETTING_VALUE_ACCESSIBILITY_DISABLE =
+    L"disable";
 
 enum WidgetSettingScreenLock
 {
@@ -194,6 +200,12 @@ enum WidgetSettingHWkeyEventPresence
     HWkeyEvent_Disable
 };
 
+enum WidgetSettingAccessibility
+{
+    Accessibility_Enable,    /* Default */
+    Accessibility_Disable
+};
+
 class WidgetSettingList
 {
   public:
@@ -221,6 +233,8 @@ class WidgetSettingList
 
     WidgetSettingHWkeyEventPresence getHWkeyEvent() const;
 
+    WidgetSettingAccessibility getAccessibility() const;
+
     bool operator ==(const WidgetSettingList& other) const;
 
   private:
@@ -232,6 +246,7 @@ class WidgetSettingList
     WidgetSettingBackgroundSupport m_BackgroundSupport;
     WidgetSettingProgressBarPresence m_ProgressbarPresence;
     WidgetSettingHWkeyEventPresence m_HWkeyEvent;
+    WidgetSettingAccessibility m_Accessibility;
     std::string m_UserAgent;
 };
 typedef std::shared_ptr<WidgetSettingList> WidgetSettingListPtr;

diff --git a/src/view/webkit/view_logic.cpp b/src/view/webkit/view_logic.cpp
index 239025f..3ed737d 100644 (file)
--- a/src/view/webkit/view_logic.cpp
+++ b/src/view/webkit/view_logic.cpp
@@ -227,7 +227,6 @@ bool ViewLogic::createWebView(Ewk_Context* context,
         return false;
     }
 
-    elm_access_object_register(m_currentEwkView, window);
     return true;
 }
 
@@ -278,6 +277,11 @@ void ViewLogic::prepareView(WidgetModel* m, const std::string &startUrl)
     }
 #endif
 
+    if (m_model->SettingList.Get().getAccessibility() == Accessibility_Enable)
+    {
+        elm_access_object_register(m_currentEwkView, m_window);
+    }
+
     ADD_PROFILING_POINT("initializeSupport", "start");
     initializeSupport();
     ADD_PROFILING_POINT("initializeSupport", "stop");