Chromium Code Reviews| Index: runtime/vm/native_message_handler.cc |
| diff --git a/runtime/vm/native_message_handler.cc b/runtime/vm/native_message_handler.cc |
| index 8f8d7a6971c725426060d8f1a5aa9aa6d4666a95..4d3133806afed82d2fbcfb1846bf06413cda0dca 100644 |
| --- a/runtime/vm/native_message_handler.cc |
| +++ b/runtime/vm/native_message_handler.cc |
| @@ -42,9 +42,20 @@ MessageHandler::MessageStatus NativeMessageHandler::HandleMessage( |
| // All allocation of objects for decoding the message is done in the |
| // zone associated with this scope. |
| ApiNativeScope scope; |
| - ApiMessageReader reader(message->data(), message->len()); |
| - Dart_CObject* object = reader.ReadMessage(); |
| - (*func())(message->dest_port(), object); |
| + |
| + if (message->IsRaw()) { |
| + ASSERT(ApiObjectConverter::CanConvert(message->raw_obj())); |
| + Dart_CObject object; |
| + bool success = ApiObjectConverter::Convert(message->raw_obj(), &object); |
|
turnidge
2015/12/11 22:30:48
As discussed offline, let's see if we can move thi
zra
2015/12/11 23:44:32
I've added a TODO here.
|
| + ASSERT(success); |
| + (*func())(message->dest_port(), &object); |
| + } else { |
| + Dart_CObject* object; |
| + ApiMessageReader reader(message->data(), message->len()); |
| + object = reader.ReadMessage(); |
| + (*func())(message->dest_port(), object); |
| + } |
| + |
| delete message; |
| return kOK; |
| } |