tizen 2.4 release

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

diff --git a/src_wearable/plugin-loading/javascript_interface.cpp b/src/plugin-loading/javascript_interface.cpp
similarity index 98%
rename from src_wearable/plugin-loading/javascript_interface.cpp
rename to src/plugin-loading/javascript_interface.cpp
index 5dc8f9f..546ed5f 100644 (file)
--- a/src_wearable/plugin-loading/javascript_interface.cpp
+++ b/src/plugin-loading/javascript_interface.cpp
@@ -20,12 +20,13 @@
  * @brief       This file is the implementation file of webkit js plugin
  *              accessing routines in EFL
  */
+
+#include <memory>
+#include <vector>
+#include <string>
 #include <javascript_interface.h>
 #include <dpl/log/secure_log.h>
-#include <dpl/scoped_array.h>
-#include <vector>
 #include <dpl/singleton_impl.h>
-#include <string>
 #include <dpl/foreach.h>
 #include <dpl/noncopyable.h>
 #include <JavaScriptCore/JavaScript.h>
@@ -56,13 +57,13 @@ std::string toString(const JSStringRef& arg)
     size_t jsSize = JSStringGetMaximumUTF8CStringSize(arg);
     if (jsSize > 0) {
         ++jsSize;
-        DPL::ScopedArray<char> buffer(new char[jsSize]);
-        size_t written = JSStringGetUTF8CString(arg, buffer.Get(), jsSize);
+        std::unique_ptr<char[]> buffer(new char[jsSize]);
+        size_t written = JSStringGetUTF8CString(arg, buffer.get(), jsSize);
         if (written > jsSize) {
             _E("Conversion could not be fully performed.");
             return std::string();
         }
-        result = buffer.Get();
+        result = buffer.get();
     }
 
     return result;
@@ -165,7 +166,7 @@ JavaScriptInterface::PropertiesList JavaScriptInterface::
             static_cast<JSObjectRef>(object->getObject()));
     std::size_t count = JSPropertyNameArrayGetCount(properties);
     result.reserve(count);
-    _D("propesties count %d", count);
+    _D("properties count %d", count);
     for (std::size_t i = 0; i < count; ++i) {
         JSStringRef property = JSPropertyNameArrayGetNameAtIndex(properties, i);
         result.push_back(toString(property));