merge wrt-plugins-tizen_0.2.0-2

[profile/ivi/wrt-plugins-tizen.git] / src / standards / Tizen / Tizen / JSCompositeFilter.cpp

diff --git a/src/standards/Tizen/Tizen/JSCompositeFilter.cpp b/src/standards/Tizen/Tizen/JSCompositeFilter.cpp
index 20ce956..2cad942 100755 (executable)
--- a/src/standards/Tizen/Tizen/JSCompositeFilter.cpp
+++ b/src/standards/Tizen/Tizen/JSCompositeFilter.cpp
@@ -29,7 +29,6 @@
 #include <API/Filter/CompositeFilter.h>
 #include <Tizen/Common/JSTizenExceptionFactory.h>
 #include <Tizen/Common/JSTizenException.h>
-#include <Tizen/Common/JSGlobalContextFactory.h>
 #include "FilterConverter.h"
 #include "JSAbstractFilterArray.h"
 #include "JSCompositeFilter.h"
@@ -110,16 +109,27 @@ CompositeFilterPtr JSCompositeFilter::getCompositeFilter(JSContextRef context, J
        return priv->getObject();
 }
 
+JSObjectRef JSCompositeFilter::createJSObject(JSContextRef context, CompositeFilterPtr privateData)
+{
+       JSCompositeFilterPriv *priv = new JSCompositeFilterPriv(context, privateData);
+       JSObjectRef jsObjectRef = JSObjectMake(context, getClassRef(), static_cast<void*>(priv));
+       if (NULL == jsObjectRef) {
+               LogError("object creation error");
+               return NULL;
+       }
+       return jsObjectRef;
+}
+
 void JSCompositeFilter::Initialize(JSContextRef context, JSObjectRef object)
 {
-//     if (!JSObjectGetPrivate(object))
-//     {
-//             CompositeFilterPtr coord(new CompositeFilter(""));
-//             JSCompositeFilterPriv *priv = new JSCompositeFilterPriv(context, CompositeFilterPtr(coord));
-//             if (!JSObjectSetPrivate(object, priv)) {
-//                     delete priv;
-//             }
-//     }
+       if (!JSObjectGetPrivate(object))
+       {
+               CompositeFilterPtr filter(new CompositeFilter(UNION_FILTER, FilterArrayPtr(NULL)));
+               JSCompositeFilterPriv *priv = new JSCompositeFilterPriv(context, CompositeFilterPtr(filter));
+               if (!JSObjectSetPrivate(object, priv)) {
+                       delete priv;
+               }
+       }
 }
 
 void JSCompositeFilter::Finalize(JSObjectRef object)
@@ -134,17 +144,6 @@ void JSCompositeFilter::Finalize(JSObjectRef object)
        priv = NULL;
 }
 
-JSObjectRef JSCompositeFilter::createJSObject(JSContextRef context, CompositeFilterPtr privateData)
-{
-       JSCompositeFilterPriv *priv = new JSCompositeFilterPriv(context, privateData);
-       JSObjectRef jsObjectRef = JSObjectMake(context, getClassRef(), static_cast<void*>(priv));
-       if (NULL == jsObjectRef) {
-               LogError("object creation error");
-               return NULL;
-       }
-       return jsObjectRef;
-}
-
 CompositeFilterPtr JSCompositeFilter::getPrivData(JSObjectRef object)
 {
        LogDebug("entered");
@@ -170,13 +169,13 @@ JSObjectRef JSCompositeFilter::constructor(JSContextRef context,
 //     AceSecurityStatus status = CONTACT_CHECK_ACCESS(controller->getContext(), CONTACT_FUNCTION_API_ADD);
 //     TIZEN_SYNC_ACCESS_HANDLER(status, context, exception);
 
-//     JSCompositeFilterPriv *priv = static_cast<JSCompositeFilterPriv*>(JSObjectGetPrivate(constructor));
-//     if (!priv) {
-//             ThrowMsg(WrtDeviceApis::Commons::NullPointerException, "Private object is null");
-//     }
-//     JSContextRef gContext = priv->getContext();
+       JSCompositeFilterPriv *priv = static_cast<JSCompositeFilterPriv*>(JSObjectGetPrivate(constructor));
+       if (!priv) {
+               ThrowMsg(WrtDeviceApis::Commons::NullPointerException, "Private object is null");
+       }
+       JSContextRef gContext = priv->getContext();
 
-       JSContextRef gContext = JSGlobalContextFactory::getInstance()->get();
+//     JSContextRef gContext = JSGlobalContextFactory::getInstance()->get();
 
        BasicValidator validator = BasicValidatorFactory::getValidator(gContext, exception);
        Try {