| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef PPAPI_PROXY_UDP_SOCKET_FILTER_H_ | 5 #ifndef PPAPI_PROXY_UDP_SOCKET_FILTER_H_ |
| 6 #define PPAPI_PROXY_UDP_SOCKET_FILTER_H_ | 6 #define PPAPI_PROXY_UDP_SOCKET_FILTER_H_ |
| 7 | 7 |
| 8 #include <queue> | 8 #include <queue> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 121 int32_t result, | 121 int32_t result, |
| 122 const std::string& data, | 122 const std::string& data, |
| 123 const PP_NetAddress_Private& addr); | 123 const PP_NetAddress_Private& addr); |
| 124 | 124 |
| 125 // lock_ protects queues_. | 125 // lock_ protects queues_. |
| 126 // | 126 // |
| 127 // Lock order (if >1 acquired): | 127 // Lock order (if >1 acquired): |
| 128 // 1 ppapi::ProxyLock | 128 // 1 ppapi::ProxyLock |
| 129 // \-->2 Filter lock_ | 129 // \-->2 Filter lock_ |
| 130 mutable base::Lock lock_; | 130 mutable base::Lock lock_; |
| 131 base::ScopedPtrHashMap<PP_Resource, RecvQueue> queues_; | 131 base::ScopedPtrHashMap<PP_Resource, scoped_ptr<RecvQueue>> queues_; |
| 132 }; | 132 }; |
| 133 | 133 |
| 134 } // namespace proxy | 134 } // namespace proxy |
| 135 } // namespace ppapi | 135 } // namespace ppapi |
| 136 | 136 |
| 137 #endif // PPAPI_PROXY_UDP_SOCKET_FILTER_H_ | 137 #endif // PPAPI_PROXY_UDP_SOCKET_FILTER_H_ |
| OLD | NEW |