Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Native Client Authors. All rights reserved. | 1 // Copyright (c) 2012 The Native Client 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 #include <limits> | 5 #include <limits> |
| 6 #include <new> | 6 #include <new> |
| 7 #include "native_client/src/include/portability.h" | 7 #include "native_client/src/include/portability.h" |
| 8 #include "native_client/src/include/portability_string.h" | 8 #include "native_client/src/include/portability_string.h" |
| 9 #include "native_client/src/public/imc_types.h" | 9 #include "native_client/src/public/imc_types.h" |
| 10 #include "native_client/src/shared/imc/nacl_imc_c.h" | 10 #include "native_client/src/shared/imc/nacl_imc_c.h" |
| 11 #include "native_client/src/shared/platform/nacl_check.h" | 11 #include "native_client/src/shared/platform/nacl_check.h" |
| 12 #include "native_client/src/shared/platform/nacl_log.h" | 12 #include "native_client/src/shared/platform/nacl_log.h" |
| 13 #include "native_client/src/shared/platform/nacl_sync_checked.h" | 13 #include "native_client/src/shared/platform/nacl_sync_checked.h" |
| 14 #if defined(NACL_LINUX) | 14 #if defined(NACL_LINUX) |
| 15 #include "native_client/src/trusted/desc/linux/nacl_desc_sysv_shm.h" | 15 #include "native_client/src/trusted/desc/linux/nacl_desc_sysv_shm.h" |
| 16 #endif // defined(NACL_LINUX) | 16 #endif // defined(NACL_LINUX) |
| 17 #include "native_client/src/trusted/desc/nacl_desc_base.h" | 17 #include "native_client/src/trusted/desc/nacl_desc_base.h" |
| 18 #include "native_client/src/trusted/desc/nacl_desc_conn_cap.h" | 18 #include "native_client/src/trusted/desc/nacl_desc_conn_cap.h" |
| 19 #include "native_client/src/trusted/desc/nacl_desc_file_info.h" | |
|
Mark Seaborn
2014/05/16 18:30:23
Not needed any more?
jvoung (off chromium)
2014/05/16 20:58:43
Oops -- Done.
| |
| 19 #include "native_client/src/trusted/desc/nacl_desc_imc.h" | 20 #include "native_client/src/trusted/desc/nacl_desc_imc.h" |
| 20 #include "native_client/src/trusted/desc/nacl_desc_imc_shm.h" | 21 #include "native_client/src/trusted/desc/nacl_desc_imc_shm.h" |
| 21 #include "native_client/src/trusted/desc/nacl_desc_invalid.h" | 22 #include "native_client/src/trusted/desc/nacl_desc_invalid.h" |
| 22 #include "native_client/src/trusted/desc/nacl_desc_io.h" | 23 #include "native_client/src/trusted/desc/nacl_desc_io.h" |
| 23 #include "native_client/src/trusted/desc/nacl_desc_quota.h" | 24 #include "native_client/src/trusted/desc/nacl_desc_quota.h" |
| 24 #include "native_client/src/trusted/desc/nacl_desc_rng.h" | 25 #include "native_client/src/trusted/desc/nacl_desc_rng.h" |
| 25 #include "native_client/src/trusted/desc/nacl_desc_sync_socket.h" | 26 #include "native_client/src/trusted/desc/nacl_desc_sync_socket.h" |
| 26 #include "native_client/src/trusted/desc/nacl_desc_wrapper.h" | 27 #include "native_client/src/trusted/desc/nacl_desc_wrapper.h" |
| 27 #include "native_client/src/trusted/desc/nrd_xfer.h" | 28 #include "native_client/src/trusted/desc/nrd_xfer.h" |
| 28 #include "native_client/src/trusted/nacl_base/nacl_refcount.h" | 29 #include "native_client/src/trusted/nacl_base/nacl_refcount.h" |
| (...skipping 585 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 614 return reinterpret_cast<struct NaClDescVtbl const *>(desc_->base.vtbl)-> | 615 return reinterpret_cast<struct NaClDescVtbl const *>(desc_->base.vtbl)-> |
| 615 SemWait(desc_); | 616 SemWait(desc_); |
| 616 } | 617 } |
| 617 | 618 |
| 618 int DescWrapper::GetValue() { | 619 int DescWrapper::GetValue() { |
| 619 return reinterpret_cast<struct NaClDescVtbl const *>(desc_->base.vtbl)-> | 620 return reinterpret_cast<struct NaClDescVtbl const *>(desc_->base.vtbl)-> |
| 620 GetValue(desc_); | 621 GetValue(desc_); |
| 621 } | 622 } |
| 622 | 623 |
| 623 } // namespace nacl | 624 } // namespace nacl |
| OLD | NEW |