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

Unified Diff: gpu/command_buffer/client/ref_counted.h

Issue 10837145: Add gpu targets to untrusted build, and add Graphics3D code to untrusted build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | gpu/command_buffer/command_buffer.gyp » ('j') | ppapi/proxy/resource_creation_proxy.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/client/ref_counted.h
===================================================================
--- gpu/command_buffer/client/ref_counted.h (revision 150367)
+++ gpu/command_buffer/client/ref_counted.h (working copy)
@@ -5,7 +5,11 @@
#ifndef GPU_COMMAND_BUFFER_CLIENT_REF_COUNTED_H_
#define GPU_COMMAND_BUFFER_CLIENT_REF_COUNTED_H_
-#if defined(__native_client__)
+// TODO(bbudge) The NaCl SRPC proxy can't depend on base, so we define our own
+// ref_counted. This causes duplicate class warnings in the NaCl IPC proxy,
+// which uses base. Remove the custom ref_counted class after NaCl has switched
+// proxies.
+#if defined(__native_client__) && !defined(NACL_PPAPI_IPC_PROXY)
#include "native_client/src/include/ref_counted.h"
namespace gpu {
using nacl::RefCountedThreadSafe;
« no previous file with comments | « no previous file | gpu/command_buffer/command_buffer.gyp » ('j') | ppapi/proxy/resource_creation_proxy.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698