Unregister bundle callbacks to avoid abort

[Issue#] N_SE-13058
[Problem] WRT abort occurs when emula
[Cause] Webkit invoke callbacks on object which is not available.
[Solution] Unregister callbacks from webkit
[SCMRequest] N/A

Verification :
(On emulator)
1. Run Intel hangonman
2. Right click on emulator window
3. Close (emulator)
4. Ok (to confirm)
5. Start the emulator again
6. Go SLP bugs folder in connection explorer
(/opt/share/hidden_storage/SLP_debug) check that new file with bug trace
does not appear

Change-Id: Iab5c211822dcec748cb2f3765d90a007d4e669f4

diff --git a/src/view/webkit/bundles/messages_names.h b/src/view/webkit/bundles/messages_names.h
index 7e33e0b..6200174 100644 (file)
--- a/src/view/webkit/bundles/messages_names.h
+++ b/src/view/webkit/bundles/messages_names.h
@@ -23,6 +23,10 @@
 namespace BundleMessages {
 const char * const START = "PluginModule::start";
 const char * const SHUTDOWN = "PluginModule::shutdown";
+
+const char * const SUSPEND = "PluginModule::suspend";
+const char * const RESUME = "PluginModule::resume";
+
 const char * const SET_CUSTOM_PROPERTIES =
     "PluginModule::setCustomProperties";
 const char * const DISPATCH_JAVASCRIPT_EVENT =

diff --git a/src/view/webkit/bundles/plugin_module_support.cpp b/src/view/webkit/bundles/plugin_module_support.cpp
index 146d73f..e67945c 100644 (file)
--- a/src/view/webkit/bundles/plugin_module_support.cpp
+++ b/src/view/webkit/bundles/plugin_module_support.cpp
@@ -146,4 +146,16 @@ void dispatchJavaScriptEvent(
     ewk_context_message_post_to_injected_bundle(ewkContext, name, msg);
 }
 
+void suspend(Ewk_Context* ewkContext)
+{
+    const char* name = BundleMessages::SUSPEND;
+    ewk_context_message_post_to_injected_bundle(ewkContext, name, name);
+}
+
+void resume(Ewk_Context* ewkContext)
+{
+    const char* name = BundleMessages::RESUME;
+    ewk_context_message_post_to_injected_bundle(ewkContext, name, name);
+}
+
 }//namespace PluginModuleSupport

diff --git a/src/view/webkit/bundles/plugin_module_support.h b/src/view/webkit/bundles/plugin_module_support.h
index d90720b..9a99aa9 100644 (file)
--- a/src/view/webkit/bundles/plugin_module_support.h
+++ b/src/view/webkit/bundles/plugin_module_support.h
@@ -34,6 +34,10 @@ void start(Ewk_Context* ewkContext,
            const char *theme,
            bool encrypted);
 void shutdown(Ewk_Context* ewkContext);
+
+void suspend(Ewk_Context* ewkContext);
+void resume(Ewk_Context* ewkContext);
+
 void setCustomProperties(
         Ewk_Context* ewkContext,
         double* scale = NULL,

diff --git a/src/view/webkit/bundles/wrt-wk2-bundle.cpp b/src/view/webkit/bundles/wrt-wk2-bundle.cpp
index aeefceb..1bc730f 100644 (file)
--- a/src/view/webkit/bundles/wrt-wk2-bundle.cpp
+++ b/src/view/webkit/bundles/wrt-wk2-bundle.cpp
@@ -166,42 +166,7 @@ void Bundle::didCreatePage(WKBundlePageRef page)
     };
     WKBundlePageSetResourceLoadClient(page, &resourceLoadClient);
 
-    WKBundlePageLoaderClient loaderClient = {
-        kWKBundlePageLoaderClientCurrentVersion,
-        this, /* clientinfo */
-        didStartProvisionalLoadForFrameCallback, /* didStartProvisionalLoadForFrame */
-        0, /* didReceiveServerRedirectForProvisionalLoadForFrame */
-        0, /* didFailProvisionalLoadWithErrorForFrame */
-        didCommitLoadForFrameCallback, /* didCommitLoadForFrame */
-        0, /* didFinishDocumentLoadForFrame */
-        0, /* didFinishLoadForFrame */
-        0, /* didFailLoadWithErrorForFrame */
-        0, /* didSameDocumentNavigationForFrame */
-        0, /* didReceiveTitleForFrame */
-        0, /* didFirstLayoutForFrame */
-        0, /* didFirstVisuallyNonEmptyLayoutForFrame */
-        didRemoveFrameFromHierarchyCallback, /* didRemoveFrameFromHierarchy */
-        0, /* didDisplayInsecureContentForFrame */
-        0, /* didRunInsecureContentForFrame */
-        0, /* didClearWindowObjectForFrame */
-        0, /* didCancelClientRedirectForFrame */
-        0, /* willPerformClientRedirectForFrame */
-        0, /* didHandleOnloadEventsForFrame */
-        0, /* didLayoutForFrame */
-        0, /* didNewFirstVisuallyNonEmptyLayout */
-        0, /* didDetectXSSForFrame */
-        0, /* shouldGoToBackForwardListItem */
-        0, /* globalObjectIsAvailableForFrame */
-        0, /* willDisconnectDOMWindowExtensionFromGlobalObject */
-        0, /* didReconnectDOMWindowExtensionToGlobalObject */
-        0, /* willDestroyGlobalObjectForDOMWindowExtension */
-        0, /* didFinishProgress */
-        0, /* shouldForceUniversalAccessFromLocalURL */
-        0, /* didReceiveIntentForFrame */
-        0, /* registerIntentServiceForFrame */
-    };
-    WKBundlePageSetPageLoaderClient(page, &loaderClient);
-
+    connectLoaderClientCallbacksToPage(page);
 
     WKBundlePagePolicyClient policyClient = {
         kWKBundlePagePolicyClientCurrentVersion,        /* version */
@@ -317,6 +282,7 @@ void Bundle::didReceiveMessage(WKStringRef messageName, WKTypeRef messageBody)
                                           BundleMessages::SHUTDOWN))
     {
         LogDebug("shutdown plugins");
+
         if (m_pagesList.empty())
         {
             PluginModule::shutdown();
@@ -327,6 +293,18 @@ void Bundle::didReceiveMessage(WKStringRef messageName, WKTypeRef messageBody)
         }
     }
     else if (WKStringIsEqualToUTF8CString(messageName,
+                                          BundleMessages::SUSPEND))
+    {
+        LogDebug("suspend plugins");
+        requestSuspend();
+    }
+    else if (WKStringIsEqualToUTF8CString(messageName,
+                                          BundleMessages::RESUME))
+    {
+        LogDebug("resume plugins");
+        requestResume();
+    }
+    else if (WKStringIsEqualToUTF8CString(messageName,
                                           BundleMessages::SET_CUSTOM_PROPERTIES))
     {
         LogDebug("reset custom properties of window objects");
@@ -936,6 +914,63 @@ std::string Bundle::DecryptResource(std::string resource, int size)
     return std::string();
 }
 
+void Bundle::requestSuspend()
+{
+    LogDebug("Unregister callbacks");
+    FOREACH(page, m_pagesList)
+    {
+        WKBundlePageSetPageLoaderClient(*page,NULL);
+    }
+}
+
+void Bundle::requestResume()
+{
+    LogDebug("Register callbacks");
+    FOREACH(page, m_pagesList)
+    {
+        connectLoaderClientCallbacksToPage(*page);
+    }
+}
+
+void Bundle::connectLoaderClientCallbacksToPage(WKBundlePageRef page)
+{
+    LogDebug("");
+
+    WKBundlePageLoaderClient loaderClient = {
+        kWKBundlePageLoaderClientCurrentVersion,
+        this, /* clientinfo */
+        didStartProvisionalLoadForFrameCallback, /* didStartProvisionalLoadForFrame */
+        0, /* didReceiveServerRedirectForProvisionalLoadForFrame */
+        0, /* didFailProvisionalLoadWithErrorForFrame */
+        didCommitLoadForFrameCallback, /* didCommitLoadForFrame */
+        0, /* didFinishDocumentLoadForFrame */
+        0, /* didFinishLoadForFrame */
+        0, /* didFailLoadWithErrorForFrame */
+        0, /* didSameDocumentNavigationForFrame */
+        0, /* didReceiveTitleForFrame */
+        0, /* didFirstLayoutForFrame */
+        0, /* didFirstVisuallyNonEmptyLayoutForFrame */
+        didRemoveFrameFromHierarchyCallback, /* didRemoveFrameFromHierarchy */
+        0, /* didDisplayInsecureContentForFrame */
+        0, /* didRunInsecureContentForFrame */
+        0, /* didClearWindowObjectForFrame */
+        0, /* didCancelClientRedirectForFrame */
+        0, /* willPerformClientRedirectForFrame */
+        0, /* didHandleOnloadEventsForFrame */
+        0, /* didLayoutForFrame */
+        0, /* didNewFirstVisuallyNonEmptyLayout */
+        0, /* didDetectXSSForFrame */
+        0, /* shouldGoToBackForwardListItem */
+        0, /* globalObjectIsAvailableForFrame */
+        0, /* willDisconnectDOMWindowExtensionFromGlobalObject */
+        0, /* didReconnectDOMWindowExtensionToGlobalObject */
+        0, /* willDestroyGlobalObjectForDOMWindowExtension */
+        0, /* didFinishProgress */
+        0, /* shouldForceUniversalAccessFromLocalURL */
+    };
+    WKBundlePageSetPageLoaderClient(page, &loaderClient);
+}
+
 
 extern "C"
 {

diff --git a/src/view/webkit/bundles/wrt-wk2-bundle.h b/src/view/webkit/bundles/wrt-wk2-bundle.h
index 53dd8d1..de4a089 100644 (file)
--- a/src/view/webkit/bundles/wrt-wk2-bundle.h
+++ b/src/view/webkit/bundles/wrt-wk2-bundle.h
@@ -156,6 +156,11 @@ class Bundle {
     bool isEncryptedResource(std::string Url, int &size);
     std::string DecryptResource(std::string resource, int size);
 
+    void requestSuspend();
+    void requestResume();
+
+    void connectLoaderClientCallbacksToPage(WKBundlePageRef page);
+
 
 };
 

diff --git a/src/view/webkit/view_logic.cpp b/src/view/webkit/view_logic.cpp
index 2ea67ee..c227120 100644 (file)
--- a/src/view/webkit/view_logic.cpp
+++ b/src/view/webkit/view_logic.cpp
@@ -231,6 +231,9 @@ void ViewLogic::suspendWidget()
     LogInfo("Pausing widget");
     Assert(m_model);
 
+    LogDebug("Request bundle to suspend");
+    PluginModuleSupport::suspend(m_ewkContext);
+
     if (!m_currentEwkView) {
         LogWarning("Cannot suspend widget without view");
     } else {
@@ -248,6 +251,9 @@ void ViewLogic::resumeWidget()
     LogInfo("Resume widget");
     Assert(m_model);
 
+    LogDebug("Request bundle to resume");
+    PluginModuleSupport::resume(m_ewkContext);
+
     if (m_currentEwkView) {
         resumeWebkit(m_currentEwkView);
     }
@@ -899,6 +905,7 @@ void ViewLogic::suspendEwkView(Evas_Object *wkView)
 
     // unregister webview callbacks
     ewkClientDeinit(wkView);
+
     return;
 }
 

diff --git a/src/wrt-client/wrt-client.cpp b/src/wrt-client/wrt-client.cpp
index 7834ec9..36d9668 100755 (executable)
--- a/src/wrt-client/wrt-client.cpp
+++ b/src/wrt-client/wrt-client.cpp
@@ -90,6 +90,8 @@ void WrtClient::OnResume()
 
 void WrtClient::OnPause()
 {
+    LogDebug("On pause");
+
     if (m_widgetState != WidgetState_Running) {
         LogWarning("Widget is not running to be suspended");
         return;