Simplify context setup, set properties on the global object directly instead of using templates

src/GlobalJsObject.cpp

 #include <vector>
 #include <stdexcept>
 
 #include <AdblockPlus/JsEngine.h>
 #include <AdblockPlus/JsValue.h>
+
+#include "AppInfoJsObject.h"
 #include "ConsoleJsObject.h"
 #include "FileSystemJsObject.h"
 #include "GlobalJsObject.h"
 #include "ConsoleJsObject.h"
 #include "WebRequestJsObject.h"
 #include "Thread.h"
 
 using namespace AdblockPlus;
 
 namespace
@@ skipping 45 matching lines @@
     }
     timeoutThread->Start();
 
     // We should actually return the timer ID here, which could be
     // used via clearTimeout(). But since we don't seem to need
     // clearTimeout(), we can save that for later.
     return v8::Undefined();
   }
 }
 
-JsValuePtr GlobalJsObject::Setup(JsEngine& jsEngine, JsValuePtr obj)
+JsValuePtr GlobalJsObject::Setup(JsEngine& jsEngine, const AppInfo& appInfo,
+    JsValuePtr obj)
 {
   obj->SetProperty("setTimeout", jsEngine.NewCallback(::SetTimeoutCallback));
   obj->SetProperty("_fileSystem",
       FileSystemJsObject::Setup(jsEngine, jsEngine.NewObject()));

[Felix Dahlke, 2013/04/18 12:46:50]

Why pass a new object in? Seems to make more sense for the setup functions to
create their own object and return it.

[Wladimir Palant, 2013/04/18 13:29:33]

Merely for consistency. GlobaJsObject::Setup() cannot create a new object, it
has to work with the existing global. I can change it for all the other Setup()
functions if you prefer but then they will work differently from
GlobalJsObject::Setup().

   obj->SetProperty("_webRequest",
       WebRequestJsObject::Setup(jsEngine, jsEngine.NewObject()));
   obj->SetProperty("console",
       ConsoleJsObject::Setup(jsEngine, jsEngine.NewObject()));
+  obj->SetProperty("_appInfo",
+      AppInfoJsObject::Setup(jsEngine, appInfo, jsEngine.NewObject()));
   return obj;
 }