Update wrt-plugins-common_0.3.53

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

diff --git a/src/standards/W3C/Widget/JSPreferences.cpp b/src/standards/W3C/Widget/JSPreferences.cpp
index 78748b3..c461fc8 100644 (file)
--- a/src/standards/W3C/Widget/JSPreferences.cpp
+++ b/src/standards/W3C/Widget/JSPreferences.cpp
@@ -30,8 +30,8 @@
 #include <CommonsJavaScript/JSDOMExceptionFactory.h>
 #include <StorageEvent/StorageEventMgr.h>
 #include <StorageEvent/IStorageEvent.h>
-#include "IFrameSupport.h"
-#include "AddEventListenerSupport.h"
+#include <js-overlay/js_iframe_support.h>
+#include <js-overlay/js_overlay_addEventListener.h>
 
 using namespace std;
 using namespace WrtDeviceApis;
@@ -230,12 +230,7 @@ JSClassRef JSPreferences::m_jsClassRef =
 void JSPreferences::initialize(JSContextRef context,
         JSObjectRef object)
 {
-    LogDebug("entered");
-
-    if( !AddEventListenerSupport::isInitialized())
-    {
-        AddEventListenerSupport::initializeContext(context);
-    }
+    LogDebug("entered. Context: " << context);
 
     LocalStoragePrivateData* priv =
       static_cast<LocalStoragePrivateData*>(JSObjectGetPrivate(object));
@@ -277,7 +272,7 @@ JSValueRef JSPreferences::removeItem(JSContextRef context,
         Assert(iframe && "Iframe is NULL");
 
         AddEventListenerSupport::
-            CallListenersFromDifferentIFrames(iframe, event);
+            CallStorageListenersFromDifferentIFrames(iframe, event);
 
         LogDebug("end");
         return JSValueMakeNull(context);
@@ -316,7 +311,7 @@ JSValueRef JSPreferences::setItem(JSContextRef context,
         Assert(iframe && "Iframe is NULL");
 
         AddEventListenerSupport::
-            CallListenersFromDifferentIFrames(iframe, event);
+            CallStorageListenersFromDifferentIFrames(iframe, event);
 
         LogDebug("end");
 
@@ -353,7 +348,7 @@ JSValueRef JSPreferences::clear(JSContextRef context,
         IStorageEventPtr storageEvent = getStorageEvent();
 
         AddEventListenerSupport::
-            CallListenersFromDifferentIFrames(iframe, storageEvent);
+            CallStorageListenersFromDifferentIFrames(iframe, storageEvent);
 
         LogDebug("end");
 
@@ -414,7 +409,7 @@ JSValueRef JSPreferences::key(JSContextRef context,
 
         size_t n = converter.toSizeT(arguments[0]);
 
-        std::string value = getIStorage(thisObject)->getValueByIndex(n);
+        std::string value = getIStorage(thisObject)->getKeyByIndex(n);
 
         LogDebug("end");
 
@@ -537,7 +532,7 @@ bool JSPreferences::setProperty(JSContextRef context,
         Assert(iframe && "Iframe is NULL");
 
         AddEventListenerSupport::
-            CallListenersFromDifferentIFrames(iframe, event);
+            CallStorageListenersFromDifferentIFrames(iframe, event);
 
         LogDebug("end");