diff options
| author | jbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-18 04:38:11 +0000 |
|---|---|---|
| committer | jbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-18 04:38:11 +0000 |
| commit | f45d3038676fa4d2a95cbf20aa692dd7c0893546 (patch) | |
| tree | edbe5130fd89c8bb778f9c19c92d3c16299b481f | |
| parent | bdf43d19fac9dc70c8dbb5b06f88a894469a33b1 (diff) | |
| download | chromium_src-f45d3038676fa4d2a95cbf20aa692dd7c0893546.zip chromium_src-f45d3038676fa4d2a95cbf20aa692dd7c0893546.tar.gz chromium_src-f45d3038676fa4d2a95cbf20aa692dd7c0893546.tar.bz2 | |
Fix tracing for gpu/ directory in NaCl
NACL_PPAPI_IPC_PROXY isn't defined when compiling the .cc files for the IPC proxy, so instead make a NACL_PPAPI_SRPC_PROXY variable that's used only when compiling the SRPC proxy and use that to determine which trace macros to use.
BUG=93839
Review URL: https://chromiumcodereview.appspot.com/11575050
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173648 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | gpu/command_buffer/client/ref_counted.h | 2 | ||||
| -rw-r--r-- | gpu/command_buffer/common/trace_event.h | 4 | ||||
| -rw-r--r-- | ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy_untrusted.gyp | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/gpu/command_buffer/client/ref_counted.h b/gpu/command_buffer/client/ref_counted.h index e3c8f27..db7fafc 100644 --- a/gpu/command_buffer/client/ref_counted.h +++ b/gpu/command_buffer/client/ref_counted.h @@ -9,7 +9,7 @@ // 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) +#if defined(NACL_PPAPI_SRPC_PROXY) #include "native_client/src/include/ref_counted.h" namespace gpu { using nacl::RefCountedThreadSafe; diff --git a/gpu/command_buffer/common/trace_event.h b/gpu/command_buffer/common/trace_event.h index cd1ab26..e497f0e1 100644 --- a/gpu/command_buffer/common/trace_event.h +++ b/gpu/command_buffer/common/trace_event.h @@ -5,7 +5,7 @@ #ifndef GPU_COMMAND_BUFFER_COMMON_TRACE_EVENT_H_ #define GPU_COMMAND_BUFFER_COMMON_TRACE_EVENT_H_ -#if defined(NACL_PPAPI_IPC_PROXY) || !defined(__native_client__) +#if !defined(NACL_PPAPI_SRPC_PROXY) #include "base/debug/trace_event.h" @@ -27,6 +27,6 @@ #define TRACE_EVENT_IF_LONGER_THAN1(x0, x1, x2, x3, x4) { } #define TRACE_EVENT_IF_LONGER_THAN2(x0, x1, x2, x3, x4, x5, x6) { } -#endif // __native_client__ +#endif // NACL_PPAPI_SRPC_PROXY #endif // GPU_COMMAND_BUFFER_COMMON_TRACE_EVENT_H_ diff --git a/ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy_untrusted.gyp b/ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy_untrusted.gyp index 0fc8388..9528127 100644 --- a/ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy_untrusted.gyp +++ b/ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy_untrusted.gyp @@ -24,6 +24,9 @@ '<(DEPTH)/media', '<(DEPTH)/ppapi/native_client/src/shared/ppapi_proxy/untrusted', ], + 'defines': [ + 'NACL_PPAPI_SRPC_PROXY', + ], 'sources': [ '<(DEPTH)/gpu/command_buffer/common/cmd_buffer_common.cc', '<(DEPTH)/gpu/command_buffer/common/debug_marker_manager.cc', |