diff options
| author | nfullagar@google.com <nfullagar@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-22 02:25:01 +0000 |
|---|---|---|
| committer | nfullagar@google.com <nfullagar@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-22 02:25:01 +0000 |
| commit | 0d792d227c65393c1142a1dbbe7826cc39c8bbec (patch) | |
| tree | e5a5f52a6645edbbf7faa8222fe8fad137223406 /gpu | |
| parent | 7646f9268284aad761f4640ee67ae16e739ade13 (diff) | |
| download | chromium_src-0d792d227c65393c1142a1dbbe7826cc39c8bbec.zip chromium_src-0d792d227c65393c1142a1dbbe7826cc39c8bbec.tar.gz chromium_src-0d792d227c65393c1142a1dbbe7826cc39c8bbec.tar.bz2 | |
Quick fix so we can bump DEPS of Chrome in NaCl
- stub out GPU_TRACE_EVENTn on #if defined(__native_client__) builds and
avoid pulling in base/*.h files.
BUG=none
TEST=trybots
Review URL: http://codereview.chromium.org/6900004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82613 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/common/gpu_trace_event.h | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/gpu/common/gpu_trace_event.h b/gpu/common/gpu_trace_event.h index 2ed9b9d..baf1392 100644 --- a/gpu/common/gpu_trace_event.h +++ b/gpu/common/gpu_trace_event.h @@ -42,6 +42,25 @@ #define GPU_TRACE_EVENT_H_ #pragma once +#if defined(__native_client__) + +// Native Client needs to avoid pulling in base/ headers, +// so stub out the tracing code at compile time. +#define GPU_TRACE_EVENT0(x0, x1) { } +#define GPU_TRACE_EVENT1(x0, x1, x2, x3) { } +#define GPU_TRACE_EVENT2(x0, x1, x2, x3, x4, x5) { } +#define GPU_TRACE_EVENT_INSTANT0(x0, x1) { } +#define GPU_TRACE_EVENT_INSTANT1(x0, x1, x2, x3) { } +#define GPU_TRACE_EVENT_INSTANT2(x0, x1, x2, x3, x4, x5) { } +#define GPU_TRACE_BEGIN0(x0, x1) { } +#define GPU_TRACE_BEGIN1(x0, x1, x2, x3) { } +#define GPU_TRACE_BEGIN2(x0, x1, x2, x3, x4, x5) { } +#define GPU_TRACE_END0(x0, x1) { } +#define GPU_TRACE_END1(x0, x1, x2, x3) { } +#define GPU_TRACE_END2(x0, x1, x2, x3, x4, x5) { } + +#else + #include "build/build_config.h" #include <string> @@ -300,5 +319,5 @@ class TraceEndOnScopeClose { } // namespace internal } // namespace gpu - +#endif // __native_client__ #endif // GPU_TRACE_EVENT_H_ |