tizen 2.4 release

[framework/web/wrt-plugins-common.git] / src / standards / W3C / Widget / JSWidget.cpp

diff --git a/src_wearable/standards/W3C/Widget/JSWidget.cpp b/src/standards/W3C/Widget/JSWidget.cpp
similarity index 97%
rename from src_wearable/standards/W3C/Widget/JSWidget.cpp
rename to src/standards/W3C/Widget/JSWidget.cpp
index ec7b7b2..47f3fa4 100644 (file)
--- a/src_wearable/standards/W3C/Widget/JSWidget.cpp
+++ b/src/standards/W3C/Widget/JSWidget.cpp
@@ -32,6 +32,8 @@
 #include <Widget/IWidget.h>
 #include <LocalStorage/LocalStorageMgr.h>
 #include <Commons/WrtAccess/WrtAccess.h>
+#include <dpl/wrt-dao-ro/wrt_db_types.h>
+#include <CommonsJavaScript/JSLifeManager.h>
 
 // temporary
 extern "C" JSGlobalContextRef JSContextGetGlobalContext(JSContextRef ctx);
@@ -108,8 +110,6 @@ struct WidgetPrivateObject
 {
     Widget::Api::IWidgetPtr iwidget;
     JSObjectRef preferencesObject;
-    //TEMP
-    //int widgetId     // TODO: check is it necessary (g.rynkowski)
     JSObjectRef widgetObject;
 };
 typedef std::shared_ptr<WidgetPrivateObject> WidgetPrivateObjectPtr;
@@ -131,7 +131,7 @@ WrtDeviceApis::Widget::Api::IWidgetPtr getIWidget(JSObjectRef arg)
     return priv->getObject()->iwidget;
 }
 
-LocalStorage::Api::ILocalStoragePtr getLocalStorage(int widgetId)
+LocalStorage::Api::ILocalStoragePtr getLocalStorage(WidgetHandle widgetId)
 {
     LocalStorage::Api::ILocalStoragePtr storage(
         LocalStorage::Api::getLocalStorage(widgetId));
@@ -154,7 +154,7 @@ JSObjectRef getPreferences(JSObjectRef arg)
 
 JSObjectRef createPreferencesObject(JSContextRef context,
                                     JSObjectRef widgetObject,
-                                    int widgetId)
+                                    WidgetHandle widgetId)
 {
     AssertMsg(widgetObject, "Widget Object can'n be null");
     //delete is invoked in JSPreferences::finalize
@@ -172,7 +172,7 @@ JSObjectRef createPreferencesObject(JSContextRef context,
         delete priv;
     }
     //Unprotect is called in JSWidget::finalize
-    JSValueProtect(context, preferences);
+    JSValueSafeProtect(context, preferences);
 
     return preferences;
 }
@@ -243,8 +243,7 @@ void JSWidget::initialize(JSContextRef context,
 
     LogDebug("entered. Context : " << context << "(global:" << g_context << "), Object: " << object);
 
-    if (context != g_context)
-    {
+    if (context != g_context) {
         context = g_context;
     }
 
@@ -259,7 +258,7 @@ void JSWidget::initialize(JSContextRef context,
 
             Widget::Api::IWidgetPtr widget =
                 Api::WidgetFactory::createWidget();
-            int widgetId = WrtAccessSingleton::Instance().getWidgetId();
+            WidgetHandle widgetId = WrtAccessSingleton::Instance().getWidgetId();
             JSObjectRef preferences =
                 createPreferencesObject(context,
                                         object,
@@ -289,12 +288,11 @@ void JSWidget::initialize(JSContextRef context,
 void JSWidget::finalize(JSObjectRef object)
 {
     LogDebug("entered");
-    LogDebug("Object: " << object);
     JSWidgetPrivateObject* priv =
         static_cast<JSWidgetPrivateObject*>(JSObjectGetPrivate(object));
 
     if (priv) {
-        JSValueUnprotect(priv->getContext(),
+        JSValueSafeUnprotect(priv->getContext(),
                          priv->getObject()->preferencesObject);
 
         delete priv;
@@ -491,8 +489,6 @@ JSValueRef JSWidget::getProperty(JSContextRef context,
                                  JSStringRef propertyName,
                                  JSValueRef* exception)
 {
-    LogDebug("Object: " << object);
-
     Try {
         Converter converter(context);