cory/tildefriends
5
6
Fork 2
Code Issues 38 Pull Requests Actions Releases 33 Wiki Activity

Let task.execute accept raw UTF-8 bytes, for the sake of the tests. Missing #include. Minor cleanup.

Browse Source 
git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@3359 ed5197a5-7fde-0310-b194-c3ffbd925b24
This commit is contained in:
Cory McWilliams
2016-12-22 18:11:49 +00:00
parent 5c855afbb3
commit 4313cfbc4f
4 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Task.cpp
View File

@ -676,9 +676,20 @@ void Task::onReceivePacket(int packetType, const char* begin, size_t length, voi
tryCatch.SetVerbose(true);
v8::Handle<v8::Value> value = Serialize::load(to, from, std::vector<char>(begin + sizeof(promiseid_t), begin + length));
v8::Handle<v8::Object> object = v8::Handle<v8::Object>::Cast(value);
v8::Handle<v8::String> source = v8::Handle<v8::String>::Cast(object->Get(v8::String::NewFromUtf8(to->_isolate, "source")));
v8::Handle<v8::Value> source = v8::Handle<v8::Value>::Cast(object->Get(v8::String::NewFromUtf8(to->_isolate, "source")));
v8::Handle<v8::String> stringSource;
if (source->IsArrayBufferView()) {
v8::Handle<v8::ArrayBufferView> array = v8::Handle<v8::ArrayBufferView>::Cast(source);
stringSource = v8::String::NewFromUtf8(
to->_isolate,
reinterpret_cast<const char*>(array->Buffer()->GetContents().Data()),
v8::String::kNormalString,
array->Buffer()->GetContents().ByteLength());
} else if (source->IsString()) {
stringSource = v8::Handle<v8::String>::Cast(source);
}
v8::Handle<v8::String> name = v8::Handle<v8::String>::Cast(object->Get(v8::String::NewFromUtf8(to->_isolate, "name")));
to->executeSource(source, name);
to->executeSource(stringSource, name);
if (tryCatch.HasCaught()) {
sendPromiseReject(to, from, promise, Serialize::store(to, tryCatch));
}