Chromium Code Reviews| Index: mojo/edk/system/ports/node.cc |
| diff --git a/mojo/edk/system/ports/node.cc b/mojo/edk/system/ports/node.cc |
| index 186e8aaad95795f6f608555a0d7c16d17a73db40..af8f0252af8c4bdc5264e938387384c83423790b 100644 |
| --- a/mojo/edk/system/ports/node.cc |
| +++ b/mojo/edk/system/ports/node.cc |
| @@ -8,6 +8,7 @@ |
| #include <utility> |
| +#include "base/atomicops.h" |
| #include "base/logging.h" |
| #include "base/memory/ref_counted.h" |
| #include "base/synchronization/lock.h" |
| @@ -804,6 +805,11 @@ scoped_refptr<Port> Node::GetPort_Locked(const PortName& port_name) { |
| if (iter == ports_.end()) |
| return nullptr; |
| +#if defined(OS_ANDROID) |
|
Torne
2016/11/18 15:37:57
You could use #if defined(OS_ANDROID) && defined(A
Ken Rockot(use gerrit already)
2016/11/18 15:49:28
Done
|
| + // Workaround for https://crbug.com/665869. |
| + base::subtle::MemoryBarrier(); |
| +#endif |
| + |
| return iter->second; |
| } |