diff options
author | Ali Ijaz Sheikh <ofrobots@google.com> | 2015-08-23 06:09:40 -0700 |
---|---|---|
committer | Rod Vagg <rod@vagg.org> | 2015-09-06 21:38:01 +1000 |
commit | 9fddd83cf9adf505bce2e2373881df0c4d41b261 (patch) | |
tree | 4272ce14c10fea496af2e78fc6debb187d613451 /deps/v8/src/extensions | |
parent | 46b7d151674d138e7ea4342d5f3ada1208b87ff2 (diff) | |
download | android-node-v8-9fddd83cf9adf505bce2e2373881df0c4d41b261.tar.gz android-node-v8-9fddd83cf9adf505bce2e2373881df0c4d41b261.tar.bz2 android-node-v8-9fddd83cf9adf505bce2e2373881df0c4d41b261.zip |
deps: upgrade V8 to 4.5.103.24
Upgrade to the latest branch-head for V8 4.5. For the full commit log see
https://github.com/v8/v8-git-mirror/commits/4.5.103.24
PR-URL: https://github.com/nodejs/node/pull/2509
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Diffstat (limited to 'deps/v8/src/extensions')
-rw-r--r-- | deps/v8/src/extensions/externalize-string-extension.cc | 49 | ||||
-rw-r--r-- | deps/v8/src/extensions/externalize-string-extension.h | 5 | ||||
-rw-r--r-- | deps/v8/src/extensions/free-buffer-extension.cc | 10 | ||||
-rw-r--r-- | deps/v8/src/extensions/free-buffer-extension.h | 5 | ||||
-rw-r--r-- | deps/v8/src/extensions/gc-extension.cc | 15 | ||||
-rw-r--r-- | deps/v8/src/extensions/gc-extension.h | 5 | ||||
-rw-r--r-- | deps/v8/src/extensions/statistics-extension.cc | 31 | ||||
-rw-r--r-- | deps/v8/src/extensions/statistics-extension.h | 5 | ||||
-rw-r--r-- | deps/v8/src/extensions/trigger-failure-extension.cc | 10 | ||||
-rw-r--r-- | deps/v8/src/extensions/trigger-failure-extension.h | 5 |
10 files changed, 80 insertions, 60 deletions
diff --git a/deps/v8/src/extensions/externalize-string-extension.cc b/deps/v8/src/extensions/externalize-string-extension.cc index 8d38dfa0f0..aedfb5e93f 100644 --- a/deps/v8/src/extensions/externalize-string-extension.cc +++ b/deps/v8/src/extensions/externalize-string-extension.cc @@ -37,9 +37,9 @@ const char* const ExternalizeStringExtension::kSource = "native function externalizeString();" "native function isOneByteString();"; -v8::Handle<v8::FunctionTemplate> +v8::Local<v8::FunctionTemplate> ExternalizeStringExtension::GetNativeFunctionTemplate( - v8::Isolate* isolate, v8::Handle<v8::String> str) { + v8::Isolate* isolate, v8::Local<v8::String> str) { if (strcmp(*v8::String::Utf8Value(str), "externalizeString") == 0) { return v8::FunctionTemplate::New(isolate, ExternalizeStringExtension::Externalize); @@ -54,28 +54,36 @@ ExternalizeStringExtension::GetNativeFunctionTemplate( void ExternalizeStringExtension::Externalize( const v8::FunctionCallbackInfo<v8::Value>& args) { if (args.Length() < 1 || !args[0]->IsString()) { - args.GetIsolate()->ThrowException(v8::String::NewFromUtf8( - args.GetIsolate(), - "First parameter to externalizeString() must be a string.")); + args.GetIsolate()->ThrowException( + v8::String::NewFromUtf8( + args.GetIsolate(), + "First parameter to externalizeString() must be a string.", + NewStringType::kNormal).ToLocalChecked()); return; } bool force_two_byte = false; if (args.Length() >= 2) { if (args[1]->IsBoolean()) { - force_two_byte = args[1]->BooleanValue(); + force_two_byte = + args[1] + ->BooleanValue(args.GetIsolate()->GetCurrentContext()) + .FromJust(); } else { - args.GetIsolate()->ThrowException(v8::String::NewFromUtf8( - args.GetIsolate(), - "Second parameter to externalizeString() must be a boolean.")); + args.GetIsolate()->ThrowException( + v8::String::NewFromUtf8( + args.GetIsolate(), + "Second parameter to externalizeString() must be a boolean.", + NewStringType::kNormal).ToLocalChecked()); return; } } bool result = false; Handle<String> string = Utils::OpenHandle(*args[0].As<v8::String>()); if (string->IsExternalString()) { - args.GetIsolate()->ThrowException(v8::String::NewFromUtf8( - args.GetIsolate(), - "externalizeString() can't externalize twice.")); + args.GetIsolate()->ThrowException( + v8::String::NewFromUtf8(args.GetIsolate(), + "externalizeString() can't externalize twice.", + NewStringType::kNormal).ToLocalChecked()); return; } if (string->IsOneByteRepresentation() && !force_two_byte) { @@ -102,8 +110,10 @@ void ExternalizeStringExtension::Externalize( if (!result) delete resource; } if (!result) { - args.GetIsolate()->ThrowException(v8::String::NewFromUtf8( - args.GetIsolate(), "externalizeString() failed.")); + args.GetIsolate()->ThrowException( + v8::String::NewFromUtf8(args.GetIsolate(), + "externalizeString() failed.", + NewStringType::kNormal).ToLocalChecked()); return; } } @@ -112,9 +122,11 @@ void ExternalizeStringExtension::Externalize( void ExternalizeStringExtension::IsOneByte( const v8::FunctionCallbackInfo<v8::Value>& args) { if (args.Length() != 1 || !args[0]->IsString()) { - args.GetIsolate()->ThrowException(v8::String::NewFromUtf8( - args.GetIsolate(), - "isOneByteString() requires a single string argument.")); + args.GetIsolate()->ThrowException( + v8::String::NewFromUtf8( + args.GetIsolate(), + "isOneByteString() requires a single string argument.", + NewStringType::kNormal).ToLocalChecked()); return; } bool is_one_byte = @@ -122,4 +134,5 @@ void ExternalizeStringExtension::IsOneByte( args.GetReturnValue().Set(is_one_byte); } -} } // namespace v8::internal +} // namespace internal +} // namespace v8 diff --git a/deps/v8/src/extensions/externalize-string-extension.h b/deps/v8/src/extensions/externalize-string-extension.h index f8c54f8f12..dc23ffd2d3 100644 --- a/deps/v8/src/extensions/externalize-string-extension.h +++ b/deps/v8/src/extensions/externalize-string-extension.h @@ -13,9 +13,8 @@ namespace internal { class ExternalizeStringExtension : public v8::Extension { public: ExternalizeStringExtension() : v8::Extension("v8/externalize", kSource) {} - virtual v8::Handle<v8::FunctionTemplate> GetNativeFunctionTemplate( - v8::Isolate* isolate, - v8::Handle<v8::String> name); + virtual v8::Local<v8::FunctionTemplate> GetNativeFunctionTemplate( + v8::Isolate* isolate, v8::Local<v8::String> name); static void Externalize(const v8::FunctionCallbackInfo<v8::Value>& args); static void IsOneByte(const v8::FunctionCallbackInfo<v8::Value>& args); diff --git a/deps/v8/src/extensions/free-buffer-extension.cc b/deps/v8/src/extensions/free-buffer-extension.cc index c880d75d0b..b642b3df30 100644 --- a/deps/v8/src/extensions/free-buffer-extension.cc +++ b/deps/v8/src/extensions/free-buffer-extension.cc @@ -11,20 +11,20 @@ namespace v8 { namespace internal { -v8::Handle<v8::FunctionTemplate> FreeBufferExtension::GetNativeFunctionTemplate( - v8::Isolate* isolate, - v8::Handle<v8::String> str) { +v8::Local<v8::FunctionTemplate> FreeBufferExtension::GetNativeFunctionTemplate( + v8::Isolate* isolate, v8::Local<v8::String> str) { return v8::FunctionTemplate::New(isolate, FreeBufferExtension::FreeBuffer); } void FreeBufferExtension::FreeBuffer( const v8::FunctionCallbackInfo<v8::Value>& args) { - v8::Handle<v8::ArrayBuffer> arrayBuffer = args[0].As<v8::ArrayBuffer>(); + v8::Local<v8::ArrayBuffer> arrayBuffer = args[0].As<v8::ArrayBuffer>(); v8::ArrayBuffer::Contents contents = arrayBuffer->Externalize(); Isolate* isolate = reinterpret_cast<Isolate*>(args.GetIsolate()); isolate->array_buffer_allocator()->Free(contents.Data(), contents.ByteLength()); } -} } // namespace v8::internal +} // namespace internal +} // namespace v8 diff --git a/deps/v8/src/extensions/free-buffer-extension.h b/deps/v8/src/extensions/free-buffer-extension.h index bccf760cc2..d62ed02b86 100644 --- a/deps/v8/src/extensions/free-buffer-extension.h +++ b/deps/v8/src/extensions/free-buffer-extension.h @@ -14,9 +14,8 @@ class FreeBufferExtension : public v8::Extension { public: FreeBufferExtension() : v8::Extension("v8/free-buffer", "native function freeBuffer();") {} - virtual v8::Handle<v8::FunctionTemplate> GetNativeFunctionTemplate( - v8::Isolate* isolate, - v8::Handle<v8::String> name); + virtual v8::Local<v8::FunctionTemplate> GetNativeFunctionTemplate( + v8::Isolate* isolate, v8::Local<v8::String> name); static void FreeBuffer(const v8::FunctionCallbackInfo<v8::Value>& args); }; diff --git a/deps/v8/src/extensions/gc-extension.cc b/deps/v8/src/extensions/gc-extension.cc index 74b74811c3..9eb453b986 100644 --- a/deps/v8/src/extensions/gc-extension.cc +++ b/deps/v8/src/extensions/gc-extension.cc @@ -10,17 +10,20 @@ namespace v8 { namespace internal { -v8::Handle<v8::FunctionTemplate> GCExtension::GetNativeFunctionTemplate( - v8::Isolate* isolate, - v8::Handle<v8::String> str) { +v8::Local<v8::FunctionTemplate> GCExtension::GetNativeFunctionTemplate( + v8::Isolate* isolate, v8::Local<v8::String> str) { return v8::FunctionTemplate::New(isolate, GCExtension::GC); } void GCExtension::GC(const v8::FunctionCallbackInfo<v8::Value>& args) { args.GetIsolate()->RequestGarbageCollectionForTesting( - args[0]->BooleanValue() ? v8::Isolate::kMinorGarbageCollection - : v8::Isolate::kFullGarbageCollection); + args[0] + ->BooleanValue(args.GetIsolate()->GetCurrentContext()) + .FromMaybe(false) + ? v8::Isolate::kMinorGarbageCollection + : v8::Isolate::kFullGarbageCollection); } -} } // namespace v8::internal +} // namespace internal +} // namespace v8 diff --git a/deps/v8/src/extensions/gc-extension.h b/deps/v8/src/extensions/gc-extension.h index 789354597e..2462bd9604 100644 --- a/deps/v8/src/extensions/gc-extension.h +++ b/deps/v8/src/extensions/gc-extension.h @@ -15,9 +15,8 @@ class GCExtension : public v8::Extension { explicit GCExtension(const char* fun_name) : v8::Extension("v8/gc", BuildSource(buffer_, sizeof(buffer_), fun_name)) {} - virtual v8::Handle<v8::FunctionTemplate> GetNativeFunctionTemplate( - v8::Isolate* isolate, - v8::Handle<v8::String> name); + virtual v8::Local<v8::FunctionTemplate> GetNativeFunctionTemplate( + v8::Isolate* isolate, v8::Local<v8::String> name); static void GC(const v8::FunctionCallbackInfo<v8::Value>& args); private: diff --git a/deps/v8/src/extensions/statistics-extension.cc b/deps/v8/src/extensions/statistics-extension.cc index d1e110e267..eb0fed80d5 100644 --- a/deps/v8/src/extensions/statistics-extension.cc +++ b/deps/v8/src/extensions/statistics-extension.cc @@ -11,9 +11,8 @@ const char* const StatisticsExtension::kSource = "native function getV8Statistics();"; -v8::Handle<v8::FunctionTemplate> StatisticsExtension::GetNativeFunctionTemplate( - v8::Isolate* isolate, - v8::Handle<v8::String> str) { +v8::Local<v8::FunctionTemplate> StatisticsExtension::GetNativeFunctionTemplate( + v8::Isolate* isolate, v8::Local<v8::String> str) { DCHECK(strcmp(*v8::String::Utf8Value(str), "getV8Statistics") == 0); return v8::FunctionTemplate::New(isolate, StatisticsExtension::GetCounters); } @@ -24,8 +23,11 @@ static void AddCounter(v8::Isolate* isolate, StatsCounter* counter, const char* name) { if (counter->Enabled()) { - object->Set(v8::String::NewFromUtf8(isolate, name), - v8::Number::New(isolate, *counter->GetInternalPointer())); + object->Set(isolate->GetCurrentContext(), + v8::String::NewFromUtf8(isolate, name, NewStringType::kNormal) + .ToLocalChecked(), + v8::Number::New(isolate, *counter->GetInternalPointer())) + .FromJust(); } } @@ -33,8 +35,10 @@ static void AddNumber(v8::Isolate* isolate, v8::Local<v8::Object> object, intptr_t value, const char* name) { - object->Set(v8::String::NewFromUtf8(isolate, name), - v8::Number::New(isolate, static_cast<double>(value))); + object->Set(isolate->GetCurrentContext(), + v8::String::NewFromUtf8(isolate, name, NewStringType::kNormal) + .ToLocalChecked(), + v8::Number::New(isolate, static_cast<double>(value))).FromJust(); } @@ -42,8 +46,10 @@ static void AddNumber64(v8::Isolate* isolate, v8::Local<v8::Object> object, int64_t value, const char* name) { - object->Set(v8::String::NewFromUtf8(isolate, name), - v8::Number::New(isolate, static_cast<double>(value))); + object->Set(isolate->GetCurrentContext(), + v8::String::NewFromUtf8(isolate, name, NewStringType::kNormal) + .ToLocalChecked(), + v8::Number::New(isolate, static_cast<double>(value))).FromJust(); } @@ -54,7 +60,9 @@ void StatisticsExtension::GetCounters( if (args.Length() > 0) { // GC if first argument evaluates to true. if (args[0]->IsBoolean() && - args[0]->ToBoolean(args.GetIsolate())->Value()) { + args[0] + ->BooleanValue(args.GetIsolate()->GetCurrentContext()) + .FromMaybe(false)) { heap->CollectAllGarbage(Heap::kNoGCFlags, "counters extension"); } } @@ -129,4 +137,5 @@ void StatisticsExtension::GetCounters( args.GetReturnValue().Set(result); } -} } // namespace v8::internal +} // namespace internal +} // namespace v8 diff --git a/deps/v8/src/extensions/statistics-extension.h b/deps/v8/src/extensions/statistics-extension.h index 0915e61de0..8149e44afe 100644 --- a/deps/v8/src/extensions/statistics-extension.h +++ b/deps/v8/src/extensions/statistics-extension.h @@ -13,9 +13,8 @@ namespace internal { class StatisticsExtension : public v8::Extension { public: StatisticsExtension() : v8::Extension("v8/statistics", kSource) {} - virtual v8::Handle<v8::FunctionTemplate> GetNativeFunctionTemplate( - v8::Isolate* isolate, - v8::Handle<v8::String> name); + virtual v8::Local<v8::FunctionTemplate> GetNativeFunctionTemplate( + v8::Isolate* isolate, v8::Local<v8::String> name); static void GetCounters(const v8::FunctionCallbackInfo<v8::Value>& args); private: diff --git a/deps/v8/src/extensions/trigger-failure-extension.cc b/deps/v8/src/extensions/trigger-failure-extension.cc index b0aacb42c6..672c1a7064 100644 --- a/deps/v8/src/extensions/trigger-failure-extension.cc +++ b/deps/v8/src/extensions/trigger-failure-extension.cc @@ -15,10 +15,9 @@ const char* const TriggerFailureExtension::kSource = "native function triggerSlowAssertFalse();"; -v8::Handle<v8::FunctionTemplate> -TriggerFailureExtension::GetNativeFunctionTemplate( - v8::Isolate* isolate, - v8::Handle<v8::String> str) { +v8::Local<v8::FunctionTemplate> +TriggerFailureExtension::GetNativeFunctionTemplate(v8::Isolate* isolate, + v8::Local<v8::String> str) { if (strcmp(*v8::String::Utf8Value(str), "triggerCheckFalse") == 0) { return v8::FunctionTemplate::New( isolate, @@ -53,4 +52,5 @@ void TriggerFailureExtension::TriggerSlowAssertFalse( SLOW_DCHECK(false); } -} } // namespace v8::internal +} // namespace internal +} // namespace v8 diff --git a/deps/v8/src/extensions/trigger-failure-extension.h b/deps/v8/src/extensions/trigger-failure-extension.h index 6974da5e31..c01b37d3e9 100644 --- a/deps/v8/src/extensions/trigger-failure-extension.h +++ b/deps/v8/src/extensions/trigger-failure-extension.h @@ -13,9 +13,8 @@ namespace internal { class TriggerFailureExtension : public v8::Extension { public: TriggerFailureExtension() : v8::Extension("v8/trigger-failure", kSource) {} - virtual v8::Handle<v8::FunctionTemplate> GetNativeFunctionTemplate( - v8::Isolate* isolate, - v8::Handle<v8::String> name); + virtual v8::Local<v8::FunctionTemplate> GetNativeFunctionTemplate( + v8::Isolate* isolate, v8::Local<v8::String> name); static void TriggerCheckFalse( const v8::FunctionCallbackInfo<v8::Value>& args); static void TriggerAssertFalse( |