From 1a4a72767877ba1a7a88799a0769d9361faeb949 Mon Sep 17 00:00:00 2001
From: Jihoon Chung <jihoon.chung@samsung.com>
Date: Thu, 9 May 2013 17:51:54 +0900
Subject: [PATCH] [Release] wrt_0.8.196

---
 packaging/wrt.spec             |  5 +++--
 src/view/webkit/CMakeLists.txt |  1 +
 src/view/webkit/view_logic.cpp | 40 ++++++++++++++++++++++++++--------------
 src/view/webkit/view_logic.h   |  4 ++++
 4 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/packaging/wrt.spec b/packaging/wrt.spec
index 1f15aa9..2faee4c 100644
--- a/packaging/wrt.spec
+++ b/packaging/wrt.spec
@@ -1,7 +1,7 @@
-#git:framework/web/wrt wrt_0.8.195
+#git:framework/web/wrt wrt_0.8.196
 Name:       wrt
 Summary:    web runtime
-Version:    0.8.195
+Version:    0.8.196
 Release:    1
 Group:      Development/Libraries
 License:    Apache License, Version 2.0
@@ -47,6 +47,7 @@ BuildRequires:  pkgconfig(wrt-popup-ace-runner)
 BuildRequires:  pkgconfig(sysman)
 BuildRequires:  pkgconfig(osp-appfw)
 BuildRequires:  pkgconfig(app2sd)
+BuildRequires:  pkgconfig(capi-system-system-settings)
 BuildRequires:  osp-appfw-internal-devel
 Requires: osp-appfw
 
diff --git a/src/view/webkit/CMakeLists.txt b/src/view/webkit/CMakeLists.txt
index 4b24cc1..3bd0305 100644
--- a/src/view/webkit/CMakeLists.txt
+++ b/src/view/webkit/CMakeLists.txt
@@ -32,6 +32,7 @@ PKG_CHECK_MODULES(VIEW_MODULE_DEP
     security-client
     haptic
     sysman
+    capi-system-system-settings
     REQUIRED
 )
 
diff --git a/src/view/webkit/view_logic.cpp b/src/view/webkit/view_logic.cpp
index f45390d..3f7dbb3 100644
--- a/src/view/webkit/view_logic.cpp
+++ b/src/view/webkit/view_logic.cpp
@@ -32,9 +32,9 @@
 
 #include <Elementary.h>
 #include <pcrecpp.h>
-#include <vconf.h>
 #include <sysman.h>
 #include <widget_model.h>
+#include <system_settings.h>
 #include <dpl/wrt-dao-ro/widget_dao_read_only.h>
 #include <dpl/wrt-dao-ro/vconf_config.h>
 #include <dpl/utils/wrt_global_settings.h>
@@ -307,8 +307,8 @@ void ViewLogic::hideWidget()
     LogDebug("hiding widget");
     ViewModule::StorageSupport::deinitializeStorage(m_model);
     m_appsSupport->deinitialize();
-
     m_vibrationSupport->deinitialize();
+    system_settings_unset_changed_cb(SYSTEM_SETTINGS_KEY_FONT_TYPE);
 
     while (!m_ewkViewList.empty()) {
         LogInfo("pop webview: " << m_ewkViewList.back());
@@ -533,12 +533,15 @@ void ViewLogic::initializeSupport()
         sysman_inform_active(pid);
         m_isBackgroundSupport = true;
     }
+    system_settings_set_changed_cb(SYSTEM_SETTINGS_KEY_FONT_TYPE,
+                                   systemSettingsChangedCallback,
+                                   this);
+
     m_schemeSupport.reset(new SchemeSupport(m_model->Type.Get().appType));
     ViewModule::StorageSupport::initializeStorage(m_model);
     m_appsSupport->initialize(m_model);
     m_securityOriginSupport.reset(new ViewModule::SecurityOriginSupport(m_model));
     m_certificateSupport.reset(new ViewModule::CertificateSupport(m_model));
-
     m_vibrationSupport->initialize();
 }
 
@@ -806,13 +809,6 @@ void ViewLogic::resumeWebkit(Evas_Object *wkView)
     LogDebug("resumeWebkit");
     Assert(wkView);
 
-    // resume NPAPI plugin
-    // The followings are not implemeted yet by webkit2
-    //      ewk_view_pause_or_resume_plugins(false);
-    //      ewk_view_pause_or_resume_video_audio(false);
-    //      ewk_view_javascript_resume();
-    //      ewk_view_enable_render();
-    //      ewk_view_reduce_plugins_frame_rate(false);
     ewk_view_resume(wkView);
 
     return;
@@ -823,10 +819,6 @@ void ViewLogic::suspendWebkit(Evas_Object *wkView)
     LogDebug("suspendWebkit");
     Assert(wkView);
 
-    // suspend the followings
-    // The followings are not implemeted yet by webkit2
-    //      ewk_view_pause_or_resume_plugins(true);
-    //      ewk_view_pause_or_resume_video_audio(true);
     ewk_view_suspend(wkView);
 
     return;
@@ -2105,3 +2097,23 @@ void ViewLogic::windowClose()
     }
 }
 
+void ViewLogic::systemSettingsChangedCallback(system_settings_key_e key,
+                                              void* data)
+{
+    LogDebug("systemSettingsChanged");
+    LogDebug("System setting Key is [" << key << "]");
+
+    Assert(data);
+    ViewLogic* This = static_cast<ViewLogic*>(data);
+
+    if (SYSTEM_SETTINGS_KEY_FONT_TYPE == key) {
+        if (!This->m_currentEwkView) {
+            LogError("ewkView isn't initialized");
+            return;
+        }
+        ewk_view_use_settings_font(This->m_currentEwkView);
+    } else {
+        LogError("Unregister system callback is called");
+    }
+}
+
diff --git a/src/view/webkit/view_logic.h b/src/view/webkit/view_logic.h
index a8155c9..2b88867 100644
--- a/src/view/webkit/view_logic.h
+++ b/src/view/webkit/view_logic.h
@@ -33,6 +33,7 @@
 #include <i_runnable_widget_object.h>
 #include <common/view_logic_apps_support.h>
 #include <common/view_logic_vibration_support.h>
+#include <system_settings.h>
 
 #include <EWebKit2.h>
 
@@ -270,6 +271,9 @@ class ViewLogic : public ViewModule::IViewModule
     // window
     void windowClose(void);
 
+    // system settings
+    static void systemSettingsChangedCallback(system_settings_key_e key, void* data);
+
     Ewk_Context* m_ewkContext;
     bool m_attachedToCustomHandlerDao;
     std::list<Evas_Object*> m_ewkViewList;
-- 
2.7.4