tizen 2.4 release

[framework/web/wrt-plugins-common.git] / src / plugin-loading / js_page_session.cpp

diff --git a/src_wearable/plugin-loading/js_page_session.cpp b/src/plugin-loading/js_page_session.cpp
similarity index 96%
rename from src_wearable/plugin-loading/js_page_session.cpp
rename to src/plugin-loading/js_page_session.cpp
index 96de957..031ed4c 100644 (file)
--- a/src_wearable/plugin-loading/js_page_session.cpp
+++ b/src/plugin-loading/js_page_session.cpp
@@ -27,13 +27,13 @@
 #include "plugin_logic.h"
 
 #include <dpl/assert.h>
-#include <dpl/scoped_array.h>
 #include <dpl/log/secure_log.h>
 #include <dpl/foreach.h>
 #include <dpl/singleton_impl.h>
 #include <dpl/wrt-dao-ro/widget_dao_read_only.h>
 #include <dpl/wrt-dao-ro/common_dao_types.h>
 #include <dpl/wrt-dao-ro/global_config.h>
+#include <dpl/wrt-dao-ro/wrt_db_types.h>
 
 #include <JavaScriptCore/JavaScript.h>
 
@@ -77,7 +77,7 @@ class JSPageSession::Impl
 
   private:
     ///< Widget handle using this session
-    int m_widgetHandle;
+    WidgetHandle m_widgetHandle;
 
     //view for this session
     JSGlobalContextRef m_context;
@@ -117,7 +117,7 @@ class JSPageSession::Impl
     ~Impl();
 
     // Widget session
-    void startSession(int widgetHandle,
+    void startSession(WidgetHandle widgetHandle,
                       JSGlobalContextRef view,
                       double scaleFactor,
                       const char* encodedBundle,
@@ -154,7 +154,7 @@ JSPageSession::Impl::Impl(const PluginContainerSupportPtr& support) :
 JSPageSession::Impl::~Impl()
 {
     if (m_sessionStarted) {
-        LogError("Must stop widget session before exit!");
+        _E("Must stop widget session before exit!");
         stopSession();
     }
 
@@ -272,7 +272,7 @@ bool JSPageSession::Impl::loadPluginOnDemand(
     // accepted
     //    LogDebug("Installing feature : " << widgetFeature.name);
     //    if (widgetFeature.rejected) {
-    //        LogWarning("This api-feature was rejected");
+    //        _W("This api-feature was rejected");
     //        return;
     //    }
     //
@@ -312,7 +312,7 @@ bool JSPageSession::Impl::installPluginOnDemand(PluginModelPtr plugin,
 
     if (!parent->getObject()) {
         _E("NULL pointer value");
-        assert(false);
+        Assert(false);
         return false;
     }
 
@@ -359,7 +359,7 @@ void JSPageSession::Impl::dispatchJavaScriptEvent(CustomEventType eventType,
     m_objectExplorer->callEventListeners(eventType, data);
 }
 
-void JSPageSession::Impl::startSession(int widgetHandle,
+void JSPageSession::Impl::startSession(WidgetHandle widgetHandle,
                                        JSGlobalContextRef context,
                                        double scaleFactor,
                                        const char* encodedBundle,
@@ -439,17 +439,17 @@ void JSPageSession::Impl::unloadPluginsFromSession()
 void JSPageSession::Impl::performLibrariesUnload()
 {
 #if 0
-    LogDebug("Perform library unload");
+    _D("Perform library unload");
 
     size_t unloadedLibraries = 0;
 
     FOREACH(pluginIt, m_loadedPlugins)
     {
-        LogDebug("Preparing library: " << (*pluginIt)->LibraryName.Get());
+        _D("Preparing library: %s", (*pluginIt)->LibraryName.Get().c_str());
 
-        PluginPtr plugin = (*pluginIt)->LibraryInstance.Get();
+        PluginPtr plugin = (*pluginIt)->LibraryInstance.get();
         if (!plugin) {
-            LogWarning("Library not loaded " << (*pluginIt)->LibraryName.Get());
+            _W("Library not loaded %s", (*pluginIt)->LibraryName.Get().c_str());
             continue;
         }
         unloadedLibraries++;
@@ -541,7 +541,7 @@ void JSPageSession::Impl::unloadFrame(JSGlobalContextRef context)
     m_objectExplorer->unloadFrame(context);
 }
 
-void JSPageSession::startSession(int widgetHandle,
+void JSPageSession::startSession(WidgetHandle widgetHandle,
                                  JSGlobalContextRef ctx,
                                  double scaleFactor,
                                  const char* encodedBundle,