| OLD | NEW |
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 GPU_COMMAND_BUFFER_CLIENT_REF_COUNTED_H_ | 5 #ifndef GPU_COMMAND_BUFFER_CLIENT_REF_COUNTED_H_ |
| 6 #define GPU_COMMAND_BUFFER_CLIENT_REF_COUNTED_H_ | 6 #define GPU_COMMAND_BUFFER_CLIENT_REF_COUNTED_H_ |
| 7 | 7 |
| 8 #if defined(__native_client__) | 8 // TODO(bbudge) The NaCl SRPC proxy can't depend on base, so we define our own |
| 9 // ref_counted. This causes duplicate class warnings in the NaCl IPC proxy, |
| 10 // which uses base. Finesse around this by adding '!defined(OS_NACL)', which |
| 11 // is false for the SRPC build since it doesn't #include build_config.h. Remove |
| 12 // the custom ref_counted class after NaCl has switched proxies. |
| 13 #if defined(__native_client__) && !defined(OS_NACL) |
| 9 #include "native_client/src/include/ref_counted.h" | 14 #include "native_client/src/include/ref_counted.h" |
| 10 namespace gpu { | 15 namespace gpu { |
| 11 using nacl::RefCountedThreadSafe; | 16 using nacl::RefCountedThreadSafe; |
| 12 } | 17 } |
| 13 #else | 18 #else |
| 14 #include "base/memory/ref_counted.h" | 19 #include "base/memory/ref_counted.h" |
| 15 namespace gpu { | 20 namespace gpu { |
| 16 using base::RefCountedThreadSafe; | 21 using base::RefCountedThreadSafe; |
| 17 } | 22 } |
| 18 #endif | 23 #endif |
| 19 | 24 |
| 20 #endif // GPU_COMMAND_BUFFER_CLIENT_REF_COUNTED_H_ | 25 #endif // GPU_COMMAND_BUFFER_CLIENT_REF_COUNTED_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 10796038:
Add gpu targets to untrusted NaCl build. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src/