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

Side by Side Diff: gpu/command_buffer/client/ref_counted.h

Issue 11575050: Fix tracing for gpu/ directory in NaCl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: change comment Created 8 years 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | gpu/command_buffer/common/trace_event.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 // 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, 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 10 // which uses base. Remove the custom ref_counted class after NaCl has switched
11 // proxies. 11 // proxies.
12 #if defined(__native_client__) && !defined(NACL_PPAPI_IPC_PROXY) 12 #if defined(NACL_PPAPI_SRPC_PROXY)
13 #include "native_client/src/include/ref_counted.h" 13 #include "native_client/src/include/ref_counted.h"
14 namespace gpu { 14 namespace gpu {
15 using nacl::RefCountedThreadSafe; 15 using nacl::RefCountedThreadSafe;
16 } 16 }
17 #else 17 #else
18 #include "base/memory/ref_counted.h" 18 #include "base/memory/ref_counted.h"
19 namespace gpu { 19 namespace gpu {
20 using base::RefCountedThreadSafe; 20 using base::RefCountedThreadSafe;
21 } 21 }
22 #endif 22 #endif
23 23
24 #endif // GPU_COMMAND_BUFFER_CLIENT_REF_COUNTED_H_ 24 #endif // GPU_COMMAND_BUFFER_CLIENT_REF_COUNTED_H_
OLDNEW
« no previous file with comments | « no previous file | gpu/command_buffer/common/trace_event.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698