Update wrt-plugins-common_0.3.53

[framework/web/wrt-plugins-common.git] / src / modules / tizen / PluginManager / PluginManager.cpp

diff --git a/src/modules/tizen/PluginManager/PluginManager.cpp b/src/modules/tizen/PluginManager/PluginManager.cpp
index 27af1fe..0f23423 100644 (file)
--- a/src/modules/tizen/PluginManager/PluginManager.cpp
+++ b/src/modules/tizen/PluginManager/PluginManager.cpp
@@ -26,6 +26,7 @@
 #include <dpl/wrt-dao-ro/plugin_dao_read_only.h>
 #include <dpl/wrt-dao-ro/WrtDatabase.h>
 #include <plugin_logic.h>
+#include <js_types.h>
 #include <dpl/wrt-dao-ro/common_dao_types.h>
 #include <Commons/Exception.h>
 #include <CommonsJavaScript/Converter.h>
@@ -33,6 +34,7 @@
 #include <dpl/log/log.h>
 #include <dpl/foreach.h>
 
+
 using namespace std;
 
 namespace {
@@ -49,9 +51,9 @@ PluginManager::PluginManager(int widgetHandle,
                              JSObjectRef object,
                              JSContextRef context) :
     m_widgetHandle(widgetHandle),
+    m_objectInstance(object),
     m_objectUri(GLOBAL_OBJECT_NAME),
     m_shortUri(objectUri),
-    m_objectInstance(object),
     m_context(context)
 {
     m_objectUri.append(SEPARATOR).append(objectUri);
@@ -112,11 +114,11 @@ bool PluginManager::loadChild(const string &name) const
                 continue;
             }
 
-            PluginLogic::JavaScriptObject jsObject = {m_objectInstance,
+            JavaScriptObject jsObject = {m_objectInstance,
                                                       m_shortUri};
 
             return PluginLogicSingleton::Instance().loadPluginOnDemand(
-                handle, jsObject);
+                handle, jsObject, const_cast<JSGlobalContextRef>(m_context));
         }
     }
     LogError("Plugin not loaded");