diff options
author | Fedor Indutny <fedor.indutny@gmail.com> | 2013-01-01 12:28:07 +0400 |
---|---|---|
committer | Fedor Indutny <fedor.indutny@gmail.com> | 2013-01-01 16:07:02 +0400 |
commit | 7b4d95a976f1b76e6dcefb6ca91dff738c80ab7a (patch) | |
tree | 1eb943733a2e660fc0183778fd441443e06196e2 /deps/v8/src/extensions | |
parent | 9e32c2ef3ede29ba0ae2086bdf658f6cd44182df (diff) | |
download | android-node-v8-7b4d95a976f1b76e6dcefb6ca91dff738c80ab7a.tar.gz android-node-v8-7b4d95a976f1b76e6dcefb6ca91dff738c80ab7a.tar.bz2 android-node-v8-7b4d95a976f1b76e6dcefb6ca91dff738c80ab7a.zip |
deps: update v8 to 3.15.11
Diffstat (limited to 'deps/v8/src/extensions')
-rw-r--r-- | deps/v8/src/extensions/externalize-string-extension.cc | 5 | ||||
-rw-r--r-- | deps/v8/src/extensions/gc-extension.cc | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/deps/v8/src/extensions/externalize-string-extension.cc b/deps/v8/src/extensions/externalize-string-extension.cc index 50d876136f..a126a5a569 100644 --- a/deps/v8/src/extensions/externalize-string-extension.cc +++ b/deps/v8/src/extensions/externalize-string-extension.cc @@ -93,7 +93,7 @@ v8::Handle<v8::Value> ExternalizeStringExtension::Externalize( return v8::ThrowException(v8::String::New( "externalizeString() can't externalize twice.")); } - if (string->IsAsciiRepresentation() && !force_two_byte) { + if (string->IsOneByteRepresentation() && !force_two_byte) { char* data = new char[string->length()]; String::WriteToFlat(*string, data, 0, string->length()); SimpleAsciiStringResource* resource = new SimpleAsciiStringResource( @@ -127,7 +127,8 @@ v8::Handle<v8::Value> ExternalizeStringExtension::IsAscii( return v8::ThrowException(v8::String::New( "isAsciiString() requires a single string argument.")); } - return Utils::OpenHandle(*args[0].As<v8::String>())->IsAsciiRepresentation() ? + return + Utils::OpenHandle(*args[0].As<v8::String>())->IsOneByteRepresentation() ? v8::True() : v8::False(); } diff --git a/deps/v8/src/extensions/gc-extension.cc b/deps/v8/src/extensions/gc-extension.cc index f921552aaa..813b9219bf 100644 --- a/deps/v8/src/extensions/gc-extension.cc +++ b/deps/v8/src/extensions/gc-extension.cc @@ -40,7 +40,11 @@ v8::Handle<v8::FunctionTemplate> GCExtension::GetNativeFunction( v8::Handle<v8::Value> GCExtension::GC(const v8::Arguments& args) { - HEAP->CollectAllGarbage(Heap::kNoGCFlags, "gc extension"); + if (args[0]->BooleanValue()) { + HEAP->CollectGarbage(NEW_SPACE, "gc extension"); + } else { + HEAP->CollectAllGarbage(Heap::kNoGCFlags, "gc extension"); + } return v8::Undefined(); } |