| Index: src/d8.h
|
| diff --git a/src/d8.h b/src/d8.h
|
| index a62a81fd9c1f3ae90bdac125f4a1d3bb2a53d003..b87b404de3bca831b0b5b1c410e0cc4dcca4fff7 100644
|
| --- a/src/d8.h
|
| +++ b/src/d8.h
|
| @@ -158,7 +158,7 @@ class SourceGroup {
|
|
|
| void End(int offset) { end_offset_ = offset; }
|
|
|
| - void Execute();
|
| + void Execute(Isolate* isolate);
|
|
|
| #ifndef V8_SHARED
|
| void StartExecuteInThread();
|
| @@ -187,7 +187,7 @@ class SourceGroup {
|
| #endif // V8_SHARED
|
|
|
| void ExitShell(int exit_code);
|
| - Handle<String> ReadFile(const char* name);
|
| + Handle<String> ReadFile(Isolate* isolate, const char* name);
|
|
|
| const char** argv_;
|
| int begin_offset_;
|
| @@ -272,9 +272,9 @@ class Shell : public i::AllStatic {
|
| bool report_exceptions);
|
| static const char* ToCString(const v8::String::Utf8Value& value);
|
| static void ReportException(TryCatch* try_catch);
|
| - static Handle<String> ReadFile(const char* name);
|
| - static Persistent<Context> CreateEvaluationContext();
|
| - static int RunMain(int argc, char* argv[]);
|
| + static Handle<String> ReadFile(Isolate* isolate, const char* name);
|
| + static Persistent<Context> CreateEvaluationContext(Isolate* isolate);
|
| + static int RunMain(Isolate* isolate, int argc, char* argv[]);
|
| static int Main(int argc, char* argv[]);
|
| static void Exit(int exit_code);
|
|
|
| @@ -310,9 +310,9 @@ class Shell : public i::AllStatic {
|
| static Handle<Value> DisableProfiler(const Arguments& args);
|
| static Handle<Value> Read(const Arguments& args);
|
| static Handle<Value> ReadBuffer(const Arguments& args);
|
| - static Handle<String> ReadFromStdin();
|
| + static Handle<String> ReadFromStdin(Isolate* isolate);
|
| static Handle<Value> ReadLine(const Arguments& args) {
|
| - return ReadFromStdin();
|
| + return ReadFromStdin(args.GetIsolate());
|
| }
|
| static Handle<Value> Load(const Arguments& args);
|
| static Handle<Value> ArrayBuffer(const Arguments& args);
|
| @@ -365,7 +365,6 @@ class Shell : public i::AllStatic {
|
|
|
| static void AddOSMethods(Handle<ObjectTemplate> os_template);
|
|
|
| - static LineEditor* console;
|
| static const char* kPrompt;
|
| static ShellOptions options;
|
|
|
| @@ -384,15 +383,17 @@ class Shell : public i::AllStatic {
|
| static Counter* GetCounter(const char* name, bool is_histogram);
|
| static void InstallUtilityScript();
|
| #endif // V8_SHARED
|
| - static void Initialize();
|
| - static void RunShell();
|
| + static void Initialize(Isolate* isolate);
|
| + static void RunShell(Isolate* isolate);
|
| static bool SetOptions(int argc, char* argv[]);
|
| - static Handle<ObjectTemplate> CreateGlobalTemplate();
|
| + static Handle<ObjectTemplate> CreateGlobalTemplate(Isolate* isolate);
|
| static Handle<FunctionTemplate> CreateArrayBufferTemplate(InvocationCallback);
|
| static Handle<FunctionTemplate> CreateArrayTemplate(InvocationCallback);
|
| - static Handle<Value> CreateExternalArrayBuffer(Handle<Object> buffer,
|
| + static Handle<Value> CreateExternalArrayBuffer(Isolate* isolate,
|
| + Handle<Object> buffer,
|
| int32_t size);
|
| - static Handle<Object> CreateExternalArray(Handle<Object> array,
|
| + static Handle<Object> CreateExternalArray(Isolate* isolate,
|
| + Handle<Object> array,
|
| Handle<Object> buffer,
|
| ExternalArrayType type,
|
| int32_t length,
|
|
|