| Index: mojo/edk/system/node_controller.cc
|
| diff --git a/mojo/edk/system/node_controller.cc b/mojo/edk/system/node_controller.cc
|
| index 2fd6484ad14e52455ee8c2071cc9c1ade09a2319..8caf9cb17a754a41acb2d691910338b6cd4d71cc 100644
|
| --- a/mojo/edk/system/node_controller.cc
|
| +++ b/mojo/edk/system/node_controller.cc
|
| @@ -209,6 +209,13 @@ void NodeController::MergePortIntoParent(const std::string& token,
|
| parent->RequestPortMerge(port.name(), token);
|
| }
|
|
|
| +int NodeController::MergeLocalPorts(const ports::PortRef& port0,
|
| + const ports::PortRef& port1) {
|
| + int rv = node_->MergeLocalPorts(port0, port1);
|
| + AcceptIncomingMessages();
|
| + return rv;
|
| +}
|
| +
|
| scoped_refptr<PlatformSharedBuffer> NodeController::CreateSharedBuffer(
|
| size_t num_bytes) {
|
| // TODO(amistry): Fix sync broker and re-enable on OSX.
|
|
|