Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: src/JsEngine.cpp

Issue 10213003: Make JsEngine::Evaluate() return a wrapper for v8::Value to accessdifferent variable types easily (Closed)
Patch Set: Unbitrotted patch Created April 16, 2013, 3:30 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/FilterEngine.cpp ('k') | src/JsValue.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/JsEngine.cpp
===================================================================
--- a/src/JsEngine.cpp
+++ b/src/JsEngine.cpp
@@ -2,21 +2,22 @@
#include <sstream>
#include "GlobalJsObject.h"
#include "Utils.h"
namespace
{
v8::Handle<v8::Context> CreateContext(
+ v8::Isolate* isolate,
AdblockPlus::FileSystem& fileSystem,
AdblockPlus::WebRequest& webRequest,
AdblockPlus::ErrorCallback& errorCallback)
{
- const v8::Locker locker(v8::Isolate::GetCurrent());
+ const v8::Locker locker(isolate);
const v8::HandleScope handleScope;
const v8::Handle<v8::ObjectTemplate> global =
AdblockPlus::GlobalJsObject::Create(fileSystem, webRequest,
errorCallback);
return v8::Context::New(0, global);
}
v8::Handle<v8::Script> CompileScript(const std::string& source, const std::string& filename)
@@ -57,40 +58,61 @@ AdblockPlus::JsError::JsError(const v8::
const v8::Handle<v8::Message> message)
: std::runtime_error(ExceptionToString(exception, message))
{
}
AdblockPlus::JsEngine::JsEngine(FileSystem* const fileSystem,
WebRequest* const webRequest,
ErrorCallback* const errorCallback)
- : fileSystem(fileSystem),
- context(CreateContext(*fileSystem, *webRequest, *errorCallback))
+ : fileSystem(fileSystem), isolate(v8::Isolate::GetCurrent()),
+ context(CreateContext(isolate, *fileSystem, *webRequest, *errorCallback))
{
}
-std::string AdblockPlus::JsEngine::Evaluate(const std::string& source,
+AdblockPlus::JsValuePtr AdblockPlus::JsEngine::Evaluate(const std::string& source,
const std::string& filename)
{
- const v8::Locker locker(v8::Isolate::GetCurrent());
- const v8::HandleScope handleScope;
- const v8::Context::Scope contextScope(context);
+ const Context context(*this);
const v8::TryCatch tryCatch;
const v8::Handle<v8::Script> script = CompileScript(source, filename);
CheckTryCatch(tryCatch);
v8::Local<v8::Value> result = script->Run();
CheckTryCatch(tryCatch);
- v8::String::Utf8Value resultString(result);
- return std::string(*resultString);
+ return JsValuePtr(new JsValue(*this, result));
}
void AdblockPlus::JsEngine::Load(const std::string& scriptPath)
{
const std::tr1::shared_ptr<std::istream> file = fileSystem->Read(scriptPath);
if (!file || !*file)
throw std::runtime_error("Unable to load script " + scriptPath);
Evaluate(Utils::Slurp(*file));
}
void AdblockPlus::JsEngine::Gc()
{
while (!v8::V8::IdleNotification());
}
+
+AdblockPlus::JsValuePtr AdblockPlus::JsEngine::NewValue(const std::string& val)
+{
+ const Context context(*this);
+ return JsValuePtr(new JsValue(*this, v8::String::New(val.c_str(), val.length())));
+}
+
+AdblockPlus::JsValuePtr AdblockPlus::JsEngine::NewValue(int64_t val)
+{
+ const Context context(*this);
+ return JsValuePtr(new JsValue(*this, v8::Integer::New(val)));
+}
+
+AdblockPlus::JsValuePtr AdblockPlus::JsEngine::NewValue(bool val)
+{
+ const Context context(*this);
+ return JsValuePtr(new JsValue(*this, v8::Boolean::New(val)));
+}
+
+AdblockPlus::JsEngine::Context::Context(const JsEngine& jsEngine)
+ : locker(jsEngine.isolate), handleScope(),
+ contextScope(jsEngine.context)
+{
+}
« no previous file with comments | « src/FilterEngine.cpp ('k') | src/JsValue.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld