gpu/command_buffer/client/ref_counted.h - Issue 10796038: Add gpu targets to untrusted NaCl build.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 10796038: Add gpu targets to untrusted NaCl build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 5 months 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/command_buffer.gyp » ('j') | no next file with comments »

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 #if defined(__native_client__) && !defined(OS_NACL)
	bbudge 2012/07/19 16:34:23 The NaCl SRPC proxy can't depend on base, so it pu The NaCl SRPC proxy can't depend on base, so it pulls in a custom smart ptr. We don't want it. Finesse around it by adding this clause, which is false for the SRPC build which doesn't #include build_config.h. piman 2012/07/19 16:52:26 Worth a comment... I assume at some point the SRPC Show quoted text On 2012/07/19 16:34:23, bbudge1 wrote: > The NaCl SRPC proxy can't depend on base, so it pulls in a custom smart ptr. We > don't want it. Finesse around it by adding this clause, which is false for the > SRPC build which doesn't #include build_config.h. Worth a comment... I assume at some point the SRPC proxy will go away, and this can be simplified, correct? bbudge 2012/07/19 18:38:10 Done. Show quoted text On 2012/07/19 16:52:26, piman wrote: > On 2012/07/19 16:34:23, bbudge1 wrote: > > The NaCl SRPC proxy can't depend on base, so it pulls in a custom smart ptr. > We > > don't want it. Finesse around it by adding this clause, which is false for the > > SRPC build which doesn't #include build_config.h. > > Worth a comment... > I assume at some point the SRPC proxy will go away, and this can be simplified, > correct? Done.
9 #include "native_client/src/include/ref_counted.h"	9 #include "native_client/src/include/ref_counted.h"

10 namespace gpu {	10 namespace gpu {

11 using nacl::RefCountedThreadSafe;	11 using nacl::RefCountedThreadSafe;

12 }	12 }

13 #else	13 #else

14 #include "base/memory/ref_counted.h"	14 #include "base/memory/ref_counted.h"

15 namespace gpu {	15 namespace gpu {

16 using base::RefCountedThreadSafe;	16 using base::RefCountedThreadSafe;

17 }	17 }

18 #endif	18 #endif

19	19

20 #endif // GPU_COMMAND_BUFFER_CLIENT_REF_COUNTED_H_	20 #endif // GPU_COMMAND_BUFFER_CLIENT_REF_COUNTED_H_

OLD	NEW