| 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 // TODO(bbudge) The NaCl SRPC proxy can't depend on base, so we define our own | 8 #if defined(__native_client__) |
| 9 // ref_counted. This causes duplicate class warnings in the NaCl IPC proxy, | |
| 10 // which uses base. Remove the custom ref_counted class after NaCl has switched | |
| 11 // proxies. | |
| 12 #if defined(__native_client__) && !defined(NACL_PPAPI_IPC_PROXY) | |
| 13 #include "native_client/src/include/ref_counted.h" | 9 #include "native_client/src/include/ref_counted.h" |
| 14 namespace gpu { | 10 namespace gpu { |
| 15 using nacl::RefCountedThreadSafe; | 11 using nacl::RefCountedThreadSafe; |
| 16 } | 12 } |
| 17 #else | 13 #else |
| 18 #include "base/memory/ref_counted.h" | 14 #include "base/memory/ref_counted.h" |
| 19 namespace gpu { | 15 namespace gpu { |
| 20 using base::RefCountedThreadSafe; | 16 using base::RefCountedThreadSafe; |
| 21 } | 17 } |
| 22 #endif | 18 #endif |
| 23 | 19 |
| 24 #endif // GPU_COMMAND_BUFFER_CLIENT_REF_COUNTED_H_ | 20 #endif // GPU_COMMAND_BUFFER_CLIENT_REF_COUNTED_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 10830197:
Revert 150343 - Add gpu targets to untrusted build, and add Graphics3D code to untrusted build. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src/