diff options
author | Michaël Zasso <targos@protonmail.com> | 2016-09-06 22:49:51 +0200 |
---|---|---|
committer | Michaël Zasso <targos@protonmail.com> | 2016-09-22 09:51:19 +0200 |
commit | ec02b811a8a5c999bab4de312be2d732b7d9d50b (patch) | |
tree | ca3068017254f238cf413a451c57a803572983a4 /deps/v8/src/d8.h | |
parent | d2eb7ce0105369a9cad82787cb33a665e9bd00ad (diff) | |
download | android-node-v8-ec02b811a8a5c999bab4de312be2d732b7d9d50b.tar.gz android-node-v8-ec02b811a8a5c999bab4de312be2d732b7d9d50b.tar.bz2 android-node-v8-ec02b811a8a5c999bab4de312be2d732b7d9d50b.zip |
deps: update V8 to 5.4.500.27
Pick up latest commit from the 5.4-lkgr branch.
deps: edit V8 gitignore to allow trace event copy
deps: update V8 trace event to 315bf1e2d45be7d53346c31cfcc37424a32c30c8
deps: edit V8 gitignore to allow gtest_prod.h copy
deps: update V8 gtest to 6f8a66431cb592dad629028a50b3dd418a408c87
PR-URL: https://github.com/nodejs/node/pull/8317
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com>
Diffstat (limited to 'deps/v8/src/d8.h')
-rw-r--r-- | deps/v8/src/d8.h | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/deps/v8/src/d8.h b/deps/v8/src/d8.h index 321d9c1770..0e365a52dd 100644 --- a/deps/v8/src/d8.h +++ b/deps/v8/src/d8.h @@ -7,8 +7,8 @@ #ifndef V8_SHARED #include "src/allocation.h" +#include "src/base/hashmap.h" #include "src/base/platform/time.h" -#include "src/hashmap.h" #include "src/list.h" #else #include "include/v8.h" @@ -61,13 +61,13 @@ class CounterMap { public: CounterMap(): hash_map_(Match) { } Counter* Lookup(const char* name) { - i::HashMap::Entry* answer = + base::HashMap::Entry* answer = hash_map_.Lookup(const_cast<char*>(name), Hash(name)); if (!answer) return NULL; return reinterpret_cast<Counter*>(answer->value); } void Set(const char* name, Counter* value) { - i::HashMap::Entry* answer = + base::HashMap::Entry* answer = hash_map_.LookupOrInsert(const_cast<char*>(name), Hash(name)); DCHECK(answer != NULL); answer->value = value; @@ -81,14 +81,14 @@ class CounterMap { const char* CurrentKey() { return static_cast<const char*>(entry_->key); } Counter* CurrentValue() { return static_cast<Counter*>(entry_->value); } private: - i::HashMap* map_; - i::HashMap::Entry* entry_; + base::HashMap* map_; + base::HashMap::Entry* entry_; }; private: static int Hash(const char* name); static bool Match(void* key1, void* key2); - i::HashMap hash_map_; + base::HashMap hash_map_; }; #endif // !V8_SHARED @@ -290,7 +290,9 @@ class ShellOptions { isolate_sources(NULL), icu_data_file(NULL), natives_blob(NULL), - snapshot_blob(NULL) {} + snapshot_blob(NULL), + trace_enabled(false), + trace_config(NULL) {} ~ShellOptions() { delete[] isolate_sources; @@ -318,6 +320,8 @@ class ShellOptions { const char* icu_data_file; const char* natives_blob; const char* snapshot_blob; + bool trace_enabled; + const char* trace_config; }; #ifdef V8_SHARED @@ -350,7 +354,7 @@ class Shell : public i::AllStatic { #ifndef V8_SHARED // TODO(binji): stupid implementation for now. Is there an easy way to hash an - // object for use in i::HashMap? By pointer? + // object for use in base::HashMap? By pointer? typedef i::List<Local<Object>> ObjectList; static bool SerializeValue(Isolate* isolate, Local<Value> value, const ObjectList& to_transfer, @@ -375,6 +379,8 @@ class Shell : public i::AllStatic { static void RealmOwner(const v8::FunctionCallbackInfo<v8::Value>& args); static void RealmGlobal(const v8::FunctionCallbackInfo<v8::Value>& args); static void RealmCreate(const v8::FunctionCallbackInfo<v8::Value>& args); + static void RealmCreateAllowCrossRealmAccess( + const v8::FunctionCallbackInfo<v8::Value>& args); static void RealmDispose(const v8::FunctionCallbackInfo<v8::Value>& args); static void RealmSwitch(const v8::FunctionCallbackInfo<v8::Value>& args); static void RealmEval(const v8::FunctionCallbackInfo<v8::Value>& args); @@ -461,6 +467,7 @@ class Shell : public i::AllStatic { static i::List<Worker*> workers_; static i::List<SharedArrayBuffer::Contents> externalized_shared_contents_; + static void WriteIgnitionDispatchCountersFile(v8::Isolate* isolate); static Counter* GetCounter(const char* name, bool is_histogram); static Local<String> Stringify(Isolate* isolate, Local<Value> value); #endif // !V8_SHARED @@ -468,6 +475,8 @@ class Shell : public i::AllStatic { static void RunShell(Isolate* isolate); static bool SetOptions(int argc, char* argv[]); static Local<ObjectTemplate> CreateGlobalTemplate(Isolate* isolate); + static MaybeLocal<Context> CreateRealm( + const v8::FunctionCallbackInfo<v8::Value>& args); }; |