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

Delta Between Two Patch Sets: include/AdblockPlus/JsEngine.h

Issue 10213003: Make JsEngine::Evaluate() return a wrapper for v8::Value to accessdifferent variable types easily (Closed)
Left Patch Set: Created April 12, 2013, 2:55 p.m.
Right Patch Set: Addressed review comments Created April 17, 2013, 7:56 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « include/AdblockPlus/FilterEngine.h ('k') | include/AdblockPlus/JsValue.h » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 #ifndef ADBLOCKPLUS_JS_ENGINE_H 1 #ifndef ADBLOCKPLUS_JS_ENGINE_H
2 #define ADBLOCKPLUS_JS_ENGINE_H 2 #define ADBLOCKPLUS_JS_ENGINE_H
3 3
4 #include <stdexcept> 4 #include <stdexcept>
5 #include <string> 5 #include <string>
6 #include <v8.h> 6 #include <v8.h>
7 #include <AdblockPlus/JsValue.h> 7 #include <AdblockPlus/JsValue.h>
8 8
9 namespace AdblockPlus 9 namespace AdblockPlus
10 { 10 {
11 class FileSystem;
12 class WebRequest;
11 class ErrorCallback; 13 class ErrorCallback;
12 class FileReader;
13 class WebRequest;
14 14
15 class JsError : public std::runtime_error 15 class JsError : public std::runtime_error
16 { 16 {
17 public: 17 public:
18 explicit JsError(const v8::Handle<v8::Value> exception, 18 explicit JsError(const v8::Handle<v8::Value> exception,
19 const v8::Handle<v8::Message> message); 19 const v8::Handle<v8::Message> message);
20 }; 20 };
21 21
22 class JsEngine 22 class JsEngine
23 { 23 {
24 friend class JsValue;
25
24 public: 26 public:
25 JsEngine(const FileReader* const fileReader, 27 JsEngine(FileSystem* const fileReader,
26 WebRequest* const webRequest, 28 WebRequest* const webRequest,
27 ErrorCallback* const errorCallback); 29 ErrorCallback* const errorCallback);
28 JsValuePtr Evaluate(const std::string& source, 30 JsValuePtr Evaluate(const std::string& source,
29 const std::string& filename = ""); 31 const std::string& filename = "");
30 void Load(const std::string& scriptPath); 32 void Load(const std::string& scriptPath);
31 void Gc(); 33 void Gc();
34 JsValuePtr NewValue(const std::string& val);
35 JsValuePtr NewValue(int64_t val);
36 JsValuePtr NewValue(bool val);
37 inline JsValuePtr NewValue(const char* val)
38 {
39 return NewValue(std::string(val));
40 }
41 inline JsValuePtr NewValue(int val)
42 {
43 return NewValue(static_cast<int64_t>(val));
44 }
45
46 class Context
47 {
48 public:
49 Context(const JsEngine& jsEngine);
50 virtual inline ~Context() {};
51
52 private:
53 const v8::Locker locker;
54 const v8::HandleScope handleScope;
55 const v8::Context::Scope contextScope;
56 };
32 57
33 private: 58 private:
34 const FileReader* const fileReader; 59 const FileSystem* const fileSystem;
60 v8::Isolate* isolate;
35 v8::Persistent<v8::Context> context; 61 v8::Persistent<v8::Context> context;
36 }; 62 };
37 } 63 }
38 64
39 #endif 65 #endif
LEFTRIGHT

Powered by Google App Engine
This is Rietveld