| Index: ppapi/proxy/serialized_structs.h
|
| ===================================================================
|
| --- ppapi/proxy/serialized_structs.h (revision 171259)
|
| +++ ppapi/proxy/serialized_structs.h (working copy)
|
| @@ -85,7 +85,7 @@
|
| // them in NaClIPCAdapter for use in NaCl.
|
| class PPAPI_PROXY_EXPORT SerializedHandle {
|
| public:
|
| - enum Type { INVALID, SHARED_MEMORY, SOCKET, CHANNEL_HANDLE, FILE };
|
| + enum Type { INVALID, SHARED_MEMORY, SOCKET, CHANNEL_HANDLE };
|
| struct Header {
|
| Header() : type(INVALID), size(0) {}
|
| Header(Type type_arg, uint32_t size_arg)
|
| @@ -102,7 +102,7 @@
|
| // Create a shared memory handle.
|
| SerializedHandle(const base::SharedMemoryHandle& handle, uint32_t size);
|
|
|
| - // Create a socket, channel or file handle.
|
| + // Create a socket or channel handle.
|
| SerializedHandle(const Type type,
|
| const IPC::PlatformFileForTransit& descriptor);
|
|
|
| @@ -110,7 +110,6 @@
|
| bool is_shmem() const { return type_ == SHARED_MEMORY; }
|
| bool is_socket() const { return type_ == SOCKET; }
|
| bool is_channel_handle() const { return type_ == CHANNEL_HANDLE; }
|
| - bool is_file() const { return type_ == FILE; }
|
| const base::SharedMemoryHandle& shmem() const {
|
| DCHECK(is_shmem());
|
| return shm_handle_;
|
| @@ -120,7 +119,7 @@
|
| return size_;
|
| }
|
| const IPC::PlatformFileForTransit& descriptor() const {
|
| - DCHECK(is_socket() || is_channel_handle() || is_file());
|
| + DCHECK(is_socket() || is_channel_handle());
|
| return descriptor_;
|
| }
|
| void set_shmem(const base::SharedMemoryHandle& handle, uint32_t size) {
|
| @@ -144,13 +143,6 @@
|
| shm_handle_ = base::SharedMemory::NULLHandle();
|
| size_ = 0;
|
| }
|
| - void set_file_handle(const IPC::PlatformFileForTransit& descriptor) {
|
| - type_ = FILE;
|
| -
|
| - descriptor_ = descriptor;
|
| - shm_handle_ = base::SharedMemory::NULLHandle();
|
| - size_ = 0;
|
| - }
|
| void set_null_shmem() {
|
| set_shmem(base::SharedMemory::NULLHandle(), 0);
|
| }
|
| @@ -160,9 +152,6 @@
|
| void set_null_channel_handle() {
|
| set_channel_handle(IPC::InvalidPlatformFileForTransit());
|
| }
|
| - void set_null_file_handle() {
|
| - set_file_handle(IPC::InvalidPlatformFileForTransit());
|
| - }
|
| bool IsHandleValid() const;
|
|
|
| Header header() const {
|
|
|