| Index: include/AdblockPlus/JsEngine.h |
| =================================================================== |
| --- a/include/AdblockPlus/JsEngine.h |
| +++ b/include/AdblockPlus/JsEngine.h |
| @@ -18,17 +18,17 @@ |
| #ifndef ADBLOCK_PLUS_JS_ENGINE_H |
| #define ADBLOCK_PLUS_JS_ENGINE_H |
| #include <stdexcept> |
| #include <stdint.h> |
| #include <string> |
| #include <v8.h> |
| #include <AdblockPlus/AppInfo.h> |
| -#include <AdblockPlus/ErrorCallback.h> |
| +#include <AdblockPlus/LogSystem.h> |
| #include <AdblockPlus/FileSystem.h> |
| #include <AdblockPlus/JsValue.h> |
| #include <AdblockPlus/WebRequest.h> |
| #include "tr1_memory.h" |
| namespace AdblockPlus |
| { |
| @@ -72,18 +72,18 @@ namespace AdblockPlus |
| JsValuePtr NewCallback(v8::InvocationCallback callback); |
| static JsEnginePtr FromArguments(const v8::Arguments& arguments); |
| JsValueList ConvertArguments(const v8::Arguments& arguments); |
| FileSystemPtr GetFileSystem(); |
| void SetFileSystem(FileSystemPtr val); |
| WebRequestPtr GetWebRequest(); |
| void SetWebRequest(WebRequestPtr val); |
| - ErrorCallbackPtr GetErrorCallback(); |
| - void SetErrorCallback(ErrorCallbackPtr val); |
| + LogSystemPtr GetLogSystem(); |
| + void SetLogSystem(LogSystemPtr val); |
| class Context |
| { |
| public: |
| Context(const JsEnginePtr jsEngine); |
| virtual inline ~Context() {}; |
| private: |
| @@ -92,15 +92,15 @@ namespace AdblockPlus |
| const v8::Context::Scope contextScope; |
| }; |
| private: |
| JsEngine(); |
| FileSystemPtr fileSystem; |
| WebRequestPtr webRequest; |
| - ErrorCallbackPtr errorCallback; |
| + LogSystemPtr logSystem; |
| v8::Isolate* isolate; |
| v8::Persistent<v8::Context> context; |
| }; |
| } |
| #endif |