Some refactoring of global JavaScript objects

src/JsValue.cpp

 #include <AdblockPlus.h>
 
 namespace
 {
   std::string fromV8String(v8::Handle<v8::Value> value)
   {
     v8::String::Utf8Value stringValue(value);
     if (stringValue.length())
       return std::string(*stringValue, stringValue.length());
     else
@@ skipping 13 matching lines @@
 {
 }
 
 AdblockPlus::JsValue::~JsValue()
 {
   value.Dispose(jsEngine.isolate);
 }
 
 bool AdblockPlus::JsValue::IsUndefined() const
 {
+  const JsEngine::Context context(jsEngine);
   return value->IsUndefined();
 }
 
 bool AdblockPlus::JsValue::IsNull() const
 {
+  const JsEngine::Context context(jsEngine);
   return value->IsNull();
 }
 
 bool AdblockPlus::JsValue::IsString() const
 {
+  const JsEngine::Context context(jsEngine);
   return value->IsString() || value->IsStringObject();
 }
 
 bool AdblockPlus::JsValue::IsNumber() const
 {
+  const JsEngine::Context context(jsEngine);
   return value->IsNumber() || value->IsNumberObject();
 }
 
 bool AdblockPlus::JsValue::IsBool() const
 {
+  const JsEngine::Context context(jsEngine);
   return value->IsBoolean() || value->IsBooleanObject();
 }
 
 bool AdblockPlus::JsValue::IsObject() const
 {
+  const JsEngine::Context context(jsEngine);
   return value->IsObject();
 }
 
 bool AdblockPlus::JsValue::IsArray() const
 {
+  const JsEngine::Context context(jsEngine);
   return value->IsArray();
 }
 
 bool AdblockPlus::JsValue::IsFunction() const
 {
+  const JsEngine::Context context(jsEngine);
   return value->IsFunction();
 }
 
 std::string AdblockPlus::JsValue::AsString() const
 {
   const JsEngine::Context context(jsEngine);
   return fromV8String(value);
 }
 
 int64_t AdblockPlus::JsValue::AsInt() const
@@ skipping 18 matching lines @@
   v8::Persistent<v8::Array> array = v8::Persistent<v8::Array>::Cast(value);
   uint32_t length = array->Length();
   for (uint32_t i = 0; i < length; i++)
   {
     v8::Local<v8::Value> item = array->Get(i);
     result.push_back(JsValuePtr(new JsValue(jsEngine, item)));
   }
   return result;
 }
 
+std::vector<std::string> AdblockPlus::JsValue::GetOwnPropertyNames() const
+{
+  if (!IsObject())
+    throw new std::runtime_error("Attempting to get propert list for a non-object");
+
+  const JsEngine::Context context(jsEngine);
+  const v8::Persistent<v8::Object> object = v8::Persistent<v8::Object>::Cast(value);
+  JsValueList properties = JsValuePtr(new JsValue(jsEngine, object->GetOwnPropertyNames()))->AsList();
+  std::vector<std::string> result;
+  for (JsValueList::iterator it = properties.begin(); it != properties.end(); ++it)
+    result.push_back((*it)->AsString());
+  return result;
+}
+
+
 AdblockPlus::JsValuePtr AdblockPlus::JsValue::GetProperty(const std::string& name) const
 {
   if (!IsObject())
     throw new std::runtime_error("Attempting to get property of a non-object");
 
   const JsEngine::Context context(jsEngine);
   v8::Local<v8::String> property = toV8String(name);
   v8::Persistent<v8::Object> obj = v8::Persistent<v8::Object>::Cast(value);
   return JsValuePtr(new JsValue(jsEngine, obj->Get(property)));
 }
@@ skipping 13 matching lines @@
   const JsEngine::Context context(jsEngine);
   SetProperty(name, toV8String(val));
 }
 
 void AdblockPlus::JsValue::SetProperty(const std::string& name, int64_t val)
 {
   const JsEngine::Context context(jsEngine);
   SetProperty(name, v8::Integer::New(val));
 }
 
+void AdblockPlus::JsValue::SetProperty(const std::string& name, JsValuePtr val)
+{
+  const JsEngine::Context context(jsEngine);
+  SetProperty(name, val->value);
+}
+
 void AdblockPlus::JsValue::SetProperty(const std::string& name, bool val)
 {
   const JsEngine::Context context(jsEngine);
   SetProperty(name, v8::Boolean::New(val));
 }
 
 std::string AdblockPlus::JsValue::GetClassName() const
 {
   if (!IsObject())
     throw new std::runtime_error("Cannot get constructor of a non-object");
@@ skipping 26 matching lines @@
   const v8::TryCatch tryCatch;
   v8::Persistent<v8::Function> func = v8::Persistent<v8::Function>::Cast(value);
   v8::Local<v8::Value> result = func->Call(thisObj, argc, argv);
   delete argv;
 
   if (tryCatch.HasCaught())
     throw AdblockPlus::JsError(tryCatch.Exception(), tryCatch.Message());
 
   return JsValuePtr(new JsValue(jsEngine, result));
 }