Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(809)

Side by Side Diff: content/common/pepper_file_util.cc

Issue 1422773008: Fixing remaining VC++ 2015 64-bit build breaks (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync to latest Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #include "content/common/pepper_file_util.h" 5 #include "content/common/pepper_file_util.h"
6 6
7 namespace content { 7 namespace content {
8 8
9 storage::FileSystemType PepperFileSystemTypeToFileSystemType( 9 storage::FileSystemType PepperFileSystemTypeToFileSystemType(
10 PP_FileSystemType type) { 10 PP_FileSystemType type) {
11 switch (type) { 11 switch (type) {
12 case PP_FILESYSTEMTYPE_LOCALTEMPORARY: 12 case PP_FILESYSTEMTYPE_LOCALTEMPORARY:
13 return storage::kFileSystemTypeTemporary; 13 return storage::kFileSystemTypeTemporary;
14 case PP_FILESYSTEMTYPE_LOCALPERSISTENT: 14 case PP_FILESYSTEMTYPE_LOCALPERSISTENT:
15 return storage::kFileSystemTypePersistent; 15 return storage::kFileSystemTypePersistent;
16 case PP_FILESYSTEMTYPE_EXTERNAL: 16 case PP_FILESYSTEMTYPE_EXTERNAL:
17 return storage::kFileSystemTypeExternal; 17 return storage::kFileSystemTypeExternal;
18 default: 18 default:
19 return storage::kFileSystemTypeUnknown; 19 return storage::kFileSystemTypeUnknown;
20 } 20 }
21 } 21 }
22 22
23 int IntegerFromSyncSocketHandle( 23 int IntegerFromSyncSocketHandle(
24 const base::SyncSocket::Handle& socket_handle) { 24 const base::SyncSocket::Handle& socket_handle) {
25 #if defined(OS_WIN) 25 #if defined(OS_WIN)
26 return reinterpret_cast<int>(socket_handle); 26 // Cast through intptr_t and then int to make the truncation explicit.
27 // Handles are size-of-pointer but are always 32-bit values.
28 return static_cast<int>(reinterpret_cast<intptr_t>(socket_handle));
Will Harris 2015/11/10 18:05:14 Can HANDLE values go above INT_MAX (signed int vs
brucedawson 2015/11/10 18:43:26 INVALID_HANDLE_VALUE (0xFFFFFFFF) is probably the
Will Harris 2015/11/10 19:45:45 seems it's hard to change pepper api to have this
brucedawson 2015/11/10 19:54:33 Good find. I'll use this in this context, and my o
27 #elif defined(OS_POSIX) 29 #elif defined(OS_POSIX)
28 return socket_handle; 30 return socket_handle;
29 #else 31 #else
30 #error Platform not supported. 32 #error Platform not supported.
31 #endif 33 #endif
32 } 34 }
33 35
34 } // namespace content 36 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698