Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1572)

Unified Diff: runtime/vm/dart_api_impl.cc

Issue 243973002: - Add a minimal implementation of Capability. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: runtime/vm/dart_api_impl.cc
===================================================================
--- runtime/vm/dart_api_impl.cc (revision 35191)
+++ runtime/vm/dart_api_impl.cc (working copy)
@@ -1231,27 +1231,21 @@
Isolate* isolate = Isolate::Current();
DARTSCOPE(isolate);
CHECK_CALLBACK_STATE(isolate);
- return Api::NewHandle(isolate, DartLibraryCalls::NewSendPort(port_id));
+ return Api::NewHandle(isolate, SendPort::New(port_id));
}
-DART_EXPORT Dart_Handle Dart_PortGetId(Dart_Handle port, Dart_Port* port_id) {
+DART_EXPORT Dart_Handle Dart_ReceivePortGetId(Dart_Handle port,
+ Dart_Port* port_id) {
Isolate* isolate = Isolate::Current();
DARTSCOPE(isolate);
CHECK_CALLBACK_STATE(isolate);
- const Instance& port_instance = Api::UnwrapInstanceHandle(isolate, port);
- if (port_instance.IsNull()) {
- RETURN_TYPE_ERROR(isolate, port, Instance);
+ const ReceivePort& receive_port = Api::UnwrapReceivePortHandle(isolate, port);
+ if (receive_port.IsNull()) {
+ RETURN_TYPE_ERROR(isolate, port, ReceivePort);
}
siva 2014/04/23 00:20:31 Missing check: if (port_id == NULL) { RETURN_NU
Ivan Posva 2014/04/23 19:43:35 Done.
- if (!DartLibraryCalls::IsSendPort(port_instance) &&
- !DartLibraryCalls::IsReceivePort(port_instance)) {
- return Api::NewError("expected an instance of RawReceivePort or SendPort.");
- }
- const Object& idObj = Object::Handle(
- DartLibraryCalls::PortGetId(port_instance));
- ASSERT(idObj.IsInteger());
- const Integer& id = Integer::Cast(idObj);
- *port_id = static_cast<Dart_Port>(id.AsInt64Value());
+ *port_id = static_cast<Dart_Port>(receive_port.Id());
+ ASSERT(*port_id != 0);
siva 2014/04/23 00:20:31 Maybe this assert needs to be inside 'Id()' ?
Ivan Posva 2014/04/23 19:43:35 ASSERT was unnecessary.
return Api::Success();
}
@@ -1290,28 +1284,22 @@
}
-DART_EXPORT Dart_Handle Dart_PostMessage(Dart_Handle send_port,
+DART_EXPORT Dart_Handle Dart_PostMessage(Dart_Handle port,
Dart_Handle object) {
Isolate* isolate = Isolate::Current();
DARTSCOPE(isolate);
- Instance& port_instance = Instance::Handle();
- port_instance ^= Api::UnwrapHandle(send_port);
- if (!DartLibraryCalls::IsSendPort(port_instance)) {
- return Api::NewError("send_port is not a SendPort.");
+ const SendPort& send_port = Api::UnwrapSendPortHandle(isolate, port);
+ if (send_port.IsNull()) {
+ RETURN_TYPE_ERROR(isolate, port, SendPort);
}
- const Object& idObj = Object::Handle(
- DartLibraryCalls::PortGetId(port_instance));
- ASSERT(!idObj.IsError());
- Integer& id = Integer::Handle();
- id ^= idObj.raw();
- Dart_Port port = static_cast<Dart_Port>(id.AsInt64Value());
+ Dart_Port port_id = static_cast<Dart_Port>(send_port.Id());
uint8_t* data = NULL;
MessageWriter writer(&data, &allocator);
Object& msg_object = Object::Handle(Api::UnwrapHandle(object));
writer.WriteMessage(msg_object);
intptr_t len = writer.BytesWritten();
bool r = PortMap::PostMessage(
- new Message(port, data, len, Message::kNormalPriority));
+ new Message(port_id, data, len, Message::kNormalPriority));
if (r) {
return Api::Success();
}

Powered by Google App Engine
This is Rietveld 408576698