Unified Diff: src/FileSystemJsObject.cpp
Issue 6112412478472192:
Issue 1547 - Pass isolate to v8::API (Closed)
Patch Set: rebase and move 'isolate' into the proper scopes
Created Feb. 5, 2015, 3:18 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
src/GlobalJsObject.cpp » ('j')
|
src/GlobalJsObject.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: src/FileSystemJsObject.cpp |
| diff --git a/src/FileSystemJsObject.cpp b/src/FileSystemJsObject.cpp |
| index 62e45d221306fb0dd3bf2a29708d957c8a5241d8..6547f0a9a9c17b38c7b2377a12531772f87301f4 100644 |
| --- a/src/FileSystemJsObject.cpp |
| +++ b/src/FileSystemJsObject.cpp |
| @@ -251,11 +251,12 @@ namespace |
| AdblockPlus::JsEnginePtr jsEngine = AdblockPlus::JsEngine::FromArguments(arguments); |
| AdblockPlus::JsValueList converted = jsEngine->ConvertArguments(arguments); |
| + v8::Isolate* isolate = arguments.GetIsolate(); |
| if (converted.size() != 2) |
| - return v8::ThrowException(v8::String::New( |
| + return v8::ThrowException(Utils::ToV8String(isolate, |
| "_fileSystem.read requires 2 parameters")); |
| if (!converted[1]->IsFunction()) |
| - return v8::ThrowException(v8::String::New( |
| + return v8::ThrowException(Utils::ToV8String(isolate, |
| "Second argument to _fileSystem.read must be a function")); |
| ReadThread* const readThread = new ReadThread(jsEngine, converted[1], |
| converted[0]->AsString()); |
| @@ -268,11 +269,12 @@ namespace |
| AdblockPlus::JsEnginePtr jsEngine = AdblockPlus::JsEngine::FromArguments(arguments); |
| AdblockPlus::JsValueList converted = jsEngine->ConvertArguments(arguments); |
| + v8::Isolate* isolate = arguments.GetIsolate(); |
| if (converted.size() != 3) |
| - return v8::ThrowException(v8::String::New( |
| + return v8::ThrowException(Utils::ToV8String(isolate, |
| "_fileSystem.write requires 3 parameters")); |
| if (!converted[2]->IsFunction()) |
| - return v8::ThrowException(v8::String::New( |
| + return v8::ThrowException(Utils::ToV8String(isolate, |
| "Third argument to _fileSystem.write must be a function")); |
| WriteThread* const writeThread = new WriteThread(jsEngine, converted[2], |
| converted[0]->AsString(), converted[1]->AsString()); |
| @@ -285,11 +287,12 @@ namespace |
| AdblockPlus::JsEnginePtr jsEngine = AdblockPlus::JsEngine::FromArguments(arguments); |
| AdblockPlus::JsValueList converted = jsEngine->ConvertArguments(arguments); |
| + v8::Isolate* isolate = arguments.GetIsolate(); |
| if (converted.size() != 3) |
| - return v8::ThrowException(v8::String::New( |
| + return v8::ThrowException(Utils::ToV8String(isolate, |
| "_fileSystem.move requires 3 parameters")); |
| if (!converted[2]->IsFunction()) |
| - return v8::ThrowException(v8::String::New( |
| + return v8::ThrowException(Utils::ToV8String(isolate, |
| "Third argument to _fileSystem.move must be a function")); |
| MoveThread* const moveThread = new MoveThread(jsEngine, converted[2], |
| converted[0]->AsString(), converted[1]->AsString()); |
| @@ -302,11 +305,12 @@ namespace |
| AdblockPlus::JsEnginePtr jsEngine = AdblockPlus::JsEngine::FromArguments(arguments); |
| AdblockPlus::JsValueList converted = jsEngine->ConvertArguments(arguments); |
| + v8::Isolate* isolate = arguments.GetIsolate(); |
| if (converted.size() != 2) |
| - return v8::ThrowException(v8::String::New( |
| + return v8::ThrowException(Utils::ToV8String(isolate, |
| "_fileSystem.remove requires 2 parameters")); |
| if (!converted[1]->IsFunction()) |
| - return v8::ThrowException(v8::String::New( |
| + return v8::ThrowException(Utils::ToV8String(isolate, |
| "Second argument to _fileSystem.remove must be a function")); |
| RemoveThread* const removeThread = new RemoveThread(jsEngine, converted[1], |
| converted[0]->AsString()); |
| @@ -319,11 +323,12 @@ namespace |
| AdblockPlus::JsEnginePtr jsEngine = AdblockPlus::JsEngine::FromArguments(arguments); |
| AdblockPlus::JsValueList converted = jsEngine->ConvertArguments(arguments); |
| + v8::Isolate* isolate = arguments.GetIsolate(); |
| if (converted.size() != 2) |
| - return v8::ThrowException(v8::String::New( |
| + return v8::ThrowException(Utils::ToV8String(isolate, |
| "_fileSystem.stat requires 2 parameters")); |
| if (!converted[1]->IsFunction()) |
| - return v8::ThrowException(v8::String::New( |
| + return v8::ThrowException(Utils::ToV8String(isolate, |
| "Second argument to _fileSystem.stat must be a function")); |
| StatThread* const statThread = new StatThread(jsEngine, converted[1], |
| converted[0]->AsString()); |
| @@ -336,13 +341,14 @@ namespace |
| AdblockPlus::JsEnginePtr jsEngine = AdblockPlus::JsEngine::FromArguments(arguments); |
| AdblockPlus::JsValueList converted = jsEngine->ConvertArguments(arguments); |
| + v8::Isolate* isolate = arguments.GetIsolate(); |
| if (converted.size() != 1) |
| - return v8::ThrowException(v8::String::New( |
| + return v8::ThrowException(Utils::ToV8String(isolate, |
| "_fileSystem.resolve requires 1 parameter")); |
| std::string resolved = jsEngine->GetFileSystem()->Resolve(converted[0]->AsString()); |
| - return Utils::ToV8String(resolved); |
| + return Utils::ToV8String(isolate, resolved); |
| } |
| } |
« no previous file with comments
|
« no previous file
|
src/GlobalJsObject.cpp » ('j')
|
src/GlobalJsObject.cpp » ('J')
